From 7b39258a3337f0ad05456c9005077fab3bb4095a Mon Sep 17 00:00:00 2001
From: Madison Scott-Clary <makyo@drab-makyo.com>
Date: Wed, 22 Apr 2020 03:11:28 -0700
Subject: [PATCH] update from sparkleup

---
 tech/index.html          |  4 ++--
 tech/md-ext/editing.html | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/tech/index.html b/tech/index.html
index 1693beb47..a5479ff26 100644
--- a/tech/index.html
+++ b/tech/index.html
@@ -24,12 +24,12 @@
 <ul>
 <li class="done3"> <a href="md-ext/vimwiki.html">VimwikiExtension</a></li>
 <li class="done3"> <a href="md-ext/verse.html">VerseExtension</a></li>
-<li class="done0"> <a href="md-ext/editing.html">EditingExtension</a></li>
+<li class="done3"> <a href="md-ext/editing.html">EditingExtension</a></li>
 </ul>
                 <span class="control">Expand all</span>
             </article>
             <footer>
-                <p>Page generated on 2020-04-21</p>
+                <p>Page generated on 2020-04-22</p>
             </footer>
         </main>
     <script type="text/javascript">
diff --git a/tech/md-ext/editing.html b/tech/md-ext/editing.html
index 961634c3d..c937b7018 100644
--- a/tech/md-ext/editing.html
+++ b/tech/md-ext/editing.html
@@ -16,22 +16,22 @@
 <h2 id="what-it-does">What it does</h2>
 <p>I want to be able to have editing comments in Markdown, so I came up with some extensions to the syntax. The goal should be for the text to still be at least mostly readable.</p>
 <ul>
-<li class="done4"> Additions <code>+{new text}</code></li>
-<li class="done4"> Deletions <code>-{old text}</code></li>
-<li class="done4"> Substitutions <code>~{old}{new}</code></li>
-<li class="done4"> Comments <code>?{la de da}(comment)</code></li>
-<li class="done4"> Resolutions <code>!{-{bad wolf}}(STET)</code></li>
+<li class="done4"> Additions <code><ins class="addition">new text</ins></code></li>
+<li class="done4"> Deletions <code><del class="deletion">old text</del></code></li>
+<li class="done4"> Substitutions <code><span class="substitution"><del>old</del><ins>new</ins></span></code></li>
+<li class="done4"> Comments <code><mark class="selected">la de da<aside>comment</aside></mark></code></li>
+<li class="done4"> Resolutions <code><aside class="comment">-{bad wolf</aside>}(STET)</code></li>
 <li>Metadata:<ul>
-<li class="done4"> Comments on all types in parentheses after <code>~{old}{new}(comment)</code> etc</li>
-<li class="done4"> Attribution in parentheses in comment <code>+{new}(comment (Commenter))</code></li>
-<li class="done4"> Date with attribution <code>-{old}(comment (Commenter 2020-04-21))</code></li>
-<li class="done0"> Comment as footnote <code>?{la de da}(^note) ... (^note): comment</code></li>
-<li class="done0"> Comments can contain markup <code>?{la de da}(some *markup*)</code></li>
+<li class="done4"> Comments on all types in parentheses after <code><span class="substitution"><del>old</del><ins>new</ins><aside>comment</aside></span></code> etc</li>
+<li class="done4"> Attribution in parentheses in comment <code><ins class="addition">new<aside>comment<span class="attribution">Commenter</span></aside></ins></code></li>
+<li class="done4"> Date with attribution <code><del class="deletion">old<aside>comment<span class="attribution">Commenter</span><span class="date">2020-04-21</span></aside></del></code></li>
+<li class="done0"> Comment as footnote <code><mark class="selected">la de da<aside>^note</aside></mark> ... (^note): comment</code></li>
+<li class="done0"> Comments can contain markup <code><mark class="selected">la de da<aside>some *markup*</aside></mark></code></li>
 </ul>
 </li>
 </ul>
 <blockquote>
-<p>She ~{brushed}{stroked}(I like this better. Attribution with date. (Makyo 2020-04-21)) her fingers +{softly}(Adverbs! Optional attributions!) along the edges of cabinet doors. Each !{-{one}(Do not want. Optional date (Makyo))}(STET (Makyo 2020-04-21)) was opened and inspected, leaving her standing on tiptoes to peer in those above the counters. Nothing but cups and glasses, plates and bowls, cutting boards and pots and pans and trays and dishes. ?{All clean and neatly stacked.}(^note)</p>
+<p>She <span class="substitution"><del>brushed</del><ins>stroked</ins><aside>I like this better. Attribution with date.<span class="attribution">Makyo</span><span class="date">2020-04-21</span></aside></span> her fingers <ins class="addition">softly<aside>Adverbs! Optional attributions!</aside></ins> along the edges of cabinet doors. Each <aside class="comment">-{one</aside>}(STET (Makyo 2020-04-21)) was opened and inspected, leaving her standing on tiptoes to peer in those above the counters. Nothing but cups and glasses, plates and bowls, cutting boards and pots and pans and trays and dishes. <mark class="selected">All clean and neatly stacked.<aside>^note</aside></mark></p>
 </blockquote>
 <p>(^note): Are you sure about this? Note at bottom of document (Makyo 2020-04-21)</p>
 <h2 id="how-to-use-it">How to use it</h2>