diff --git a/513grapheme-stack.mu b/513grapheme-stack.mu
index 3aa0fd4e..5792e08c 100644
--- a/513grapheme-stack.mu
+++ b/513grapheme-stack.mu
@@ -1,26 +1,26 @@
 # code-point-utf8 stacks are the smallest unit of editable text
 
-type code-point-utf8-stack {
+type grapheme-stack {
   data: (handle array code-point-utf8)
   top: int
 }
 
-fn initialize-code-point-utf8-stack _self: (addr code-point-utf8-stack), n: int {
-  var self/esi: (addr code-point-utf8-stack) <- copy _self
+fn initialize-grapheme-stack _self: (addr grapheme-stack), n: int {
+  var self/esi: (addr grapheme-stack) <- copy _self
   var d/edi: (addr handle array code-point-utf8) <- get self, data
   populate d, n
   var top/eax: (addr int) <- get self, top
   copy-to *top, 0
 }
 
-fn clear-code-point-utf8-stack _self: (addr code-point-utf8-stack) {
-  var self/esi: (addr code-point-utf8-stack) <- copy _self
+fn clear-grapheme-stack _self: (addr grapheme-stack) {
+  var self/esi: (addr grapheme-stack) <- copy _self
   var top/eax: (addr int) <- get self, top
   copy-to *top, 0
 }
 
-fn code-point-utf8-stack-empty? _self: (addr code-point-utf8-stack) -> _/eax: boolean {
-  var self/esi: (addr code-point-utf8-stack) <- copy _self
+fn grapheme-stack-empty? _self: (addr grapheme-stack) -> _/eax: boolean {
+  var self/esi: (addr grapheme-stack) <- copy _self
   var top/eax: (addr int) <- get self, top
   compare *top, 0
   {
@@ -30,14 +30,14 @@ fn code-point-utf8-stack-empty? _self: (addr code-point-utf8-stack) -> _/eax: bo
   return 0/false
 }
 
-fn code-point-utf8-stack-length _self: (addr code-point-utf8-stack) -> _/eax: int {
-  var self/esi: (addr code-point-utf8-stack) <- copy _self
+fn grapheme-stack-length _self: (addr grapheme-stack) -> _/eax: int {
+  var self/esi: (addr grapheme-stack) <- copy _self
   var top/eax: (addr int) <- get self, top
   return *top
 }
 
-fn push-code-point-utf8-stack _self: (addr code-point-utf8-stack), _val: code-point-utf8 {
-  var self/esi: (addr code-point-utf8-stack) <- copy _self
+fn push-grapheme-stack _self: (addr grapheme-stack), _val: code-point-utf8 {
+  var self/esi: (addr grapheme-stack) <- copy _self
   var top-addr/ecx: (addr int) <- get self, top
   var data-ah/edx: (addr handle array code-point-utf8) <- get self, data
   var data/eax: (addr array code-point-utf8) <- lookup *data-ah
@@ -48,8 +48,8 @@ fn push-code-point-utf8-stack _self: (addr code-point-utf8-stack), _val: code-po
   add-to *top-addr, 1
 }
 
-fn pop-code-point-utf8-stack _self: (addr code-point-utf8-stack) -> _/eax: code-point-utf8 {
-  var self/esi: (addr code-point-utf8-stack) <- copy _self
+fn pop-grapheme-stack _self: (addr grapheme-stack) -> _/eax: code-point-utf8 {
+  var self/esi: (addr grapheme-stack) <- copy _self
   var top-addr/ecx: (addr int) <- get self, top
   {
     compare *top-addr, 0
@@ -64,8 +64,8 @@ fn pop-code-point-utf8-stack _self: (addr code-point-utf8-stack) -> _/eax: code-
   return *result-addr
 }
 
-fn copy-code-point-utf8-stack _src: (addr code-point-utf8-stack), dest: (addr code-point-utf8-stack) {
-  var src/esi: (addr code-point-utf8-stack) <- copy _src
+fn copy-grapheme-stack _src: (addr grapheme-stack), dest: (addr grapheme-stack) {
+  var src/esi: (addr grapheme-stack) <- copy _src
   var data-ah/edi: (addr handle array code-point-utf8) <- get src, data
   var _data/eax: (addr array code-point-utf8) <- lookup *data-ah
   var data/edi: (addr array code-point-utf8) <- copy _data
@@ -75,7 +75,7 @@ fn copy-code-point-utf8-stack _src: (addr code-point-utf8-stack), dest: (addr co
     compare i, *top-addr
     break-if->=
     var g/edx: (addr code-point-utf8) <- index data, i
-    push-code-point-utf8-stack dest, *g
+    push-grapheme-stack dest, *g
     i <- increment
     loop
   }
@@ -84,8 +84,8 @@ fn copy-code-point-utf8-stack _src: (addr code-point-utf8-stack), dest: (addr co
 # dump stack to screen from bottom to top
 # hardcoded colors:
 #   matching paren
-fn render-stack-from-bottom-wrapping-right-then-down screen: (addr screen), _self: (addr code-point-utf8-stack), xmin: int, ymin: int, xmax: int, ymax: int, _x: int, _y: int, highlight-matching-open-paren?: boolean, open-paren-depth: int, color: int, background-color: int -> _/eax: int, _/ecx: int {
-  var self/esi: (addr code-point-utf8-stack) <- copy _self
+fn render-stack-from-bottom-wrapping-right-then-down screen: (addr screen), _self: (addr grapheme-stack), xmin: int, ymin: int, xmax: int, ymax: int, _x: int, _y: int, highlight-matching-open-paren?: boolean, open-paren-depth: int, color: int, background-color: int -> _/eax: int, _/ecx: int {
+  var self/esi: (addr grapheme-stack) <- copy _self
   var matching-open-paren-index/edx: int <- get-matching-open-paren-index self, highlight-matching-open-paren?, open-paren-depth
   var data-ah/edi: (addr handle array code-point-utf8) <- get self, data
   var _data/eax: (addr array code-point-utf8) <- lookup *data-ah
@@ -123,7 +123,7 @@ fn render-stack-from-bottom-wrapping-right-then-down screen: (addr screen), _sel
 }
 
 # helper for small words
-fn render-stack-from-bottom screen: (addr screen), self: (addr code-point-utf8-stack), x: int, y: int, highlight-matching-open-paren?: boolean, open-paren-depth: int -> _/eax: int {
+fn render-stack-from-bottom screen: (addr screen), self: (addr grapheme-stack), x: int, y: int, highlight-matching-open-paren?: boolean, open-paren-depth: int -> _/eax: int {
   var _width/eax: int <- copy 0
   var _height/ecx: int <- copy 0
   _width, _height <- screen-size screen
@@ -140,8 +140,8 @@ fn render-stack-from-bottom screen: (addr screen), self: (addr code-point-utf8-s
 # hard-coded colors:
 #   matching paren
 #   cursor
-fn render-stack-from-top-wrapping-right-then-down screen: (addr screen), _self: (addr code-point-utf8-stack), xmin: int, ymin: int, xmax: int, ymax: int, _x: int, _y: int, render-cursor?: boolean, color: int, background-color: int -> _/eax: int, _/ecx: int {
-  var self/esi: (addr code-point-utf8-stack) <- copy _self
+fn render-stack-from-top-wrapping-right-then-down screen: (addr screen), _self: (addr grapheme-stack), xmin: int, ymin: int, xmax: int, ymax: int, _x: int, _y: int, render-cursor?: boolean, color: int, background-color: int -> _/eax: int, _/ecx: int {
+  var self/esi: (addr grapheme-stack) <- copy _self
   var matching-close-paren-index/edx: int <- get-matching-close-paren-index self, render-cursor?
   var data-ah/eax: (addr handle array code-point-utf8) <- get self, data
   var _data/eax: (addr array code-point-utf8) <- lookup *data-ah
@@ -196,7 +196,7 @@ fn render-stack-from-top-wrapping-right-then-down screen: (addr screen), _self:
 }
 
 # helper for small words
-fn render-stack-from-top screen: (addr screen), self: (addr code-point-utf8-stack), x: int, y: int, render-cursor?: boolean -> _/eax: int {
+fn render-stack-from-top screen: (addr screen), self: (addr grapheme-stack), x: int, y: int, render-cursor?: boolean -> _/eax: int {
   var _width/eax: int <- copy 0
   var _height/ecx: int <- copy 0
   _width, _height <- screen-size screen
@@ -208,190 +208,190 @@ fn render-stack-from-top screen: (addr screen), self: (addr code-point-utf8-stac
   return x2  # y2? yolo
 }
 
-fn test-render-code-point-utf8-stack {
+fn test-render-grapheme-stack {
   # setup: gs = "abc"
-  var gs-storage: code-point-utf8-stack
-  var gs/edi: (addr code-point-utf8-stack) <- address gs-storage
-  initialize-code-point-utf8-stack gs, 5
+  var gs-storage: grapheme-stack
+  var gs/edi: (addr grapheme-stack) <- address gs-storage
+  initialize-grapheme-stack gs, 5
   var g/eax: code-point-utf8 <- copy 0x61/a
-  push-code-point-utf8-stack gs, g
+  push-grapheme-stack gs, g
   g <- copy 0x62/b
-  push-code-point-utf8-stack gs, g
+  push-grapheme-stack gs, g
   g <- copy 0x63/c
-  push-code-point-utf8-stack gs, g
+  push-grapheme-stack gs, g
   # setup: screen
   var screen-storage: screen
   var screen/esi: (addr screen) <- address screen-storage
   initialize-screen screen, 5, 4, 0/no-pixel-graphics
   #
   var x/eax: int <- render-stack-from-bottom screen, gs, 0/x, 0/y, 0/no-highlight-matching-open-paren, 0/open-paren-depth
-  check-screen-row screen, 0/y, "abc ", "F - test-render-code-point-utf8-stack from bottom"
-  check-ints-equal x, 3, "F - test-render-code-point-utf8-stack from bottom: result"
-  check-background-color-in-screen-row screen, 3/bg=reverse, 0/y, "   ", "F - test-render-code-point-utf8-stack from bottom: bg"
+  check-screen-row screen, 0/y, "abc ", "F - test-render-grapheme-stack from bottom"
+  check-ints-equal x, 3, "F - test-render-grapheme-stack from bottom: result"
+  check-background-color-in-screen-row screen, 3/bg=reverse, 0/y, "   ", "F - test-render-grapheme-stack from bottom: bg"
   #
   var x/eax: int <- render-stack-from-top screen, gs, 0/x, 1/y, 0/cursor=false
-  check-screen-row screen, 1/y, "cba ", "F - test-render-code-point-utf8-stack from top without cursor"
-  check-ints-equal x, 3, "F - test-render-code-point-utf8-stack from top without cursor: result"
-  check-background-color-in-screen-row screen, 3/bg=reverse, 1/y, "   ", "F - test-render-code-point-utf8-stack from top without cursor: bg"
+  check-screen-row screen, 1/y, "cba ", "F - test-render-grapheme-stack from top without cursor"
+  check-ints-equal x, 3, "F - test-render-grapheme-stack from top without cursor: result"
+  check-background-color-in-screen-row screen, 3/bg=reverse, 1/y, "   ", "F - test-render-grapheme-stack from top without cursor: bg"
   #
   var x/eax: int <- render-stack-from-top screen, gs, 0/x, 2/y, 1/cursor=true
-  check-screen-row screen, 2/y, "cba ", "F - test-render-code-point-utf8-stack from top with cursor"
-  check-ints-equal x, 3, "F - test-render-code-point-utf8-stack from top with cursor: result"
-  check-background-color-in-screen-row screen, 3/bg=reverse, 2/y, "|   ", "F - test-render-code-point-utf8-stack from top with cursor: bg"
+  check-screen-row screen, 2/y, "cba ", "F - test-render-grapheme-stack from top with cursor"
+  check-ints-equal x, 3, "F - test-render-grapheme-stack from top with cursor: result"
+  check-background-color-in-screen-row screen, 3/bg=reverse, 2/y, "|   ", "F - test-render-grapheme-stack from top with cursor: bg"
 }
 
-fn test-render-code-point-utf8-stack-while-highlighting-matching-close-paren {
+fn test-render-grapheme-stack-while-highlighting-matching-close-paren {
   # setup: gs = "(b)"
-  var gs-storage: code-point-utf8-stack
-  var gs/edi: (addr code-point-utf8-stack) <- address gs-storage
-  initialize-code-point-utf8-stack gs, 5
+  var gs-storage: grapheme-stack
+  var gs/edi: (addr grapheme-stack) <- address gs-storage
+  initialize-grapheme-stack gs, 5
   var g/eax: code-point-utf8 <- copy 0x29/close-paren
-  push-code-point-utf8-stack gs, g
+  push-grapheme-stack gs, g
   g <- copy 0x62/b
-  push-code-point-utf8-stack gs, g
+  push-grapheme-stack gs, g
   g <- copy 0x28/open-paren
-  push-code-point-utf8-stack gs, g
+  push-grapheme-stack gs, g
   # setup: screen
   var screen-storage: screen
   var screen/esi: (addr screen) <- address screen-storage
   initialize-screen screen, 5, 4, 0/no-pixel-graphics
   #
   var x/eax: int <- render-stack-from-top screen, gs, 0/x, 2/y, 1/cursor=true
-  check-screen-row                      screen,               2/y, "(b) ", "F - test-render-code-point-utf8-stack-while-highlighting-matching-close-paren"
-  check-background-color-in-screen-row  screen, 3/bg=reverse,  2/y, "|   ", "F - test-render-code-point-utf8-stack-while-highlighting-matching-close-paren: cursor"
-  check-screen-row-in-color             screen, 0xf/fg=white, 2/y, "  ) ", "F - test-render-code-point-utf8-stack-while-highlighting-matching-close-paren: matching paren"
+  check-screen-row                      screen,               2/y, "(b) ", "F - test-render-grapheme-stack-while-highlighting-matching-close-paren"
+  check-background-color-in-screen-row  screen, 3/bg=reverse,  2/y, "|   ", "F - test-render-grapheme-stack-while-highlighting-matching-close-paren: cursor"
+  check-screen-row-in-color             screen, 0xf/fg=white, 2/y, "  ) ", "F - test-render-grapheme-stack-while-highlighting-matching-close-paren: matching paren"
 }
 
-fn test-render-code-point-utf8-stack-while-highlighting-matching-close-paren-2 {
+fn test-render-grapheme-stack-while-highlighting-matching-close-paren-2 {
   # setup: gs = "(a (b)) c"
-  var gs-storage: code-point-utf8-stack
-  var gs/edi: (addr code-point-utf8-stack) <- address gs-storage
-  initialize-code-point-utf8-stack gs, 0x10
+  var gs-storage: grapheme-stack
+  var gs/edi: (addr grapheme-stack) <- address gs-storage
+  initialize-grapheme-stack gs, 0x10
   var g/eax: code-point-utf8 <- copy 0x63/c
-  push-code-point-utf8-stack gs, g
+  push-grapheme-stack gs, g
   g <- copy 0x20/space
-  push-code-point-utf8-stack gs, g
+  push-grapheme-stack gs, g
   g <- copy 0x29/close-paren
-  push-code-point-utf8-stack gs, g
+  push-grapheme-stack gs, g
   g <- copy 0x29/close-paren
-  push-code-point-utf8-stack gs, g
+  push-grapheme-stack gs, g
   g <- copy 0x62/b
-  push-code-point-utf8-stack gs, g
+  push-grapheme-stack gs, g
   g <- copy 0x28/open-paren
-  push-code-point-utf8-stack gs, g
+  push-grapheme-stack gs, g
   g <- copy 0x20/space
-  push-code-point-utf8-stack gs, g
+  push-grapheme-stack gs, g
   g <- copy 0x61/a
-  push-code-point-utf8-stack gs, g
+  push-grapheme-stack gs, g
   g <- copy 0x28/open-paren
-  push-code-point-utf8-stack gs, g
+  push-grapheme-stack gs, g
   # setup: screen
   var screen-storage: screen
   var screen/esi: (addr screen) <- address screen-storage
   initialize-screen screen, 5, 4, 0/no-pixel-graphics
   #
   var x/eax: int <- render-stack-from-top screen, gs, 0/x, 2/y, 1/cursor=true
-  check-screen-row                      screen,               2/y, "(a (b)) c ", "F - test-render-code-point-utf8-stack-while-highlighting-matching-close-paren-2"
-  check-background-color-in-screen-row  screen, 3/bg=reverse,  2/y, "|         ", "F - test-render-code-point-utf8-stack-while-highlighting-matching-close-paren-2: cursor"
-  check-screen-row-in-color             screen, 0xf/fg=white, 2/y, "      )   ", "F - test-render-code-point-utf8-stack-while-highlighting-matching-close-paren-2: matching paren"
+  check-screen-row                      screen,               2/y, "(a (b)) c ", "F - test-render-grapheme-stack-while-highlighting-matching-close-paren-2"
+  check-background-color-in-screen-row  screen, 3/bg=reverse,  2/y, "|         ", "F - test-render-grapheme-stack-while-highlighting-matching-close-paren-2: cursor"
+  check-screen-row-in-color             screen, 0xf/fg=white, 2/y, "      )   ", "F - test-render-grapheme-stack-while-highlighting-matching-close-paren-2: matching paren"
 }
 
-fn test-render-code-point-utf8-stack-while-highlighting-matching-open-paren-with-close-paren-at-end {
+fn test-render-grapheme-stack-while-highlighting-matching-open-paren-with-close-paren-at-end {
   # setup: gs = "(b)"
-  var gs-storage: code-point-utf8-stack
-  var gs/edi: (addr code-point-utf8-stack) <- address gs-storage
-  initialize-code-point-utf8-stack gs, 5
+  var gs-storage: grapheme-stack
+  var gs/edi: (addr grapheme-stack) <- address gs-storage
+  initialize-grapheme-stack gs, 5
   var g/eax: code-point-utf8 <- copy 0x28/open-paren
-  push-code-point-utf8-stack gs, g
+  push-grapheme-stack gs, g
   g <- copy 0x62/b
-  push-code-point-utf8-stack gs, g
+  push-grapheme-stack gs, g
   g <- copy 0x29/close-paren
-  push-code-point-utf8-stack gs, g
+  push-grapheme-stack gs, g
   # setup: screen
   var screen-storage: screen
   var screen/esi: (addr screen) <- address screen-storage
   initialize-screen screen, 5, 4, 0/no-pixel-graphics
   #
   var x/eax: int <- render-stack-from-bottom screen, gs, 0/x, 2/y, 1/highlight-matching-open-paren, 1/open-paren-depth
-  check-screen-row          screen,               2/y, "(b) ", "F - test-render-code-point-utf8-stack-while-highlighting-matching-open-paren-with-close-paren-at-end"
-  check-screen-row-in-color screen, 0xf/fg=white, 2/y, "(   ", "F - test-render-code-point-utf8-stack-while-highlighting-matching-open-paren-with-close-paren-at-end: matching paren"
+  check-screen-row          screen,               2/y, "(b) ", "F - test-render-grapheme-stack-while-highlighting-matching-open-paren-with-close-paren-at-end"
+  check-screen-row-in-color screen, 0xf/fg=white, 2/y, "(   ", "F - test-render-grapheme-stack-while-highlighting-matching-open-paren-with-close-paren-at-end: matching paren"
 }
 
-fn test-render-code-point-utf8-stack-while-highlighting-matching-open-paren-with-close-paren-at-end-2 {
+fn test-render-grapheme-stack-while-highlighting-matching-open-paren-with-close-paren-at-end-2 {
   # setup: gs = "a((b))"
-  var gs-storage: code-point-utf8-stack
-  var gs/edi: (addr code-point-utf8-stack) <- address gs-storage
-  initialize-code-point-utf8-stack gs, 0x10
+  var gs-storage: grapheme-stack
+  var gs/edi: (addr grapheme-stack) <- address gs-storage
+  initialize-grapheme-stack gs, 0x10
   var g/eax: code-point-utf8 <- copy 0x61/a
-  push-code-point-utf8-stack gs, g
+  push-grapheme-stack gs, g
   g <- copy 0x28/open-paren
-  push-code-point-utf8-stack gs, g
+  push-grapheme-stack gs, g
   g <- copy 0x28/open-paren
-  push-code-point-utf8-stack gs, g
+  push-grapheme-stack gs, g
   g <- copy 0x62/b
-  push-code-point-utf8-stack gs, g
+  push-grapheme-stack gs, g
   g <- copy 0x29/close-paren
-  push-code-point-utf8-stack gs, g
+  push-grapheme-stack gs, g
   g <- copy 0x29/close-paren
-  push-code-point-utf8-stack gs, g
+  push-grapheme-stack gs, g
   # setup: screen
   var screen-storage: screen
   var screen/esi: (addr screen) <- address screen-storage
   initialize-screen screen, 5, 4, 0/no-pixel-graphics
   #
   var x/eax: int <- render-stack-from-bottom screen, gs, 0/x, 2/y, 1/highlight-matching-open-paren, 1/open-paren-depth
-  check-screen-row          screen,               2/y, "a((b)) ", "F - test-render-code-point-utf8-stack-while-highlighting-matching-open-paren-with-close-paren-at-end-2"
-  check-screen-row-in-color screen, 0xf/fg=white, 2/y, " (     ", "F - test-render-code-point-utf8-stack-while-highlighting-matching-open-paren-with-close-paren-at-end-2: matching paren"
+  check-screen-row          screen,               2/y, "a((b)) ", "F - test-render-grapheme-stack-while-highlighting-matching-open-paren-with-close-paren-at-end-2"
+  check-screen-row-in-color screen, 0xf/fg=white, 2/y, " (     ", "F - test-render-grapheme-stack-while-highlighting-matching-open-paren-with-close-paren-at-end-2: matching paren"
 }
 
-fn test-render-code-point-utf8-stack-while-highlighting-matching-open-paren {
+fn test-render-grapheme-stack-while-highlighting-matching-open-paren {
   # setup: gs = "(b"
-  var gs-storage: code-point-utf8-stack
-  var gs/edi: (addr code-point-utf8-stack) <- address gs-storage
-  initialize-code-point-utf8-stack gs, 5
+  var gs-storage: grapheme-stack
+  var gs/edi: (addr grapheme-stack) <- address gs-storage
+  initialize-grapheme-stack gs, 5
   var g/eax: code-point-utf8 <- copy 0x28/open-paren
-  push-code-point-utf8-stack gs, g
+  push-grapheme-stack gs, g
   g <- copy 0x62/b
-  push-code-point-utf8-stack gs, g
+  push-grapheme-stack gs, g
   # setup: screen
   var screen-storage: screen
   var screen/esi: (addr screen) <- address screen-storage
   initialize-screen screen, 5, 4, 0/no-pixel-graphics
   #
   var x/eax: int <- render-stack-from-bottom screen, gs, 0/x, 2/y, 1/highlight-matching-open-paren, 0/open-paren-depth
-  check-screen-row          screen,               2/y, "(b ", "F - test-render-code-point-utf8-stack-while-highlighting-matching-open-paren"
-  check-screen-row-in-color screen, 0xf/fg=white, 2/y, "(  ", "F - test-render-code-point-utf8-stack-while-highlighting-matching-open-paren: matching paren"
+  check-screen-row          screen,               2/y, "(b ", "F - test-render-grapheme-stack-while-highlighting-matching-open-paren"
+  check-screen-row-in-color screen, 0xf/fg=white, 2/y, "(  ", "F - test-render-grapheme-stack-while-highlighting-matching-open-paren: matching paren"
 }
 
-fn test-render-code-point-utf8-stack-while-highlighting-matching-open-paren-2 {
+fn test-render-grapheme-stack-while-highlighting-matching-open-paren-2 {
   # setup: gs = "a((b)"
-  var gs-storage: code-point-utf8-stack
-  var gs/edi: (addr code-point-utf8-stack) <- address gs-storage
-  initialize-code-point-utf8-stack gs, 0x10
+  var gs-storage: grapheme-stack
+  var gs/edi: (addr grapheme-stack) <- address gs-storage
+  initialize-grapheme-stack gs, 0x10
   var g/eax: code-point-utf8 <- copy 0x61/a
-  push-code-point-utf8-stack gs, g
+  push-grapheme-stack gs, g
   g <- copy 0x28/open-paren
-  push-code-point-utf8-stack gs, g
+  push-grapheme-stack gs, g
   g <- copy 0x28/open-paren
-  push-code-point-utf8-stack gs, g
+  push-grapheme-stack gs, g
   g <- copy 0x62/b
-  push-code-point-utf8-stack gs, g
+  push-grapheme-stack gs, g
   g <- copy 0x29/close-paren
-  push-code-point-utf8-stack gs, g
+  push-grapheme-stack gs, g
   # setup: screen
   var screen-storage: screen
   var screen/esi: (addr screen) <- address screen-storage
   initialize-screen screen, 5, 4, 0/no-pixel-graphics
   #
   var x/eax: int <- render-stack-from-bottom screen, gs, 0/x, 2/y, 1/highlight-matching-open-paren, 0/open-paren-depth
-  check-screen-row          screen,               2/y, "a((b) ", "F - test-render-code-point-utf8-stack-while-highlighting-matching-open-paren-2"
-  check-screen-row-in-color screen, 0xf/fg=white, 2/y, " (    ", "F - test-render-code-point-utf8-stack-while-highlighting-matching-open-paren-2: matching paren"
+  check-screen-row          screen,               2/y, "a((b) ", "F - test-render-grapheme-stack-while-highlighting-matching-open-paren-2"
+  check-screen-row-in-color screen, 0xf/fg=white, 2/y, " (    ", "F - test-render-grapheme-stack-while-highlighting-matching-open-paren-2: matching paren"
 }
 
 # return the index of the matching close-paren of the code-point-utf8 at cursor (top of stack)
 # or top index if there's no matching close-paren
-fn get-matching-close-paren-index _self: (addr code-point-utf8-stack), render-cursor?: boolean -> _/edx: int {
-  var self/esi: (addr code-point-utf8-stack) <- copy _self
+fn get-matching-close-paren-index _self: (addr grapheme-stack), render-cursor?: boolean -> _/edx: int {
+  var self/esi: (addr grapheme-stack) <- copy _self
   var top-addr/edx: (addr int) <- get self, top
   # if not rendering cursor, return
   compare render-cursor?, 0/false
@@ -446,8 +446,8 @@ fn get-matching-close-paren-index _self: (addr code-point-utf8-stack), render-cu
 
 # return the index of the first open-paren at the given depth
 # or top index if there's no matching close-paren
-fn get-matching-open-paren-index _self: (addr code-point-utf8-stack), control: boolean, depth: int -> _/edx: int {
-  var self/esi: (addr code-point-utf8-stack) <- copy _self
+fn get-matching-open-paren-index _self: (addr grapheme-stack), control: boolean, depth: int -> _/edx: int {
+  var self/esi: (addr grapheme-stack) <- copy _self
   var top-addr/edx: (addr int) <- get self, top
   # if not rendering cursor, return
   compare control, 0/false
@@ -494,8 +494,8 @@ fn get-matching-open-paren-index _self: (addr code-point-utf8-stack), control: b
 
 # compare from bottom
 # beware: modifies 'stream', which must be disposed of after a false result
-fn prefix-match? _self: (addr code-point-utf8-stack), s: (addr stream byte) -> _/eax: boolean {
-  var self/esi: (addr code-point-utf8-stack) <- copy _self
+fn prefix-match? _self: (addr grapheme-stack), s: (addr stream byte) -> _/eax: boolean {
+  var self/esi: (addr grapheme-stack) <- copy _self
   var data-ah/edi: (addr handle array code-point-utf8) <- get self, data
   var _data/eax: (addr array code-point-utf8) <- lookup *data-ah
   var data/edi: (addr array code-point-utf8) <- copy _data
@@ -522,8 +522,8 @@ fn prefix-match? _self: (addr code-point-utf8-stack), s: (addr stream byte) -> _
 
 # compare from bottom
 # beware: modifies 'stream', which must be disposed of after a false result
-fn suffix-match? _self: (addr code-point-utf8-stack), s: (addr stream byte) -> _/eax: boolean {
-  var self/esi: (addr code-point-utf8-stack) <- copy _self
+fn suffix-match? _self: (addr grapheme-stack), s: (addr stream byte) -> _/eax: boolean {
+  var self/esi: (addr grapheme-stack) <- copy _self
   var data-ah/edi: (addr handle array code-point-utf8) <- get self, data
   var _data/eax: (addr array code-point-utf8) <- lookup *data-ah
   var data/edi: (addr array code-point-utf8) <- copy _data
@@ -549,15 +549,15 @@ fn suffix-match? _self: (addr code-point-utf8-stack), s: (addr stream byte) -> _
   return 1   # true
 }
 
-fn code-point-utf8-stack-is-decimal-integer? _self: (addr code-point-utf8-stack) -> _/eax: boolean {
-  var self/esi: (addr code-point-utf8-stack) <- copy _self
+fn grapheme-stack-is-decimal-integer? _self: (addr grapheme-stack) -> _/eax: boolean {
+  var self/esi: (addr grapheme-stack) <- copy _self
   var data-ah/eax: (addr handle array code-point-utf8) <- get self, data
   var _data/eax: (addr array code-point-utf8) <- lookup *data-ah
   var data/edx: (addr array code-point-utf8) <- copy _data
   var top-addr/ecx: (addr int) <- get self, top
   var i/ebx: int <- copy 0
   var result/eax: boolean <- copy 1/true
-  $code-point-utf8-stack-is-integer?:loop: {
+  $grapheme-stack-is-integer?:loop: {
     compare i, *top-addr
     break-if->=
     var g/edx: (addr code-point-utf8) <- index data, i
diff --git a/514gap-buffer.mu b/514gap-buffer.mu
index 6513983c..4765621e 100644
--- a/514gap-buffer.mu
+++ b/514gap-buffer.mu
@@ -1,8 +1,8 @@
 # primitive for editing text
 
 type gap-buffer {
-  left: code-point-utf8-stack
-  right: code-point-utf8-stack
+  left: grapheme-stack
+  right: grapheme-stack
   # some fields for scanning incrementally through a gap-buffer
   left-read-index: int
   right-read-index: int
@@ -10,39 +10,39 @@ type gap-buffer {
 
 fn initialize-gap-buffer _self: (addr gap-buffer), capacity: int {
   var self/esi: (addr gap-buffer) <- copy _self
-  var left/eax: (addr code-point-utf8-stack) <- get self, left
-  initialize-code-point-utf8-stack left, capacity
-  var right/eax: (addr code-point-utf8-stack) <- get self, right
-  initialize-code-point-utf8-stack right, capacity
+  var left/eax: (addr grapheme-stack) <- get self, left
+  initialize-grapheme-stack left, capacity
+  var right/eax: (addr grapheme-stack) <- get self, right
+  initialize-grapheme-stack right, capacity
 }
 
 fn clear-gap-buffer _self: (addr gap-buffer) {
   var self/esi: (addr gap-buffer) <- copy _self
-  var left/eax: (addr code-point-utf8-stack) <- get self, left
-  clear-code-point-utf8-stack left
-  var right/eax: (addr code-point-utf8-stack) <- get self, right
-  clear-code-point-utf8-stack right
+  var left/eax: (addr grapheme-stack) <- get self, left
+  clear-grapheme-stack left
+  var right/eax: (addr grapheme-stack) <- get self, right
+  clear-grapheme-stack right
 }
 
 fn gap-buffer-empty? _self: (addr gap-buffer) -> _/eax: boolean {
   var self/esi: (addr gap-buffer) <- copy _self
   # if !empty?(left) return false
   {
-    var left/eax: (addr code-point-utf8-stack) <- get self, left
-    var result/eax: boolean <- code-point-utf8-stack-empty? left
+    var left/eax: (addr grapheme-stack) <- get self, left
+    var result/eax: boolean <- grapheme-stack-empty? left
     compare result, 0/false
     break-if-!=
     return 0/false
   }
   # return empty?(right)
-  var left/eax: (addr code-point-utf8-stack) <- get self, left
-  var result/eax: boolean <- code-point-utf8-stack-empty? left
+  var left/eax: (addr grapheme-stack) <- get self, left
+  var result/eax: boolean <- grapheme-stack-empty? left
   return result
 }
 
 fn gap-buffer-capacity _gap: (addr gap-buffer) -> _/edx: int {
   var gap/esi: (addr gap-buffer) <- copy _gap
-  var left/eax: (addr code-point-utf8-stack) <- get gap, left
+  var left/eax: (addr grapheme-stack) <- get gap, left
   var left-data-ah/eax: (addr handle array code-point-utf8) <- get left, data
   var left-data/eax: (addr array code-point-utf8) <- lookup *left-data-ah
   var result/eax: int <- length left-data
@@ -86,15 +86,15 @@ fn emit-gap-buffer self: (addr gap-buffer), out: (addr stream byte) {
 
 fn append-gap-buffer _self: (addr gap-buffer), out: (addr stream byte) {
   var self/esi: (addr gap-buffer) <- copy _self
-  var left/eax: (addr code-point-utf8-stack) <- get self, left
+  var left/eax: (addr grapheme-stack) <- get self, left
   emit-stack-from-bottom left, out
-  var right/eax: (addr code-point-utf8-stack) <- get self, right
+  var right/eax: (addr grapheme-stack) <- get self, right
   emit-stack-from-top right, out
 }
 
 # dump stack from bottom to top
-fn emit-stack-from-bottom _self: (addr code-point-utf8-stack), out: (addr stream byte) {
-  var self/esi: (addr code-point-utf8-stack) <- copy _self
+fn emit-stack-from-bottom _self: (addr grapheme-stack), out: (addr stream byte) {
+  var self/esi: (addr grapheme-stack) <- copy _self
   var data-ah/edi: (addr handle array code-point-utf8) <- get self, data
   var _data/eax: (addr array code-point-utf8) <- lookup *data-ah
   var data/edi: (addr array code-point-utf8) <- copy _data
@@ -111,8 +111,8 @@ fn emit-stack-from-bottom _self: (addr code-point-utf8-stack), out: (addr stream
 }
 
 # dump stack from top to bottom
-fn emit-stack-from-top _self: (addr code-point-utf8-stack), out: (addr stream byte) {
-  var self/esi: (addr code-point-utf8-stack) <- copy _self
+fn emit-stack-from-top _self: (addr grapheme-stack), out: (addr stream byte) {
+  var self/esi: (addr grapheme-stack) <- copy _self
   var data-ah/edi: (addr handle array code-point-utf8) <- get self, data
   var _data/eax: (addr array code-point-utf8) <- lookup *data-ah
   var data/edi: (addr array code-point-utf8) <- copy _data
@@ -139,10 +139,10 @@ fn word-at-gap _self: (addr gap-buffer), out: (addr stream byte) {
     break-if-!=
     return
   }
-  var left/ecx: (addr code-point-utf8-stack) <- get self, left
+  var left/ecx: (addr grapheme-stack) <- get self, left
   var left-index/eax: int <- top-most-word left
   emit-stack-from-index left, left-index, out
-  var right/ecx: (addr code-point-utf8-stack) <- get self, right
+  var right/ecx: (addr grapheme-stack) <- get self, right
   var right-index/eax: int <- top-most-word right
   emit-stack-to-index right, right-index, out
 }
@@ -243,7 +243,7 @@ fn test-word-at-gap-multiple-words-with-gap-at-final-non-word {
 fn code-point-utf8-at-gap _self: (addr gap-buffer) -> _/eax: code-point-utf8 {
   # send top of right most of the time
   var self/esi: (addr gap-buffer) <- copy _self
-  var right/edi: (addr code-point-utf8-stack) <- get self, right
+  var right/edi: (addr grapheme-stack) <- get self, right
   var data-ah/eax: (addr handle array code-point-utf8) <- get right, data
   var data/eax: (addr array code-point-utf8) <- lookup *data-ah
   var top-addr/ecx: (addr int) <- get right, top
@@ -256,7 +256,7 @@ fn code-point-utf8-at-gap _self: (addr gap-buffer) -> _/eax: code-point-utf8 {
     return *result
   }
   # send top of left only if right is empty
-  var left/edi: (addr code-point-utf8-stack) <- get self, left
+  var left/edi: (addr grapheme-stack) <- get self, left
   var data-ah/eax: (addr handle array code-point-utf8) <- get left, data
   var data/eax: (addr array code-point-utf8) <- lookup *data-ah
   var top-addr/ecx: (addr int) <- get left, top
@@ -272,8 +272,8 @@ fn code-point-utf8-at-gap _self: (addr gap-buffer) -> _/eax: code-point-utf8 {
   return 0
 }
 
-fn top-most-word _self: (addr code-point-utf8-stack) -> _/eax: int {
-  var self/esi: (addr code-point-utf8-stack) <- copy _self
+fn top-most-word _self: (addr grapheme-stack) -> _/eax: int {
+  var self/esi: (addr grapheme-stack) <- copy _self
   var data-ah/edi: (addr handle array code-point-utf8) <- get self, data
   var _data/eax: (addr array code-point-utf8) <- lookup *data-ah
   var data/edi: (addr array code-point-utf8) <- copy _data
@@ -294,8 +294,8 @@ fn top-most-word _self: (addr code-point-utf8-stack) -> _/eax: int {
   return i
 }
 
-fn emit-stack-from-index _self: (addr code-point-utf8-stack), start: int, out: (addr stream byte) {
-  var self/esi: (addr code-point-utf8-stack) <- copy _self
+fn emit-stack-from-index _self: (addr grapheme-stack), start: int, out: (addr stream byte) {
+  var self/esi: (addr grapheme-stack) <- copy _self
   var data-ah/edi: (addr handle array code-point-utf8) <- get self, data
   var _data/eax: (addr array code-point-utf8) <- lookup *data-ah
   var data/edi: (addr array code-point-utf8) <- copy _data
@@ -311,8 +311,8 @@ fn emit-stack-from-index _self: (addr code-point-utf8-stack), start: int, out: (
   }
 }
 
-fn emit-stack-to-index _self: (addr code-point-utf8-stack), end: int, out: (addr stream byte) {
-  var self/esi: (addr code-point-utf8-stack) <- copy _self
+fn emit-stack-to-index _self: (addr grapheme-stack), end: int, out: (addr stream byte) {
+  var self/esi: (addr grapheme-stack) <- copy _self
   var data-ah/edi: (addr handle array code-point-utf8) <- get self, data
   var _data/eax: (addr array code-point-utf8) <- lookup *data-ah
   var data/edi: (addr array code-point-utf8) <- copy _data
@@ -384,14 +384,14 @@ fn is-ascii-word-code-point-utf8? g: code-point-utf8 -> _/eax: boolean {
 # cursor is a single other color.
 fn render-gap-buffer-wrapping-right-then-down screen: (addr screen), _gap: (addr gap-buffer), xmin: int, ymin: int, xmax: int, ymax: int, render-cursor?: boolean, color: int, background-color: int -> _/eax: int, _/ecx: int {
   var gap/esi: (addr gap-buffer) <- copy _gap
-  var left/edx: (addr code-point-utf8-stack) <- get gap, left
+  var left/edx: (addr grapheme-stack) <- get gap, left
   var highlight-matching-open-paren?/ebx: boolean <- copy 0/false
   var matching-open-paren-depth/edi: int <- copy 0
   highlight-matching-open-paren?, matching-open-paren-depth <- highlight-matching-open-paren? gap, render-cursor?
   var x2/eax: int <- copy 0
   var y2/ecx: int <- copy 0
   x2, y2 <- render-stack-from-bottom-wrapping-right-then-down screen, left, xmin, ymin, xmax, ymax, xmin, ymin, highlight-matching-open-paren?, matching-open-paren-depth, color, background-color
-  var right/edx: (addr code-point-utf8-stack) <- get gap, right
+  var right/edx: (addr grapheme-stack) <- get gap, right
   x2, y2 <- render-stack-from-top-wrapping-right-then-down screen, right, xmin, ymin, xmax, ymax, x2, y2, render-cursor?, color, background-color
   # decide whether we still need to print a cursor
   var fg/edi: int <- copy color
@@ -400,7 +400,7 @@ fn render-gap-buffer-wrapping-right-then-down screen: (addr screen), _gap: (addr
   {
     break-if-=
     # if the right side is empty, code-point-utf8 stack didn't print the cursor
-    var empty?/eax: boolean <- code-point-utf8-stack-empty? right
+    var empty?/eax: boolean <- grapheme-stack-empty? right
     compare empty?, 0/false
     break-if-=
     # swap foreground and background
@@ -427,10 +427,10 @@ fn render-gap-buffer screen: (addr screen), gap: (addr gap-buffer), x: int, y: i
 
 fn gap-buffer-length _gap: (addr gap-buffer) -> _/eax: int {
   var gap/esi: (addr gap-buffer) <- copy _gap
-  var left/eax: (addr code-point-utf8-stack) <- get gap, left
+  var left/eax: (addr grapheme-stack) <- get gap, left
   var tmp/eax: (addr int) <- get left, top
   var left-length/ecx: int <- copy *tmp
-  var right/esi: (addr code-point-utf8-stack) <- get gap, right
+  var right/esi: (addr grapheme-stack) <- get gap, right
   tmp <- get right, top
   var result/eax: int <- copy *tmp
   result <- add left-length
@@ -439,8 +439,8 @@ fn gap-buffer-length _gap: (addr gap-buffer) -> _/eax: int {
 
 fn add-code-point-utf8-at-gap _self: (addr gap-buffer), g: code-point-utf8 {
   var self/esi: (addr gap-buffer) <- copy _self
-  var left/eax: (addr code-point-utf8-stack) <- get self, left
-  push-code-point-utf8-stack left, g
+  var left/eax: (addr grapheme-stack) <- get self, left
+  push-grapheme-stack left, g
 }
 
 fn add-code-point-at-gap self: (addr gap-buffer), c: code-point {
@@ -466,28 +466,28 @@ fn gap-to-end self: (addr gap-buffer) {
 
 fn gap-at-start? _self: (addr gap-buffer) -> _/eax: boolean {
   var self/esi: (addr gap-buffer) <- copy _self
-  var left/eax: (addr code-point-utf8-stack) <- get self, left
-  var result/eax: boolean <- code-point-utf8-stack-empty? left
+  var left/eax: (addr grapheme-stack) <- get self, left
+  var result/eax: boolean <- grapheme-stack-empty? left
   return result
 }
 
 fn gap-at-end? _self: (addr gap-buffer) -> _/eax: boolean {
   var self/esi: (addr gap-buffer) <- copy _self
-  var right/eax: (addr code-point-utf8-stack) <- get self, right
-  var result/eax: boolean <- code-point-utf8-stack-empty? right
+  var right/eax: (addr grapheme-stack) <- get self, right
+  var result/eax: boolean <- grapheme-stack-empty? right
   return result
 }
 
 fn gap-right _self: (addr gap-buffer) -> _/eax: code-point-utf8 {
   var self/esi: (addr gap-buffer) <- copy _self
   var g/eax: code-point-utf8 <- copy 0
-  var right/ecx: (addr code-point-utf8-stack) <- get self, right
-  g <- pop-code-point-utf8-stack right
+  var right/ecx: (addr grapheme-stack) <- get self, right
+  g <- pop-grapheme-stack right
   compare g, -1
   {
     break-if-=
-    var left/ecx: (addr code-point-utf8-stack) <- get self, left
-    push-code-point-utf8-stack left, g
+    var left/ecx: (addr grapheme-stack) <- get self, left
+    push-grapheme-stack left, g
   }
   return g
 }
@@ -496,21 +496,21 @@ fn gap-left _self: (addr gap-buffer) -> _/eax: code-point-utf8 {
   var self/esi: (addr gap-buffer) <- copy _self
   var g/eax: code-point-utf8 <- copy 0
   {
-    var left/ecx: (addr code-point-utf8-stack) <- get self, left
-    g <- pop-code-point-utf8-stack left
+    var left/ecx: (addr grapheme-stack) <- get self, left
+    g <- pop-grapheme-stack left
   }
   compare g, -1
   {
     break-if-=
-    var right/ecx: (addr code-point-utf8-stack) <- get self, right
-    push-code-point-utf8-stack right, g
+    var right/ecx: (addr grapheme-stack) <- get self, right
+    push-grapheme-stack right, g
   }
   return g
 }
 
 fn index-of-gap _self: (addr gap-buffer) -> _/eax: int {
   var self/eax: (addr gap-buffer) <- copy _self
-  var left/eax: (addr code-point-utf8-stack) <- get self, left
+  var left/eax: (addr grapheme-stack) <- get self, left
   var top-addr/eax: (addr int) <- get left, top
   var result/eax: int <- copy *top-addr
   return result
@@ -519,7 +519,7 @@ fn index-of-gap _self: (addr gap-buffer) -> _/eax: int {
 fn first-code-point-utf8-in-gap-buffer _self: (addr gap-buffer) -> _/eax: code-point-utf8 {
   var self/esi: (addr gap-buffer) <- copy _self
   # try to read from left
-  var left/eax: (addr code-point-utf8-stack) <- get self, left
+  var left/eax: (addr grapheme-stack) <- get self, left
   var top-addr/ecx: (addr int) <- get left, top
   compare *top-addr, 0
   {
@@ -530,7 +530,7 @@ fn first-code-point-utf8-in-gap-buffer _self: (addr gap-buffer) -> _/eax: code-p
     return *result-addr
   }
   # try to read from right
-  var right/eax: (addr code-point-utf8-stack) <- get self, right
+  var right/eax: (addr grapheme-stack) <- get self, right
   top-addr <- get right, top
   compare *top-addr, 0
   {
@@ -549,13 +549,13 @@ fn first-code-point-utf8-in-gap-buffer _self: (addr gap-buffer) -> _/eax: code-p
 fn code-point-utf8-before-cursor-in-gap-buffer _self: (addr gap-buffer) -> _/eax: code-point-utf8 {
   var self/esi: (addr gap-buffer) <- copy _self
   # try to read from left
-  var left/ecx: (addr code-point-utf8-stack) <- get self, left
+  var left/ecx: (addr grapheme-stack) <- get self, left
   var top-addr/edx: (addr int) <- get left, top
   compare *top-addr, 0
   {
     break-if-<=
-    var result/eax: code-point-utf8 <- pop-code-point-utf8-stack left
-    push-code-point-utf8-stack left, result
+    var result/eax: code-point-utf8 <- pop-grapheme-stack left
+    push-grapheme-stack left, result
     return result
   }
   # give up
@@ -564,14 +564,14 @@ fn code-point-utf8-before-cursor-in-gap-buffer _self: (addr gap-buffer) -> _/eax
 
 fn delete-before-gap _self: (addr gap-buffer) {
   var self/eax: (addr gap-buffer) <- copy _self
-  var left/eax: (addr code-point-utf8-stack) <- get self, left
-  var dummy/eax: code-point-utf8 <- pop-code-point-utf8-stack left
+  var left/eax: (addr grapheme-stack) <- get self, left
+  var dummy/eax: code-point-utf8 <- pop-grapheme-stack left
 }
 
 fn pop-after-gap _self: (addr gap-buffer) -> _/eax: code-point-utf8 {
   var self/eax: (addr gap-buffer) <- copy _self
-  var right/eax: (addr code-point-utf8-stack) <- get self, right
-  var result/eax: code-point-utf8 <- pop-code-point-utf8-stack right
+  var right/eax: (addr grapheme-stack) <- get self, right
+  var result/eax: code-point-utf8 <- pop-grapheme-stack right
   return result
 }
 
@@ -584,7 +584,7 @@ fn gap-buffer-equal? _self: (addr gap-buffer), s: (addr array byte) -> _/eax: bo
   var expected-stream/ecx: (addr stream byte) <- address stream-storage
   write expected-stream, s
   # compare left
-  var left/edx: (addr code-point-utf8-stack) <- get self, left
+  var left/edx: (addr grapheme-stack) <- get self, left
   var result/eax: boolean <- prefix-match? left, expected-stream
   compare result, 0/false
   {
@@ -592,7 +592,7 @@ fn gap-buffer-equal? _self: (addr gap-buffer), s: (addr array byte) -> _/eax: bo
     return result
   }
   # compare right
-  var right/edx: (addr code-point-utf8-stack) <- get self, right
+  var right/edx: (addr grapheme-stack) <- get self, right
   result <- suffix-match? right, expected-stream
   compare result, 0/false
   {
@@ -691,7 +691,7 @@ fn gap-index _self: (addr gap-buffer), _n: int -> _/eax: code-point-utf8 {
   var self/esi: (addr gap-buffer) <- copy _self
   var n/ebx: int <- copy _n
   # if n < left->length, index into left
-  var left/edi: (addr code-point-utf8-stack) <- get self, left
+  var left/edi: (addr grapheme-stack) <- get self, left
   var left-len-a/edx: (addr int) <- get left, top
   compare n, *left-len-a
   {
@@ -704,7 +704,7 @@ fn gap-index _self: (addr gap-buffer), _n: int -> _/eax: code-point-utf8 {
   # shrink n
   n <- subtract *left-len-a
   # if n < right->length, index into right
-  var right/edi: (addr code-point-utf8-stack) <- get self, right
+  var right/edi: (addr grapheme-stack) <- get self, right
   var right-len-a/edx: (addr int) <- get right, top
   compare n, *right-len-a
   {
@@ -788,25 +788,25 @@ fn copy-gap-buffer _src-ah: (addr handle gap-buffer), _dest-ah: (addr handle gap
   var dest-ah/eax: (addr handle gap-buffer) <- copy _dest-ah
   var _dest-a/eax: (addr gap-buffer) <- lookup *dest-ah
   var dest-a/edi: (addr gap-buffer) <- copy _dest-a
-  # copy left code-point-utf8-stack
-  var src/ecx: (addr code-point-utf8-stack) <- get src-a, left
-  var dest/edx: (addr code-point-utf8-stack) <- get dest-a, left
-  copy-code-point-utf8-stack src, dest
-  # copy right code-point-utf8-stack
+  # copy left grapheme-stack
+  var src/ecx: (addr grapheme-stack) <- get src-a, left
+  var dest/edx: (addr grapheme-stack) <- get dest-a, left
+  copy-grapheme-stack src, dest
+  # copy right grapheme-stack
   src <- get src-a, right
   dest <- get dest-a, right
-  copy-code-point-utf8-stack src, dest
+  copy-grapheme-stack src, dest
 }
 
 fn gap-buffer-is-decimal-integer? _self: (addr gap-buffer) -> _/eax: boolean {
   var self/esi: (addr gap-buffer) <- copy _self
-  var curr/ecx: (addr code-point-utf8-stack) <- get self, left
-  var result/eax: boolean <- code-point-utf8-stack-is-decimal-integer? curr
+  var curr/ecx: (addr grapheme-stack) <- get self, left
+  var result/eax: boolean <- grapheme-stack-is-decimal-integer? curr
   {
     compare result, 0/false
     break-if-=
     curr <- get self, right
-    result <- code-point-utf8-stack-is-decimal-integer? curr
+    result <- grapheme-stack-is-decimal-integer? curr
   }
   return result
 }
@@ -947,7 +947,7 @@ fn highlight-matching-open-paren? _gap: (addr gap-buffer), render-cursor?: boole
     return 0/false, 0
   }
   var gap/esi: (addr gap-buffer) <- copy _gap
-  var stack/edi: (addr code-point-utf8-stack) <- get gap, right
+  var stack/edi: (addr grapheme-stack) <- get gap, right
   var top-addr/eax: (addr int) <- get stack, top
   var top-index/ecx: int <- copy *top-addr
   compare top-index, 0
@@ -1022,8 +1022,8 @@ fn rewind-gap-buffer _self: (addr gap-buffer) {
 fn gap-buffer-scan-done? _self: (addr gap-buffer) -> _/eax: boolean {
   var self/esi: (addr gap-buffer) <- copy _self
   # more in left?
-  var left/eax: (addr code-point-utf8-stack) <- get self, left
-  var left-size/eax: int <- code-point-utf8-stack-length left
+  var left/eax: (addr grapheme-stack) <- get self, left
+  var left-size/eax: int <- grapheme-stack-length left
   var left-read-index/ecx: (addr int) <- get self, left-read-index
   compare *left-read-index, left-size
   {
@@ -1031,8 +1031,8 @@ fn gap-buffer-scan-done? _self: (addr gap-buffer) -> _/eax: boolean {
     return 0/false
   }
   # more in right?
-  var right/eax: (addr code-point-utf8-stack) <- get self, right
-  var right-size/eax: int <- code-point-utf8-stack-length right
+  var right/eax: (addr grapheme-stack) <- get self, right
+  var right-size/eax: int <- grapheme-stack-length right
   var right-read-index/ecx: (addr int) <- get self, right-read-index
   compare *right-read-index, right-size
   {
@@ -1046,8 +1046,8 @@ fn gap-buffer-scan-done? _self: (addr gap-buffer) -> _/eax: boolean {
 fn peek-from-gap-buffer _self: (addr gap-buffer) -> _/eax: code-point-utf8 {
   var self/esi: (addr gap-buffer) <- copy _self
   # more in left?
-  var left/ecx: (addr code-point-utf8-stack) <- get self, left
-  var left-size/eax: int <- code-point-utf8-stack-length left
+  var left/ecx: (addr grapheme-stack) <- get self, left
+  var left-size/eax: int <- grapheme-stack-length left
   var left-read-index-a/edx: (addr int) <- get self, left-read-index
   compare *left-read-index-a, left-size
   {
@@ -1059,8 +1059,8 @@ fn peek-from-gap-buffer _self: (addr gap-buffer) -> _/eax: code-point-utf8 {
     return *result
   }
   # more in right?
-  var right/ecx: (addr code-point-utf8-stack) <- get self, right
-  var _right-size/eax: int <- code-point-utf8-stack-length right
+  var right/ecx: (addr grapheme-stack) <- get self, right
+  var _right-size/eax: int <- grapheme-stack-length right
   var right-size/ebx: int <- copy _right-size
   var right-read-index-a/edx: (addr int) <- get self, right-read-index
   compare *right-read-index-a, right-size
@@ -1082,8 +1082,8 @@ fn peek-from-gap-buffer _self: (addr gap-buffer) -> _/eax: code-point-utf8 {
 fn read-from-gap-buffer _self: (addr gap-buffer) -> _/eax: code-point-utf8 {
   var self/esi: (addr gap-buffer) <- copy _self
   # more in left?
-  var left/ecx: (addr code-point-utf8-stack) <- get self, left
-  var left-size/eax: int <- code-point-utf8-stack-length left
+  var left/ecx: (addr grapheme-stack) <- get self, left
+  var left-size/eax: int <- grapheme-stack-length left
   var left-read-index-a/edx: (addr int) <- get self, left-read-index
   compare *left-read-index-a, left-size
   {
@@ -1096,8 +1096,8 @@ fn read-from-gap-buffer _self: (addr gap-buffer) -> _/eax: code-point-utf8 {
     return *result
   }
   # more in right?
-  var right/ecx: (addr code-point-utf8-stack) <- get self, right
-  var _right-size/eax: int <- code-point-utf8-stack-length right
+  var right/ecx: (addr grapheme-stack) <- get self, right
+  var _right-size/eax: int <- grapheme-stack-length right
   var right-size/ebx: int <- copy _right-size
   var right-read-index-a/edx: (addr int) <- get self, right-read-index
   compare *right-read-index-a, right-size
@@ -1120,8 +1120,8 @@ fn read-from-gap-buffer _self: (addr gap-buffer) -> _/eax: code-point-utf8 {
 fn put-back-from-gap-buffer _self: (addr gap-buffer) {
   var self/esi: (addr gap-buffer) <- copy _self
   # more in right?
-  var right/eax: (addr code-point-utf8-stack) <- get self, right
-  var right-size/eax: int <- code-point-utf8-stack-length right
+  var right/eax: (addr grapheme-stack) <- get self, right
+  var right-size/eax: int <- grapheme-stack-length right
   var right-read-index-a/eax: (addr int) <- get self, right-read-index
   compare *right-read-index-a, 0
   {
@@ -1130,8 +1130,8 @@ fn put-back-from-gap-buffer _self: (addr gap-buffer) {
     return
   }
   # more in left?
-  var left/eax: (addr code-point-utf8-stack) <- get self, left
-  var left-size/eax: int <- code-point-utf8-stack-length left
+  var left/eax: (addr grapheme-stack) <- get self, left
+  var left-size/eax: int <- grapheme-stack-length left
   var left-read-index-a/eax: (addr int) <- get self, left-read-index
   decrement *left-read-index-a
 }
diff --git a/html/513grapheme-stack.mu.html b/html/513grapheme-stack.mu.html
index bde73e65..8476f08d 100644
--- a/html/513grapheme-stack.mu.html
+++ b/html/513grapheme-stack.mu.html
@@ -64,27 +64,27 @@ if ('onhashchange' in window) {
 <pre id='vimCodeElement'>
 <span id="L1" class="LineNr">  1 </span><span class="muComment"># code-point-utf8 stacks are the smallest unit of editable text</span>
 <span id="L2" class="LineNr">  2 </span>
-<span id="L3" class="LineNr">  3 </span><span class="PreProc">type</span> <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a> <span class="Delimiter">{</span>
+<span id="L3" class="LineNr">  3 </span><span class="PreProc">type</span> <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a> <span class="Delimiter">{</span>
 <span id="L4" class="LineNr">  4 </span>  data: (handle array code-point-utf8)
 <span id="L5" class="LineNr">  5 </span>  top: int
 <span id="L6" class="LineNr">  6 </span><span class="Delimiter">}</span>
 <span id="L7" class="LineNr">  7 </span>
-<span id="L8" class="LineNr">  8 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='513grapheme-stack.mu.html#L8'>initialize-code-point-utf8-stack</a></span> _self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>), n: int <span class="Delimiter">{</span>
-<span id="L9" class="LineNr">  9 </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="L8" class="LineNr">  8 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='513grapheme-stack.mu.html#L8'>initialize-grapheme-stack</a></span> _self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>), n: int <span class="Delimiter">{</span>
+<span id="L9" class="LineNr">  9 </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="L10" class="LineNr"> 10 </span>  <span class="PreProc">var</span> d/<span class="muRegEdi">edi</span>: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> get self, data
 <span id="L11" class="LineNr"> 11 </span>  populate d, n
 <span id="L12" class="LineNr"> 12 </span>  <span class="PreProc">var</span> top/eax: (addr int) <span class="Special">&lt;-</span> get self, top
 <span id="L13" class="LineNr"> 13 </span>  copy-to *top, <span class="Constant">0</span>
 <span id="L14" class="LineNr"> 14 </span><span class="Delimiter">}</span>
 <span id="L15" class="LineNr"> 15 </span>
-<span id="L16" class="LineNr"> 16 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='513grapheme-stack.mu.html#L16'>clear-code-point-utf8-stack</a></span> _self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Delimiter">{</span>
-<span id="L17" class="LineNr"> 17 </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="L16" class="LineNr"> 16 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='513grapheme-stack.mu.html#L16'>clear-grapheme-stack</a></span> _self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Delimiter">{</span>
+<span id="L17" class="LineNr"> 17 </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="L18" class="LineNr"> 18 </span>  <span class="PreProc">var</span> top/eax: (addr int) <span class="Special">&lt;-</span> get self, top
 <span id="L19" class="LineNr"> 19 </span>  copy-to *top, <span class="Constant">0</span>
 <span id="L20" class="LineNr"> 20 </span><span class="Delimiter">}</span>
 <span id="L21" class="LineNr"> 21 </span>
-<span id="L22" class="LineNr"> 22 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='513grapheme-stack.mu.html#L22'>code-point-utf8-stack-empty?</a></span> _self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
-<span id="L23" class="LineNr"> 23 </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="L22" class="LineNr"> 22 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='513grapheme-stack.mu.html#L22'>grapheme-stack-empty?</a></span> _self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
+<span id="L23" class="LineNr"> 23 </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="L24" class="LineNr"> 24 </span>  <span class="PreProc">var</span> top/eax: (addr int) <span class="Special">&lt;-</span> get self, top
 <span id="L25" class="LineNr"> 25 </span>  compare *top, <span class="Constant">0</span>
 <span id="L26" class="LineNr"> 26 </span>  <span class="Delimiter">{</span>
@@ -94,14 +94,14 @@ if ('onhashchange' in window) {
 <span id="L30" class="LineNr"> 30 </span>  <span class="PreProc">return</span> <span class="Constant">0</span>/false
 <span id="L31" class="LineNr"> 31 </span><span class="Delimiter">}</span>
 <span id="L32" class="LineNr"> 32 </span>
-<span id="L33" class="LineNr"> 33 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='513grapheme-stack.mu.html#L33'>code-point-utf8-stack-length</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="L34" class="LineNr"> 34 </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="L33" class="LineNr"> 33 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='513grapheme-stack.mu.html#L33'>grapheme-stack-length</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="L34" class="LineNr"> 34 </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="L35" class="LineNr"> 35 </span>  <span class="PreProc">var</span> top/eax: (addr int) <span class="Special">&lt;-</span> get self, top
 <span id="L36" class="LineNr"> 36 </span>  <span class="PreProc">return</span> *top
 <span id="L37" class="LineNr"> 37 </span><span class="Delimiter">}</span>
 <span id="L38" class="LineNr"> 38 </span>
-<span id="L39" class="LineNr"> 39 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a></span> _self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>), _val: code-point-utf8 <span class="Delimiter">{</span>
-<span id="L40" class="LineNr"> 40 </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="L39" class="LineNr"> 39 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a></span> _self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>), _val: code-point-utf8 <span class="Delimiter">{</span>
+<span id="L40" class="LineNr"> 40 </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="L41" class="LineNr"> 41 </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="L42" class="LineNr"> 42 </span>  <span class="PreProc">var</span> data-ah/<span class="muRegEdx">edx</span>: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> get self, data
 <span id="L43" class="LineNr"> 43 </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
@@ -112,8 +112,8 @@ if ('onhashchange' in window) {
 <span id="L48" class="LineNr"> 48 </span>  add-to *top-addr, <span class="Constant">1</span>
 <span id="L49" class="LineNr"> 49 </span><span class="Delimiter">}</span>
 <span id="L50" class="LineNr"> 50 </span>
-<span id="L51" class="LineNr"> 51 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='513grapheme-stack.mu.html#L51'>pop-code-point-utf8-stack</a></span> _self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>)<span class="PreProc"> -&gt; </span>_/eax: code-point-utf8 <span class="Delimiter">{</span>
-<span id="L52" class="LineNr"> 52 </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="L51" class="LineNr"> 51 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='513grapheme-stack.mu.html#L51'>pop-grapheme-stack</a></span> _self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>)<span class="PreProc"> -&gt; </span>_/eax: code-point-utf8 <span class="Delimiter">{</span>
+<span id="L52" class="LineNr"> 52 </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="L53" class="LineNr"> 53 </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="L54" class="LineNr"> 54 </span>  <span class="Delimiter">{</span>
 <span id="L55" class="LineNr"> 55 </span>    compare *top-addr, <span class="Constant">0</span>
@@ -128,8 +128,8 @@ if ('onhashchange' in window) {
 <span id="L64" class="LineNr"> 64 </span>  <span class="PreProc">return</span> *result-addr
 <span id="L65" class="LineNr"> 65 </span><span class="Delimiter">}</span>
 <span id="L66" class="LineNr"> 66 </span>
-<span id="L67" class="LineNr"> 67 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='513grapheme-stack.mu.html#L67'>copy-code-point-utf8-stack</a></span> _src: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>), dest: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Delimiter">{</span>
-<span id="L68" class="LineNr"> 68 </span>  <span class="PreProc">var</span> src/<span class="muRegEsi">esi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> copy _src
+<span id="L67" class="LineNr"> 67 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='513grapheme-stack.mu.html#L67'>copy-grapheme-stack</a></span> _src: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>), dest: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Delimiter">{</span>
+<span id="L68" class="LineNr"> 68 </span>  <span class="PreProc">var</span> src/<span class="muRegEsi">esi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> copy _src
 <span id="L69" class="LineNr"> 69 </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 src, data
 <span id="L70" class="LineNr"> 70 </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="L71" class="LineNr"> 71 </span>  <span class="PreProc">var</span> data/<span class="muRegEdi">edi</span>: (addr array code-point-utf8) <span class="Special">&lt;-</span> copy _data
@@ -139,7 +139,7 @@ if ('onhashchange' in window) {
 <span id="L75" class="LineNr"> 75 </span>    compare i, *top-addr
 <span id="L76" class="LineNr"> 76 </span>    <span class="PreProc">break-if-&gt;=</span>
 <span id="L77" class="LineNr"> 77 </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="L78" class="LineNr"> 78 </span>    <a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a> dest, *g
+<span id="L78" class="LineNr"> 78 </span>    <a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a> dest, *g
 <span id="L79" class="LineNr"> 79 </span>    i <span class="Special">&lt;-</span> increment
 <span id="L80" class="LineNr"> 80 </span>    <span class="PreProc">loop</span>
 <span id="L81" class="LineNr"> 81 </span>  <span class="Delimiter">}</span>
@@ -148,8 +148,8 @@ if ('onhashchange' in window) {
 <span id="L84" class="LineNr"> 84 </span><span class="muComment"># dump stack to screen from bottom to top</span>
 <span id="L85" class="LineNr"> 85 </span><span class="muComment"># hardcoded colors:</span>
 <span id="L86" class="LineNr"> 86 </span><span class="muComment">#   matching paren</span>
-<span id="L87" class="LineNr"> 87 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='513grapheme-stack.mu.html#L87'>render-stack-from-bottom-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>), _self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>), xmin: int, ymin: int, xmax: int, ymax: int, _x: int, _y: int, <a href='514gap-buffer.mu.html#L942'>highlight-matching-open-paren?</a>: boolean, open-paren-depth: int, color: int, background-color: int<span class="PreProc"> -&gt; </span>_/eax: int, _/<span class="muRegEcx">ecx</span>: int <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='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> copy _self
+<span id="L87" class="LineNr"> 87 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='513grapheme-stack.mu.html#L87'>render-stack-from-bottom-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>), _self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>), xmin: int, ymin: int, xmax: int, ymax: int, _x: int, _y: int, <a href='514gap-buffer.mu.html#L942'>highlight-matching-open-paren?</a>: boolean, open-paren-depth: int, color: int, background-color: int<span class="PreProc"> -&gt; </span>_/eax: int, _/<span class="muRegEcx">ecx</span>: int <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='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L89" class="LineNr"> 89 </span>  <span class="PreProc">var</span> matching-open-paren-index/<span class="muRegEdx">edx</span>: int <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L449'>get-matching-open-paren-index</a> self, <a href='514gap-buffer.mu.html#L942'>highlight-matching-open-paren?</a>, open-paren-depth
 <span id="L90" class="LineNr"> 90 </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="L91" class="LineNr"> 91 </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
@@ -187,7 +187,7 @@ if ('onhashchange' in window) {
 <span id="L123" class="LineNr">123 </span><span class="Delimiter">}</span>
 <span id="L124" class="LineNr">124 </span>
 <span id="L125" class="LineNr">125 </span><span class="muComment"># helper for small words</span>
-<span id="L126" class="LineNr">126 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='513grapheme-stack.mu.html#L126'>render-stack-from-bottom</a></span> <a href='500fake-screen.mu.html#L16'>screen</a>: (addr <a href='500fake-screen.mu.html#L16'>screen</a>), self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>), x: int, y: int, <a href='514gap-buffer.mu.html#L942'>highlight-matching-open-paren?</a>: boolean, open-paren-depth: int<span class="PreProc"> -&gt; </span>_/eax: int <span class="Delimiter">{</span>
+<span id="L126" class="LineNr">126 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='513grapheme-stack.mu.html#L126'>render-stack-from-bottom</a></span> <a href='500fake-screen.mu.html#L16'>screen</a>: (addr <a href='500fake-screen.mu.html#L16'>screen</a>), self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>), x: int, y: int, <a href='514gap-buffer.mu.html#L942'>highlight-matching-open-paren?</a>: boolean, open-paren-depth: int<span class="PreProc"> -&gt; </span>_/eax: int <span class="Delimiter">{</span>
 <span id="L127" class="LineNr">127 </span>  <span class="PreProc">var</span> _width/eax: int <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
 <span id="L128" class="LineNr">128 </span>  <span class="PreProc">var</span> _height/<span class="muRegEcx">ecx</span>: int <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
 <span id="L129" class="LineNr">129 </span>  _width, _height <span class="Special">&lt;-</span> <a href='500fake-screen.mu.html#L75'>screen-size</a> <a href='500fake-screen.mu.html#L16'>screen</a>
@@ -204,8 +204,8 @@ if ('onhashchange' in window) {
 <span id="L140" class="LineNr">140 </span><span class="muComment"># hard-coded colors:</span>
 <span id="L141" class="LineNr">141 </span><span class="muComment">#   matching paren</span>
 <span id="L142" class="LineNr">142 </span><span class="muComment">#   cursor</span>
-<span id="L143" class="LineNr">143 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='513grapheme-stack.mu.html#L143'>render-stack-from-top-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>), _self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>), xmin: int, ymin: int, xmax: int, ymax: int, _x: int, _y: 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="L144" class="LineNr">144 </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="L143" class="LineNr">143 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='513grapheme-stack.mu.html#L143'>render-stack-from-top-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>), _self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>), xmin: int, ymin: int, xmax: int, ymax: int, _x: int, _y: 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="L144" class="LineNr">144 </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="L145" class="LineNr">145 </span>  <span class="PreProc">var</span> matching-close-paren-index/<span class="muRegEdx">edx</span>: int <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L393'>get-matching-close-paren-index</a> self, render-cursor?
 <span id="L146" class="LineNr">146 </span>  <span class="PreProc">var</span> data-ah/eax: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> get self, data
 <span id="L147" class="LineNr">147 </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
@@ -260,7 +260,7 @@ if ('onhashchange' in window) {
 <span id="L196" class="LineNr">196 </span><span class="Delimiter">}</span>
 <span id="L197" class="LineNr">197 </span>
 <span id="L198" class="LineNr">198 </span><span class="muComment"># helper for small words</span>
-<span id="L199" class="LineNr">199 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='513grapheme-stack.mu.html#L199'>render-stack-from-top</a></span> <a href='500fake-screen.mu.html#L16'>screen</a>: (addr <a href='500fake-screen.mu.html#L16'>screen</a>), self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>), x: int, y: int, render-cursor?: boolean<span class="PreProc"> -&gt; </span>_/eax: int <span class="Delimiter">{</span>
+<span id="L199" class="LineNr">199 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='513grapheme-stack.mu.html#L199'>render-stack-from-top</a></span> <a href='500fake-screen.mu.html#L16'>screen</a>: (addr <a href='500fake-screen.mu.html#L16'>screen</a>), self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>), x: int, y: int, render-cursor?: boolean<span class="PreProc"> -&gt; </span>_/eax: int <span class="Delimiter">{</span>
 <span id="L200" class="LineNr">200 </span>  <span class="PreProc">var</span> _width/eax: int <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
 <span id="L201" class="LineNr">201 </span>  <span class="PreProc">var</span> _height/<span class="muRegEcx">ecx</span>: int <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
 <span id="L202" class="LineNr">202 </span>  _width, _height <span class="Special">&lt;-</span> <a href='500fake-screen.mu.html#L75'>screen-size</a> <a href='500fake-screen.mu.html#L16'>screen</a>
@@ -272,190 +272,190 @@ if ('onhashchange' in window) {
 <span id="L208" class="LineNr">208 </span>  <span class="PreProc">return</span> x2  <span class="muComment"># y2? yolo</span>
 <span id="L209" class="LineNr">209 </span><span class="Delimiter">}</span>
 <span id="L210" class="LineNr">210 </span>
-<span id="L211" class="LineNr">211 </span><span class="PreProc">fn</span> <span class="muTest"><a href='513grapheme-stack.mu.html#L211'>test-render-code-point-utf8-stack</a></span> <span class="Delimiter">{</span>
+<span id="L211" class="LineNr">211 </span><span class="PreProc">fn</span> <span class="muTest"><a href='513grapheme-stack.mu.html#L211'>test-render-grapheme-stack</a></span> <span class="Delimiter">{</span>
 <span id="L212" class="LineNr">212 </span>  <span class="muComment"># setup: gs = &quot;abc&quot;</span>
-<span id="L213" class="LineNr">213 </span>  <span class="PreProc">var</span> gs-storage: <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>
-<span id="L214" class="LineNr">214 </span>  <span class="PreProc">var</span> gs/<span class="muRegEdi">edi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> address gs-storage
-<span id="L215" class="LineNr">215 </span>  <a href='513grapheme-stack.mu.html#L8'>initialize-code-point-utf8-stack</a> gs, <span class="Constant">5</span>
+<span id="L213" class="LineNr">213 </span>  <span class="PreProc">var</span> gs-storage: <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>
+<span id="L214" class="LineNr">214 </span>  <span class="PreProc">var</span> gs/<span class="muRegEdi">edi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> address gs-storage
+<span id="L215" class="LineNr">215 </span>  <a href='513grapheme-stack.mu.html#L8'>initialize-grapheme-stack</a> gs, <span class="Constant">5</span>
 <span id="L216" class="LineNr">216 </span>  <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> copy <span class="Constant">0x61</span>/a
-<span id="L217" class="LineNr">217 </span>  <a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a> gs, g
+<span id="L217" class="LineNr">217 </span>  <a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a> gs, g
 <span id="L218" class="LineNr">218 </span>  g <span class="Special">&lt;-</span> copy <span class="Constant">0x62</span>/b
-<span id="L219" class="LineNr">219 </span>  <a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a> gs, g
+<span id="L219" class="LineNr">219 </span>  <a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a> gs, g
 <span id="L220" class="LineNr">220 </span>  g <span class="Special">&lt;-</span> copy <span class="Constant">0x63</span>/c
-<span id="L221" class="LineNr">221 </span>  <a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a> gs, g
+<span id="L221" class="LineNr">221 </span>  <a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a> gs, g
 <span id="L222" class="LineNr">222 </span>  <span class="muComment"># setup: screen</span>
 <span id="L223" class="LineNr">223 </span>  <span class="PreProc">var</span> screen-storage: <a href='500fake-screen.mu.html#L16'>screen</a>
 <span id="L224" class="LineNr">224 </span>  <span class="PreProc">var</span> <a href='500fake-screen.mu.html#L16'>screen</a>/<span class="muRegEsi">esi</span>: (addr <a href='500fake-screen.mu.html#L16'>screen</a>) <span class="Special">&lt;-</span> address screen-storage
 <span id="L225" class="LineNr">225 </span>  <a href='500fake-screen.mu.html#L34'>initialize-screen</a> <a href='500fake-screen.mu.html#L16'>screen</a>, <span class="Constant">5</span>, <span class="Constant">4</span>, <span class="Constant">0</span>/no-pixel-graphics
 <span id="L226" class="LineNr">226 </span>  <span class="muComment">#</span>
 <span id="L227" class="LineNr">227 </span>  <span class="PreProc">var</span> x/eax: int <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L126'>render-stack-from-bottom</a> <a href='500fake-screen.mu.html#L16'>screen</a>, gs, <span class="Constant">0</span>/x, <span class="Constant">0</span>/y, <span class="Constant">0</span>/no-highlight-matching-open-paren, <span class="Constant">0</span>/open-paren-depth
-<span id="L228" class="LineNr">228 </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 - <a href='513grapheme-stack.mu.html#L211'>test-render-code-point-utf8-stack</a> from bottom&quot;</span>
-<span id="L229" class="LineNr">229 </span>  <a href='502test.mu.html#L2'>check-ints-equal</a> x, <span class="Constant">3</span>, <span class="Constant">&quot;F - <a href='513grapheme-stack.mu.html#L211'>test-render-code-point-utf8-stack</a> from bottom: result&quot;</span>
-<span id="L230" class="LineNr">230 </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='513grapheme-stack.mu.html#L211'>test-render-code-point-utf8-stack</a> from bottom: bg&quot;</span>
+<span id="L228" class="LineNr">228 </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 - <a href='513grapheme-stack.mu.html#L211'>test-render-grapheme-stack</a> from bottom&quot;</span>
+<span id="L229" class="LineNr">229 </span>  <a href='502test.mu.html#L2'>check-ints-equal</a> x, <span class="Constant">3</span>, <span class="Constant">&quot;F - <a href='513grapheme-stack.mu.html#L211'>test-render-grapheme-stack</a> from bottom: result&quot;</span>
+<span id="L230" class="LineNr">230 </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='513grapheme-stack.mu.html#L211'>test-render-grapheme-stack</a> from bottom: bg&quot;</span>
 <span id="L231" class="LineNr">231 </span>  <span class="muComment">#</span>
 <span id="L232" class="LineNr">232 </span>  <span class="PreProc">var</span> x/eax: int <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L199'>render-stack-from-top</a> <a href='500fake-screen.mu.html#L16'>screen</a>, gs, <span class="Constant">0</span>/x, <span class="Constant">1</span>/y, <span class="Constant">0</span>/cursor=false
-<span id="L233" class="LineNr">233 </span>  <a href='504test-screen.mu.html#L7'>check-screen-row</a> <a href='500fake-screen.mu.html#L16'>screen</a>, <span class="Constant">1</span>/y, <span class="Constant">&quot;cba &quot;</span>, <span class="Constant">&quot;F - <a href='513grapheme-stack.mu.html#L211'>test-render-code-point-utf8-stack</a> from top without cursor&quot;</span>
-<span id="L234" class="LineNr">234 </span>  <a href='502test.mu.html#L2'>check-ints-equal</a> x, <span class="Constant">3</span>, <span class="Constant">&quot;F - <a href='513grapheme-stack.mu.html#L211'>test-render-code-point-utf8-stack</a> from top without cursor: result&quot;</span>
-<span id="L235" class="LineNr">235 </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">1</span>/y, <span class="Constant">&quot;   &quot;</span>, <span class="Constant">&quot;F - <a href='513grapheme-stack.mu.html#L211'>test-render-code-point-utf8-stack</a> from top without cursor: bg&quot;</span>
+<span id="L233" class="LineNr">233 </span>  <a href='504test-screen.mu.html#L7'>check-screen-row</a> <a href='500fake-screen.mu.html#L16'>screen</a>, <span class="Constant">1</span>/y, <span class="Constant">&quot;cba &quot;</span>, <span class="Constant">&quot;F - <a href='513grapheme-stack.mu.html#L211'>test-render-grapheme-stack</a> from top without cursor&quot;</span>
+<span id="L234" class="LineNr">234 </span>  <a href='502test.mu.html#L2'>check-ints-equal</a> x, <span class="Constant">3</span>, <span class="Constant">&quot;F - <a href='513grapheme-stack.mu.html#L211'>test-render-grapheme-stack</a> from top without cursor: result&quot;</span>
+<span id="L235" class="LineNr">235 </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">1</span>/y, <span class="Constant">&quot;   &quot;</span>, <span class="Constant">&quot;F - <a href='513grapheme-stack.mu.html#L211'>test-render-grapheme-stack</a> from top without cursor: bg&quot;</span>
 <span id="L236" class="LineNr">236 </span>  <span class="muComment">#</span>
 <span id="L237" class="LineNr">237 </span>  <span class="PreProc">var</span> x/eax: int <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L199'>render-stack-from-top</a> <a href='500fake-screen.mu.html#L16'>screen</a>, gs, <span class="Constant">0</span>/x, <span class="Constant">2</span>/y, <span class="Constant">1</span>/cursor=true
-<span id="L238" class="LineNr">238 </span>  <a href='504test-screen.mu.html#L7'>check-screen-row</a> <a href='500fake-screen.mu.html#L16'>screen</a>, <span class="Constant">2</span>/y, <span class="Constant">&quot;cba &quot;</span>, <span class="Constant">&quot;F - <a href='513grapheme-stack.mu.html#L211'>test-render-code-point-utf8-stack</a> from top with cursor&quot;</span>
-<span id="L239" class="LineNr">239 </span>  <a href='502test.mu.html#L2'>check-ints-equal</a> x, <span class="Constant">3</span>, <span class="Constant">&quot;F - <a href='513grapheme-stack.mu.html#L211'>test-render-code-point-utf8-stack</a> from top with cursor: result&quot;</span>
-<span id="L240" class="LineNr">240 </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">2</span>/y, <span class="Constant">&quot;|   &quot;</span>, <span class="Constant">&quot;F - <a href='513grapheme-stack.mu.html#L211'>test-render-code-point-utf8-stack</a> from top with cursor: bg&quot;</span>
+<span id="L238" class="LineNr">238 </span>  <a href='504test-screen.mu.html#L7'>check-screen-row</a> <a href='500fake-screen.mu.html#L16'>screen</a>, <span class="Constant">2</span>/y, <span class="Constant">&quot;cba &quot;</span>, <span class="Constant">&quot;F - <a href='513grapheme-stack.mu.html#L211'>test-render-grapheme-stack</a> from top with cursor&quot;</span>
+<span id="L239" class="LineNr">239 </span>  <a href='502test.mu.html#L2'>check-ints-equal</a> x, <span class="Constant">3</span>, <span class="Constant">&quot;F - <a href='513grapheme-stack.mu.html#L211'>test-render-grapheme-stack</a> from top with cursor: result&quot;</span>
+<span id="L240" class="LineNr">240 </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">2</span>/y, <span class="Constant">&quot;|   &quot;</span>, <span class="Constant">&quot;F - <a href='513grapheme-stack.mu.html#L211'>test-render-grapheme-stack</a> from top with cursor: bg&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="muTest"><a href='513grapheme-stack.mu.html#L243'>test-render-code-point-utf8-stack-while-highlighting-matching-close-paren</a></span> <span class="Delimiter">{</span>
+<span id="L243" class="LineNr">243 </span><span class="PreProc">fn</span> <span class="muTest"><a href='513grapheme-stack.mu.html#L243'>test-render-grapheme-stack-while-highlighting-matching-close-paren</a></span> <span class="Delimiter">{</span>
 <span id="L244" class="LineNr">244 </span>  <span class="muComment"># setup: gs = &quot;(b)&quot;</span>
-<span id="L245" class="LineNr">245 </span>  <span class="PreProc">var</span> gs-storage: <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>
-<span id="L246" class="LineNr">246 </span>  <span class="PreProc">var</span> gs/<span class="muRegEdi">edi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> address gs-storage
-<span id="L247" class="LineNr">247 </span>  <a href='513grapheme-stack.mu.html#L8'>initialize-code-point-utf8-stack</a> gs, <span class="Constant">5</span>
+<span id="L245" class="LineNr">245 </span>  <span class="PreProc">var</span> gs-storage: <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>
+<span id="L246" class="LineNr">246 </span>  <span class="PreProc">var</span> gs/<span class="muRegEdi">edi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> address gs-storage
+<span id="L247" class="LineNr">247 </span>  <a href='513grapheme-stack.mu.html#L8'>initialize-grapheme-stack</a> gs, <span class="Constant">5</span>
 <span id="L248" class="LineNr">248 </span>  <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> copy <span class="Constant">0x29</span>/close-paren
-<span id="L249" class="LineNr">249 </span>  <a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a> gs, g
+<span id="L249" class="LineNr">249 </span>  <a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a> gs, g
 <span id="L250" class="LineNr">250 </span>  g <span class="Special">&lt;-</span> copy <span class="Constant">0x62</span>/b
-<span id="L251" class="LineNr">251 </span>  <a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a> gs, g
+<span id="L251" class="LineNr">251 </span>  <a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a> gs, g
 <span id="L252" class="LineNr">252 </span>  g <span class="Special">&lt;-</span> copy <span class="Constant">0x28</span>/open-paren
-<span id="L253" class="LineNr">253 </span>  <a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a> gs, g
+<span id="L253" class="LineNr">253 </span>  <a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a> gs, g
 <span id="L254" class="LineNr">254 </span>  <span class="muComment"># setup: screen</span>
 <span id="L255" class="LineNr">255 </span>  <span class="PreProc">var</span> screen-storage: <a href='500fake-screen.mu.html#L16'>screen</a>
 <span id="L256" class="LineNr">256 </span>  <span class="PreProc">var</span> <a href='500fake-screen.mu.html#L16'>screen</a>/<span class="muRegEsi">esi</span>: (addr <a href='500fake-screen.mu.html#L16'>screen</a>) <span class="Special">&lt;-</span> address screen-storage
 <span id="L257" class="LineNr">257 </span>  <a href='500fake-screen.mu.html#L34'>initialize-screen</a> <a href='500fake-screen.mu.html#L16'>screen</a>, <span class="Constant">5</span>, <span class="Constant">4</span>, <span class="Constant">0</span>/no-pixel-graphics
 <span id="L258" class="LineNr">258 </span>  <span class="muComment">#</span>
 <span id="L259" class="LineNr">259 </span>  <span class="PreProc">var</span> x/eax: int <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L199'>render-stack-from-top</a> <a href='500fake-screen.mu.html#L16'>screen</a>, gs, <span class="Constant">0</span>/x, <span class="Constant">2</span>/y, <span class="Constant">1</span>/cursor=true
-<span id="L260" class="LineNr">260 </span>  <a href='504test-screen.mu.html#L7'>check-screen-row</a>                      <a href='500fake-screen.mu.html#L16'>screen</a>,               <span class="Constant">2</span>/y, <span class="Constant">&quot;(b) &quot;</span>, <span class="Constant">&quot;F - test-render-code-point-utf8-stack-while-highlighting-matching-close-paren&quot;</span>
-<span id="L261" class="LineNr">261 </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">2</span>/y, <span class="Constant">&quot;|   &quot;</span>, <span class="Constant">&quot;F - <a href='513grapheme-stack.mu.html#L243'>test-render-code-point-utf8-stack-while-highlighting-matching-close-paren</a>: cursor&quot;</span>
-<span id="L262" class="LineNr">262 </span>  <a href='504test-screen.mu.html#L75'>check-screen-row-in-color</a>             <a href='500fake-screen.mu.html#L16'>screen</a>, <span class="Constant">0xf</span>/fg=white, <span class="Constant">2</span>/y, <span class="Constant">&quot;  ) &quot;</span>, <span class="Constant">&quot;F - <a href='513grapheme-stack.mu.html#L243'>test-render-code-point-utf8-stack-while-highlighting-matching-close-paren</a>: matching paren&quot;</span>
+<span id="L260" class="LineNr">260 </span>  <a href='504test-screen.mu.html#L7'>check-screen-row</a>                      <a href='500fake-screen.mu.html#L16'>screen</a>,               <span class="Constant">2</span>/y, <span class="Constant">&quot;(b) &quot;</span>, <span class="Constant">&quot;F - test-render-grapheme-stack-while-highlighting-matching-close-paren&quot;</span>
+<span id="L261" class="LineNr">261 </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">2</span>/y, <span class="Constant">&quot;|   &quot;</span>, <span class="Constant">&quot;F - <a href='513grapheme-stack.mu.html#L243'>test-render-grapheme-stack-while-highlighting-matching-close-paren</a>: cursor&quot;</span>
+<span id="L262" class="LineNr">262 </span>  <a href='504test-screen.mu.html#L75'>check-screen-row-in-color</a>             <a href='500fake-screen.mu.html#L16'>screen</a>, <span class="Constant">0xf</span>/fg=white, <span class="Constant">2</span>/y, <span class="Constant">&quot;  ) &quot;</span>, <span class="Constant">&quot;F - <a href='513grapheme-stack.mu.html#L243'>test-render-grapheme-stack-while-highlighting-matching-close-paren</a>: matching paren&quot;</span>
 <span id="L263" class="LineNr">263 </span><span class="Delimiter">}</span>
 <span id="L264" class="LineNr">264 </span>
-<span id="L265" class="LineNr">265 </span><span class="PreProc">fn</span> <span class="muTest"><a href='513grapheme-stack.mu.html#L265'>test-render-code-point-utf8-stack-while-highlighting-matching-close-paren-2</a></span> <span class="Delimiter">{</span>
+<span id="L265" class="LineNr">265 </span><span class="PreProc">fn</span> <span class="muTest"><a href='513grapheme-stack.mu.html#L265'>test-render-grapheme-stack-while-highlighting-matching-close-paren-2</a></span> <span class="Delimiter">{</span>
 <span id="L266" class="LineNr">266 </span>  <span class="muComment"># setup: gs = &quot;(a (b)) c&quot;</span>
-<span id="L267" class="LineNr">267 </span>  <span class="PreProc">var</span> gs-storage: <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>
-<span id="L268" class="LineNr">268 </span>  <span class="PreProc">var</span> gs/<span class="muRegEdi">edi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> address gs-storage
-<span id="L269" class="LineNr">269 </span>  <a href='513grapheme-stack.mu.html#L8'>initialize-code-point-utf8-stack</a> gs, <span class="Constant">0x10</span>
+<span id="L267" class="LineNr">267 </span>  <span class="PreProc">var</span> gs-storage: <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>
+<span id="L268" class="LineNr">268 </span>  <span class="PreProc">var</span> gs/<span class="muRegEdi">edi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> address gs-storage
+<span id="L269" class="LineNr">269 </span>  <a href='513grapheme-stack.mu.html#L8'>initialize-grapheme-stack</a> gs, <span class="Constant">0x10</span>
 <span id="L270" class="LineNr">270 </span>  <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> copy <span class="Constant">0x63</span>/c
-<span id="L271" class="LineNr">271 </span>  <a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a> gs, g
+<span id="L271" class="LineNr">271 </span>  <a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a> gs, g
 <span id="L272" class="LineNr">272 </span>  g <span class="Special">&lt;-</span> copy <span class="Constant">0x20</span>/space
-<span id="L273" class="LineNr">273 </span>  <a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a> gs, g
+<span id="L273" class="LineNr">273 </span>  <a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a> gs, g
 <span id="L274" class="LineNr">274 </span>  g <span class="Special">&lt;-</span> copy <span class="Constant">0x29</span>/close-paren
-<span id="L275" class="LineNr">275 </span>  <a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a> gs, g
+<span id="L275" class="LineNr">275 </span>  <a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a> gs, g
 <span id="L276" class="LineNr">276 </span>  g <span class="Special">&lt;-</span> copy <span class="Constant">0x29</span>/close-paren
-<span id="L277" class="LineNr">277 </span>  <a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a> gs, g
+<span id="L277" class="LineNr">277 </span>  <a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a> gs, g
 <span id="L278" class="LineNr">278 </span>  g <span class="Special">&lt;-</span> copy <span class="Constant">0x62</span>/b
-<span id="L279" class="LineNr">279 </span>  <a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a> gs, g
+<span id="L279" class="LineNr">279 </span>  <a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a> gs, g
 <span id="L280" class="LineNr">280 </span>  g <span class="Special">&lt;-</span> copy <span class="Constant">0x28</span>/open-paren
-<span id="L281" class="LineNr">281 </span>  <a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a> gs, g
+<span id="L281" class="LineNr">281 </span>  <a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a> gs, g
 <span id="L282" class="LineNr">282 </span>  g <span class="Special">&lt;-</span> copy <span class="Constant">0x20</span>/space
-<span id="L283" class="LineNr">283 </span>  <a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a> gs, g
+<span id="L283" class="LineNr">283 </span>  <a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a> gs, g
 <span id="L284" class="LineNr">284 </span>  g <span class="Special">&lt;-</span> copy <span class="Constant">0x61</span>/a
-<span id="L285" class="LineNr">285 </span>  <a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a> gs, g
+<span id="L285" class="LineNr">285 </span>  <a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a> gs, g
 <span id="L286" class="LineNr">286 </span>  g <span class="Special">&lt;-</span> copy <span class="Constant">0x28</span>/open-paren
-<span id="L287" class="LineNr">287 </span>  <a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a> gs, g
+<span id="L287" class="LineNr">287 </span>  <a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a> gs, g
 <span id="L288" class="LineNr">288 </span>  <span class="muComment"># setup: screen</span>
 <span id="L289" class="LineNr">289 </span>  <span class="PreProc">var</span> screen-storage: <a href='500fake-screen.mu.html#L16'>screen</a>
 <span id="L290" class="LineNr">290 </span>  <span class="PreProc">var</span> <a href='500fake-screen.mu.html#L16'>screen</a>/<span class="muRegEsi">esi</span>: (addr <a href='500fake-screen.mu.html#L16'>screen</a>) <span class="Special">&lt;-</span> address screen-storage
 <span id="L291" class="LineNr">291 </span>  <a href='500fake-screen.mu.html#L34'>initialize-screen</a> <a href='500fake-screen.mu.html#L16'>screen</a>, <span class="Constant">5</span>, <span class="Constant">4</span>, <span class="Constant">0</span>/no-pixel-graphics
 <span id="L292" class="LineNr">292 </span>  <span class="muComment">#</span>
 <span id="L293" class="LineNr">293 </span>  <span class="PreProc">var</span> x/eax: int <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L199'>render-stack-from-top</a> <a href='500fake-screen.mu.html#L16'>screen</a>, gs, <span class="Constant">0</span>/x, <span class="Constant">2</span>/y, <span class="Constant">1</span>/cursor=true
-<span id="L294" class="LineNr">294 </span>  <a href='504test-screen.mu.html#L7'>check-screen-row</a>                      <a href='500fake-screen.mu.html#L16'>screen</a>,               <span class="Constant">2</span>/y, <span class="Constant">&quot;(a (b)) c &quot;</span>, <span class="Constant">&quot;F - test-render-code-point-utf8-stack-while-highlighting-matching-close-paren-2&quot;</span>
-<span id="L295" class="LineNr">295 </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">2</span>/y, <span class="Constant">&quot;|         &quot;</span>, <span class="Constant">&quot;F - <a href='513grapheme-stack.mu.html#L265'>test-render-code-point-utf8-stack-while-highlighting-matching-close-paren-2</a>: cursor&quot;</span>
-<span id="L296" class="LineNr">296 </span>  <a href='504test-screen.mu.html#L75'>check-screen-row-in-color</a>             <a href='500fake-screen.mu.html#L16'>screen</a>, <span class="Constant">0xf</span>/fg=white, <span class="Constant">2</span>/y, <span class="Constant">&quot;      )   &quot;</span>, <span class="Constant">&quot;F - <a href='513grapheme-stack.mu.html#L265'>test-render-code-point-utf8-stack-while-highlighting-matching-close-paren-2</a>: matching paren&quot;</span>
+<span id="L294" class="LineNr">294 </span>  <a href='504test-screen.mu.html#L7'>check-screen-row</a>                      <a href='500fake-screen.mu.html#L16'>screen</a>,               <span class="Constant">2</span>/y, <span class="Constant">&quot;(a (b)) c &quot;</span>, <span class="Constant">&quot;F - test-render-grapheme-stack-while-highlighting-matching-close-paren-2&quot;</span>
+<span id="L295" class="LineNr">295 </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">2</span>/y, <span class="Constant">&quot;|         &quot;</span>, <span class="Constant">&quot;F - <a href='513grapheme-stack.mu.html#L265'>test-render-grapheme-stack-while-highlighting-matching-close-paren-2</a>: cursor&quot;</span>
+<span id="L296" class="LineNr">296 </span>  <a href='504test-screen.mu.html#L75'>check-screen-row-in-color</a>             <a href='500fake-screen.mu.html#L16'>screen</a>, <span class="Constant">0xf</span>/fg=white, <span class="Constant">2</span>/y, <span class="Constant">&quot;      )   &quot;</span>, <span class="Constant">&quot;F - <a href='513grapheme-stack.mu.html#L265'>test-render-grapheme-stack-while-highlighting-matching-close-paren-2</a>: matching paren&quot;</span>
 <span id="L297" class="LineNr">297 </span><span class="Delimiter">}</span>
 <span id="L298" class="LineNr">298 </span>
-<span id="L299" class="LineNr">299 </span><span class="PreProc">fn</span> <span class="muTest"><a href='513grapheme-stack.mu.html#L299'>test-render-code-point-utf8-stack-while-highlighting-matching-open-paren-with-close-paren-at-end</a></span> <span class="Delimiter">{</span>
+<span id="L299" class="LineNr">299 </span><span class="PreProc">fn</span> <span class="muTest"><a href='513grapheme-stack.mu.html#L299'>test-render-grapheme-stack-while-highlighting-matching-open-paren-with-close-paren-at-end</a></span> <span class="Delimiter">{</span>
 <span id="L300" class="LineNr">300 </span>  <span class="muComment"># setup: gs = &quot;(b)&quot;</span>
-<span id="L301" class="LineNr">301 </span>  <span class="PreProc">var</span> gs-storage: <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>
-<span id="L302" class="LineNr">302 </span>  <span class="PreProc">var</span> gs/<span class="muRegEdi">edi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> address gs-storage
-<span id="L303" class="LineNr">303 </span>  <a href='513grapheme-stack.mu.html#L8'>initialize-code-point-utf8-stack</a> gs, <span class="Constant">5</span>
+<span id="L301" class="LineNr">301 </span>  <span class="PreProc">var</span> gs-storage: <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>
+<span id="L302" class="LineNr">302 </span>  <span class="PreProc">var</span> gs/<span class="muRegEdi">edi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> address gs-storage
+<span id="L303" class="LineNr">303 </span>  <a href='513grapheme-stack.mu.html#L8'>initialize-grapheme-stack</a> gs, <span class="Constant">5</span>
 <span id="L304" class="LineNr">304 </span>  <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> copy <span class="Constant">0x28</span>/open-paren
-<span id="L305" class="LineNr">305 </span>  <a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a> gs, g
+<span id="L305" class="LineNr">305 </span>  <a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a> gs, g
 <span id="L306" class="LineNr">306 </span>  g <span class="Special">&lt;-</span> copy <span class="Constant">0x62</span>/b
-<span id="L307" class="LineNr">307 </span>  <a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a> gs, g
+<span id="L307" class="LineNr">307 </span>  <a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a> gs, g
 <span id="L308" class="LineNr">308 </span>  g <span class="Special">&lt;-</span> copy <span class="Constant">0x29</span>/close-paren
-<span id="L309" class="LineNr">309 </span>  <a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a> gs, g
+<span id="L309" class="LineNr">309 </span>  <a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a> gs, g
 <span id="L310" class="LineNr">310 </span>  <span class="muComment"># setup: screen</span>
 <span id="L311" class="LineNr">311 </span>  <span class="PreProc">var</span> screen-storage: <a href='500fake-screen.mu.html#L16'>screen</a>
 <span id="L312" class="LineNr">312 </span>  <span class="PreProc">var</span> <a href='500fake-screen.mu.html#L16'>screen</a>/<span class="muRegEsi">esi</span>: (addr <a href='500fake-screen.mu.html#L16'>screen</a>) <span class="Special">&lt;-</span> address screen-storage
 <span id="L313" class="LineNr">313 </span>  <a href='500fake-screen.mu.html#L34'>initialize-screen</a> <a href='500fake-screen.mu.html#L16'>screen</a>, <span class="Constant">5</span>, <span class="Constant">4</span>, <span class="Constant">0</span>/no-pixel-graphics
 <span id="L314" class="LineNr">314 </span>  <span class="muComment">#</span>
 <span id="L315" class="LineNr">315 </span>  <span class="PreProc">var</span> x/eax: int <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L126'>render-stack-from-bottom</a> <a href='500fake-screen.mu.html#L16'>screen</a>, gs, <span class="Constant">0</span>/x, <span class="Constant">2</span>/y, <span class="Constant">1</span>/highlight-matching-open-paren, <span class="Constant">1</span>/open-paren-depth
-<span id="L316" class="LineNr">316 </span>  <a href='504test-screen.mu.html#L7'>check-screen-row</a>          <a href='500fake-screen.mu.html#L16'>screen</a>,               <span class="Constant">2</span>/y, <span class="Constant">&quot;(b) &quot;</span>, <span class="Constant">&quot;F - test-render-code-point-utf8-stack-while-highlighting-matching-open-paren-with-close-paren-at-end&quot;</span>
-<span id="L317" class="LineNr">317 </span>  <a href='504test-screen.mu.html#L75'>check-screen-row-in-color</a> <a href='500fake-screen.mu.html#L16'>screen</a>, <span class="Constant">0xf</span>/fg=white, <span class="Constant">2</span>/y, <span class="Constant">&quot;(   &quot;</span>, <span class="Constant">&quot;F - <a href='513grapheme-stack.mu.html#L299'>test-render-code-point-utf8-stack-while-highlighting-matching-open-paren-with-close-paren-at-end</a>: matching paren&quot;</span>
+<span id="L316" class="LineNr">316 </span>  <a href='504test-screen.mu.html#L7'>check-screen-row</a>          <a href='500fake-screen.mu.html#L16'>screen</a>,               <span class="Constant">2</span>/y, <span class="Constant">&quot;(b) &quot;</span>, <span class="Constant">&quot;F - test-render-grapheme-stack-while-highlighting-matching-open-paren-with-close-paren-at-end&quot;</span>
+<span id="L317" class="LineNr">317 </span>  <a href='504test-screen.mu.html#L75'>check-screen-row-in-color</a> <a href='500fake-screen.mu.html#L16'>screen</a>, <span class="Constant">0xf</span>/fg=white, <span class="Constant">2</span>/y, <span class="Constant">&quot;(   &quot;</span>, <span class="Constant">&quot;F - <a href='513grapheme-stack.mu.html#L299'>test-render-grapheme-stack-while-highlighting-matching-open-paren-with-close-paren-at-end</a>: matching paren&quot;</span>
 <span id="L318" class="LineNr">318 </span><span class="Delimiter">}</span>
 <span id="L319" class="LineNr">319 </span>
-<span id="L320" class="LineNr">320 </span><span class="PreProc">fn</span> <span class="muTest"><a href='513grapheme-stack.mu.html#L320'>test-render-code-point-utf8-stack-while-highlighting-matching-open-paren-with-close-paren-at-end-2</a></span> <span class="Delimiter">{</span>
+<span id="L320" class="LineNr">320 </span><span class="PreProc">fn</span> <span class="muTest"><a href='513grapheme-stack.mu.html#L320'>test-render-grapheme-stack-while-highlighting-matching-open-paren-with-close-paren-at-end-2</a></span> <span class="Delimiter">{</span>
 <span id="L321" class="LineNr">321 </span>  <span class="muComment"># setup: gs = &quot;a((b))&quot;</span>
-<span id="L322" class="LineNr">322 </span>  <span class="PreProc">var</span> gs-storage: <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>
-<span id="L323" class="LineNr">323 </span>  <span class="PreProc">var</span> gs/<span class="muRegEdi">edi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> address gs-storage
-<span id="L324" class="LineNr">324 </span>  <a href='513grapheme-stack.mu.html#L8'>initialize-code-point-utf8-stack</a> gs, <span class="Constant">0x10</span>
+<span id="L322" class="LineNr">322 </span>  <span class="PreProc">var</span> gs-storage: <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>
+<span id="L323" class="LineNr">323 </span>  <span class="PreProc">var</span> gs/<span class="muRegEdi">edi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> address gs-storage
+<span id="L324" class="LineNr">324 </span>  <a href='513grapheme-stack.mu.html#L8'>initialize-grapheme-stack</a> gs, <span class="Constant">0x10</span>
 <span id="L325" class="LineNr">325 </span>  <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> copy <span class="Constant">0x61</span>/a
-<span id="L326" class="LineNr">326 </span>  <a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a> gs, g
+<span id="L326" class="LineNr">326 </span>  <a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a> gs, g
 <span id="L327" class="LineNr">327 </span>  g <span class="Special">&lt;-</span> copy <span class="Constant">0x28</span>/open-paren
-<span id="L328" class="LineNr">328 </span>  <a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a> gs, g
+<span id="L328" class="LineNr">328 </span>  <a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a> gs, g
 <span id="L329" class="LineNr">329 </span>  g <span class="Special">&lt;-</span> copy <span class="Constant">0x28</span>/open-paren
-<span id="L330" class="LineNr">330 </span>  <a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a> gs, g
+<span id="L330" class="LineNr">330 </span>  <a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a> gs, g
 <span id="L331" class="LineNr">331 </span>  g <span class="Special">&lt;-</span> copy <span class="Constant">0x62</span>/b
-<span id="L332" class="LineNr">332 </span>  <a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a> gs, g
+<span id="L332" class="LineNr">332 </span>  <a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a> gs, g
 <span id="L333" class="LineNr">333 </span>  g <span class="Special">&lt;-</span> copy <span class="Constant">0x29</span>/close-paren
-<span id="L334" class="LineNr">334 </span>  <a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a> gs, g
+<span id="L334" class="LineNr">334 </span>  <a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a> gs, g
 <span id="L335" class="LineNr">335 </span>  g <span class="Special">&lt;-</span> copy <span class="Constant">0x29</span>/close-paren
-<span id="L336" class="LineNr">336 </span>  <a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a> gs, g
+<span id="L336" class="LineNr">336 </span>  <a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a> gs, g
 <span id="L337" class="LineNr">337 </span>  <span class="muComment"># setup: screen</span>
 <span id="L338" class="LineNr">338 </span>  <span class="PreProc">var</span> screen-storage: <a href='500fake-screen.mu.html#L16'>screen</a>
 <span id="L339" class="LineNr">339 </span>  <span class="PreProc">var</span> <a href='500fake-screen.mu.html#L16'>screen</a>/<span class="muRegEsi">esi</span>: (addr <a href='500fake-screen.mu.html#L16'>screen</a>) <span class="Special">&lt;-</span> address screen-storage
 <span id="L340" class="LineNr">340 </span>  <a href='500fake-screen.mu.html#L34'>initialize-screen</a> <a href='500fake-screen.mu.html#L16'>screen</a>, <span class="Constant">5</span>, <span class="Constant">4</span>, <span class="Constant">0</span>/no-pixel-graphics
 <span id="L341" class="LineNr">341 </span>  <span class="muComment">#</span>
 <span id="L342" class="LineNr">342 </span>  <span class="PreProc">var</span> x/eax: int <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L126'>render-stack-from-bottom</a> <a href='500fake-screen.mu.html#L16'>screen</a>, gs, <span class="Constant">0</span>/x, <span class="Constant">2</span>/y, <span class="Constant">1</span>/highlight-matching-open-paren, <span class="Constant">1</span>/open-paren-depth
-<span id="L343" class="LineNr">343 </span>  <a href='504test-screen.mu.html#L7'>check-screen-row</a>          <a href='500fake-screen.mu.html#L16'>screen</a>,               <span class="Constant">2</span>/y, <span class="Constant">&quot;a((b)) &quot;</span>, <span class="Constant">&quot;F - test-render-code-point-utf8-stack-while-highlighting-matching-open-paren-with-close-paren-at-end-2&quot;</span>
-<span id="L344" class="LineNr">344 </span>  <a href='504test-screen.mu.html#L75'>check-screen-row-in-color</a> <a href='500fake-screen.mu.html#L16'>screen</a>, <span class="Constant">0xf</span>/fg=white, <span class="Constant">2</span>/y, <span class="Constant">&quot; (     &quot;</span>, <span class="Constant">&quot;F - <a href='513grapheme-stack.mu.html#L320'>test-render-code-point-utf8-stack-while-highlighting-matching-open-paren-with-close-paren-at-end-2</a>: matching paren&quot;</span>
+<span id="L343" class="LineNr">343 </span>  <a href='504test-screen.mu.html#L7'>check-screen-row</a>          <a href='500fake-screen.mu.html#L16'>screen</a>,               <span class="Constant">2</span>/y, <span class="Constant">&quot;a((b)) &quot;</span>, <span class="Constant">&quot;F - test-render-grapheme-stack-while-highlighting-matching-open-paren-with-close-paren-at-end-2&quot;</span>
+<span id="L344" class="LineNr">344 </span>  <a href='504test-screen.mu.html#L75'>check-screen-row-in-color</a> <a href='500fake-screen.mu.html#L16'>screen</a>, <span class="Constant">0xf</span>/fg=white, <span class="Constant">2</span>/y, <span class="Constant">&quot; (     &quot;</span>, <span class="Constant">&quot;F - <a href='513grapheme-stack.mu.html#L320'>test-render-grapheme-stack-while-highlighting-matching-open-paren-with-close-paren-at-end-2</a>: matching paren&quot;</span>
 <span id="L345" class="LineNr">345 </span><span class="Delimiter">}</span>
 <span id="L346" class="LineNr">346 </span>
-<span id="L347" class="LineNr">347 </span><span class="PreProc">fn</span> <span class="muTest"><a href='513grapheme-stack.mu.html#L347'>test-render-code-point-utf8-stack-while-highlighting-matching-open-paren</a></span> <span class="Delimiter">{</span>
+<span id="L347" class="LineNr">347 </span><span class="PreProc">fn</span> <span class="muTest"><a href='513grapheme-stack.mu.html#L347'>test-render-grapheme-stack-while-highlighting-matching-open-paren</a></span> <span class="Delimiter">{</span>
 <span id="L348" class="LineNr">348 </span>  <span class="muComment"># setup: gs = &quot;(b&quot;</span>
-<span id="L349" class="LineNr">349 </span>  <span class="PreProc">var</span> gs-storage: <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>
-<span id="L350" class="LineNr">350 </span>  <span class="PreProc">var</span> gs/<span class="muRegEdi">edi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> address gs-storage
-<span id="L351" class="LineNr">351 </span>  <a href='513grapheme-stack.mu.html#L8'>initialize-code-point-utf8-stack</a> gs, <span class="Constant">5</span>
+<span id="L349" class="LineNr">349 </span>  <span class="PreProc">var</span> gs-storage: <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>
+<span id="L350" class="LineNr">350 </span>  <span class="PreProc">var</span> gs/<span class="muRegEdi">edi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> address gs-storage
+<span id="L351" class="LineNr">351 </span>  <a href='513grapheme-stack.mu.html#L8'>initialize-grapheme-stack</a> gs, <span class="Constant">5</span>
 <span id="L352" class="LineNr">352 </span>  <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> copy <span class="Constant">0x28</span>/open-paren
-<span id="L353" class="LineNr">353 </span>  <a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a> gs, g
+<span id="L353" class="LineNr">353 </span>  <a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a> gs, g
 <span id="L354" class="LineNr">354 </span>  g <span class="Special">&lt;-</span> copy <span class="Constant">0x62</span>/b
-<span id="L355" class="LineNr">355 </span>  <a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a> gs, g
+<span id="L355" class="LineNr">355 </span>  <a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a> gs, g
 <span id="L356" class="LineNr">356 </span>  <span class="muComment"># setup: screen</span>
 <span id="L357" class="LineNr">357 </span>  <span class="PreProc">var</span> screen-storage: <a href='500fake-screen.mu.html#L16'>screen</a>
 <span id="L358" class="LineNr">358 </span>  <span class="PreProc">var</span> <a href='500fake-screen.mu.html#L16'>screen</a>/<span class="muRegEsi">esi</span>: (addr <a href='500fake-screen.mu.html#L16'>screen</a>) <span class="Special">&lt;-</span> address screen-storage
 <span id="L359" class="LineNr">359 </span>  <a href='500fake-screen.mu.html#L34'>initialize-screen</a> <a href='500fake-screen.mu.html#L16'>screen</a>, <span class="Constant">5</span>, <span class="Constant">4</span>, <span class="Constant">0</span>/no-pixel-graphics
 <span id="L360" class="LineNr">360 </span>  <span class="muComment">#</span>
 <span id="L361" class="LineNr">361 </span>  <span class="PreProc">var</span> x/eax: int <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L126'>render-stack-from-bottom</a> <a href='500fake-screen.mu.html#L16'>screen</a>, gs, <span class="Constant">0</span>/x, <span class="Constant">2</span>/y, <span class="Constant">1</span>/highlight-matching-open-paren, <span class="Constant">0</span>/open-paren-depth
-<span id="L362" class="LineNr">362 </span>  <a href='504test-screen.mu.html#L7'>check-screen-row</a>          <a href='500fake-screen.mu.html#L16'>screen</a>,               <span class="Constant">2</span>/y, <span class="Constant">&quot;(b &quot;</span>, <span class="Constant">&quot;F - test-render-code-point-utf8-stack-while-highlighting-matching-open-paren&quot;</span>
-<span id="L363" class="LineNr">363 </span>  <a href='504test-screen.mu.html#L75'>check-screen-row-in-color</a> <a href='500fake-screen.mu.html#L16'>screen</a>, <span class="Constant">0xf</span>/fg=white, <span class="Constant">2</span>/y, <span class="Constant">&quot;(  &quot;</span>, <span class="Constant">&quot;F - <a href='513grapheme-stack.mu.html#L347'>test-render-code-point-utf8-stack-while-highlighting-matching-open-paren</a>: matching paren&quot;</span>
+<span id="L362" class="LineNr">362 </span>  <a href='504test-screen.mu.html#L7'>check-screen-row</a>          <a href='500fake-screen.mu.html#L16'>screen</a>,               <span class="Constant">2</span>/y, <span class="Constant">&quot;(b &quot;</span>, <span class="Constant">&quot;F - test-render-grapheme-stack-while-highlighting-matching-open-paren&quot;</span>
+<span id="L363" class="LineNr">363 </span>  <a href='504test-screen.mu.html#L75'>check-screen-row-in-color</a> <a href='500fake-screen.mu.html#L16'>screen</a>, <span class="Constant">0xf</span>/fg=white, <span class="Constant">2</span>/y, <span class="Constant">&quot;(  &quot;</span>, <span class="Constant">&quot;F - <a href='513grapheme-stack.mu.html#L347'>test-render-grapheme-stack-while-highlighting-matching-open-paren</a>: matching paren&quot;</span>
 <span id="L364" class="LineNr">364 </span><span class="Delimiter">}</span>
 <span id="L365" class="LineNr">365 </span>
-<span id="L366" class="LineNr">366 </span><span class="PreProc">fn</span> <span class="muTest"><a href='513grapheme-stack.mu.html#L366'>test-render-code-point-utf8-stack-while-highlighting-matching-open-paren-2</a></span> <span class="Delimiter">{</span>
+<span id="L366" class="LineNr">366 </span><span class="PreProc">fn</span> <span class="muTest"><a href='513grapheme-stack.mu.html#L366'>test-render-grapheme-stack-while-highlighting-matching-open-paren-2</a></span> <span class="Delimiter">{</span>
 <span id="L367" class="LineNr">367 </span>  <span class="muComment"># setup: gs = &quot;a((b)&quot;</span>
-<span id="L368" class="LineNr">368 </span>  <span class="PreProc">var</span> gs-storage: <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>
-<span id="L369" class="LineNr">369 </span>  <span class="PreProc">var</span> gs/<span class="muRegEdi">edi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> address gs-storage
-<span id="L370" class="LineNr">370 </span>  <a href='513grapheme-stack.mu.html#L8'>initialize-code-point-utf8-stack</a> gs, <span class="Constant">0x10</span>
+<span id="L368" class="LineNr">368 </span>  <span class="PreProc">var</span> gs-storage: <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>
+<span id="L369" class="LineNr">369 </span>  <span class="PreProc">var</span> gs/<span class="muRegEdi">edi</span>: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>) <span class="Special">&lt;-</span> address gs-storage
+<span id="L370" class="LineNr">370 </span>  <a href='513grapheme-stack.mu.html#L8'>initialize-grapheme-stack</a> gs, <span class="Constant">0x10</span>
 <span id="L371" class="LineNr">371 </span>  <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> copy <span class="Constant">0x61</span>/a
-<span id="L372" class="LineNr">372 </span>  <a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a> gs, g
+<span id="L372" class="LineNr">372 </span>  <a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a> gs, g
 <span id="L373" class="LineNr">373 </span>  g <span class="Special">&lt;-</span> copy <span class="Constant">0x28</span>/open-paren
-<span id="L374" class="LineNr">374 </span>  <a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a> gs, g
+<span id="L374" class="LineNr">374 </span>  <a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a> gs, g
 <span id="L375" class="LineNr">375 </span>  g <span class="Special">&lt;-</span> copy <span class="Constant">0x28</span>/open-paren
-<span id="L376" class="LineNr">376 </span>  <a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a> gs, g
+<span id="L376" class="LineNr">376 </span>  <a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a> gs, g
 <span id="L377" class="LineNr">377 </span>  g <span class="Special">&lt;-</span> copy <span class="Constant">0x62</span>/b
-<span id="L378" class="LineNr">378 </span>  <a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a> gs, g
+<span id="L378" class="LineNr">378 </span>  <a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a> gs, g
 <span id="L379" class="LineNr">379 </span>  g <span class="Special">&lt;-</span> copy <span class="Constant">0x29</span>/close-paren
-<span id="L380" class="LineNr">380 </span>  <a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a> gs, g
+<span id="L380" class="LineNr">380 </span>  <a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a> gs, g
 <span id="L381" class="LineNr">381 </span>  <span class="muComment"># setup: screen</span>
 <span id="L382" class="LineNr">382 </span>  <span class="PreProc">var</span> screen-storage: <a href='500fake-screen.mu.html#L16'>screen</a>
 <span id="L383" class="LineNr">383 </span>  <span class="PreProc">var</span> <a href='500fake-screen.mu.html#L16'>screen</a>/<span class="muRegEsi">esi</span>: (addr <a href='500fake-screen.mu.html#L16'>screen</a>) <span class="Special">&lt;-</span> address screen-storage
 <span id="L384" class="LineNr">384 </span>  <a href='500fake-screen.mu.html#L34'>initialize-screen</a> <a href='500fake-screen.mu.html#L16'>screen</a>, <span class="Constant">5</span>, <span class="Constant">4</span>, <span class="Constant">0</span>/no-pixel-graphics
 <span id="L385" class="LineNr">385 </span>  <span class="muComment">#</span>
 <span id="L386" class="LineNr">386 </span>  <span class="PreProc">var</span> x/eax: int <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L126'>render-stack-from-bottom</a> <a href='500fake-screen.mu.html#L16'>screen</a>, gs, <span class="Constant">0</span>/x, <span class="Constant">2</span>/y, <span class="Constant">1</span>/highlight-matching-open-paren, <span class="Constant">0</span>/open-paren-depth
-<span id="L387" class="LineNr">387 </span>  <a href='504test-screen.mu.html#L7'>check-screen-row</a>          <a href='500fake-screen.mu.html#L16'>screen</a>,               <span class="Constant">2</span>/y, <span class="Constant">&quot;a((b) &quot;</span>, <span class="Constant">&quot;F - test-render-code-point-utf8-stack-while-highlighting-matching-open-paren-2&quot;</span>
-<span id="L388" class="LineNr">388 </span>  <a href='504test-screen.mu.html#L75'>check-screen-row-in-color</a> <a href='500fake-screen.mu.html#L16'>screen</a>, <span class="Constant">0xf</span>/fg=white, <span class="Constant">2</span>/y, <span class="Constant">&quot; (    &quot;</span>, <span class="Constant">&quot;F - <a href='513grapheme-stack.mu.html#L366'>test-render-code-point-utf8-stack-while-highlighting-matching-open-paren-2</a>: matching paren&quot;</span>
+<span id="L387" class="LineNr">387 </span>  <a href='504test-screen.mu.html#L7'>check-screen-row</a>          <a href='500fake-screen.mu.html#L16'>screen</a>,               <span class="Constant">2</span>/y, <span class="Constant">&quot;a((b) &quot;</span>, <span class="Constant">&quot;F - test-render-grapheme-stack-while-highlighting-matching-open-paren-2&quot;</span>
+<span id="L388" class="LineNr">388 </span>  <a href='504test-screen.mu.html#L75'>check-screen-row-in-color</a> <a href='500fake-screen.mu.html#L16'>screen</a>, <span class="Constant">0xf</span>/fg=white, <span class="Constant">2</span>/y, <span class="Constant">&quot; (    &quot;</span>, <span class="Constant">&quot;F - <a href='513grapheme-stack.mu.html#L366'>test-render-grapheme-stack-while-highlighting-matching-open-paren-2</a>: matching paren&quot;</span>
 <span id="L389" class="LineNr">389 </span><span class="Delimiter">}</span>
 <span id="L390" class="LineNr">390 </span>
 <span id="L391" class="LineNr">391 </span><span class="muComment"># return the index of the matching close-paren of the code-point-utf8 at cursor (top of stack)</span>
 <span id="L392" class="LineNr">392 </span><span class="muComment"># or top index if there's no matching close-paren</span>
-<span id="L393" class="LineNr">393 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='513grapheme-stack.mu.html#L393'>get-matching-close-paren-index</a></span> _self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>), render-cursor?: boolean<span class="PreProc"> -&gt; </span>_/<span class="muRegEdx">edx</span>: int <span class="Delimiter">{</span>
-<span id="L394" class="LineNr">394 </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="L393" class="LineNr">393 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='513grapheme-stack.mu.html#L393'>get-matching-close-paren-index</a></span> _self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>), render-cursor?: boolean<span class="PreProc"> -&gt; </span>_/<span class="muRegEdx">edx</span>: int <span class="Delimiter">{</span>
+<span id="L394" class="LineNr">394 </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="L395" class="LineNr">395 </span>  <span class="PreProc">var</span> top-addr/<span class="muRegEdx">edx</span>: (addr int) <span class="Special">&lt;-</span> get self, top
 <span id="L396" class="LineNr">396 </span>  <span class="muComment"># if not rendering cursor, return</span>
 <span id="L397" class="LineNr">397 </span>  compare render-cursor?, <span class="Constant">0</span>/false
@@ -510,8 +510,8 @@ if ('onhashchange' in window) {
 <span id="L446" class="LineNr">446 </span>
 <span id="L447" class="LineNr">447 </span><span class="muComment"># return the index of the first open-paren at the given depth</span>
 <span id="L448" class="LineNr">448 </span><span class="muComment"># or top index if there's no matching close-paren</span>
-<span id="L449" class="LineNr">449 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='513grapheme-stack.mu.html#L449'>get-matching-open-paren-index</a></span> _self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>), control: boolean, depth: int<span class="PreProc"> -&gt; </span>_/<span class="muRegEdx">edx</span>: int <span class="Delimiter">{</span>
-<span id="L450" class="LineNr">450 </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="L449" class="LineNr">449 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='513grapheme-stack.mu.html#L449'>get-matching-open-paren-index</a></span> _self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>), control: boolean, depth: int<span class="PreProc"> -&gt; </span>_/<span class="muRegEdx">edx</span>: int <span class="Delimiter">{</span>
+<span id="L450" class="LineNr">450 </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="L451" class="LineNr">451 </span>  <span class="PreProc">var</span> top-addr/<span class="muRegEdx">edx</span>: (addr int) <span class="Special">&lt;-</span> get self, top
 <span id="L452" class="LineNr">452 </span>  <span class="muComment"># if not rendering cursor, return</span>
 <span id="L453" class="LineNr">453 </span>  compare control, <span class="Constant">0</span>/false
@@ -558,8 +558,8 @@ if ('onhashchange' in window) {
 <span id="L494" class="LineNr">494 </span>
 <span id="L495" class="LineNr">495 </span><span class="muComment"># compare from bottom</span>
 <span id="L496" class="LineNr">496 </span><span class="muComment"># beware: modifies 'stream', which must be disposed of after a false result</span>
-<span id="L497" class="LineNr">497 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='513grapheme-stack.mu.html#L497'>prefix-match?</a></span> _self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>), s: (addr stream byte)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
-<span id="L498" class="LineNr">498 </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="L497" class="LineNr">497 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='513grapheme-stack.mu.html#L497'>prefix-match?</a></span> _self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>), s: (addr stream byte)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
+<span id="L498" class="LineNr">498 </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="L499" class="LineNr">499 </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="L500" class="LineNr">500 </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="L501" class="LineNr">501 </span>  <span class="PreProc">var</span> data/<span class="muRegEdi">edi</span>: (addr array code-point-utf8) <span class="Special">&lt;-</span> copy _data
@@ -586,8 +586,8 @@ if ('onhashchange' in window) {
 <span id="L522" class="LineNr">522 </span>
 <span id="L523" class="LineNr">523 </span><span class="muComment"># compare from bottom</span>
 <span id="L524" class="LineNr">524 </span><span class="muComment"># beware: modifies 'stream', which must be disposed of after a false result</span>
-<span id="L525" class="LineNr">525 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='513grapheme-stack.mu.html#L525'>suffix-match?</a></span> _self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>), s: (addr stream byte)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
-<span id="L526" class="LineNr">526 </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="L525" class="LineNr">525 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='513grapheme-stack.mu.html#L525'>suffix-match?</a></span> _self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>), s: (addr stream byte)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
+<span id="L526" class="LineNr">526 </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="L527" class="LineNr">527 </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="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> data/<span class="muRegEdi">edi</span>: (addr array code-point-utf8) <span class="Special">&lt;-</span> copy _data
@@ -613,15 +613,15 @@ if ('onhashchange' in window) {
 <span id="L549" class="LineNr">549 </span>  <span class="PreProc">return</span> <span class="Constant">1</span>   <span class="muComment"># true</span>
 <span id="L550" class="LineNr">550 </span><span class="Delimiter">}</span>
 <span id="L551" class="LineNr">551 </span>
-<span id="L552" class="LineNr">552 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='513grapheme-stack.mu.html#L552'>code-point-utf8-stack-is-decimal-integer?</a></span> _self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
-<span id="L553" class="LineNr">553 </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="L552" class="LineNr">552 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='513grapheme-stack.mu.html#L552'>grapheme-stack-is-decimal-integer?</a></span> _self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
+<span id="L553" class="LineNr">553 </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="L554" class="LineNr">554 </span>  <span class="PreProc">var</span> data-ah/eax: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> get self, data
 <span id="L555" class="LineNr">555 </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="L556" class="LineNr">556 </span>  <span class="PreProc">var</span> data/<span class="muRegEdx">edx</span>: (addr array code-point-utf8) <span class="Special">&lt;-</span> copy _data
 <span id="L557" class="LineNr">557 </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="L558" class="LineNr">558 </span>  <span class="PreProc">var</span> i/<span class="muRegEbx">ebx</span>: int <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
 <span id="L559" class="LineNr">559 </span>  <span class="PreProc">var</span> result/eax: boolean <span class="Special">&lt;-</span> copy <span class="Constant">1</span>/true
-<span id="L560" class="LineNr">560 </span>  $code-point-utf8-stack-is-integer?:<span class="PreProc">loop</span>: <span class="Delimiter">{</span>
+<span id="L560" class="LineNr">560 </span>  $grapheme-stack-is-integer?:<span class="PreProc">loop</span>: <span class="Delimiter">{</span>
 <span id="L561" class="LineNr">561 </span>    compare i, *top-addr
 <span id="L562" class="LineNr">562 </span>    <span class="PreProc">break-if-&gt;=</span>
 <span id="L563" class="LineNr">563 </span>    <span class="PreProc">var</span> g/<span class="muRegEdx">edx</span>: (addr code-point-utf8) <span class="Special">&lt;-</span> index data, i
diff --git a/html/514gap-buffer.mu.html b/html/514gap-buffer.mu.html
index fecdeb83..b93853d1 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'>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="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="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,39 +74,39 @@ 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'>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="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="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'>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="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="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'>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="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="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'>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="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="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'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get gap, left
+<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 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
@@ -150,15 +150,15 @@ 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'>code-point-utf8-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'>grapheme-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'>code-point-utf8-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'>grapheme-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'>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="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 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
@@ -175,8 +175,8 @@ if ('onhashchange' in window) {
 <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'>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="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 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
@@ -203,10 +203,10 @@ if ('onhashchange' in window) {
 <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'>code-point-utf8-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'>grapheme-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'>code-point-utf8-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'>grapheme-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>
@@ -307,7 +307,7 @@ if ('onhashchange' in window) {
 <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'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, right
+<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 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
@@ -320,7 +320,7 @@ if ('onhashchange' in window) {
 <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'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> get self, left
+<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 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
@@ -336,8 +336,8 @@ if ('onhashchange' in window) {
 <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'>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="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 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
@@ -358,8 +358,8 @@ 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'>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="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 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
@@ -375,8 +375,8 @@ if ('onhashchange' in window) {
 <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'>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="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 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
@@ -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'>code-point-utf8-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'>grapheme-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'>code-point-utf8-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'>grapheme-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
@@ -464,7 +464,7 @@ if ('onhashchange' in window) {
 <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, 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="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="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>
@@ -491,10 +491,10 @@ 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'>code-point-utf8-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'>grapheme-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'>code-point-utf8-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'>grapheme-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
@@ -503,8 +503,8 @@ if ('onhashchange' in window) {
 <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-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'>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="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="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>
@@ -530,28 +530,28 @@ 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'>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="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="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'>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="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="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: 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: 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="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="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'>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="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="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>
@@ -560,21 +560,21 @@ if ('onhashchange' in window) {
 <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: 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'>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="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="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'>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="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="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'>code-point-utf8-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'>grapheme-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
@@ -583,7 +583,7 @@ if ('onhashchange' in window) {
 <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'>code-point-utf8-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'>grapheme-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>
@@ -594,7 +594,7 @@ if ('onhashchange' in window) {
 <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'>code-point-utf8-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'>grapheme-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>
@@ -613,13 +613,13 @@ if ('onhashchange' in window) {
 <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'>code-point-utf8-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'>grapheme-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: 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="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-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="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,14 +628,14 @@ 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'>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="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: code-point-utf8 <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L51'>pop-grapheme-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: 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'>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="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: code-point-utf8 <span class="Special">&lt;-</span> <a href='513grapheme-stack.mu.html#L51'>pop-grapheme-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>
@@ -648,7 +648,7 @@ if ('onhashchange' in window) {
 <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'>code-point-utf8-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'>grapheme-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'>code-point-utf8-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'>grapheme-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>
@@ -755,7 +755,7 @@ if ('onhashchange' in window) {
 <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'>code-point-utf8-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'>grapheme-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>
@@ -768,7 +768,7 @@ if ('onhashchange' in window) {
 <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'>code-point-utf8-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'>grapheme-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>
@@ -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 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="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="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-code-point-utf8-stack</a> src, dest
+<span id="L798" class="LineNr"> 798 </span>  <a href='513grapheme-stack.mu.html#L67'>copy-grapheme-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'>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="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="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'>code-point-utf8-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'>grapheme-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>
@@ -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'>code-point-utf8-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'>grapheme-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>
@@ -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'>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="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="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'>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="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="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>
@@ -1110,8 +1110,8 @@ if ('onhashchange' in window) {
 <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'>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="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="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>
@@ -1123,8 +1123,8 @@ if ('onhashchange' in window) {
 <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'>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="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="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
@@ -1146,8 +1146,8 @@ if ('onhashchange' in window) {
 <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'>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="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="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>
@@ -1160,8 +1160,8 @@ if ('onhashchange' in window) {
 <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'>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="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="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
@@ -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'>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="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="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'>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="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="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>
diff --git a/html/linux/tile/gap-buffer.mu.html b/html/linux/tile/gap-buffer.mu.html
index 8adacb5b..fba0c57b 100644
--- a/html/linux/tile/gap-buffer.mu.html
+++ b/html/linux/tile/gap-buffer.mu.html
@@ -62,16 +62,16 @@ if ('onhashchange' in window) {
 <a href='https://github.com/akkartik/mu/blob/main/linux/tile/gap-buffer.mu'>https://github.com/akkartik/mu/blob/main/linux/tile/gap-buffer.mu</a>
 <pre id='vimCodeElement'>
 <span id="L1" class="LineNr">  1 </span><span class="PreProc">type</span> <a href='gap-buffer.mu.html#L1'>gap-buffer</a> <span class="Delimiter">{</span>
-<span id="L2" class="LineNr">  2 </span>  left: <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>
-<span id="L3" class="LineNr">  3 </span>  right: <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>
+<span id="L2" class="LineNr">  2 </span>  left: <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>
+<span id="L3" class="LineNr">  3 </span>  right: <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>
 <span id="L4" class="LineNr">  4 </span><span class="Delimiter">}</span>
 <span id="L5" class="LineNr">  5 </span>
 <span id="L6" class="LineNr">  6 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L6'>initialize-gap-buffer</a></span> _self: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Delimiter">{</span>
 <span id="L7" class="LineNr">  7 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L8" class="LineNr">  8 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
-<span id="L9" class="LineNr">  9 </span>  <a href='grapheme-stack.mu.html#L6'>initialize-code-point-utf8-stack</a> left, <span class="Constant">0x10</span>/max-word-size
-<span id="L10" class="LineNr"> 10 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, right
-<span id="L11" class="LineNr"> 11 </span>  <a href='grapheme-stack.mu.html#L6'>initialize-code-point-utf8-stack</a> right, <span class="Constant">0x10</span>/max-word-size
+<span id="L8" class="LineNr">  8 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
+<span id="L9" class="LineNr">  9 </span>  <a href='grapheme-stack.mu.html#L6'>initialize-grapheme-stack</a> left, <span class="Constant">0x10</span>/max-word-size
+<span id="L10" class="LineNr"> 10 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, right
+<span id="L11" class="LineNr"> 11 </span>  <a href='grapheme-stack.mu.html#L6'>initialize-grapheme-stack</a> right, <span class="Constant">0x10</span>/max-word-size
 <span id="L12" class="LineNr"> 12 </span><span class="Delimiter">}</span>
 <span id="L13" class="LineNr"> 13 </span>
 <span id="L14" class="LineNr"> 14 </span><span class="muComment"># just for tests</span>
@@ -100,15 +100,15 @@ if ('onhashchange' in window) {
 <span id="L37" class="LineNr"> 37 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L37'>emit-gap-buffer</a></span> _self: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>), out: (addr stream byte) <span class="Delimiter">{</span>
 <span id="L38" class="LineNr"> 38 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L39" class="LineNr"> 39 </span>  <a href='../106stream.subx.html#L17'>clear-stream</a> out
-<span id="L40" class="LineNr"> 40 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
+<span id="L40" class="LineNr"> 40 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
 <span id="L41" class="LineNr"> 41 </span>  <a href='gap-buffer.mu.html#L47'>emit-stack-from-bottom</a> left, out
-<span id="L42" class="LineNr"> 42 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, right
+<span id="L42" class="LineNr"> 42 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, right
 <span id="L43" class="LineNr"> 43 </span>  <a href='gap-buffer.mu.html#L65'>emit-stack-from-top</a> right, out
 <span id="L44" class="LineNr"> 44 </span><span class="Delimiter">}</span>
 <span id="L45" class="LineNr"> 45 </span>
 <span id="L46" class="LineNr"> 46 </span><span class="muComment"># dump stack from bottom to top</span>
-<span id="L47" class="LineNr"> 47 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L47'>emit-stack-from-bottom</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>), out: (addr stream byte) <span class="Delimiter">{</span>
-<span id="L48" class="LineNr"> 48 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> copy _self
+<span id="L47" class="LineNr"> 47 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L47'>emit-stack-from-bottom</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>), out: (addr stream byte) <span class="Delimiter">{</span>
+<span id="L48" class="LineNr"> 48 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L49" class="LineNr"> 49 </span>  <span class="PreProc">var</span> data-ah/<span class="muRegEdi">edi</span>: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, data
 <span id="L50" class="LineNr"> 50 </span>  <span class="PreProc">var</span> _data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
 <span id="L51" class="LineNr"> 51 </span>  <span class="PreProc">var</span> data/<span class="muRegEdi">edi</span>: (addr array code-point-utf8) <span class="Special">&lt;-</span> copy _data
@@ -125,8 +125,8 @@ if ('onhashchange' in window) {
 <span id="L62" class="LineNr"> 62 </span><span class="Delimiter">}</span>
 <span id="L63" class="LineNr"> 63 </span>
 <span id="L64" class="LineNr"> 64 </span><span class="muComment"># dump stack from top to bottom</span>
-<span id="L65" class="LineNr"> 65 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L65'>emit-stack-from-top</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>), out: (addr stream byte) <span class="Delimiter">{</span>
-<span id="L66" class="LineNr"> 66 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> copy _self
+<span id="L65" class="LineNr"> 65 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L65'>emit-stack-from-top</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>), out: (addr stream byte) <span class="Delimiter">{</span>
+<span id="L66" class="LineNr"> 66 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L67" class="LineNr"> 67 </span>  <span class="PreProc">var</span> data-ah/<span class="muRegEdi">edi</span>: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, data
 <span id="L68" class="LineNr"> 68 </span>  <span class="PreProc">var</span> _data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
 <span id="L69" class="LineNr"> 69 </span>  <span class="PreProc">var</span> data/<span class="muRegEdi">edi</span>: (addr array code-point-utf8) <span class="Special">&lt;-</span> copy _data
@@ -145,18 +145,18 @@ if ('onhashchange' in window) {
 <span id="L82" class="LineNr"> 82 </span>
 <span id="L83" class="LineNr"> 83 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L83'>render-gap-buffer</a></span> <a href='../405screen.mu.html#L9'>screen</a>: (addr <a href='../405screen.mu.html#L9'>screen</a>), _gap: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Delimiter">{</span>
 <span id="L84" class="LineNr"> 84 </span>  <span class="PreProc">var</span> gap/<span class="muRegEsi">esi</span>: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _gap
-<span id="L85" class="LineNr"> 85 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> gap, left
+<span id="L85" class="LineNr"> 85 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> gap, left
 <span id="L86" class="LineNr"> 86 </span>  <a href='grapheme-stack.mu.html#L78'>render-stack-from-bottom</a> left, <a href='../405screen.mu.html#L9'>screen</a>
-<span id="L87" class="LineNr"> 87 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> gap, right
+<span id="L87" class="LineNr"> 87 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> gap, right
 <span id="L88" class="LineNr"> 88 </span>  <a href='grapheme-stack.mu.html#L97'>render-stack-from-top</a> right, <a href='../405screen.mu.html#L9'>screen</a>
 <span id="L89" class="LineNr"> 89 </span><span class="Delimiter">}</span>
 <span id="L90" class="LineNr"> 90 </span>
 <span id="L91" class="LineNr"> 91 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L91'>gap-buffer-length</a></span> _gap: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: int <span class="Delimiter">{</span>
 <span id="L92" class="LineNr"> 92 </span>  <span class="PreProc">var</span> gap/<span class="muRegEsi">esi</span>: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _gap
-<span id="L93" class="LineNr"> 93 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> gap, left
+<span id="L93" class="LineNr"> 93 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> gap, left
 <span id="L94" class="LineNr"> 94 </span>  <span class="PreProc">var</span> tmp/eax: (addr int) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> left, <a href='../203stack.subx.html#L338'>top</a>
 <span id="L95" class="LineNr"> 95 </span>  <span class="PreProc">var</span> left-length/<span class="muRegEcx">ecx</span>: int <span class="Special">&lt;-</span> copy *tmp
-<span id="L96" class="LineNr"> 96 </span>  <span class="PreProc">var</span> right/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> gap, right
+<span id="L96" class="LineNr"> 96 </span>  <span class="PreProc">var</span> right/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> gap, right
 <span id="L97" class="LineNr"> 97 </span>  tmp <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> right, <a href='../203stack.subx.html#L338'>top</a>
 <span id="L98" class="LineNr"> 98 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L82'>result</a>/eax: int <span class="Special">&lt;-</span> copy *tmp
 <span id="L99" class="LineNr"> 99 </span>  <a href='data.mu.html#L82'>result</a> <span class="Special">&lt;-</span> add left-length
@@ -165,8 +165,8 @@ if ('onhashchange' in window) {
 <span id="L102" class="LineNr">102 </span>
 <span id="L103" class="LineNr">103 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L103'>add-code-point-utf8-at-gap</a></span> _self: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>), g: code-point-utf8 <span class="Delimiter">{</span>
 <span id="L104" class="LineNr">104 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L105" class="LineNr">105 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
-<span id="L106" class="LineNr">106 </span>  <a href='grapheme-stack.mu.html#L31'>push-code-point-utf8-stack</a> left, g
+<span id="L105" class="LineNr">105 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
+<span id="L106" class="LineNr">106 </span>  <a href='grapheme-stack.mu.html#L31'>push-grapheme-stack</a> left, g
 <span id="L107" class="LineNr">107 </span><span class="Delimiter">}</span>
 <span id="L108" class="LineNr">108 </span>
 <span id="L109" class="LineNr">109 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L109'>gap-to-start</a></span> self: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Delimiter">{</span>
@@ -187,28 +187,28 @@ if ('onhashchange' in window) {
 <span id="L124" class="LineNr">124 </span>
 <span id="L125" class="LineNr">125 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L125'>gap-at-start?</a></span> _self: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
 <span id="L126" class="LineNr">126 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L127" class="LineNr">127 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
-<span id="L128" class="LineNr">128 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L82'>result</a>/eax: boolean <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L20'>code-point-utf8-stack-empty?</a> left
+<span id="L127" class="LineNr">127 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
+<span id="L128" class="LineNr">128 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L82'>result</a>/eax: boolean <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L20'>grapheme-stack-empty?</a> left
 <span id="L129" class="LineNr">129 </span>  <span class="PreProc">return</span> <a href='data.mu.html#L82'>result</a>
 <span id="L130" class="LineNr">130 </span><span class="Delimiter">}</span>
 <span id="L131" class="LineNr">131 </span>
 <span id="L132" class="LineNr">132 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L132'>gap-at-end?</a></span> _self: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
 <span id="L133" class="LineNr">133 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L134" class="LineNr">134 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, right
-<span id="L135" class="LineNr">135 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L82'>result</a>/eax: boolean <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L20'>code-point-utf8-stack-empty?</a> right
+<span id="L134" class="LineNr">134 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, right
+<span id="L135" class="LineNr">135 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L82'>result</a>/eax: boolean <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L20'>grapheme-stack-empty?</a> right
 <span id="L136" class="LineNr">136 </span>  <span class="PreProc">return</span> <a href='data.mu.html#L82'>result</a>
 <span id="L137" class="LineNr">137 </span><span class="Delimiter">}</span>
 <span id="L138" class="LineNr">138 </span>
 <span id="L139" class="LineNr">139 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L139'>gap-right</a></span> _self: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: code-point-utf8 <span class="Delimiter">{</span>
 <span id="L140" class="LineNr">140 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L141" class="LineNr">141 </span>  <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
-<span id="L142" class="LineNr">142 </span>  <span class="PreProc">var</span> right/<span class="muRegEcx">ecx</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, right
-<span id="L143" class="LineNr">143 </span>  g <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L43'>pop-code-point-utf8-stack</a> right
+<span id="L142" class="LineNr">142 </span>  <span class="PreProc">var</span> right/<span class="muRegEcx">ecx</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, right
+<span id="L143" class="LineNr">143 </span>  g <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L43'>pop-grapheme-stack</a> right
 <span id="L144" class="LineNr">144 </span>  compare g, <span class="Constant">-1</span>
 <span id="L145" class="LineNr">145 </span>  <span class="Delimiter">{</span>
 <span id="L146" class="LineNr">146 </span>    <span class="PreProc">break-if-=</span>
-<span id="L147" class="LineNr">147 </span>    <span class="PreProc">var</span> left/<span class="muRegEcx">ecx</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
-<span id="L148" class="LineNr">148 </span>    <a href='grapheme-stack.mu.html#L31'>push-code-point-utf8-stack</a> left, g
+<span id="L147" class="LineNr">147 </span>    <span class="PreProc">var</span> left/<span class="muRegEcx">ecx</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
+<span id="L148" class="LineNr">148 </span>    <a href='grapheme-stack.mu.html#L31'>push-grapheme-stack</a> left, g
 <span id="L149" class="LineNr">149 </span>  <span class="Delimiter">}</span>
 <span id="L150" class="LineNr">150 </span>  <span class="PreProc">return</span> g
 <span id="L151" class="LineNr">151 </span><span class="Delimiter">}</span>
@@ -217,21 +217,21 @@ if ('onhashchange' in window) {
 <span id="L154" class="LineNr">154 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L155" class="LineNr">155 </span>  <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
 <span id="L156" class="LineNr">156 </span>  <span class="Delimiter">{</span>
-<span id="L157" class="LineNr">157 </span>    <span class="PreProc">var</span> left/<span class="muRegEcx">ecx</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
-<span id="L158" class="LineNr">158 </span>    g <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L43'>pop-code-point-utf8-stack</a> left
+<span id="L157" class="LineNr">157 </span>    <span class="PreProc">var</span> left/<span class="muRegEcx">ecx</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
+<span id="L158" class="LineNr">158 </span>    g <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L43'>pop-grapheme-stack</a> left
 <span id="L159" class="LineNr">159 </span>  <span class="Delimiter">}</span>
 <span id="L160" class="LineNr">160 </span>  compare g, <span class="Constant">-1</span>
 <span id="L161" class="LineNr">161 </span>  <span class="Delimiter">{</span>
 <span id="L162" class="LineNr">162 </span>    <span class="PreProc">break-if-=</span>
-<span id="L163" class="LineNr">163 </span>    <span class="PreProc">var</span> right/<span class="muRegEcx">ecx</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, right
-<span id="L164" class="LineNr">164 </span>    <a href='grapheme-stack.mu.html#L31'>push-code-point-utf8-stack</a> right, g
+<span id="L163" class="LineNr">163 </span>    <span class="PreProc">var</span> right/<span class="muRegEcx">ecx</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, right
+<span id="L164" class="LineNr">164 </span>    <a href='grapheme-stack.mu.html#L31'>push-grapheme-stack</a> right, g
 <span id="L165" class="LineNr">165 </span>  <span class="Delimiter">}</span>
 <span id="L166" class="LineNr">166 </span>  <span class="PreProc">return</span> g
 <span id="L167" class="LineNr">167 </span><span class="Delimiter">}</span>
 <span id="L168" class="LineNr">168 </span>
 <span id="L169" class="LineNr">169 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L169'>gap-index</a></span> _self: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: int <span class="Delimiter">{</span>
 <span id="L170" class="LineNr">170 </span>  <span class="PreProc">var</span> self/eax: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L171" class="LineNr">171 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
+<span id="L171" class="LineNr">171 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
 <span id="L172" class="LineNr">172 </span>  <span class="PreProc">var</span> top-addr/eax: (addr int) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> left, <a href='../203stack.subx.html#L338'>top</a>
 <span id="L173" class="LineNr">173 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L82'>result</a>/eax: int <span class="Special">&lt;-</span> copy *top-addr
 <span id="L174" class="LineNr">174 </span>  <span class="PreProc">return</span> <a href='data.mu.html#L82'>result</a>
@@ -240,7 +240,7 @@ if ('onhashchange' in window) {
 <span id="L177" class="LineNr">177 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L177'>first-code-point-utf8-in-gap-buffer</a></span> _self: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: code-point-utf8 <span class="Delimiter">{</span>
 <span id="L178" class="LineNr">178 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L179" class="LineNr">179 </span>  <span class="muComment"># try to read from left</span>
-<span id="L180" class="LineNr">180 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
+<span id="L180" class="LineNr">180 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
 <span id="L181" class="LineNr">181 </span>  <span class="PreProc">var</span> top-addr/<span class="muRegEcx">ecx</span>: (addr int) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> left, <a href='../203stack.subx.html#L338'>top</a>
 <span id="L182" class="LineNr">182 </span>  compare *top-addr, <span class="Constant">0</span>
 <span id="L183" class="LineNr">183 </span>  <span class="Delimiter">{</span>
@@ -251,7 +251,7 @@ if ('onhashchange' in window) {
 <span id="L188" class="LineNr">188 </span>    <span class="PreProc">return</span> *result-addr
 <span id="L189" class="LineNr">189 </span>  <span class="Delimiter">}</span>
 <span id="L190" class="LineNr">190 </span>  <span class="muComment"># try to read from right</span>
-<span id="L191" class="LineNr">191 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, right
+<span id="L191" class="LineNr">191 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, right
 <span id="L192" class="LineNr">192 </span>  top-addr <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> right, <a href='../203stack.subx.html#L338'>top</a>
 <span id="L193" class="LineNr">193 </span>  compare *top-addr, <span class="Constant">0</span>
 <span id="L194" class="LineNr">194 </span>  <span class="Delimiter">{</span>
@@ -270,13 +270,13 @@ if ('onhashchange' in window) {
 <span id="L207" class="LineNr">207 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L207'>code-point-utf8-before-cursor-in-gap-buffer</a></span> _self: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: code-point-utf8 <span class="Delimiter">{</span>
 <span id="L208" class="LineNr">208 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L209" class="LineNr">209 </span>  <span class="muComment"># try to read from left</span>
-<span id="L210" class="LineNr">210 </span>  <span class="PreProc">var</span> left/<span class="muRegEcx">ecx</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
+<span id="L210" class="LineNr">210 </span>  <span class="PreProc">var</span> left/<span class="muRegEcx">ecx</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
 <span id="L211" class="LineNr">211 </span>  <span class="PreProc">var</span> top-addr/<span class="muRegEdx">edx</span>: (addr int) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> left, <a href='../203stack.subx.html#L338'>top</a>
 <span id="L212" class="LineNr">212 </span>  compare *top-addr, <span class="Constant">0</span>
 <span id="L213" class="LineNr">213 </span>  <span class="Delimiter">{</span>
 <span id="L214" class="LineNr">214 </span>    <span class="PreProc">break-if-&lt;=</span>
-<span id="L215" class="LineNr">215 </span>    <span class="PreProc">var</span> <a href='data.mu.html#L82'>result</a>/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L43'>pop-code-point-utf8-stack</a> left
-<span id="L216" class="LineNr">216 </span>    <a href='grapheme-stack.mu.html#L31'>push-code-point-utf8-stack</a> left, <a href='data.mu.html#L82'>result</a>
+<span id="L215" class="LineNr">215 </span>    <span class="PreProc">var</span> <a href='data.mu.html#L82'>result</a>/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L43'>pop-grapheme-stack</a> left
+<span id="L216" class="LineNr">216 </span>    <a href='grapheme-stack.mu.html#L31'>push-grapheme-stack</a> left, <a href='data.mu.html#L82'>result</a>
 <span id="L217" class="LineNr">217 </span>    <span class="PreProc">return</span> <a href='data.mu.html#L82'>result</a>
 <span id="L218" class="LineNr">218 </span>  <span class="Delimiter">}</span>
 <span id="L219" class="LineNr">219 </span>  <span class="muComment"># give up</span>
@@ -285,14 +285,14 @@ if ('onhashchange' in window) {
 <span id="L222" class="LineNr">222 </span>
 <span id="L223" class="LineNr">223 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L223'>delete-before-gap</a></span> _self: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Delimiter">{</span>
 <span id="L224" class="LineNr">224 </span>  <span class="PreProc">var</span> self/eax: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L225" class="LineNr">225 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
-<span id="L226" class="LineNr">226 </span>  <span class="PreProc">var</span> dummy/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L43'>pop-code-point-utf8-stack</a> left
+<span id="L225" class="LineNr">225 </span>  <span class="PreProc">var</span> left/eax: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
+<span id="L226" class="LineNr">226 </span>  <span class="PreProc">var</span> dummy/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L43'>pop-grapheme-stack</a> left
 <span id="L227" class="LineNr">227 </span><span class="Delimiter">}</span>
 <span id="L228" class="LineNr">228 </span>
 <span id="L229" class="LineNr">229 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L229'>pop-after-gap</a></span> _self: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: code-point-utf8 <span class="Delimiter">{</span>
 <span id="L230" class="LineNr">230 </span>  <span class="PreProc">var</span> self/eax: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L231" class="LineNr">231 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, right
-<span id="L232" class="LineNr">232 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L82'>result</a>/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L43'>pop-code-point-utf8-stack</a> right
+<span id="L231" class="LineNr">231 </span>  <span class="PreProc">var</span> right/eax: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, right
+<span id="L232" class="LineNr">232 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L82'>result</a>/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L43'>pop-grapheme-stack</a> right
 <span id="L233" class="LineNr">233 </span>  <span class="PreProc">return</span> <a href='data.mu.html#L82'>result</a>
 <span id="L234" class="LineNr">234 </span><span class="Delimiter">}</span>
 <span id="L235" class="LineNr">235 </span>
@@ -305,7 +305,7 @@ if ('onhashchange' in window) {
 <span id="L242" class="LineNr">242 </span>  <span class="PreProc">var</span> expected-stream/<span class="muRegEcx">ecx</span>: (addr stream byte) <span class="Special">&lt;-</span> address stream-storage
 <span id="L243" class="LineNr">243 </span>  <a href='../108write.subx.html#L24'>write</a> expected-stream, s
 <span id="L244" class="LineNr">244 </span>  <span class="muComment"># compare left</span>
-<span id="L245" class="LineNr">245 </span>  <span class="PreProc">var</span> left/<span class="muRegEdx">edx</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
+<span id="L245" class="LineNr">245 </span>  <span class="PreProc">var</span> left/<span class="muRegEdx">edx</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
 <span id="L246" class="LineNr">246 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L82'>result</a>/eax: boolean <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L117'>prefix-match?</a> left, expected-stream
 <span id="L247" class="LineNr">247 </span>  compare <a href='data.mu.html#L82'>result</a>, <span class="Constant">0</span>/false
 <span id="L248" class="LineNr">248 </span>  <span class="Delimiter">{</span>
@@ -313,7 +313,7 @@ if ('onhashchange' in window) {
 <span id="L250" class="LineNr">250 </span>    <span class="PreProc">return</span> <a href='data.mu.html#L82'>result</a>
 <span id="L251" class="LineNr">251 </span>  <span class="Delimiter">}</span>
 <span id="L252" class="LineNr">252 </span>  <span class="muComment"># compare right</span>
-<span id="L253" class="LineNr">253 </span>  <span class="PreProc">var</span> right/<span class="muRegEdx">edx</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, right
+<span id="L253" class="LineNr">253 </span>  <span class="PreProc">var</span> right/<span class="muRegEdx">edx</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, right
 <span id="L254" class="LineNr">254 </span>  <a href='data.mu.html#L82'>result</a> <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L145'>suffix-match?</a> right, expected-stream
 <span id="L255" class="LineNr">255 </span>  compare <a href='data.mu.html#L82'>result</a>, <span class="Constant">0</span>/false
 <span id="L256" class="LineNr">256 </span>  <span class="Delimiter">{</span>
@@ -382,25 +382,25 @@ if ('onhashchange' in window) {
 <span id="L319" class="LineNr">319 </span>  <span class="PreProc">var</span> dest-ah/eax: (addr handle <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _dest-ah
 <span id="L320" class="LineNr">320 </span>  <span class="PreProc">var</span> _dest-a/eax: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *dest-ah
 <span id="L321" class="LineNr">321 </span>  <span class="PreProc">var</span> dest-a/<span class="muRegEdi">edi</span>: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _dest-a
-<span id="L322" class="LineNr">322 </span>  <span class="muComment"># copy left code-point-utf8-stack</span>
-<span id="L323" class="LineNr">323 </span>  <span class="PreProc">var</span> src/<span class="muRegEcx">ecx</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> src-a, left
-<span id="L324" class="LineNr">324 </span>  <span class="PreProc">var</span> dest/<span class="muRegEdx">edx</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> dest-a, left
-<span id="L325" class="LineNr">325 </span>  <a href='grapheme-stack.mu.html#L59'>copy-code-point-utf8-stack</a> src, dest
-<span id="L326" class="LineNr">326 </span>  <span class="muComment"># copy right code-point-utf8-stack</span>
+<span id="L322" class="LineNr">322 </span>  <span class="muComment"># copy left grapheme-stack</span>
+<span id="L323" class="LineNr">323 </span>  <span class="PreProc">var</span> src/<span class="muRegEcx">ecx</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> src-a, left
+<span id="L324" class="LineNr">324 </span>  <span class="PreProc">var</span> dest/<span class="muRegEdx">edx</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> dest-a, left
+<span id="L325" class="LineNr">325 </span>  <a href='grapheme-stack.mu.html#L59'>copy-grapheme-stack</a> src, dest
+<span id="L326" class="LineNr">326 </span>  <span class="muComment"># copy right grapheme-stack</span>
 <span id="L327" class="LineNr">327 </span>  src <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> src-a, right
 <span id="L328" class="LineNr">328 </span>  dest <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> dest-a, right
-<span id="L329" class="LineNr">329 </span>  <a href='grapheme-stack.mu.html#L59'>copy-code-point-utf8-stack</a> src, dest
+<span id="L329" class="LineNr">329 </span>  <a href='grapheme-stack.mu.html#L59'>copy-grapheme-stack</a> src, dest
 <span id="L330" class="LineNr">330 </span><span class="Delimiter">}</span>
 <span id="L331" class="LineNr">331 </span>
 <span id="L332" class="LineNr">332 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='gap-buffer.mu.html#L332'>gap-buffer-is-decimal-integer?</a></span> _self: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
 <span id="L333" class="LineNr">333 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> copy _self
-<span id="L334" class="LineNr">334 </span>  <span class="PreProc">var</span> curr/<span class="muRegEcx">ecx</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
-<span id="L335" class="LineNr">335 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L82'>result</a>/eax: boolean <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L172'>code-point-utf8-stack-is-decimal-integer?</a> curr
+<span id="L334" class="LineNr">334 </span>  <span class="PreProc">var</span> curr/<span class="muRegEcx">ecx</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, left
+<span id="L335" class="LineNr">335 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L82'>result</a>/eax: boolean <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L172'>grapheme-stack-is-decimal-integer?</a> curr
 <span id="L336" class="LineNr">336 </span>  <span class="Delimiter">{</span>
 <span id="L337" class="LineNr">337 </span>    compare <a href='data.mu.html#L82'>result</a>, <span class="Constant">0</span>/false
 <span id="L338" class="LineNr">338 </span>    <span class="PreProc">break-if-=</span>
 <span id="L339" class="LineNr">339 </span>    curr <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, right
-<span id="L340" class="LineNr">340 </span>    <a href='data.mu.html#L82'>result</a> <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L172'>code-point-utf8-stack-is-decimal-integer?</a> curr
+<span id="L340" class="LineNr">340 </span>    <a href='data.mu.html#L82'>result</a> <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L172'>grapheme-stack-is-decimal-integer?</a> curr
 <span id="L341" class="LineNr">341 </span>  <span class="Delimiter">}</span>
 <span id="L342" class="LineNr">342 </span>  <span class="PreProc">return</span> <a href='data.mu.html#L82'>result</a>
 <span id="L343" class="LineNr">343 </span><span class="Delimiter">}</span>
diff --git a/html/linux/tile/grapheme-stack.mu.html b/html/linux/tile/grapheme-stack.mu.html
index d5a29921..398a6049 100644
--- a/html/linux/tile/grapheme-stack.mu.html
+++ b/html/linux/tile/grapheme-stack.mu.html
@@ -61,27 +61,27 @@ if ('onhashchange' in window) {
 <body onload='JumpToLine();'>
 <a href='https://github.com/akkartik/mu/blob/main/linux/tile/grapheme-stack.mu'>https://github.com/akkartik/mu/blob/main/linux/tile/grapheme-stack.mu</a>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr">  1 </span><span class="PreProc">type</span> <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a> <span class="Delimiter">{</span>
+<span id="L1" class="LineNr">  1 </span><span class="PreProc">type</span> <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a> <span class="Delimiter">{</span>
 <span id="L2" class="LineNr">  2 </span>  data: (handle array code-point-utf8)
 <span id="L3" class="LineNr">  3 </span>  <a href='../203stack.subx.html#L338'>top</a>: int
 <span id="L4" class="LineNr">  4 </span><span class="Delimiter">}</span>
 <span id="L5" class="LineNr">  5 </span>
-<span id="L6" class="LineNr">  6 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L6'>initialize-code-point-utf8-stack</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>), n: int <span class="Delimiter">{</span>
-<span id="L7" class="LineNr">  7 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> copy _self
+<span id="L6" class="LineNr">  6 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L6'>initialize-grapheme-stack</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>), n: int <span class="Delimiter">{</span>
+<span id="L7" class="LineNr">  7 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L8" class="LineNr">  8 </span>  <span class="PreProc">var</span> d/<span class="muRegEdi">edi</span>: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, data
 <span id="L9" class="LineNr">  9 </span>  populate d, n
 <span id="L10" class="LineNr"> 10 </span>  <span class="PreProc">var</span> <a href='../203stack.subx.html#L338'>top</a>/eax: (addr int) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, <a href='../203stack.subx.html#L338'>top</a>
 <span id="L11" class="LineNr"> 11 </span>  copy-to *top, <span class="Constant">0</span>
 <span id="L12" class="LineNr"> 12 </span><span class="Delimiter">}</span>
 <span id="L13" class="LineNr"> 13 </span>
-<span id="L14" class="LineNr"> 14 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L14'>clear-code-point-utf8-stack</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Delimiter">{</span>
-<span id="L15" class="LineNr"> 15 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> copy _self
+<span id="L14" class="LineNr"> 14 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L14'>clear-grapheme-stack</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Delimiter">{</span>
+<span id="L15" class="LineNr"> 15 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L16" class="LineNr"> 16 </span>  <span class="PreProc">var</span> <a href='../203stack.subx.html#L338'>top</a>/eax: (addr int) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, <a href='../203stack.subx.html#L338'>top</a>
 <span id="L17" class="LineNr"> 17 </span>  copy-to *top, <span class="Constant">0</span>
 <span id="L18" class="LineNr"> 18 </span><span class="Delimiter">}</span>
 <span id="L19" class="LineNr"> 19 </span>
-<span id="L20" class="LineNr"> 20 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L20'>code-point-utf8-stack-empty?</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
-<span id="L21" class="LineNr"> 21 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> copy _self
+<span id="L20" class="LineNr"> 20 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L20'>grapheme-stack-empty?</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
+<span id="L21" class="LineNr"> 21 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L22" class="LineNr"> 22 </span>  <span class="PreProc">var</span> <a href='../203stack.subx.html#L338'>top</a>/eax: (addr int) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, <a href='../203stack.subx.html#L338'>top</a>
 <span id="L23" class="LineNr"> 23 </span>  compare *top, <span class="Constant">0</span>
 <span id="L24" class="LineNr"> 24 </span>  <span class="Delimiter">{</span>
@@ -91,8 +91,8 @@ if ('onhashchange' in window) {
 <span id="L28" class="LineNr"> 28 </span>  <span class="PreProc">return</span> <span class="Constant">0</span>/false
 <span id="L29" class="LineNr"> 29 </span><span class="Delimiter">}</span>
 <span id="L30" class="LineNr"> 30 </span>
-<span id="L31" class="LineNr"> 31 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L31'>push-code-point-utf8-stack</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>), _val: code-point-utf8 <span class="Delimiter">{</span>
-<span id="L32" class="LineNr"> 32 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> copy _self
+<span id="L31" class="LineNr"> 31 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L31'>push-grapheme-stack</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>), _val: code-point-utf8 <span class="Delimiter">{</span>
+<span id="L32" class="LineNr"> 32 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L33" class="LineNr"> 33 </span>  <span class="PreProc">var</span> top-addr/<span class="muRegEcx">ecx</span>: (addr int) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, <a href='../203stack.subx.html#L338'>top</a>
 <span id="L34" class="LineNr"> 34 </span>  <span class="PreProc">var</span> data-ah/<span class="muRegEdx">edx</span>: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, data
 <span id="L35" class="LineNr"> 35 </span>  <span class="PreProc">var</span> data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
@@ -103,8 +103,8 @@ if ('onhashchange' in window) {
 <span id="L40" class="LineNr"> 40 </span>  add-to *top-addr, <span class="Constant">1</span>
 <span id="L41" class="LineNr"> 41 </span><span class="Delimiter">}</span>
 <span id="L42" class="LineNr"> 42 </span>
-<span id="L43" class="LineNr"> 43 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L43'>pop-code-point-utf8-stack</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>)<span class="PreProc"> -&gt; </span>_/eax: code-point-utf8 <span class="Delimiter">{</span>
-<span id="L44" class="LineNr"> 44 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> copy _self
+<span id="L43" class="LineNr"> 43 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L43'>pop-grapheme-stack</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>)<span class="PreProc"> -&gt; </span>_/eax: code-point-utf8 <span class="Delimiter">{</span>
+<span id="L44" class="LineNr"> 44 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L45" class="LineNr"> 45 </span>  <span class="PreProc">var</span> top-addr/<span class="muRegEcx">ecx</span>: (addr int) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, <a href='../203stack.subx.html#L338'>top</a>
 <span id="L46" class="LineNr"> 46 </span>  <span class="Delimiter">{</span>
 <span id="L47" class="LineNr"> 47 </span>    compare *top-addr, <span class="Constant">0</span>
@@ -119,8 +119,8 @@ if ('onhashchange' in window) {
 <span id="L56" class="LineNr"> 56 </span>  <span class="PreProc">return</span> *result-addr
 <span id="L57" class="LineNr"> 57 </span><span class="Delimiter">}</span>
 <span id="L58" class="LineNr"> 58 </span>
-<span id="L59" class="LineNr"> 59 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L59'>copy-code-point-utf8-stack</a></span> _src: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>), dest: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Delimiter">{</span>
-<span id="L60" class="LineNr"> 60 </span>  <span class="PreProc">var</span> src/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> copy _src
+<span id="L59" class="LineNr"> 59 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L59'>copy-grapheme-stack</a></span> _src: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>), dest: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Delimiter">{</span>
+<span id="L60" class="LineNr"> 60 </span>  <span class="PreProc">var</span> src/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> copy _src
 <span id="L61" class="LineNr"> 61 </span>  <span class="PreProc">var</span> data-ah/<span class="muRegEdi">edi</span>: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> src, data
 <span id="L62" class="LineNr"> 62 </span>  <span class="PreProc">var</span> _data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
 <span id="L63" class="LineNr"> 63 </span>  <span class="PreProc">var</span> data/<span class="muRegEdi">edi</span>: (addr array code-point-utf8) <span class="Special">&lt;-</span> copy _data
@@ -130,7 +130,7 @@ if ('onhashchange' in window) {
 <span id="L67" class="LineNr"> 67 </span>    compare i, *top-addr
 <span id="L68" class="LineNr"> 68 </span>    <span class="PreProc">break-if-&gt;=</span>
 <span id="L69" class="LineNr"> 69 </span>    <span class="PreProc">var</span> g/<span class="muRegEdx">edx</span>: (addr code-point-utf8) <span class="Special">&lt;-</span> index data, i
-<span id="L70" class="LineNr"> 70 </span>    <a href='grapheme-stack.mu.html#L31'>push-code-point-utf8-stack</a> dest, *g
+<span id="L70" class="LineNr"> 70 </span>    <a href='grapheme-stack.mu.html#L31'>push-grapheme-stack</a> dest, *g
 <span id="L71" class="LineNr"> 71 </span>    i <span class="Special">&lt;-</span> increment
 <span id="L72" class="LineNr"> 72 </span>    <span class="PreProc">loop</span>
 <span id="L73" class="LineNr"> 73 </span>  <span class="Delimiter">}</span>
@@ -138,8 +138,8 @@ if ('onhashchange' in window) {
 <span id="L75" class="LineNr"> 75 </span>
 <span id="L76" class="LineNr"> 76 </span><span class="muComment"># dump stack to screen from bottom to top</span>
 <span id="L77" class="LineNr"> 77 </span><span class="muComment"># don't move the cursor or anything</span>
-<span id="L78" class="LineNr"> 78 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L78'>render-stack-from-bottom</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>), <a href='../405screen.mu.html#L9'>screen</a>: (addr <a href='../405screen.mu.html#L9'>screen</a>) <span class="Delimiter">{</span>
-<span id="L79" class="LineNr"> 79 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> copy _self
+<span id="L78" class="LineNr"> 78 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L78'>render-stack-from-bottom</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>), <a href='../405screen.mu.html#L9'>screen</a>: (addr <a href='../405screen.mu.html#L9'>screen</a>) <span class="Delimiter">{</span>
+<span id="L79" class="LineNr"> 79 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L80" class="LineNr"> 80 </span>  <span class="PreProc">var</span> data-ah/<span class="muRegEdi">edi</span>: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, data
 <span id="L81" class="LineNr"> 81 </span>  <span class="PreProc">var</span> _data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
 <span id="L82" class="LineNr"> 82 </span>  <span class="PreProc">var</span> data/<span class="muRegEdi">edi</span>: (addr array code-point-utf8) <span class="Special">&lt;-</span> copy _data
@@ -157,8 +157,8 @@ if ('onhashchange' in window) {
 <span id="L94" class="LineNr"> 94 </span>
 <span id="L95" class="LineNr"> 95 </span><span class="muComment"># dump stack to screen from top to bottom</span>
 <span id="L96" class="LineNr"> 96 </span><span class="muComment"># don't move the cursor or anything</span>
-<span id="L97" class="LineNr"> 97 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L97'>render-stack-from-top</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>), <a href='../405screen.mu.html#L9'>screen</a>: (addr <a href='../405screen.mu.html#L9'>screen</a>) <span class="Delimiter">{</span>
-<span id="L98" class="LineNr"> 98 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> copy _self
+<span id="L97" class="LineNr"> 97 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L97'>render-stack-from-top</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>), <a href='../405screen.mu.html#L9'>screen</a>: (addr <a href='../405screen.mu.html#L9'>screen</a>) <span class="Delimiter">{</span>
+<span id="L98" class="LineNr"> 98 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L99" class="LineNr"> 99 </span>  <span class="PreProc">var</span> data-ah/<span class="muRegEdi">edi</span>: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, data
 <span id="L100" class="LineNr">100 </span>  <span class="PreProc">var</span> _data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
 <span id="L101" class="LineNr">101 </span>  <span class="PreProc">var</span> data/<span class="muRegEdi">edi</span>: (addr array code-point-utf8) <span class="Special">&lt;-</span> copy _data
@@ -177,8 +177,8 @@ if ('onhashchange' in window) {
 <span id="L114" class="LineNr">114 </span>
 <span id="L115" class="LineNr">115 </span><span class="muComment"># compare from bottom</span>
 <span id="L116" class="LineNr">116 </span><span class="muComment"># beware: modifies 'stream', which must be disposed of after a false result</span>
-<span id="L117" class="LineNr">117 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L117'>prefix-match?</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>), s: (addr stream byte)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
-<span id="L118" class="LineNr">118 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> copy _self
+<span id="L117" class="LineNr">117 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L117'>prefix-match?</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>), s: (addr stream byte)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
+<span id="L118" class="LineNr">118 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L119" class="LineNr">119 </span>  <span class="PreProc">var</span> data-ah/<span class="muRegEdi">edi</span>: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, data
 <span id="L120" class="LineNr">120 </span>  <span class="PreProc">var</span> _data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
 <span id="L121" class="LineNr">121 </span>  <span class="PreProc">var</span> data/<span class="muRegEdi">edi</span>: (addr array code-point-utf8) <span class="Special">&lt;-</span> copy _data
@@ -205,8 +205,8 @@ if ('onhashchange' in window) {
 <span id="L142" class="LineNr">142 </span>
 <span id="L143" class="LineNr">143 </span><span class="muComment"># compare from bottom</span>
 <span id="L144" class="LineNr">144 </span><span class="muComment"># beware: modifies 'stream', which must be disposed of after a false result</span>
-<span id="L145" class="LineNr">145 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L145'>suffix-match?</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>), s: (addr stream byte)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
-<span id="L146" class="LineNr">146 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> copy _self
+<span id="L145" class="LineNr">145 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L145'>suffix-match?</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>), s: (addr stream byte)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
+<span id="L146" class="LineNr">146 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L147" class="LineNr">147 </span>  <span class="PreProc">var</span> data-ah/<span class="muRegEdi">edi</span>: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, data
 <span id="L148" class="LineNr">148 </span>  <span class="PreProc">var</span> _data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
 <span id="L149" class="LineNr">149 </span>  <span class="PreProc">var</span> data/<span class="muRegEdi">edi</span>: (addr array code-point-utf8) <span class="Special">&lt;-</span> copy _data
@@ -232,15 +232,15 @@ if ('onhashchange' in window) {
 <span id="L169" class="LineNr">169 </span>  <span class="PreProc">return</span> <span class="Constant">1</span>   <span class="muComment"># true</span>
 <span id="L170" class="LineNr">170 </span><span class="Delimiter">}</span>
 <span id="L171" class="LineNr">171 </span>
-<span id="L172" class="LineNr">172 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L172'>code-point-utf8-stack-is-decimal-integer?</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
-<span id="L173" class="LineNr">173 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> copy _self
+<span id="L172" class="LineNr">172 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='grapheme-stack.mu.html#L172'>grapheme-stack-is-decimal-integer?</a></span> _self: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>)<span class="PreProc"> -&gt; </span>_/eax: boolean <span class="Delimiter">{</span>
+<span id="L173" class="LineNr">173 </span>  <span class="PreProc">var</span> self/<span class="muRegEsi">esi</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> copy _self
 <span id="L174" class="LineNr">174 </span>  <span class="PreProc">var</span> data-ah/eax: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, data
 <span id="L175" class="LineNr">175 </span>  <span class="PreProc">var</span> _data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *data-ah
 <span id="L176" class="LineNr">176 </span>  <span class="PreProc">var</span> data/<span class="muRegEdx">edx</span>: (addr array code-point-utf8) <span class="Special">&lt;-</span> copy _data
 <span id="L177" class="LineNr">177 </span>  <span class="PreProc">var</span> top-addr/<span class="muRegEcx">ecx</span>: (addr int) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> self, <a href='../203stack.subx.html#L338'>top</a>
 <span id="L178" class="LineNr">178 </span>  <span class="PreProc">var</span> i/<span class="muRegEbx">ebx</span>: int <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
 <span id="L179" class="LineNr">179 </span>  <span class="PreProc">var</span> <a href='data.mu.html#L82'>result</a>/eax: boolean <span class="Special">&lt;-</span> copy <span class="Constant">1</span>/true
-<span id="L180" class="LineNr">180 </span>  $code-point-utf8-stack-is-integer?:<span class="PreProc">loop</span>: <span class="Delimiter">{</span>
+<span id="L180" class="LineNr">180 </span>  $grapheme-stack-is-integer?:<span class="PreProc">loop</span>: <span class="Delimiter">{</span>
 <span id="L181" class="LineNr">181 </span>    compare i, *top-addr
 <span id="L182" class="LineNr">182 </span>    <span class="PreProc">break-if-&gt;=</span>
 <span id="L183" class="LineNr">183 </span>    <span class="PreProc">var</span> g/<span class="muRegEdx">edx</span>: (addr code-point-utf8) <span class="Special">&lt;-</span> index data, i
diff --git a/html/linux/tile/word.mu.html b/html/linux/tile/word.mu.html
index 4d1e86d3..f5eaa88d 100644
--- a/html/linux/tile/word.mu.html
+++ b/html/linux/tile/word.mu.html
@@ -122,12 +122,12 @@ if ('onhashchange' in window) {
 <span id="L58" class="LineNr"> 58 </span>  <a href='word.mu.html#L185'>cursor-to-start</a> src
 <span id="L59" class="LineNr"> 59 </span>  <span class="PreProc">var</span> src-data-ah/eax: (addr handle <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> src, scalar-data
 <span id="L60" class="LineNr"> 60 </span>  <span class="PreProc">var</span> src-data/eax: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *src-data-ah
-<span id="L61" class="LineNr"> 61 </span>  <span class="PreProc">var</span> src-stack/<span class="muRegEcx">ecx</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> src-data, right
+<span id="L61" class="LineNr"> 61 </span>  <span class="PreProc">var</span> src-stack/<span class="muRegEcx">ecx</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> src-data, right
 <span id="L62" class="LineNr"> 62 </span>  <span class="Delimiter">{</span>
-<span id="L63" class="LineNr"> 63 </span>    <span class="PreProc">var</span> done?/eax: boolean <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L20'>code-point-utf8-stack-empty?</a> src-stack
+<span id="L63" class="LineNr"> 63 </span>    <span class="PreProc">var</span> done?/eax: boolean <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L20'>grapheme-stack-empty?</a> src-stack
 <span id="L64" class="LineNr"> 64 </span>    compare done?, <span class="Constant">0</span>/false
 <span id="L65" class="LineNr"> 65 </span>    <span class="PreProc">break-if-!=</span>
-<span id="L66" class="LineNr"> 66 </span>    <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L43'>pop-code-point-utf8-stack</a> src-stack
+<span id="L66" class="LineNr"> 66 </span>    <span class="PreProc">var</span> g/eax: code-point-utf8 <span class="Special">&lt;-</span> <a href='grapheme-stack.mu.html#L43'>pop-grapheme-stack</a> src-stack
 <span id="L67" class="LineNr"> 67 </span><span class="CommentedCode">#?     print-code-point-utf8 0, g</span>
 <span id="L68" class="LineNr"> 68 </span><span class="CommentedCode">#?     print-string 0, &quot;\n&quot;</span>
 <span id="L69" class="LineNr"> 69 </span>    <a href='word.mu.html#L148'>add-code-point-utf8-to-word</a> dest, g
@@ -143,7 +143,7 @@ if ('onhashchange' in window) {
 <span id="L79" class="LineNr"> 79 </span>  <span class="PreProc">var</span> src/eax: (addr <a href='data.mu.html#L42'>word</a>) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *src-ah
 <span id="L80" class="LineNr"> 80 </span>  <span class="PreProc">var</span> src-data-ah/eax: (addr handle <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> src, scalar-data
 <span id="L81" class="LineNr"> 81 </span>  <span class="PreProc">var</span> src-data/eax: (addr <a href='gap-buffer.mu.html#L1'>gap-buffer</a>) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *src-data-ah
-<span id="L82" class="LineNr"> 82 </span>  <span class="PreProc">var</span> src-stack/<span class="muRegEcx">ecx</span>: (addr <a href='grapheme-stack.mu.html#L1'>code-point-utf8-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> src-data, left
+<span id="L82" class="LineNr"> 82 </span>  <span class="PreProc">var</span> src-stack/<span class="muRegEcx">ecx</span>: (addr <a href='grapheme-stack.mu.html#L1'>grapheme-stack</a>) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> src-data, left
 <span id="L83" class="LineNr"> 83 </span>  <span class="PreProc">var</span> src-stack-data-ah/eax: (addr handle array code-point-utf8) <span class="Special">&lt;-</span> <a href='../131table.subx.html#L26'>get</a> src-stack, data
 <span id="L84" class="LineNr"> 84 </span>  <span class="PreProc">var</span> _src-stack-data/eax: (addr array code-point-utf8) <span class="Special">&lt;-</span> <a href='../120allocate.subx.html#L258'>lookup</a> *src-stack-data-ah
 <span id="L85" class="LineNr"> 85 </span>  <span class="PreProc">var</span> src-stack-data/<span class="muRegEdx">edx</span>: (addr array code-point-utf8) <span class="Special">&lt;-</span> copy _src-stack-data
diff --git a/html/signatures.mu.html b/html/signatures.mu.html
index bead3889..90bb25eb 100644
--- a/html/signatures.mu.html
+++ b/html/signatures.mu.html
@@ -303,22 +303,22 @@ if ('onhashchange' in window) {
 <span id="L242" class="LineNr">242 </span><span class="PreProc">sig</span> <a href='512array.mu.html#L86'>find-slide-down-slot-in-array</a> _a: (addr array int), _val: int<span class="PreProc"> -&gt; </span>_/<span class="muRegEcx">ecx</span>: int
 <span id="L243" class="LineNr">243 </span><span class="PreProc">sig</span> <a href='512array.mu.html#L105'>check-slide-up</a> before: (addr array byte), start: int, end: int, target: int, after: (addr array byte), msg: (addr array byte)
 <span id="L244" class="LineNr">244 </span><span class="PreProc">sig</span> <a href='512array.mu.html#L114'>check-slide-down</a> before: (addr array byte), start: int, end: int, target: int, after: (addr array byte), msg: (addr array byte)
-<span id="L245" class="LineNr">245 </span><span class="PreProc">sig</span> <a href='513grapheme-stack.mu.html#L8'>initialize-code-point-utf8-stack</a> _self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>), n: int
-<span id="L246" class="LineNr">246 </span><span class="PreProc">sig</span> <a href='513grapheme-stack.mu.html#L16'>clear-code-point-utf8-stack</a> _self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>)
-<span id="L247" class="LineNr">247 </span><span class="PreProc">sig</span> <a href='513grapheme-stack.mu.html#L22'>code-point-utf8-stack-empty?</a> _self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>)<span class="PreProc"> -&gt; </span>_/eax: boolean
-<span id="L248" class="LineNr">248 </span><span class="PreProc">sig</span> <a href='513grapheme-stack.mu.html#L33'>code-point-utf8-stack-length</a> _self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>)<span class="PreProc"> -&gt; </span>_/eax: int
-<span id="L249" class="LineNr">249 </span><span class="PreProc">sig</span> <a href='513grapheme-stack.mu.html#L39'>push-code-point-utf8-stack</a> _self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>), _val: code-point-utf8
-<span id="L250" class="LineNr">250 </span><span class="PreProc">sig</span> <a href='513grapheme-stack.mu.html#L51'>pop-code-point-utf8-stack</a> _self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>)<span class="PreProc"> -&gt; </span>_/eax: code-point-utf8
-<span id="L251" class="LineNr">251 </span><span class="PreProc">sig</span> <a href='513grapheme-stack.mu.html#L67'>copy-code-point-utf8-stack</a> _src: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>), dest: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>)
-<span id="L252" class="LineNr">252 </span><span class="PreProc">sig</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>: (addr <a href='500fake-screen.mu.html#L16'>screen</a>), _self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>), xmin: int, ymin: int, xmax: int, ymax: int, _x: int, _y: int, <a href='514gap-buffer.mu.html#L942'>highlight-matching-open-paren?</a>: boolean, open-paren-depth: int, color: int, background-color: int<span class="PreProc"> -&gt; </span>_/eax: int, _/<span class="muRegEcx">ecx</span>: int
-<span id="L253" class="LineNr">253 </span><span class="PreProc">sig</span> <a href='513grapheme-stack.mu.html#L126'>render-stack-from-bottom</a> <a href='500fake-screen.mu.html#L16'>screen</a>: (addr <a href='500fake-screen.mu.html#L16'>screen</a>), self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>), x: int, y: int, <a href='514gap-buffer.mu.html#L942'>highlight-matching-open-paren?</a>: boolean, open-paren-depth: int<span class="PreProc"> -&gt; </span>_/eax: int
-<span id="L254" class="LineNr">254 </span><span class="PreProc">sig</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>: (addr <a href='500fake-screen.mu.html#L16'>screen</a>), _self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>), xmin: int, ymin: int, xmax: int, ymax: int, _x: int, _y: int, render-cursor?: boolean, color: int, background-color: int<span class="PreProc"> -&gt; </span>_/eax: int, _/<span class="muRegEcx">ecx</span>: int
-<span id="L255" class="LineNr">255 </span><span class="PreProc">sig</span> <a href='513grapheme-stack.mu.html#L199'>render-stack-from-top</a> <a href='500fake-screen.mu.html#L16'>screen</a>: (addr <a href='500fake-screen.mu.html#L16'>screen</a>), self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>), x: int, y: int, render-cursor?: boolean<span class="PreProc"> -&gt; </span>_/eax: int
-<span id="L256" class="LineNr">256 </span><span class="PreProc">sig</span> <a href='513grapheme-stack.mu.html#L393'>get-matching-close-paren-index</a> _self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>), render-cursor?: boolean<span class="PreProc"> -&gt; </span>_/<span class="muRegEdx">edx</span>: int
-<span id="L257" class="LineNr">257 </span><span class="PreProc">sig</span> <a href='513grapheme-stack.mu.html#L449'>get-matching-open-paren-index</a> _self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>), control: boolean, depth: int<span class="PreProc"> -&gt; </span>_/<span class="muRegEdx">edx</span>: int
-<span id="L258" class="LineNr">258 </span><span class="PreProc">sig</span> <a href='513grapheme-stack.mu.html#L497'>prefix-match?</a> _self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>), s: (addr stream byte)<span class="PreProc"> -&gt; </span>_/eax: boolean
-<span id="L259" class="LineNr">259 </span><span class="PreProc">sig</span> <a href='513grapheme-stack.mu.html#L525'>suffix-match?</a> _self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>), s: (addr stream byte)<span class="PreProc"> -&gt; </span>_/eax: boolean
-<span id="L260" class="LineNr">260 </span><span class="PreProc">sig</span> <a href='513grapheme-stack.mu.html#L552'>code-point-utf8-stack-is-decimal-integer?</a> _self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>)<span class="PreProc"> -&gt; </span>_/eax: boolean
+<span id="L245" class="LineNr">245 </span><span class="PreProc">sig</span> <a href='513grapheme-stack.mu.html#L8'>initialize-grapheme-stack</a> _self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>), n: int
+<span id="L246" class="LineNr">246 </span><span class="PreProc">sig</span> <a href='513grapheme-stack.mu.html#L16'>clear-grapheme-stack</a> _self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>)
+<span id="L247" class="LineNr">247 </span><span class="PreProc">sig</span> <a href='513grapheme-stack.mu.html#L22'>grapheme-stack-empty?</a> _self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>)<span class="PreProc"> -&gt; </span>_/eax: boolean
+<span id="L248" class="LineNr">248 </span><span class="PreProc">sig</span> <a href='513grapheme-stack.mu.html#L33'>grapheme-stack-length</a> _self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>)<span class="PreProc"> -&gt; </span>_/eax: int
+<span id="L249" class="LineNr">249 </span><span class="PreProc">sig</span> <a href='513grapheme-stack.mu.html#L39'>push-grapheme-stack</a> _self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>), _val: code-point-utf8
+<span id="L250" class="LineNr">250 </span><span class="PreProc">sig</span> <a href='513grapheme-stack.mu.html#L51'>pop-grapheme-stack</a> _self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>)<span class="PreProc"> -&gt; </span>_/eax: code-point-utf8
+<span id="L251" class="LineNr">251 </span><span class="PreProc">sig</span> <a href='513grapheme-stack.mu.html#L67'>copy-grapheme-stack</a> _src: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>), dest: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>)
+<span id="L252" class="LineNr">252 </span><span class="PreProc">sig</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>: (addr <a href='500fake-screen.mu.html#L16'>screen</a>), _self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>), xmin: int, ymin: int, xmax: int, ymax: int, _x: int, _y: int, <a href='514gap-buffer.mu.html#L942'>highlight-matching-open-paren?</a>: boolean, open-paren-depth: int, color: int, background-color: int<span class="PreProc"> -&gt; </span>_/eax: int, _/<span class="muRegEcx">ecx</span>: int
+<span id="L253" class="LineNr">253 </span><span class="PreProc">sig</span> <a href='513grapheme-stack.mu.html#L126'>render-stack-from-bottom</a> <a href='500fake-screen.mu.html#L16'>screen</a>: (addr <a href='500fake-screen.mu.html#L16'>screen</a>), self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>), x: int, y: int, <a href='514gap-buffer.mu.html#L942'>highlight-matching-open-paren?</a>: boolean, open-paren-depth: int<span class="PreProc"> -&gt; </span>_/eax: int
+<span id="L254" class="LineNr">254 </span><span class="PreProc">sig</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>: (addr <a href='500fake-screen.mu.html#L16'>screen</a>), _self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>), xmin: int, ymin: int, xmax: int, ymax: int, _x: int, _y: int, render-cursor?: boolean, color: int, background-color: int<span class="PreProc"> -&gt; </span>_/eax: int, _/<span class="muRegEcx">ecx</span>: int
+<span id="L255" class="LineNr">255 </span><span class="PreProc">sig</span> <a href='513grapheme-stack.mu.html#L199'>render-stack-from-top</a> <a href='500fake-screen.mu.html#L16'>screen</a>: (addr <a href='500fake-screen.mu.html#L16'>screen</a>), self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>), x: int, y: int, render-cursor?: boolean<span class="PreProc"> -&gt; </span>_/eax: int
+<span id="L256" class="LineNr">256 </span><span class="PreProc">sig</span> <a href='513grapheme-stack.mu.html#L393'>get-matching-close-paren-index</a> _self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>), render-cursor?: boolean<span class="PreProc"> -&gt; </span>_/<span class="muRegEdx">edx</span>: int
+<span id="L257" class="LineNr">257 </span><span class="PreProc">sig</span> <a href='513grapheme-stack.mu.html#L449'>get-matching-open-paren-index</a> _self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>), control: boolean, depth: int<span class="PreProc"> -&gt; </span>_/<span class="muRegEdx">edx</span>: int
+<span id="L258" class="LineNr">258 </span><span class="PreProc">sig</span> <a href='513grapheme-stack.mu.html#L497'>prefix-match?</a> _self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>), s: (addr stream byte)<span class="PreProc"> -&gt; </span>_/eax: boolean
+<span id="L259" class="LineNr">259 </span><span class="PreProc">sig</span> <a href='513grapheme-stack.mu.html#L525'>suffix-match?</a> _self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>), s: (addr stream byte)<span class="PreProc"> -&gt; </span>_/eax: boolean
+<span id="L260" class="LineNr">260 </span><span class="PreProc">sig</span> <a href='513grapheme-stack.mu.html#L552'>grapheme-stack-is-decimal-integer?</a> _self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>)<span class="PreProc"> -&gt; </span>_/eax: boolean
 <span id="L261" class="LineNr">261 </span><span class="PreProc">sig</span> <a href='514gap-buffer.mu.html#L11'>initialize-gap-buffer</a> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>), capacity: int
 <span id="L262" class="LineNr">262 </span><span class="PreProc">sig</span> <a href='514gap-buffer.mu.html#L19'>clear-gap-buffer</a> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>)
 <span id="L263" class="LineNr">263 </span><span class="PreProc">sig</span> <a href='514gap-buffer.mu.html#L27'>gap-buffer-empty?</a> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: boolean
@@ -327,13 +327,13 @@ if ('onhashchange' in window) {
 <span id="L266" class="LineNr">266 </span><span class="PreProc">sig</span> <a href='514gap-buffer.mu.html#L67'>load-gap-buffer-from-stream</a> self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>), in: (addr stream byte)
 <span id="L267" class="LineNr">267 </span><span class="PreProc">sig</span> <a href='514gap-buffer.mu.html#L82'>emit-gap-buffer</a> self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>), out: (addr stream byte)
 <span id="L268" class="LineNr">268 </span><span class="PreProc">sig</span> <a href='514gap-buffer.mu.html#L87'>append-gap-buffer</a> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>), out: (addr stream byte)
-<span id="L269" class="LineNr">269 </span><span class="PreProc">sig</span> <a href='514gap-buffer.mu.html#L96'>emit-stack-from-bottom</a> _self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>), out: (addr stream byte)
-<span id="L270" class="LineNr">270 </span><span class="PreProc">sig</span> <a href='514gap-buffer.mu.html#L114'>emit-stack-from-top</a> _self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>), out: (addr stream byte)
+<span id="L269" class="LineNr">269 </span><span class="PreProc">sig</span> <a href='514gap-buffer.mu.html#L96'>emit-stack-from-bottom</a> _self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>), out: (addr stream byte)
+<span id="L270" class="LineNr">270 </span><span class="PreProc">sig</span> <a href='514gap-buffer.mu.html#L114'>emit-stack-from-top</a> _self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>), out: (addr stream byte)
 <span id="L271" class="LineNr">271 </span><span class="PreProc">sig</span> <a href='514gap-buffer.mu.html#L132'>word-at-gap</a> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>), out: (addr stream byte)
 <span id="L272" class="LineNr">272 </span><span class="PreProc">sig</span> <a href='514gap-buffer.mu.html#L243'>code-point-utf8-at-gap</a> _self: (addr <a href='514gap-buffer.mu.html#L3'>gap-buffer</a>)<span class="PreProc"> -&gt; </span>_/eax: code-point-utf8
-<span id="L273" class="LineNr">273 </span><span class="PreProc">sig</span> <a href='514gap-buffer.mu.html#L275'>top-most-word</a> _self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>)<span class="PreProc"> -&gt; </span>_/eax: int
-<span id="L274" class="LineNr">274 </span><span class="PreProc">sig</span> <a href='514gap-buffer.mu.html#L297'>emit-stack-from-index</a> _self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>), start: int, out: (addr stream byte)
-<span id="L275" class="LineNr">275 </span><span class="PreProc">sig</span> <a href='514gap-buffer.mu.html#L314'>emit-stack-to-index</a> _self: (addr <a href='513grapheme-stack.mu.html#L3'>code-point-utf8-stack</a>), end: int, out: (addr stream byte)
+<span id="L273" class="LineNr">273 </span><span class="PreProc">sig</span> <a href='514gap-buffer.mu.html#L275'>top-most-word</a> _self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>)<span class="PreProc"> -&gt; </span>_/eax: int
+<span id="L274" class="LineNr">274 </span><span class="PreProc">sig</span> <a href='514gap-buffer.mu.html#L297'>emit-stack-from-index</a> _self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>), start: int, out: (addr stream byte)
+<span id="L275" class="LineNr">275 </span><span class="PreProc">sig</span> <a href='514gap-buffer.mu.html#L314'>emit-stack-to-index</a> _self: (addr <a href='513grapheme-stack.mu.html#L3'>grapheme-stack</a>), end: int, out: (addr stream byte)
 <span id="L276" class="LineNr">276 </span><span class="PreProc">sig</span> <a href='514gap-buffer.mu.html#L334'>is-ascii-word-code-point-utf8?</a> g: code-point-utf8<span class="PreProc"> -&gt; </span>_/eax: boolean
 <span id="L277" class="LineNr">277 </span><span class="PreProc">sig</span> <a href='514gap-buffer.mu.html#L385'>render-gap-buffer-wrapping-right-then-down</a> <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 id="L278" class="LineNr">278 </span><span class="PreProc">sig</span> <a href='514gap-buffer.mu.html#L416'>render-gap-buffer</a> <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>), x: int, y: int, render-cursor?: boolean, color: int, background-color: int<span class="PreProc"> -&gt; </span>_/eax: int
diff --git a/linux/tile/gap-buffer.mu b/linux/tile/gap-buffer.mu
index 1441684b..3c22501d 100644
--- a/linux/tile/gap-buffer.mu
+++ b/linux/tile/gap-buffer.mu
@@ -1,14 +1,14 @@
 type gap-buffer {
-  left: code-point-utf8-stack
-  right: code-point-utf8-stack
+  left: grapheme-stack
+  right: grapheme-stack
 }
 
 fn initialize-gap-buffer _self: (addr gap-buffer) {
   var self/esi: (addr gap-buffer) <- copy _self
-  var left/eax: (addr code-point-utf8-stack) <- get self, left
-  initialize-code-point-utf8-stack left, 0x10/max-word-size
-  var right/eax: (addr code-point-utf8-stack) <- get self, right
-  initialize-code-point-utf8-stack right, 0x10/max-word-size
+  var left/eax: (addr grapheme-stack) <- get self, left
+  initialize-grapheme-stack left, 0x10/max-word-size
+  var right/eax: (addr grapheme-stack) <- get self, right
+  initialize-grapheme-stack right, 0x10/max-word-size
 }
 
 # just for tests
@@ -37,15 +37,15 @@ fn gap-buffer-to-string self: (addr gap-buffer), out: (addr handle array byte) {
 fn emit-gap-buffer _self: (addr gap-buffer), out: (addr stream byte) {
   var self/esi: (addr gap-buffer) <- copy _self
   clear-stream out
-  var left/eax: (addr code-point-utf8-stack) <- get self, left
+  var left/eax: (addr grapheme-stack) <- get self, left
   emit-stack-from-bottom left, out
-  var right/eax: (addr code-point-utf8-stack) <- get self, right
+  var right/eax: (addr grapheme-stack) <- get self, right
   emit-stack-from-top right, out
 }
 
 # dump stack from bottom to top
-fn emit-stack-from-bottom _self: (addr code-point-utf8-stack), out: (addr stream byte) {
-  var self/esi: (addr code-point-utf8-stack) <- copy _self
+fn emit-stack-from-bottom _self: (addr grapheme-stack), out: (addr stream byte) {
+  var self/esi: (addr grapheme-stack) <- copy _self
   var data-ah/edi: (addr handle array code-point-utf8) <- get self, data
   var _data/eax: (addr array code-point-utf8) <- lookup *data-ah
   var data/edi: (addr array code-point-utf8) <- copy _data
@@ -62,8 +62,8 @@ fn emit-stack-from-bottom _self: (addr code-point-utf8-stack), out: (addr stream
 }
 
 # dump stack from top to bottom
-fn emit-stack-from-top _self: (addr code-point-utf8-stack), out: (addr stream byte) {
-  var self/esi: (addr code-point-utf8-stack) <- copy _self
+fn emit-stack-from-top _self: (addr grapheme-stack), out: (addr stream byte) {
+  var self/esi: (addr grapheme-stack) <- copy _self
   var data-ah/edi: (addr handle array code-point-utf8) <- get self, data
   var _data/eax: (addr array code-point-utf8) <- lookup *data-ah
   var data/edi: (addr array code-point-utf8) <- copy _data
@@ -82,18 +82,18 @@ fn emit-stack-from-top _self: (addr code-point-utf8-stack), out: (addr stream by
 
 fn render-gap-buffer screen: (addr screen), _gap: (addr gap-buffer) {
   var gap/esi: (addr gap-buffer) <- copy _gap
-  var left/eax: (addr code-point-utf8-stack) <- get gap, left
+  var left/eax: (addr grapheme-stack) <- get gap, left
   render-stack-from-bottom left, screen
-  var right/eax: (addr code-point-utf8-stack) <- get gap, right
+  var right/eax: (addr grapheme-stack) <- get gap, right
   render-stack-from-top right, screen
 }
 
 fn gap-buffer-length _gap: (addr gap-buffer) -> _/eax: int {
   var gap/esi: (addr gap-buffer) <- copy _gap
-  var left/eax: (addr code-point-utf8-stack) <- get gap, left
+  var left/eax: (addr grapheme-stack) <- get gap, left
   var tmp/eax: (addr int) <- get left, top
   var left-length/ecx: int <- copy *tmp
-  var right/esi: (addr code-point-utf8-stack) <- get gap, right
+  var right/esi: (addr grapheme-stack) <- get gap, right
   tmp <- get right, top
   var result/eax: int <- copy *tmp
   result <- add left-length
@@ -102,8 +102,8 @@ fn gap-buffer-length _gap: (addr gap-buffer) -> _/eax: int {
 
 fn add-code-point-utf8-at-gap _self: (addr gap-buffer), g: code-point-utf8 {
   var self/esi: (addr gap-buffer) <- copy _self
-  var left/eax: (addr code-point-utf8-stack) <- get self, left
-  push-code-point-utf8-stack left, g
+  var left/eax: (addr grapheme-stack) <- get self, left
+  push-grapheme-stack left, g
 }
 
 fn gap-to-start self: (addr gap-buffer) {
@@ -124,28 +124,28 @@ fn gap-to-end self: (addr gap-buffer) {
 
 fn gap-at-start? _self: (addr gap-buffer) -> _/eax: boolean {
   var self/esi: (addr gap-buffer) <- copy _self
-  var left/eax: (addr code-point-utf8-stack) <- get self, left
-  var result/eax: boolean <- code-point-utf8-stack-empty? left
+  var left/eax: (addr grapheme-stack) <- get self, left
+  var result/eax: boolean <- grapheme-stack-empty? left
   return result
 }
 
 fn gap-at-end? _self: (addr gap-buffer) -> _/eax: boolean {
   var self/esi: (addr gap-buffer) <- copy _self
-  var right/eax: (addr code-point-utf8-stack) <- get self, right
-  var result/eax: boolean <- code-point-utf8-stack-empty? right
+  var right/eax: (addr grapheme-stack) <- get self, right
+  var result/eax: boolean <- grapheme-stack-empty? right
   return result
 }
 
 fn gap-right _self: (addr gap-buffer) -> _/eax: code-point-utf8 {
   var self/esi: (addr gap-buffer) <- copy _self
   var g/eax: code-point-utf8 <- copy 0
-  var right/ecx: (addr code-point-utf8-stack) <- get self, right
-  g <- pop-code-point-utf8-stack right
+  var right/ecx: (addr grapheme-stack) <- get self, right
+  g <- pop-grapheme-stack right
   compare g, -1
   {
     break-if-=
-    var left/ecx: (addr code-point-utf8-stack) <- get self, left
-    push-code-point-utf8-stack left, g
+    var left/ecx: (addr grapheme-stack) <- get self, left
+    push-grapheme-stack left, g
   }
   return g
 }
@@ -154,21 +154,21 @@ fn gap-left _self: (addr gap-buffer) -> _/eax: code-point-utf8 {
   var self/esi: (addr gap-buffer) <- copy _self
   var g/eax: code-point-utf8 <- copy 0
   {
-    var left/ecx: (addr code-point-utf8-stack) <- get self, left
-    g <- pop-code-point-utf8-stack left
+    var left/ecx: (addr grapheme-stack) <- get self, left
+    g <- pop-grapheme-stack left
   }
   compare g, -1
   {
     break-if-=
-    var right/ecx: (addr code-point-utf8-stack) <- get self, right
-    push-code-point-utf8-stack right, g
+    var right/ecx: (addr grapheme-stack) <- get self, right
+    push-grapheme-stack right, g
   }
   return g
 }
 
 fn gap-index _self: (addr gap-buffer) -> _/eax: int {
   var self/eax: (addr gap-buffer) <- copy _self
-  var left/eax: (addr code-point-utf8-stack) <- get self, left
+  var left/eax: (addr grapheme-stack) <- get self, left
   var top-addr/eax: (addr int) <- get left, top
   var result/eax: int <- copy *top-addr
   return result
@@ -177,7 +177,7 @@ fn gap-index _self: (addr gap-buffer) -> _/eax: int {
 fn first-code-point-utf8-in-gap-buffer _self: (addr gap-buffer) -> _/eax: code-point-utf8 {
   var self/esi: (addr gap-buffer) <- copy _self
   # try to read from left
-  var left/eax: (addr code-point-utf8-stack) <- get self, left
+  var left/eax: (addr grapheme-stack) <- get self, left
   var top-addr/ecx: (addr int) <- get left, top
   compare *top-addr, 0
   {
@@ -188,7 +188,7 @@ fn first-code-point-utf8-in-gap-buffer _self: (addr gap-buffer) -> _/eax: code-p
     return *result-addr
   }
   # try to read from right
-  var right/eax: (addr code-point-utf8-stack) <- get self, right
+  var right/eax: (addr grapheme-stack) <- get self, right
   top-addr <- get right, top
   compare *top-addr, 0
   {
@@ -207,13 +207,13 @@ fn first-code-point-utf8-in-gap-buffer _self: (addr gap-buffer) -> _/eax: code-p
 fn code-point-utf8-before-cursor-in-gap-buffer _self: (addr gap-buffer) -> _/eax: code-point-utf8 {
   var self/esi: (addr gap-buffer) <- copy _self
   # try to read from left
-  var left/ecx: (addr code-point-utf8-stack) <- get self, left
+  var left/ecx: (addr grapheme-stack) <- get self, left
   var top-addr/edx: (addr int) <- get left, top
   compare *top-addr, 0
   {
     break-if-<=
-    var result/eax: code-point-utf8 <- pop-code-point-utf8-stack left
-    push-code-point-utf8-stack left, result
+    var result/eax: code-point-utf8 <- pop-grapheme-stack left
+    push-grapheme-stack left, result
     return result
   }
   # give up
@@ -222,14 +222,14 @@ fn code-point-utf8-before-cursor-in-gap-buffer _self: (addr gap-buffer) -> _/eax
 
 fn delete-before-gap _self: (addr gap-buffer) {
   var self/eax: (addr gap-buffer) <- copy _self
-  var left/eax: (addr code-point-utf8-stack) <- get self, left
-  var dummy/eax: code-point-utf8 <- pop-code-point-utf8-stack left
+  var left/eax: (addr grapheme-stack) <- get self, left
+  var dummy/eax: code-point-utf8 <- pop-grapheme-stack left
 }
 
 fn pop-after-gap _self: (addr gap-buffer) -> _/eax: code-point-utf8 {
   var self/eax: (addr gap-buffer) <- copy _self
-  var right/eax: (addr code-point-utf8-stack) <- get self, right
-  var result/eax: code-point-utf8 <- pop-code-point-utf8-stack right
+  var right/eax: (addr grapheme-stack) <- get self, right
+  var result/eax: code-point-utf8 <- pop-grapheme-stack right
   return result
 }
 
@@ -242,7 +242,7 @@ fn gap-buffer-equal? _self: (addr gap-buffer), s: (addr array byte) -> _/eax: bo
   var expected-stream/ecx: (addr stream byte) <- address stream-storage
   write expected-stream, s
   # compare left
-  var left/edx: (addr code-point-utf8-stack) <- get self, left
+  var left/edx: (addr grapheme-stack) <- get self, left
   var result/eax: boolean <- prefix-match? left, expected-stream
   compare result, 0/false
   {
@@ -250,7 +250,7 @@ fn gap-buffer-equal? _self: (addr gap-buffer), s: (addr array byte) -> _/eax: bo
     return result
   }
   # compare right
-  var right/edx: (addr code-point-utf8-stack) <- get self, right
+  var right/edx: (addr grapheme-stack) <- get self, right
   result <- suffix-match? right, expected-stream
   compare result, 0/false
   {
@@ -319,25 +319,25 @@ fn copy-gap-buffer _src-ah: (addr handle gap-buffer), _dest-ah: (addr handle gap
   var dest-ah/eax: (addr handle gap-buffer) <- copy _dest-ah
   var _dest-a/eax: (addr gap-buffer) <- lookup *dest-ah
   var dest-a/edi: (addr gap-buffer) <- copy _dest-a
-  # copy left code-point-utf8-stack
-  var src/ecx: (addr code-point-utf8-stack) <- get src-a, left
-  var dest/edx: (addr code-point-utf8-stack) <- get dest-a, left
-  copy-code-point-utf8-stack src, dest
-  # copy right code-point-utf8-stack
+  # copy left grapheme-stack
+  var src/ecx: (addr grapheme-stack) <- get src-a, left
+  var dest/edx: (addr grapheme-stack) <- get dest-a, left
+  copy-grapheme-stack src, dest
+  # copy right grapheme-stack
   src <- get src-a, right
   dest <- get dest-a, right
-  copy-code-point-utf8-stack src, dest
+  copy-grapheme-stack src, dest
 }
 
 fn gap-buffer-is-decimal-integer? _self: (addr gap-buffer) -> _/eax: boolean {
   var self/esi: (addr gap-buffer) <- copy _self
-  var curr/ecx: (addr code-point-utf8-stack) <- get self, left
-  var result/eax: boolean <- code-point-utf8-stack-is-decimal-integer? curr
+  var curr/ecx: (addr grapheme-stack) <- get self, left
+  var result/eax: boolean <- grapheme-stack-is-decimal-integer? curr
   {
     compare result, 0/false
     break-if-=
     curr <- get self, right
-    result <- code-point-utf8-stack-is-decimal-integer? curr
+    result <- grapheme-stack-is-decimal-integer? curr
   }
   return result
 }
diff --git a/linux/tile/grapheme-stack.mu b/linux/tile/grapheme-stack.mu
index c7565a1c..0966be6c 100644
--- a/linux/tile/grapheme-stack.mu
+++ b/linux/tile/grapheme-stack.mu
@@ -1,24 +1,24 @@
-type code-point-utf8-stack {
+type grapheme-stack {
   data: (handle array code-point-utf8)
   top: int
 }
 
-fn initialize-code-point-utf8-stack _self: (addr code-point-utf8-stack), n: int {
-  var self/esi: (addr code-point-utf8-stack) <- copy _self
+fn initialize-grapheme-stack _self: (addr grapheme-stack), n: int {
+  var self/esi: (addr grapheme-stack) <- copy _self
   var d/edi: (addr handle array code-point-utf8) <- get self, data
   populate d, n
   var top/eax: (addr int) <- get self, top
   copy-to *top, 0
 }
 
-fn clear-code-point-utf8-stack _self: (addr code-point-utf8-stack) {
-  var self/esi: (addr code-point-utf8-stack) <- copy _self
+fn clear-grapheme-stack _self: (addr grapheme-stack) {
+  var self/esi: (addr grapheme-stack) <- copy _self
   var top/eax: (addr int) <- get self, top
   copy-to *top, 0
 }
 
-fn code-point-utf8-stack-empty? _self: (addr code-point-utf8-stack) -> _/eax: boolean {
-  var self/esi: (addr code-point-utf8-stack) <- copy _self
+fn grapheme-stack-empty? _self: (addr grapheme-stack) -> _/eax: boolean {
+  var self/esi: (addr grapheme-stack) <- copy _self
   var top/eax: (addr int) <- get self, top
   compare *top, 0
   {
@@ -28,8 +28,8 @@ fn code-point-utf8-stack-empty? _self: (addr code-point-utf8-stack) -> _/eax: bo
   return 0/false
 }
 
-fn push-code-point-utf8-stack _self: (addr code-point-utf8-stack), _val: code-point-utf8 {
-  var self/esi: (addr code-point-utf8-stack) <- copy _self
+fn push-grapheme-stack _self: (addr grapheme-stack), _val: code-point-utf8 {
+  var self/esi: (addr grapheme-stack) <- copy _self
   var top-addr/ecx: (addr int) <- get self, top
   var data-ah/edx: (addr handle array code-point-utf8) <- get self, data
   var data/eax: (addr array code-point-utf8) <- lookup *data-ah
@@ -40,8 +40,8 @@ fn push-code-point-utf8-stack _self: (addr code-point-utf8-stack), _val: code-po
   add-to *top-addr, 1
 }
 
-fn pop-code-point-utf8-stack _self: (addr code-point-utf8-stack) -> _/eax: code-point-utf8 {
-  var self/esi: (addr code-point-utf8-stack) <- copy _self
+fn pop-grapheme-stack _self: (addr grapheme-stack) -> _/eax: code-point-utf8 {
+  var self/esi: (addr grapheme-stack) <- copy _self
   var top-addr/ecx: (addr int) <- get self, top
   {
     compare *top-addr, 0
@@ -56,8 +56,8 @@ fn pop-code-point-utf8-stack _self: (addr code-point-utf8-stack) -> _/eax: code-
   return *result-addr
 }
 
-fn copy-code-point-utf8-stack _src: (addr code-point-utf8-stack), dest: (addr code-point-utf8-stack) {
-  var src/esi: (addr code-point-utf8-stack) <- copy _src
+fn copy-grapheme-stack _src: (addr grapheme-stack), dest: (addr grapheme-stack) {
+  var src/esi: (addr grapheme-stack) <- copy _src
   var data-ah/edi: (addr handle array code-point-utf8) <- get src, data
   var _data/eax: (addr array code-point-utf8) <- lookup *data-ah
   var data/edi: (addr array code-point-utf8) <- copy _data
@@ -67,7 +67,7 @@ fn copy-code-point-utf8-stack _src: (addr code-point-utf8-stack), dest: (addr co
     compare i, *top-addr
     break-if->=
     var g/edx: (addr code-point-utf8) <- index data, i
-    push-code-point-utf8-stack dest, *g
+    push-grapheme-stack dest, *g
     i <- increment
     loop
   }
@@ -75,8 +75,8 @@ fn copy-code-point-utf8-stack _src: (addr code-point-utf8-stack), dest: (addr co
 
 # dump stack to screen from bottom to top
 # don't move the cursor or anything
-fn render-stack-from-bottom _self: (addr code-point-utf8-stack), screen: (addr screen) {
-  var self/esi: (addr code-point-utf8-stack) <- copy _self
+fn render-stack-from-bottom _self: (addr grapheme-stack), screen: (addr screen) {
+  var self/esi: (addr grapheme-stack) <- copy _self
   var data-ah/edi: (addr handle array code-point-utf8) <- get self, data
   var _data/eax: (addr array code-point-utf8) <- lookup *data-ah
   var data/edi: (addr array code-point-utf8) <- copy _data
@@ -94,8 +94,8 @@ fn render-stack-from-bottom _self: (addr code-point-utf8-stack), screen: (addr s
 
 # dump stack to screen from top to bottom
 # don't move the cursor or anything
-fn render-stack-from-top _self: (addr code-point-utf8-stack), screen: (addr screen) {
-  var self/esi: (addr code-point-utf8-stack) <- copy _self
+fn render-stack-from-top _self: (addr grapheme-stack), screen: (addr screen) {
+  var self/esi: (addr grapheme-stack) <- copy _self
   var data-ah/edi: (addr handle array code-point-utf8) <- get self, data
   var _data/eax: (addr array code-point-utf8) <- lookup *data-ah
   var data/edi: (addr array code-point-utf8) <- copy _data
@@ -114,8 +114,8 @@ fn render-stack-from-top _self: (addr code-point-utf8-stack), screen: (addr scre
 
 # compare from bottom
 # beware: modifies 'stream', which must be disposed of after a false result
-fn prefix-match? _self: (addr code-point-utf8-stack), s: (addr stream byte) -> _/eax: boolean {
-  var self/esi: (addr code-point-utf8-stack) <- copy _self
+fn prefix-match? _self: (addr grapheme-stack), s: (addr stream byte) -> _/eax: boolean {
+  var self/esi: (addr grapheme-stack) <- copy _self
   var data-ah/edi: (addr handle array code-point-utf8) <- get self, data
   var _data/eax: (addr array code-point-utf8) <- lookup *data-ah
   var data/edi: (addr array code-point-utf8) <- copy _data
@@ -142,8 +142,8 @@ fn prefix-match? _self: (addr code-point-utf8-stack), s: (addr stream byte) -> _
 
 # compare from bottom
 # beware: modifies 'stream', which must be disposed of after a false result
-fn suffix-match? _self: (addr code-point-utf8-stack), s: (addr stream byte) -> _/eax: boolean {
-  var self/esi: (addr code-point-utf8-stack) <- copy _self
+fn suffix-match? _self: (addr grapheme-stack), s: (addr stream byte) -> _/eax: boolean {
+  var self/esi: (addr grapheme-stack) <- copy _self
   var data-ah/edi: (addr handle array code-point-utf8) <- get self, data
   var _data/eax: (addr array code-point-utf8) <- lookup *data-ah
   var data/edi: (addr array code-point-utf8) <- copy _data
@@ -169,15 +169,15 @@ fn suffix-match? _self: (addr code-point-utf8-stack), s: (addr stream byte) -> _
   return 1   # true
 }
 
-fn code-point-utf8-stack-is-decimal-integer? _self: (addr code-point-utf8-stack) -> _/eax: boolean {
-  var self/esi: (addr code-point-utf8-stack) <- copy _self
+fn grapheme-stack-is-decimal-integer? _self: (addr grapheme-stack) -> _/eax: boolean {
+  var self/esi: (addr grapheme-stack) <- copy _self
   var data-ah/eax: (addr handle array code-point-utf8) <- get self, data
   var _data/eax: (addr array code-point-utf8) <- lookup *data-ah
   var data/edx: (addr array code-point-utf8) <- copy _data
   var top-addr/ecx: (addr int) <- get self, top
   var i/ebx: int <- copy 0
   var result/eax: boolean <- copy 1/true
-  $code-point-utf8-stack-is-integer?:loop: {
+  $grapheme-stack-is-integer?:loop: {
     compare i, *top-addr
     break-if->=
     var g/edx: (addr code-point-utf8) <- index data, i
diff --git a/linux/tile/word.mu b/linux/tile/word.mu
index 3b4851f0..ba4877fa 100644
--- a/linux/tile/word.mu
+++ b/linux/tile/word.mu
@@ -58,12 +58,12 @@ fn move-word-contents _src-ah: (addr handle word), _dest-ah: (addr handle word)
   cursor-to-start src
   var src-data-ah/eax: (addr handle gap-buffer) <- get src, scalar-data
   var src-data/eax: (addr gap-buffer) <- lookup *src-data-ah
-  var src-stack/ecx: (addr code-point-utf8-stack) <- get src-data, right
+  var src-stack/ecx: (addr grapheme-stack) <- get src-data, right
   {
-    var done?/eax: boolean <- code-point-utf8-stack-empty? src-stack
+    var done?/eax: boolean <- grapheme-stack-empty? src-stack
     compare done?, 0/false
     break-if-!=
-    var g/eax: code-point-utf8 <- pop-code-point-utf8-stack src-stack
+    var g/eax: code-point-utf8 <- pop-grapheme-stack src-stack
 #?     print-code-point-utf8 0, g
 #?     print-string 0, "\n"
     add-code-point-utf8-to-word dest, g
@@ -79,7 +79,7 @@ fn copy-word-contents-before-cursor _src-ah: (addr handle word), _dest-ah: (addr
   var src/eax: (addr word) <- lookup *src-ah
   var src-data-ah/eax: (addr handle gap-buffer) <- get src, scalar-data
   var src-data/eax: (addr gap-buffer) <- lookup *src-data-ah
-  var src-stack/ecx: (addr code-point-utf8-stack) <- get src-data, left
+  var src-stack/ecx: (addr grapheme-stack) <- get src-data, left
   var src-stack-data-ah/eax: (addr handle array code-point-utf8) <- get src-stack, data
   var _src-stack-data/eax: (addr array code-point-utf8) <- lookup *src-stack-data-ah
   var src-stack-data/edx: (addr array code-point-utf8) <- copy _src-stack-data
diff --git a/signatures.mu b/signatures.mu
index ee8ea5dd..0a34e0b8 100644
--- a/signatures.mu
+++ b/signatures.mu
@@ -242,22 +242,22 @@ sig slide-down _a: (addr array int), start: int, end: int, target: int
 sig find-slide-down-slot-in-array _a: (addr array int), _val: int -> _/ecx: int
 sig check-slide-up before: (addr array byte), start: int, end: int, target: int, after: (addr array byte), msg: (addr array byte)
 sig check-slide-down before: (addr array byte), start: int, end: int, target: int, after: (addr array byte), msg: (addr array byte)
-sig initialize-code-point-utf8-stack _self: (addr code-point-utf8-stack), n: int
-sig clear-code-point-utf8-stack _self: (addr code-point-utf8-stack)
-sig code-point-utf8-stack-empty? _self: (addr code-point-utf8-stack) -> _/eax: boolean
-sig code-point-utf8-stack-length _self: (addr code-point-utf8-stack) -> _/eax: int
-sig push-code-point-utf8-stack _self: (addr code-point-utf8-stack), _val: code-point-utf8
-sig pop-code-point-utf8-stack _self: (addr code-point-utf8-stack) -> _/eax: code-point-utf8
-sig copy-code-point-utf8-stack _src: (addr code-point-utf8-stack), dest: (addr code-point-utf8-stack)
-sig render-stack-from-bottom-wrapping-right-then-down screen: (addr screen), _self: (addr code-point-utf8-stack), xmin: int, ymin: int, xmax: int, ymax: int, _x: int, _y: int, highlight-matching-open-paren?: boolean, open-paren-depth: int, color: int, background-color: int -> _/eax: int, _/ecx: int
-sig render-stack-from-bottom screen: (addr screen), self: (addr code-point-utf8-stack), x: int, y: int, highlight-matching-open-paren?: boolean, open-paren-depth: int -> _/eax: int
-sig render-stack-from-top-wrapping-right-then-down screen: (addr screen), _self: (addr code-point-utf8-stack), xmin: int, ymin: int, xmax: int, ymax: int, _x: int, _y: int, render-cursor?: boolean, color: int, background-color: int -> _/eax: int, _/ecx: int
-sig render-stack-from-top screen: (addr screen), self: (addr code-point-utf8-stack), x: int, y: int, render-cursor?: boolean -> _/eax: int
-sig get-matching-close-paren-index _self: (addr code-point-utf8-stack), render-cursor?: boolean -> _/edx: int
-sig get-matching-open-paren-index _self: (addr code-point-utf8-stack), control: boolean, depth: int -> _/edx: int
-sig prefix-match? _self: (addr code-point-utf8-stack), s: (addr stream byte) -> _/eax: boolean
-sig suffix-match? _self: (addr code-point-utf8-stack), s: (addr stream byte) -> _/eax: boolean
-sig code-point-utf8-stack-is-decimal-integer? _self: (addr code-point-utf8-stack) -> _/eax: boolean
+sig initialize-grapheme-stack _self: (addr grapheme-stack), n: int
+sig clear-grapheme-stack _self: (addr grapheme-stack)
+sig grapheme-stack-empty? _self: (addr grapheme-stack) -> _/eax: boolean
+sig grapheme-stack-length _self: (addr grapheme-stack) -> _/eax: int
+sig push-grapheme-stack _self: (addr grapheme-stack), _val: code-point-utf8
+sig pop-grapheme-stack _self: (addr grapheme-stack) -> _/eax: code-point-utf8
+sig copy-grapheme-stack _src: (addr grapheme-stack), dest: (addr grapheme-stack)
+sig render-stack-from-bottom-wrapping-right-then-down screen: (addr screen), _self: (addr grapheme-stack), xmin: int, ymin: int, xmax: int, ymax: int, _x: int, _y: int, highlight-matching-open-paren?: boolean, open-paren-depth: int, color: int, background-color: int -> _/eax: int, _/ecx: int
+sig render-stack-from-bottom screen: (addr screen), self: (addr grapheme-stack), x: int, y: int, highlight-matching-open-paren?: boolean, open-paren-depth: int -> _/eax: int
+sig render-stack-from-top-wrapping-right-then-down screen: (addr screen), _self: (addr grapheme-stack), xmin: int, ymin: int, xmax: int, ymax: int, _x: int, _y: int, render-cursor?: boolean, color: int, background-color: int -> _/eax: int, _/ecx: int
+sig render-stack-from-top screen: (addr screen), self: (addr grapheme-stack), x: int, y: int, render-cursor?: boolean -> _/eax: int
+sig get-matching-close-paren-index _self: (addr grapheme-stack), render-cursor?: boolean -> _/edx: int
+sig get-matching-open-paren-index _self: (addr grapheme-stack), control: boolean, depth: int -> _/edx: int
+sig prefix-match? _self: (addr grapheme-stack), s: (addr stream byte) -> _/eax: boolean
+sig suffix-match? _self: (addr grapheme-stack), s: (addr stream byte) -> _/eax: boolean
+sig grapheme-stack-is-decimal-integer? _self: (addr grapheme-stack) -> _/eax: boolean
 sig initialize-gap-buffer _self: (addr gap-buffer), capacity: int
 sig clear-gap-buffer _self: (addr gap-buffer)
 sig gap-buffer-empty? _self: (addr gap-buffer) -> _/eax: boolean
@@ -266,13 +266,13 @@ sig initialize-gap-buffer-with self: (addr gap-buffer), keys: (addr array byte)
 sig load-gap-buffer-from-stream self: (addr gap-buffer), in: (addr stream byte)
 sig emit-gap-buffer self: (addr gap-buffer), out: (addr stream byte)
 sig append-gap-buffer _self: (addr gap-buffer), out: (addr stream byte)
-sig emit-stack-from-bottom _self: (addr code-point-utf8-stack), out: (addr stream byte)
-sig emit-stack-from-top _self: (addr code-point-utf8-stack), out: (addr stream byte)
+sig emit-stack-from-bottom _self: (addr grapheme-stack), out: (addr stream byte)
+sig emit-stack-from-top _self: (addr grapheme-stack), out: (addr stream byte)
 sig word-at-gap _self: (addr gap-buffer), out: (addr stream byte)
 sig code-point-utf8-at-gap _self: (addr gap-buffer) -> _/eax: code-point-utf8
-sig top-most-word _self: (addr code-point-utf8-stack) -> _/eax: int
-sig emit-stack-from-index _self: (addr code-point-utf8-stack), start: int, out: (addr stream byte)
-sig emit-stack-to-index _self: (addr code-point-utf8-stack), end: int, out: (addr stream byte)
+sig top-most-word _self: (addr grapheme-stack) -> _/eax: int
+sig emit-stack-from-index _self: (addr grapheme-stack), start: int, out: (addr stream byte)
+sig emit-stack-to-index _self: (addr grapheme-stack), end: int, out: (addr stream byte)
 sig is-ascii-word-code-point-utf8? g: code-point-utf8 -> _/eax: boolean
 sig render-gap-buffer-wrapping-right-then-down screen: (addr screen), _gap: (addr gap-buffer), xmin: int, ymin: int, xmax: int, ymax: int, render-cursor?: boolean, color: int, background-color: int -> _/eax: int, _/ecx: int
 sig render-gap-buffer screen: (addr screen), gap: (addr gap-buffer), x: int, y: int, render-cursor?: boolean, color: int, background-color: int -> _/eax: int