.

2 files changed, 107 insertions, 14 deletions

diff --git a/html/apps/ex14.mu.html b/html/apps/ex14.mu.html
index 5af8970f..9b527ec1 100644
--- a/html/apps/ex14.mu.html
+++ b/html/apps/ex14.mu.html
@@ -59,8 +59,8 @@ if ('onhashchange' in window) {
 <pre id='vimCodeElement'>
 <span id="L1" class="LineNr"> 1 </span><span class="muComment"># Unicode demo</span>
 <span id="L2" class="LineNr"> 2 </span><span class="muComment">#</span>
-<span id="L3" class="LineNr"> 3 </span><span class="muComment"># Mu can't read Unicode from keyboard yet, so we'll read from disk and print</span>
-<span id="L4" class="LineNr"> 4 </span><span class="muComment"># to screen.</span>
+<span id="L3" class="LineNr"> 3 </span><span class="muComment"># Mu can't read Unicode from keyboard yet, so we'll read utf-8 from disk and</span>
+<span id="L4" class="LineNr"> 4 </span><span class="muComment"># print to screen.</span>
 <span id="L5" class="LineNr"> 5 </span><span class="muComment">#</span>
 <span id="L6" class="LineNr"> 6 </span><span class="muComment"># Steps for trying it out:</span>
 <span id="L7" class="LineNr"> 7 </span><span class="muComment">#   1. Translate this example into a disk image code.img.</span>
@@ -72,18 +72,13 @@ if ('onhashchange' in window) {
 <span id="L13" class="LineNr">13 </span><span class="muComment">#       qemu-system-i386 -hda code.img -hdb data.img</span>
 <span id="L14" class="LineNr">14 </span><span class="muComment">#</span>
 <span id="L15" class="LineNr">15 </span><span class="muComment"># Expected output: 'நட' in green near the top-left corner of screen</span>
-<span id="L16" class="LineNr">16 </span><span class="muComment">#</span>
-<span id="L17" class="LineNr">17 </span><span class="muComment"># Limitations:</span>
-<span id="L18" class="LineNr">18 </span><span class="muComment">#   - Utf-8 is the one true encoding.</span>
-<span id="L19" class="LineNr">19 </span><span class="muComment">#   - No keyboard support yet.</span>
-<span id="L20" class="LineNr">20 </span><span class="muComment">#   - Just single-code-point graphemes so far. No combiner characters, etc.</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='ex14.mu.html#L22'>main</a></span> <a href='../500fake-screen.mu.html#L14'>screen</a>: (addr <a href='../500fake-screen.mu.html#L14'>screen</a>), keyboard: (addr keyboard), data-disk: (addr disk) <span class="Delimiter">{</span>
-<span id="L23" class="LineNr">23 </span>  <span class="PreProc">var</span> text-storage: (stream byte <span class="Constant">0x200</span>)
-<span id="L24" class="LineNr">24 </span>  <span class="PreProc">var</span> text/<span class="muRegEsi">esi</span>: (addr stream byte) <span class="Special">&lt;-</span> address text-storage
-<span id="L25" class="LineNr">25 </span>  <a href='../510disk.mu.html#L1'>load-sectors</a> data-disk, <span class="Constant">0</span>/lba, <span class="Constant">1</span>/num-sectors, text
-<span id="L26" class="LineNr">26 </span>  <span class="PreProc">var</span> dummy/eax: int <span class="Special">&lt;-</span> <a href='../501draw-text.mu.html#L117'>draw-stream-rightward</a> <a href='../500fake-screen.mu.html#L14'>screen</a>, text, <span class="Constant">0</span>/x <span class="Constant">0x80</span>/xmax <span class="Constant">0</span>/y, <span class="Constant">0xa</span>/fg, <span class="Constant">0</span>/bg
-<span id="L27" class="LineNr">27 </span><span class="Delimiter">}</span>
+<span id="L16" class="LineNr">16 </span>
+<span id="L17" class="LineNr">17 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='ex14.mu.html#L17'>main</a></span> <a href='../500fake-screen.mu.html#L14'>screen</a>: (addr <a href='../500fake-screen.mu.html#L14'>screen</a>), keyboard: (addr keyboard), data-disk: (addr disk) <span class="Delimiter">{</span>
+<span id="L18" class="LineNr">18 </span>  <span class="PreProc">var</span> text-storage: (stream byte <span class="Constant">0x200</span>)
+<span id="L19" class="LineNr">19 </span>  <span class="PreProc">var</span> text/<span class="muRegEsi">esi</span>: (addr stream byte) <span class="Special">&lt;-</span> address text-storage
+<span id="L20" class="LineNr">20 </span>  <a href='../510disk.mu.html#L1'>load-sectors</a> data-disk, <span class="Constant">0</span>/lba, <span class="Constant">1</span>/num-sectors, text
+<span id="L21" class="LineNr">21 </span>  <span class="PreProc">var</span> dummy/eax: int <span class="Special">&lt;-</span> <a href='../501draw-text.mu.html#L117'>draw-stream-rightward</a> <a href='../500fake-screen.mu.html#L14'>screen</a>, text, <span class="Constant">0</span>/x <span class="Constant">0x80</span>/xmax <span class="Constant">0</span>/y, <span class="Constant">0xa</span>/fg, <span class="Constant">0</span>/bg
+<span id="L22" class="LineNr">22 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/apps/ex15.mu.html b/html/apps/ex15.mu.html
new file mode 100644
index 00000000..fd61ac64
--- /dev/null
+++ b/html/apps/ex15.mu.html
@@ -0,0 +1,98 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<title>Mu - apps/ex15.mu</title>
+<meta name="Generator" content="Vim/8.1">
+<meta name="plugin-version" content="vim8.1_v1">
+<meta name="syntax" content="none">
+<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="colorscheme" content="minimal-light">
+<style type="text/css">
+<!--
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #ffffd7; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #ffffd7; }
+a { color:inherit; }
+* { font-size:12pt; font-size: 1em; }
+.PreProc { color: #c000c0; }
+.Special { color: #ff6060; }
+.LineNr { }
+.Constant { color: #008787; }
+.Delimiter { color: #c000c0; }
+.muFunction { color: #af5f00; text-decoration: underline; }
+.muComment { color: #005faf; }
+-->
+</style>
+
+<script type='text/javascript'>
+<!--
+
+/* function to open any folds containing a jumped-to line before jumping to it */
+function JumpToLine()
+{
+  var lineNum;
+  lineNum = window.location.hash;
+  lineNum = lineNum.substr(1); /* strip off '#' */
+
+  if (lineNum.indexOf('L') == -1) {
+    lineNum = 'L'+lineNum;
+  }
+  var lineElem = document.getElementById(lineNum);
+  /* Always jump to new location even if the line was hidden inside a fold, or
+   * we corrected the raw number to a line ID.
+   */
+  if (lineElem) {
+    lineElem.scrollIntoView(true);
+  }
+  return true;
+}
+if ('onhashchange' in window) {
+  window.onhashchange = JumpToLine;
+}
+
+-->
+</script>
+</head>
+<body onload='JumpToLine();'>
+<a href='https://github.com/akkartik/mu/blob/main/apps/ex15.mu'>https://github.com/akkartik/mu/blob/main/apps/ex15.mu</a>
+<pre id='vimCodeElement'>
+<span id="L1" class="LineNr"> 1 </span><span class="muComment"># Demo of combining-character support in Mu, which can be summarized as, &quot;the</span>
+<span id="L2" class="LineNr"> 2 </span><span class="muComment"># old typewriter-based approach of backing up one character and adding the</span>
+<span id="L3" class="LineNr"> 3 </span><span class="muComment"># accent or _matra_ in.&quot;</span>
+<span id="L4" class="LineNr"> 4 </span><span class="muComment">#   <a href="https://en.wikipedia.org/wiki/Combining_character">https://en.wikipedia.org/wiki/Combining_character</a></span>
+<span id="L5" class="LineNr"> 5 </span><span class="muComment">#</span>
+<span id="L6" class="LineNr"> 6 </span><span class="muComment"># Mu uses this approach for both accents in Latin languages and vowel</span>
+<span id="L7" class="LineNr"> 7 </span><span class="muComment"># diacritics in Abugida scripts.</span>
+<span id="L8" class="LineNr"> 8 </span><span class="muComment">#   <a href="https://en.wikipedia.org/wiki/Diacritic">https://en.wikipedia.org/wiki/Diacritic</a></span>
+<span id="L9" class="LineNr"> 9 </span><span class="muComment">#   <a href="https://en.wikipedia.org/wiki/Abugida">https://en.wikipedia.org/wiki/Abugida</a></span>
+<span id="L10" class="LineNr">10 </span><span class="muComment">#</span>
+<span id="L11" class="LineNr">11 </span><span class="muComment"># Steps for trying it out:</span>
+<span id="L12" class="LineNr">12 </span><span class="muComment">#   1. Translate this example into a disk image code.img.</span>
+<span id="L13" class="LineNr">13 </span><span class="muComment">#       ./translate apps/ex15.mu</span>
+<span id="L14" class="LineNr">14 </span><span class="muComment">#   2. Run:</span>
+<span id="L15" class="LineNr">15 </span><span class="muComment">#       qemu-system-i386 -hda code.img -hdb data.img</span>
+<span id="L16" class="LineNr">16 </span><span class="muComment">#</span>
+<span id="L17" class="LineNr">17 </span><span class="muComment"># Expected output: 'à' in green in a few places near the top-left corner of</span>
+<span id="L18" class="LineNr">18 </span><span class="muComment"># screen, showing off what this approach can and cannot do.</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='ex15.mu.html#L20'>main</a></span> <a href='../500fake-screen.mu.html#L14'>screen</a>: (addr <a href='../500fake-screen.mu.html#L14'>screen</a>), keyboard: (addr keyboard), data-disk: (addr disk) <span class="Delimiter">{</span>
+<span id="L21" class="LineNr">21 </span>  <span class="muComment"># at the top of screen, the accent is almost cropped</span>
+<span id="L22" class="LineNr">22 </span>  <span class="PreProc">var</span> dummy/eax: int <span class="Special">&lt;-</span>    <a href='../103glyph.subx.html#L19'>draw-code-point-on-real-screen</a>   <span class="Constant">0x61</span>/a,                       <span class="Constant">0</span>/x <span class="Constant">0</span>/y, <span class="Constant">3</span>/fg <span class="Constant">0</span>/bg
+<span id="L23" class="LineNr">23 </span>  <span class="PreProc">var</span> dummy/eax: int <span class="Special">&lt;-</span> <a href='../103glyph.subx.html#L31'>overlay-code-point-on-real-screen</a> <span class="Constant">0x0300</span>/combining-grave-accent,  <span class="Constant">0</span>/x <span class="Constant">0</span>/y, <span class="Constant">3</span>/fg <span class="Constant">0</span>/bg
+<span id="L24" class="LineNr">24 </span>
+<span id="L25" class="LineNr">25 </span>  <span class="muComment"># below a grapheme with a descender, the accent uglily overlaps</span>
+<span id="L26" class="LineNr">26 </span>  <span class="muComment">#   <a href="https://en.wikipedia.org/wiki/Descender">https://en.wikipedia.org/wiki/Descender</a></span>
+<span id="L27" class="LineNr">27 </span>  <span class="PreProc">var</span> dummy/eax: int <span class="Special">&lt;-</span>    <a href='../103glyph.subx.html#L19'>draw-code-point-on-real-screen</a>   <span class="Constant">0x67</span>/g,                       <span class="Constant">4</span>/x <span class="Constant">3</span>/y, <span class="Constant">3</span>/fg <span class="Constant">0</span>/bg
+<span id="L28" class="LineNr">28 </span>  <span class="PreProc">var</span> dummy/eax: int <span class="Special">&lt;-</span>    <a href='../103glyph.subx.html#L19'>draw-code-point-on-real-screen</a>   <span class="Constant">0x61</span>/a,                       <span class="Constant">4</span>/x <span class="Constant">4</span>/y, <span class="Constant">3</span>/fg <span class="Constant">0</span>/bg
+<span id="L29" class="LineNr">29 </span>  <span class="PreProc">var</span> dummy/eax: int <span class="Special">&lt;-</span> <a href='../103glyph.subx.html#L31'>overlay-code-point-on-real-screen</a> <span class="Constant">0x0300</span>/combining-grave-accent,  <span class="Constant">4</span>/x <span class="Constant">4</span>/y, <span class="Constant">3</span>/fg <span class="Constant">0</span>/bg
+<span id="L30" class="LineNr">30 </span>
+<span id="L31" class="LineNr">31 </span>  <span class="muComment"># beside a grapheme with a descender, it becomes more obvious that monowidth fonts can't make baselines line up</span>
+<span id="L32" class="LineNr">32 </span>  <span class="muComment">#   <a href="https://en.wikipedia.org/wiki/Baseline_(typography)">https://en.wikipedia.org/wiki/Baseline_(typography)</a></span>
+<span id="L33" class="LineNr">33 </span>  <span class="PreProc">var</span> dummy/eax: int <span class="Special">&lt;-</span>    <a href='../103glyph.subx.html#L19'>draw-code-point-on-real-screen</a>   <span class="Constant">0x67</span>/g,                       <span class="Constant">8</span>/x <span class="Constant">3</span>/y, <span class="Constant">3</span>/fg <span class="Constant">0</span>/bg
+<span id="L34" class="LineNr">34 </span>  <span class="PreProc">var</span> dummy/eax: int <span class="Special">&lt;-</span>    <a href='../103glyph.subx.html#L19'>draw-code-point-on-real-screen</a>   <span class="Constant">0x61</span>/a,                       <span class="Constant">9</span>/x <span class="Constant">3</span>/y, <span class="Constant">3</span>/fg <span class="Constant">0</span>/bg
+<span id="L35" class="LineNr">35 </span>  <span class="PreProc">var</span> dummy/eax: int <span class="Special">&lt;-</span> <a href='../103glyph.subx.html#L31'>overlay-code-point-on-real-screen</a> <span class="Constant">0x0300</span>/combining-grave-accent,  <span class="Constant">9</span>/x <span class="Constant">3</span>/y, <span class="Constant">3</span>/fg <span class="Constant">0</span>/bg
+<span id="L36" class="LineNr">36 </span><span class="Delimiter">}</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->