Index: Makefile.in
==================================================================
--- Makefile.in
+++ Makefile.in
@@ -34,11 +34,11 @@
 TCC = @CC@
 
 #### Tcl shell for use in running the fossil testsuite.  If you do not
 #    care about testing the end result, this can be blank.
 #
-TCLSH = tclsh
+TCLSH = @TCLSH@
 
 CFLAGS = @CFLAGS@
 LIB =	@LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@
 BCCFLAGS =	@CPPFLAGS@ $(CFLAGS)
 TCCFLAGS =	@EXTRA_CFLAGS@ @CPPFLAGS@ $(CFLAGS) -DHAVE_AUTOCONFIG_H -D_HAVE_SQLITE_CONFIG_H

Index: auto.def
==================================================================
--- auto.def
+++ auto.def
@@ -33,12 +33,47 @@
 }
 
 # Use pread/pwrite system calls in place of seek + read/write if possible
 define USE_PREAD [cc-check-functions pread]
 
-# Find tclsh for the test suite. Can't yet use jimsh for this.
+# Find tclsh for the test suite.
+#
+# We can't use jimsh for this: the test suite uses features of Tcl that
+# Jim doesn't support, either statically or due to the way it's built by
+# autosetup.  For example, Jim supports `file normalize`, but only if
+# you build it with HAVE_REALPATH, which won't ever be defined in this
+# context because autosetup doesn't try to discover platform-specific
+# details like that before it decides to build jimsh0.  Besides which,
+# autosetup won't build jimsh0 at all if it can find tclsh itself.
+# Ironically, this means we may right now be running under either jimsh0
+# or a version of tclsh that we find unsuitable below!
 cc-check-progs tclsh
+set hbtd /usr/local/Cellar/tcl-tk
+if {[string equal false [get-define TCLSH]]} {
+    msg-result "WARNING: 'make test' will not run here."
+} else {
+    set v [exec /bin/sh -c "echo 'puts \$tcl_version' | tclsh"]
+    if {[expr $v >= 8.6]} {
+        msg-result "Found Tclsh version $v in the PATH."
+        define TCLSH tclsh
+    } elseif {[file isdirectory $hbtd]} {
+        # This is a macOS system with the Homebrew version of Tcl/Tk
+        # installed.  Select the newest version.  It won't normally be
+        # in the PATH to avoid shadowing /usr/bin/tclsh, and even if it
+        # were in the PATH, it's bad practice to put /usr/local/bin (the
+        # Homebrew default) ahead of /usr/bin, especially given that
+        # it's user-writeable by default with Homebrew.  Thus, we can be
+        # pretty sure the only way to call it is with an absolute path.
+        set v [exec ls -tr $hbtd | tail -1]
+        set path "$hbtd/$v/bin/tclsh"
+        define TCLSH $path
+        msg-result "Using Homebrew Tcl/Tk version $path."
+    } else {
+        msg-result "WARNING: tclsh $v found; need >= 8.6 for 'make test'."
+        define TCLSH false     ;# force "make test" failure via /usr/bin/false
+    }
+}
 
 define EXTRA_CFLAGS "-Wall"
 define EXTRA_LDFLAGS ""
 define USE_SYSTEM_SQLITE 0
 define USE_LINENOISE 0

Index: skins/ardoise/header.txt
==================================================================
--- skins/ardoise/header.txt
+++ skins/ardoise/header.txt
@@ -41,10 +41,13 @@
   menulink /dir?ci=tip Files
 }
 if {[hascap o]} {
   menulink  /brlist Branches
   menulink  /taglist Tags
+}
+if {[anycap 23456] || [anoncap 2] || [anoncap 3]} {
+  menulink /forum Forum
 }
 if {[hascap r]} {
   menulink /ticket Tickets
 }
 if {[hascap j]} {

Index: skins/black_and_white/header.txt
==================================================================
--- skins/black_and_white/header.txt
+++ skins/black_and_white/header.txt
@@ -22,10 +22,13 @@
   html "<a href='$home/tree?ci=tip'>Files</a>\n"
 }
 if {[anoncap o]} {
   html "<a href='$home/brlist'>Branches</a>\n"
   html "<a href='$home/taglist'>Tags</a>\n"
+}
+if {[anycap 23456] || [anoncap 2] || [anoncap 3]} {
+  html "<a href='$home/forum'>Forum</a>\n"
 }
 if {[anoncap r]} {
   html "<a href='$home/ticket'>Tickets</a>\n"
 }
 if {[anoncap j]} {

Index: skins/blitz/header.txt
==================================================================
--- skins/blitz/header.txt
+++ skins/blitz/header.txt
@@ -45,10 +45,13 @@
   menulink /dir?ci=tip Files
 }
 if {[hascap o]} {
   menulink  /brlist Branches
   menulink  /taglist Tags
+}
+if {[anycap 23456] || [anoncap 2] || [anoncap 3]} {
+  menulink /forum Forum
 }
 if {[hascap r]} {
   menulink /ticket Tickets
 }
 if {[hascap j]} {

Index: skins/blitz_no_logo/header.txt
==================================================================
--- skins/blitz_no_logo/header.txt
+++ skins/blitz_no_logo/header.txt
@@ -42,10 +42,13 @@
   menulink /dir?ci=tip Files
 }
 if {[hascap o]} {
   menulink  /brlist Branches
   menulink  /taglist Tags
+}
+if {[anycap 23456] || [anoncap 2] || [anoncap 3]} {
+  menulink /forum Forum
 }
 if {[hascap r]} {
   menulink /ticket Tickets
 }
 if {[hascap j]} {

Index: skins/bootstrap/header.txt
==================================================================
--- skins/bootstrap/header.txt
+++ skins/bootstrap/header.txt
@@ -77,10 +77,17 @@
                   if {[string compare $current_page "taglist"] == 0} {
                     html "<li class='active'><a href='$home/taglist'>Tags</a></li>\n"
                   } else {
                     html "<li><a href='$home/taglist'>Tags</a></li>\n"
                   }
+                }
+                if {[anycap 23456] || [anoncap 2] || [anoncap 3]} {
+                  if {[string compare $current_page "forum"] == 0} {
+                    html "<li class='active'><a href='$home/forum'>Forum</a></li>\n"
+                  } else {
+                    html "<li><a href='$home/forum'>Forum</a></li>\n"
+                  }
                 }
                 if {[hascap r]} {
                   if {[string compare $current_page "reportlist"] == 0} {
                     html "<li class='active'><a href='$home/reportlist'>Tickets</a></li>\n"
                   } else {

Index: skins/default/css.txt
==================================================================
--- skins/default/css.txt
+++ skins/default/css.txt
@@ -1,8 +1,7 @@
 body {
     margin: 0 auto;
-    padding: 0px 20px;
     background-color: white;
     font-family: sans-serif;
     font-size:14pt;
     -moz-text-size-adjust: none;
     -webkit-text-size-adjust: none;
@@ -15,20 +14,21 @@
 }
 a:hover {
     color: #4183C4;
     text-decoration: underline;
 }
+div.forumPosts a:visited {
+    color: #6A7F94;
+}
 
 hr {
     color: #eee;
 }
 
 .title {
     color: #4183C4;
     float:left;
-    padding-top: 30px;
-    padding-bottom: 10px;
 }
 .title h1 {
     display:inline;
 }
 .title h1:after {
@@ -72,39 +72,51 @@
 }
 
 .status {
     float:right;
     font-size:.7em;
-    padding-top:50px;
 }
 
 .mainmenu {
     font-size:.8em;
     clear:both;
-    padding:10px;
     background:#eaeaea linear-gradient(#fafafa, #eaeaea) repeat-x;
     border:1px solid #eaeaea;
     border-radius:5px;
     overflow-x: auto;
+    overflow-y: hidden;
     white-space: nowrap;
+    z-index: 21;  /* just above hbdrop */
 }
 
 .mainmenu a {
-    padding: 10px 20px;
     text-decoration:none;
     color: #777;
     border-right:1px solid #eaeaea;
 }
 .mainmenu a.active,
 .mainmenu a:hover {
     color: #000;
     border-bottom:2px solid #D26911;
 }
+
+div#hbdrop {
+    background-color: white;
+    border: 1px solid black;
+    border-top: white;
+    border-radius: 0 0 0.5em 0.5em;
+    display: none;
+    font-size: 80%;
+    left: 2em;
+    width: 90%;
+    padding-right: 1em;
+    position: absolute;
+    z-index: 20;  /* just below mainmenu, but above timeline bubbles */
+}
 
 .submenu {
     font-size: .7em;
-    margin-top: 10px;
     padding: 10px;
     border-bottom: 1px solid #ccc;
 }
 
 .submenu a, .submenu label {
@@ -207,5 +219,51 @@
   white-space: nowrap;
 }
 div.submenu label {
   white-space: nowrap;
 }
+
+@media screen and (max-width: 600px) {
+  /* Spacing for mobile */
+  body {
+    padding-left: 4px;
+    padding-right: 4px;
+  }
+  .title {
+    padding-top: 0px;
+    padding-bottom: 0px;
+  }
+  .status {padding-top: 0px;}
+  .mainmenu a {
+    padding: 10px 10px;
+  }
+  .mainmenu {
+    padding: 10px;
+  }
+  .desktoponly {
+    display: none;
+  }
+}
+@media screen and (min-width: 600px) {
+  /* Spacing for desktop */
+  body {
+    padding-left: 20px;
+    padding-right: 20px;
+  }
+  .title {
+    padding-top: 10px;
+    padding-bottom: 10px;
+  }
+  .status {padding-top: 30px;}
+  .mainmenu a {
+    padding: 10px 20px;
+  }
+  .mainmenu {
+    padding: 10px;
+  }
+}
+@media screen and (max-width: 1200px) {
+  /* Special declarations for narrow desktop or wide mobile */
+  .wideonly {
+    display: none;
+  }
+}

Index: skins/default/footer.txt
==================================================================
--- skins/default/footer.txt
+++ skins/default/footer.txt
@@ -1,5 +1,8 @@
 <div class="footer">
 This page was generated in about
 <th1>puts [expr {([utime]+[stime]+1000)/1000*0.001}]</th1>s by
 Fossil $release_version $manifest_version $manifest_date
 </div>
+<script nonce="$nonce">
+<th1>styleScript</th1>
+</script>

Index: skins/default/header.txt
==================================================================
--- skins/default/header.txt
+++ skins/default/header.txt
@@ -8,37 +8,42 @@
  }
     </th1></div>
 </div>
 <div class="mainmenu">
 <th1>
-proc menulink {url name} {
+proc menulink {url name cls} {
   upvar current_page current
   upvar home home
   if {[string range $url 0 [string length $current]] eq "/$current"} {
-    html "<a href='$home$url' class='active'>$name</a>\n"
+    html "<a href='$home$url' class='active $cls'>$name</a>\n"
   } else {
-    html "<a href='$home$url'>$name</a>\n"
+    html "<a href='$home$url' class='$cls'>$name</a>\n"
   }
 }
-menulink $index_page Home
+html "<a href='#'>&#9776;</a>"
+menulink $index_page Home {}
 if {[anycap jor]} {
-  menulink /timeline Timeline
+  menulink /timeline Timeline {}
 }
 if {[hascap oh]} {
-  menulink /dir?ci=tip Files
+  menulink /dir?ci=tip Files desktoponly
 }
 if {[hascap o]} {
-  menulink  /brlist Branches
-  menulink  /taglist Tags
+  menulink  /brlist Branches desktoponly
+  menulink  /taglist Tags wideonly
+}
+if {[anycap 23456] || [anoncap 2] || [anoncap 3]} {
+  menulink /forum Forum wideonly
 }
 if {[hascap r]} {
-  menulink /ticket Tickets
+  menulink /ticket Tickets wideonly
 }
 if {[hascap j]} {
-  menulink /wiki Wiki
+  menulink /wiki Wiki wideonly
 }
 if {[hascap s]} {
-  menulink /setup Admin
+  menulink /setup Admin {}
 } elseif {[hascap a]} {
-  menulink /setup_ulist Users
+  menulink /setup_ulist Users {}
 }
 </th1></div>
+<div id='hbdrop'></div>

ADDED   skins/default/js.txt
Index: skins/default/js.txt
==================================================================
--- /dev/null
+++ skins/default/js.txt
@@ -0,0 +1,122 @@
+(function() {
+  var home='$home';
+  var panel = document.getElementById("hbdrop");
+  if (!panel) return;   // site admin might've nuked it
+  var panelBorder = panel.style.border;
+  var animate = panel.style.hasOwnProperty('transition');
+  var animMS = 400;
+
+  // Calculate panel height despite its being hidden at call time.
+  // Based on https://stackoverflow.com/a/29047447/142454
+  var panelHeight;  // computed on sitemap load
+  function calculatePanelHeight() {
+    // Get initial panel styles so we can restore them below.
+    var es   = window.getComputedStyle(panel),
+        edis = es.display,
+        epos = es.position,
+        evis = es.visibility;
+
+    // Restyle the panel so we can measure its height while invisible.
+    panel.style.visibility = 'hidden';
+    panel.style.position   = 'absolute';
+    panel.style.display    = 'block';
+    panelHeight = panel.offsetHeight + 'px';
+
+    // Revert styles now that job is done.
+    panel.style.display    = edis;
+    panel.style.position   = epos;
+    panel.style.visibility = evis;
+  }
+
+  // Show the panel by changing the panel height, which kicks off the
+  // slide-open/closed transition set up in the XHR onload handler.
+  //
+  // Schedule the change for a near-future time in case this is the
+  // first call, where the div was initially invisible.  That causes
+  // the browser to consider the height change as part of the same
+  // state change as the visibility change, so it doesn't see a state
+  // *transition*, hence never kicks off the *CSS* transition:
+  //
+  // https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Transitions/Using_CSS_transitions#JavaScript_examples
+  function showPanel() {
+    if (animate) {
+      setTimeout(function() {
+        panel.style.maxHeight = panelHeight;
+        panel.style.border    = panelBorder;
+      }, 40);   // 25ms is insufficient with Firefox 62
+    }
+    else {
+      panel.style.display = 'block';
+    }
+  }
+
+  // Return true if the panel is showing.
+  function panelShowing() {
+    if (animate) {
+      return panel.style.maxHeight == panelHeight;
+    }
+    else {
+      return panel.style.display == 'block';
+    }
+  }
+
+  // Click handler for the hamburger button.
+  var needSitemapHTML = true;
+  document.querySelector("div.mainmenu > a").onclick = function() {
+    if (panelShowing()) {
+      // Transition back to hidden state.
+      if (animate) {
+        panel.style.maxHeight = '0';
+        setTimeout(function() {
+          // Browsers show a 1px high border line when maxHeight == 0,
+          // our "hidden" state, so hide the borders in that state, too.
+          panel.style.border = 'none';
+        }, animMS);
+      }
+      else {
+        panel.style.display = 'none';
+      }
+    }
+    else if (needSitemapHTML) {
+      // Only get it once per page load: it isn't likely to
+      // change on us.
+      var xhr = new XMLHttpRequest();
+      xhr.onload = function() {
+        var doc = xhr.responseXML;
+        if (doc) {
+          var sm = doc.querySelector("ul#sitemap");
+          if (sm && xhr.status == 200) {
+            // Got sitemap.  Insert it into the drop-down panel.
+            needSitemapHTML = false;
+            panel.innerHTML = sm.outerHTML;
+            if (window.setAllHrefs) {
+              setAllHrefs();   // don't need anti-robot defense here
+            }
+
+            // Display the panel
+            if (animate) {
+              // Set up a CSS transition to animate the panel open and
+              // closed.  Only needs to be done once per page load.
+              // Based on https://stackoverflow.com/a/29047447/142454
+              calculatePanelHeight();
+              panel.style.transition = 'max-height ' +
+                  (animMS / 1000) + 's ease-in-out';
+              panel.style.overflowY  = 'hidden';
+              panel.style.maxHeight  = '0';
+              showPanel();
+            }
+            panel.style.display = 'block';
+          }
+        }
+        // else, can't parse response as HTML or XML
+      }
+      xhr.open("POST", home + "/sitemap");
+      xhr.responseType = "document";
+      xhr.send("popup=1");
+    }
+    else {
+      showPanel();   // just show what we built above
+    }
+    return false;  // prevent browser from acting on <a> click
+  }
+})();

Index: skins/eagle/header.txt
==================================================================
--- skins/eagle/header.txt
+++ skins/eagle/header.txt
@@ -71,11 +71,11 @@
      } else {
        puts "Not logged in"
      }
   </th1></nobr><small><div id="clock"></div></small></div>
 </div>
-<script>
+<th1>html "<script nonce='$nonce'>"</th1>
 function updateClock(){
   var e = document.getElementById("clock");
   if(e){
     var d = new Date();
     function f(n) {
@@ -106,10 +106,13 @@
   menulink /dir?ci=tip Files
 }
 if {[anoncap o]} {
   menulink /brlist Branches
   menulink /taglist Tags
+}
+if {[anycap 23456] || [anoncap 2] || [anoncap 3]} {
+  menulink /forum Forum
 }
 if {[anoncap r]} {
   menulink /ticket Tickets
 }
 if {[anoncap j]} {

Index: skins/enhanced1/header.txt
==================================================================
--- skins/enhanced1/header.txt
+++ skins/enhanced1/header.txt
@@ -71,11 +71,11 @@
      } else {
        puts "Not logged in"
      }
   </th1></nobr><small><div id="clock"></div></small></div>
 </div>
-<script>
+<th1>html "<script nonce='$nonce'>"</th1>
 function updateClock(){
   var e = document.getElementById("clock");
   if(e){
     var d = new Date();
     function f(n) {
@@ -106,10 +106,13 @@
   menulink /dir?ci=tip Files
 }
 if {[anoncap o]} {
   menulink /brlist Branches
   menulink /taglist Tags
+}
+if {[anycap 23456] || [anoncap 2] || [anoncap 3]} {
+  menulink /forum Forum
 }
 if {[anoncap r]} {
   menulink /ticket Tickets
 }
 if {[anoncap j]} {

Index: skins/khaki/header.txt
==================================================================
--- skins/khaki/header.txt
+++ skins/khaki/header.txt
@@ -20,10 +20,13 @@
   html "<a href='$home/tree?ci=tip'>Files</a>\n"
 }
 if {[anoncap o]} {
   html "<a href='$home/brlist'>Branches</a>\n"
   html "<a href='$home/taglist'>Tags</a>\n"
+}
+if {[anycap 23456] || [anoncap 2] || [anoncap 3]} {
+  html "<a href='$home/forum'>Forum</a>\n"
 }
 if {[anoncap r]} {
   html "<a href='$home/ticket'>Tickets</a>\n"
 }
 if {[anoncap j]} {

Index: skins/original/header.txt
==================================================================
--- skins/original/header.txt
+++ skins/original/header.txt
@@ -21,10 +21,13 @@
   html "<a href='$home/tree?ci=tip'>Files</a>\n"
 }
 if {[anoncap o]} {
   html "<a href='$home/brlist'>Branches</a>\n"
   html "<a href='$home/taglist'>Tags</a>\n"
+}
+if {[anycap 23456] || [anoncap 2] || [anoncap 3]} {
+  html "<a href='$home/forum'>Forum</a>\n"
 }
 if {[anoncap r]} {
   html "<a href='$home/ticket'>Tickets</a>\n"
 }
 if {[anoncap j]} {

Index: skins/plain_gray/header.txt
==================================================================
--- skins/plain_gray/header.txt
+++ skins/plain_gray/header.txt
@@ -18,10 +18,13 @@
   html "<a href='$home/tree?ci=tip'>Files</a>\n"
 }
 if {[anoncap o]} {
   html "<a href='$home/brlist'>Branches</a>\n"
   html "<a href='$home/taglist'>Tags</a>\n"
+}
+if {[anycap 23456] || [anoncap 2] || [anoncap 3]} {
+  html "<a href='$home/forum'>Forum</a>\n"
 }
 if {[anoncap r]} {
   html "<a href='$home/ticket'>Tickets</a>\n"
 }
 if {[anoncap j]} {

Index: skins/rounded1/header.txt
==================================================================
--- skins/rounded1/header.txt
+++ skins/rounded1/header.txt
@@ -22,10 +22,13 @@
   html "<a href='$home/tree?ci=tip'>Files</a>\n"
 }
 if {[anoncap o]} {
   html "<a href='$home/brlist'>Branches</a>\n"
   html "<a href='$home/taglist'>Tags</a>\n"
+}
+if {[anycap 23456] || [anoncap 2] || [anoncap 3]} {
+  html "<a href='$home/forum'>Forum</a>\n"
 }
 if {[anoncap r]} {
   html "<a href='$home/ticket'>Tickets</a>\n"
 }
 if {[anoncap j]} {

Index: skins/xekri/header.txt
==================================================================
--- skins/xekri/header.txt
+++ skins/xekri/header.txt
@@ -71,11 +71,11 @@
      } else {
        puts "Not logged in"
      }
   </th1></nobr><small><div id="clock"></div></small></div>
 </div>
-<script>
+<th1>html "<script nonce='$nonce'>"</th1>
 function updateClock(){
   var e = document.getElementById("clock");
   if(e){
     var d = new Date();
     function f(n) {
@@ -110,10 +110,13 @@
   menulink /dir?ci=tip Files
 }
 if {[anoncap o]} {
   menulink  /brlist Branches
   menulink  /taglist Tags
+}
+if {[anycap 23456] || [anoncap 2] || [anoncap 3]} {
+  menulink /forum Forum
 }
 if {[anoncap r]} {
   menulink /ticket Tickets
 }
 if {[anoncap j]} {

ADDED   src/alerts.c
Index: src/alerts.c
==================================================================
--- /dev/null
+++ src/alerts.c
@@ -0,0 +1,2755 @@
+/*
+** Copyright (c) 2018 D. Richard Hipp
+**
+** This program is free software; you can redistribute it and/or
+** modify it under the terms of the Simplified BSD License (also
+** known as the "2-Clause License" or "FreeBSD License".)
+**
+** This program is distributed in the hope that it will be useful,
+** but without any warranty; without even the implied warranty of
+** merchantability or fitness for a particular purpose.
+**
+** Author contact information:
+**   drh@hwaci.com
+**   http://www.hwaci.com/drh/
+**
+*******************************************************************************
+**
+** Logic for email notification, also known as "alerts".
+**
+** Are you looking for the code that reads and writes the internet
+** email protocol?  That is not here.  See the "smtp.c" file instead.
+** Yes, the choice of source code filenames is not the greatest, but
+** it is not so bad that changing them seems justified.
+*/ 
+#include "config.h"
+#include "alerts.h"
+#include <assert.h>
+#include <time.h>
+
+/*
+** Maximum size of the subscriberCode blob, in bytes
+*/
+#define SUBSCRIBER_CODE_SZ 32
+
+/*
+** SQL code to implement the tables needed by the email notification
+** system.
+*/
+static const char zAlertInit[] =
+@ DROP TABLE IF EXISTS repository.subscriber;
+@ -- Subscribers are distinct from users.  A person can have a log-in in
+@ -- the USER table without being a subscriber.  Or a person can be a
+@ -- subscriber without having a USER table entry.  Or they can have both.
+@ -- In the last case the suname column points from the subscriber entry
+@ -- to the USER entry.
+@ --
+@ -- The ssub field is a string where each character indicates a particular
+@ -- type of event to subscribe to.  Choices:
+@ --     a - Announcements
+@ --     c - Check-ins
+@ --     t - Ticket changes
+@ --     w - Wiki changes
+@ -- Probably different codes will be added in the future.  In the future
+@ -- we might also add a separate table that allows subscribing to email
+@ -- notifications for specific branches or tags or tickets.
+@ --
+@ CREATE TABLE repository.subscriber(
+@   subscriberId INTEGER PRIMARY KEY, -- numeric subscriber ID.  Internal use
+@   subscriberCode BLOB DEFAULT (randomblob(32)) UNIQUE, -- UUID for subscriber
+@   semail TEXT UNIQUE COLLATE nocase,-- email address
+@   suname TEXT,                      -- corresponding USER entry
+@   sverified BOOLEAN DEFAULT true,   -- email address verified
+@   sdonotcall BOOLEAN,               -- true for Do Not Call 
+@   sdigest BOOLEAN,                  -- true for daily digests only
+@   ssub TEXT,                        -- baseline subscriptions
+@   sctime INTDATE,                   -- When this entry was created. unixtime
+@   mtime INTDATE,                    -- Last change.  unixtime
+@   smip TEXT                         -- IP address of last change
+@ );
+@ CREATE INDEX repository.subscriberUname
+@   ON subscriber(suname) WHERE suname IS NOT NULL;
+@ 
+@ DROP TABLE IF EXISTS repository.pending_alert;
+@ -- Email notifications that need to be sent.
+@ --
+@ -- The first character of the eventid determines the event type.
+@ -- Remaining characters determine the specific event.  For example,
+@ -- 'c4413' means check-in with rid=4413.
+@ --
+@ CREATE TABLE repository.pending_alert(
+@   eventid TEXT PRIMARY KEY,         -- Object that changed
+@   sentSep BOOLEAN DEFAULT false,    -- individual alert sent
+@   sentDigest BOOLEAN DEFAULT false, -- digest alert sent
+@   sentMod BOOLEAN DEFAULT false     -- pending moderation alert sent
+@ ) WITHOUT ROWID;
+@ 
+@ DROP TABLE IF EXISTS repository.alert_bounce;
+@ -- Record bounced emails.  If too many bounces are received within
+@ -- some defined time range, then cancel the subscription.  Older
+@ -- entries are periodically purged.
+@ --
+@ CREATE TABLE repository.alert_bounce(
+@   subscriberId INTEGER, -- to whom the email was sent.
+@   sendTime INTEGER,     -- seconds since 1970 when email was sent
+@   rcvdTime INTEGER      -- seconds since 1970 when bounce was received
+@ );
+;
+
+/*
+** Return true if the email notification tables exist.
+*/
+int alert_tables_exist(void){
+  return db_table_exists("repository", "subscriber");
+}
+
+/*
+** Make sure the table needed for email notification exist in the repository.
+**
+** If the bOnlyIfEnabled option is true, then tables are only created
+** if the email-send-method is something other than "off".
+*/
+void alert_schema(int bOnlyIfEnabled){
+  if( !alert_tables_exist() ){
+    if( bOnlyIfEnabled
+     && fossil_strcmp(db_get("email-send-method","off"),"off")==0
+    ){
+      return;  /* Don't create table for disabled email */
+    }
+    db_multi_exec(zAlertInit/*works-like:""*/);
+    alert_triggers_enable();
+  }else if( !db_table_has_column("repository","pending_alert","sentMod") ){
+    db_multi_exec(
+      "ALTER TABLE repository.pending_alert"
+      " ADD COLUMN sentMod BOOLEAN DEFAULT false;"
+    );
+  }
+}
+
+/*
+** Enable triggers that automatically populate the pending_alert
+** table.
+*/
+void alert_triggers_enable(void){
+  if( !db_table_exists("repository","pending_alert") ) return;
+  db_multi_exec(
+    "CREATE TRIGGER IF NOT EXISTS repository.alert_trigger1\n"
+    "AFTER INSERT ON event BEGIN\n"
+    "  INSERT INTO pending_alert(eventid)\n"
+    "    SELECT printf('%%.1c%%d',new.type,new.objid) WHERE true\n"
+    "    ON CONFLICT(eventId) DO NOTHING;\n"
+    "END;"
+  );
+}
+
+/*
+** Disable triggers the event_pending triggers.
+**
+** This must be called before rebuilding the EVENT table, for example
+** via the "fossil rebuild" command.
+*/
+void alert_triggers_disable(void){
+  db_multi_exec(
+    "DROP TRIGGER IF EXISTS repository.alert_trigger1;\n"
+    "DROP TRIGGER IF EXISTS repository.email_trigger1;\n" // Legacy
+  );
+}
+
+/*
+** Return true if email alerts are active.
+*/
+int alert_enabled(void){
+  if( !alert_tables_exist() ) return 0;
+  if( fossil_strcmp(db_get("email-send-method","off"),"off")==0 ) return 0;
+  return 1;
+}
+
+/*
+** If the subscriber table does not exist, then paint an error message
+** web page and return true.
+**
+** If the subscriber table does exist, return 0 without doing anything.
+*/
+static int alert_webpages_disabled(void){
+  if( alert_tables_exist() ) return 0;
+  style_header("Email Alerts Are Disabled");
+  @ <p>Email alerts are disabled on this server</p>
+  style_footer();
+  return 1;
+}
+
+/*
+** Insert a "Subscriber List" submenu link if the current user
+** is an administrator.
+*/
+void alert_submenu_common(void){
+  if( g.perm.Admin ){
+    if( fossil_strcmp(g.zPath,"subscribers") ){
+      style_submenu_element("List Subscribers","%R/subscribers");
+    }
+    if( fossil_strcmp(g.zPath,"subscribe") ){
+      style_submenu_element("Add New Subscriber","%R/subscribe");
+    }
+  }
+}
+
+
+/*
+** WEBPAGE: setup_notification
+**
+** Administrative page for configuring and controlling email notification.
+** Normally accessible via the /Admin/Notification menu.
+*/
+void setup_notification(void){
+  static const char *const azSendMethods[] = {
+    "off",   "Disabled",
+    "pipe",  "Pipe to a command",
+    "db",    "Store in a database",
+    "dir",   "Store in a directory",
+    "relay", "SMTP relay"
+  };
+  login_check_credentials();
+  if( !g.perm.Setup ){
+    login_needed(0);
+    return;
+  }
+  db_begin_transaction();
+
+  alert_submenu_common();
+  style_submenu_element("Send Announcement","%R/announce");
+  style_header("Email Notification Setup");
+  @ <h1>Status</h1>
+  @ <table class="label-value">
+  if( alert_enabled() ){
+    stats_for_email();
+  }else{
+    @ <th>Disabled</th>
+  }
+  @ </table>
+  @ <hr>
+  @ <h1> Configuration </h1>
+  @ <form action="%R/setup_notification" method="post"><div>
+  @ <input type="submit"  name="submit" value="Apply Changes" /><hr>
+  login_insert_csrf_secret();
+
+  entry_attribute("Canonical Server URL", 40, "email-url",
+                   "eurl", "", 0);
+  @ <p><b>Required.</b>
+  @ This is URL used as the basename for hyperlinks included in
+  @ email alert text.  Omit the trailing "/".
+  @ Suggested value: "%h(g.zBaseURL)"
+  @ (Property: "email-url")</p>
+  @ <hr>
+
+  entry_attribute("\"Return-Path\" email address", 20, "email-self",
+                   "eself", "", 0);
+  @ <p><b>Required.</b>
+  @ This is the email to which email notification bounces should be sent.
+  @ In cases where the email notification does not align with a specific
+  @ Fossil login account (for example, digest messages), this is also
+  @ the "From:" address of the email notification.
+  @ The system administrator should arrange for emails sent to this address
+  @ to be handed off to the "fossil email incoming" command so that Fossil
+  @ can handle bounces. (Property: "email-self")</p>
+  @ <hr>
+
+  entry_attribute("Repository Nickname", 16, "email-subname",
+                   "enn", "", 0);
+  @ <p><b>Required.</b>
+  @ This is short name used to identifies the repository in the
+  @ Subject: line of email alerts.  Traditionally this name is
+  @ included in square brackets.  Examples: "[fossil-src]", "[sqlite-src]".
+  @ (Property: "email-subname")</p>
+  @ <hr>
+
+  multiple_choice_attribute("Email Send Method", "email-send-method", "esm",
+       "off", count(azSendMethods)/2, azSendMethods);
+  @ <p>How to send email.  Requires auxiliary information from the fields
+  @ that follow.  Hint: Use the <a href="%R/announce">/announce</a> page
+  @ to send test message to debug this setting.
+  @ (Property: "email-send-method")</p>
+  alert_schema(1);
+  entry_attribute("Pipe Email Text Into This Command", 60, "email-send-command",
+                   "ecmd", "sendmail -ti", 0);
+  @ <p>When the send method is "pipe to a command", this is the command
+  @ that is run.  Email messages are piped into the standard input of this
+  @ command.  The command is expected to extract the sender address,
+  @ recepient addresses, and subject from the header of the piped email
+  @ text.  (Property: "email-send-command")</p>
+
+  entry_attribute("Store Emails In This Database", 60, "email-send-db",
+                   "esdb", "", 0);
+  @ <p>When the send method is "store in a databaes", each email message is
+  @ stored in an SQLite database file with the name given here.
+  @ (Property: "email-send-db")</p>
+
+  entry_attribute("Store Emails In This Directory", 60, "email-send-dir",
+                   "esdir", "", 0);
+  @ <p>When the send method is "store in a directory", each email message is
+  @ stored as a separate file in the directory shown here.
+  @ (Property: "email-send-dir")</p>
+
+  entry_attribute("SMTP Relay Host", 60, "email-send-relayhost",
+                   "esrh", "", 0);
+  @ <p>When the send method is "SMTP relay", each email message is
+  @ transmitted via the SMTP protocol (rfc5321) to a "Mail Submission
+  @ Agent" or "MSA" (rfc4409) at the hostname shown here.  Optionally
+  @ append a colon and TCP port number (ex: smtp.example.com:587).
+  @ The default TCP port number is 25.
+  @ (Property: "email-send-relayhost")</p>
+  @ <hr>
+
+  entry_attribute("Administrator email address", 40, "email-admin",
+                   "eadmin", "", 0);
+  @ <p>This is the email for the human administrator for the system.
+  @ Abuse and trouble reports are send here.
+  @ (Property: "email-admin")</p>
+  @ <hr>
+
+  @ <p><input type="submit"  name="submit" value="Apply Changes" /></p>
+  @ </div></form>
+  db_end_transaction(0);
+  style_footer();
+}
+
+#if 0
+/*
+** Encode pMsg as MIME base64 and append it to pOut
+*/
+static void append_base64(Blob *pOut, Blob *pMsg){
+  int n, i, k;
+  char zBuf[100];
+  n = blob_size(pMsg);
+  for(i=0; i<n; i+=54){
+    k = translateBase64(blob_buffer(pMsg)+i, i+54<n ? 54 : n-i, zBuf);
+    blob_append(pOut, zBuf, k);
+    blob_append(pOut, "\r\n", 2);
+  }
+}
+#endif
+
+/*
+** Encode pMsg using the quoted-printable email encoding and
+** append it onto pOut
+*/
+static void append_quoted(Blob *pOut, Blob *pMsg){
+  char *zIn = blob_str(pMsg);
+  char c;
+  int iCol = 0;
+  while( (c = *(zIn++))!=0 ){
+    if( (c>='!' && c<='~' && c!='=' && c!=':')
+     || (c==' ' && zIn[0]!='\r' && zIn[0]!='\n')
+    ){
+      blob_append_char(pOut, c);
+      iCol++;
+      if( iCol>=70 ){
+        blob_append(pOut, "=\r\n", 3);
+        iCol = 0;
+      }
+    }else if( c=='\r' && zIn[0]=='\n' ){
+      zIn++;
+      blob_append(pOut, "\r\n", 2);
+      iCol = 0;
+    }else if( c=='\n' ){
+      blob_append(pOut, "\r\n", 2);
+      iCol = 0;
+    }else{
+      char x[3];
+      x[0] = '=';
+      x[1] = "0123456789ABCDEF"[(c>>4)&0xf];
+      x[2] = "0123456789ABCDEF"[c&0xf];
+      blob_append(pOut, x, 3);
+      iCol += 3;
+    }
+  }
+}
+
+#if defined(_WIN32) || defined(WIN32)
+# undef popen
+# define popen _popen
+# undef pclose
+# define pclose _pclose
+#endif
+
+#if INTERFACE
+/*
+** An instance of the following object is used to send emails.
+*/
+struct AlertSender {
+  sqlite3 *db;               /* Database emails are sent to */
+  sqlite3_stmt *pStmt;       /* Stmt to insert into the database */
+  const char *zDest;         /* How to send email. */
+  const char *zDb;           /* Name of database file */
+  const char *zDir;          /* Directory in which to store as email files */
+  const char *zCmd;          /* Command to run for each email */
+  const char *zFrom;         /* Emails come from here */
+  SmtpSession *pSmtp;        /* SMTP relay connection */
+  Blob out;                  /* For zDest=="blob" */
+  char *zErr;                /* Error message */
+  u32 mFlags;                /* Flags */
+  int bImmediateFail;        /* On any error, call fossil_fatal() */
+};
+
+/* Allowed values for mFlags to alert_sender_new().
+*/
+#define ALERT_IMMEDIATE_FAIL   0x0001   /* Call fossil_fatal() on any error */
+#define ALERT_TRACE            0x0002   /* Log sending process on console */
+
+#endif /* INTERFACE */
+
+/*
+** Shutdown an emailer.  Clear all information other than the error message.
+*/
+static void emailerShutdown(AlertSender *p){
+  sqlite3_finalize(p->pStmt);
+  p->pStmt = 0;
+  sqlite3_close(p->db);
+  p->db = 0;
+  p->zDb = 0;
+  p->zDir = 0;
+  p->zCmd = 0;
+  if( p->pSmtp ){
+    smtp_client_quit(p->pSmtp);
+    smtp_session_free(p->pSmtp);
+    p->pSmtp = 0;
+  }
+  blob_reset(&p->out);
+}
+
+/*
+** Put the AlertSender into an error state.
+*/
+static void emailerError(AlertSender *p, const char *zFormat, ...){
+  va_list ap;
+  fossil_free(p->zErr);
+  va_start(ap, zFormat);
+  p->zErr = vmprintf(zFormat, ap);
+  va_end(ap);
+  emailerShutdown(p);
+  if( p->mFlags & ALERT_IMMEDIATE_FAIL ){
+    fossil_fatal("%s", p->zErr);
+  }
+}
+
+/*
+** Free an email sender object
+*/
+void alert_sender_free(AlertSender *p){
+  if( p ){
+    emailerShutdown(p);
+    fossil_free(p->zErr);
+    fossil_free(p);
+  }
+}
+
+/*
+** Get an email setting value.  Report an error if not configured.
+** Return 0 on success and one if there is an error.
+*/
+static int emailerGetSetting(
+  AlertSender *p,        /* Where to report the error */
+  const char **pzVal,    /* Write the setting value here */
+  const char *zName      /* Name of the setting */
+){
+  const char *z = db_get(zName, 0);
+  int rc = 0;
+  if( z==0 || z[0]==0 ){
+    emailerError(p, "missing \"%s\" setting", zName);
+    rc = 1;
+  }else{
+    *pzVal = z;
+  }
+  return rc;
+}
+
+/*
+** Create a new AlertSender object.
+**
+** The method used for sending email is determined by various email-*
+** settings, and especially email-send-method.  The repository
+** email-send-method can be overridden by the zAltDest argument to
+** cause a different sending mechanism to be used.  Pass "stdout" to
+** zAltDest to cause all emails to be printed to the console for
+** debugging purposes.
+**
+** The AlertSender object returned must be freed using alert_sender_free().
+*/
+AlertSender *alert_sender_new(const char *zAltDest, u32 mFlags){
+  AlertSender *p;
+
+  p = fossil_malloc(sizeof(*p));
+  memset(p, 0, sizeof(*p));
+  blob_init(&p->out, 0, 0);
+  p->mFlags = mFlags;
+  if( zAltDest ){
+    p->zDest = zAltDest;
+  }else{
+    p->zDest = db_get("email-send-method","off");
+  }
+  if( fossil_strcmp(p->zDest,"off")==0 ) return p;
+  if( emailerGetSetting(p, &p->zFrom, "email-self") ) return p;
+  if( fossil_strcmp(p->zDest,"db")==0 ){
+    char *zErr;
+    int rc;
+    if( emailerGetSetting(p, &p->zDb, "email-send-db") ) return p;
+    rc = sqlite3_open(p->zDb, &p->db);
+    if( rc ){
+      emailerError(p, "unable to open output database file \"%s\": %s",
+                   p->zDb, sqlite3_errmsg(p->db));
+      return p;
+    }
+    rc = sqlite3_exec(p->db, "CREATE TABLE IF NOT EXISTS email(\n"
+                          "  emailid INTEGER PRIMARY KEY,\n"
+                          "  msg TEXT\n);", 0, 0, &zErr);
+    if( zErr ){
+      emailerError(p, "CREATE TABLE failed with \"%s\"", zErr);
+      sqlite3_free(zErr);
+      return p;
+    }
+    rc = sqlite3_prepare_v2(p->db, "INSERT INTO email(msg) VALUES(?1)", -1,
+                            &p->pStmt, 0);
+    if( rc ){
+      emailerError(p, "cannot prepare INSERT statement: %s",
+                 sqlite3_errmsg(p->db));
+      return p;
+    }
+  }else if( fossil_strcmp(p->zDest, "pipe")==0 ){
+    emailerGetSetting(p, &p->zCmd, "email-send-command");
+  }else if( fossil_strcmp(p->zDest, "dir")==0 ){
+    emailerGetSetting(p, &p->zDir, "email-send-dir");
+  }else if( fossil_strcmp(p->zDest, "blob")==0 ){
+    blob_init(&p->out, 0, 0);
+  }else if( fossil_strcmp(p->zDest, "relay")==0 ){
+    const char *zRelay = 0;
+    emailerGetSetting(p, &zRelay, "email-send-relayhost");
+    if( zRelay ){
+      u32 smtpFlags = SMTP_DIRECT;
+      if( mFlags & ALERT_TRACE ) smtpFlags |= SMTP_TRACE_STDOUT;
+      p->pSmtp = smtp_session_new(p->zFrom, zRelay, smtpFlags);
+      smtp_client_startup(p->pSmtp);
+    }
+  }
+  return p;
+}
+
+/*
+** Scan the header of the email message in pMsg looking for the
+** (first) occurrance of zField.  Fill pValue with the content of
+** that field.
+**
+** This routine initializes pValue.  Any prior content of pValue is
+** discarded (leaked).
+**
+** Return non-zero on success.  Return 0 if no instance of the header
+** is found.
+*/
+int email_header_value(Blob *pMsg, const char *zField, Blob *pValue){
+  int nField = (int)strlen(zField);
+  Blob line;
+  blob_rewind(pMsg);
+  blob_init(pValue,0,0);
+  while( blob_line(pMsg, &line) ){
+    int n, i;
+    char *z;
+    blob_trim(&line);
+    n = blob_size(&line);
+    if( n==0 ) return 0;
+    if( n<nField+1 ) continue;
+    z = blob_buffer(&line);
+    if( sqlite3_strnicmp(z, zField, nField)==0 && z[nField]==':' ){
+      for(i=nField+1; i<n && fossil_isspace(z[i]); i++){}
+      blob_init(pValue, z+i, n-i);
+      while( blob_line(pMsg, &line) ){
+        blob_trim(&line);
+        n = blob_size(&line);
+        if( n==0 ) break;
+        z = blob_buffer(&line);
+        if( !fossil_isspace(z[0]) ) break;
+        for(i=1; i<n && fossil_isspace(z[i]); i++){}
+        blob_append(pValue, " ", 1);
+        blob_append(pValue, z+i, n-i);
+      }
+      return 1;
+    }
+  }
+  return 0;
+}
+
+/*
+** Make a copy of the input string up to but not including the
+** first cTerm character.
+**
+** Verify that the string really that is to be copied really is a
+** valid email address.  If it is not, then return NULL.
+**
+** This routine is more restrictive than necessary.  It does not
+** allow comments, IP address, quoted strings, or certain uncommon
+** characters.  The only non-alphanumerics allowed in the local
+** part are "_", "+", "-" and "+".
+*/
+char *email_copy_addr(const char *z, char cTerm ){
+  int i;
+  int nAt = 0;
+  int nDot = 0;
+  char c;
+  if( z[0]=='.' ) return 0;  /* Local part cannot begin with "." */
+  for(i=0; (c = z[i])!=0 && c!=cTerm; i++){
+    if( fossil_isalnum(c) ){
+      /* Alphanumerics are always ok */
+    }else if( c=='@' ){
+      if( nAt ) return 0;   /* Only a single "@"  allowed */
+      if( i>64 ) return 0;  /* Local part too big */
+      nAt = 1;
+      nDot = 0;
+      if( i==0 ) return 0;  /* Disallow empty local part */
+      if( z[i-1]=='.' ) return 0; /* Last char of local cannot be "." */
+      if( z[i+1]=='.' || z[i+1]=='-' ){
+        return 0; /* Domain cannot begin with "." or "-" */
+      }
+    }else if( c=='-' ){
+      if( z[i+1]==cTerm ) return 0;  /* Last character cannot be "-" */
+    }else if( c=='.' ){
+      if( z[i+1]=='.' ) return 0;  /* Do not allow ".." */
+      if( z[i+1]==cTerm ) return 0;  /* Domain may not end with . */
+      nDot++;
+    }else if( (c=='_' || c=='+') && nAt==0 ){
+      /* _ and + are ok in the local part */
+    }else{
+      return 0;   /* Anything else is an error */
+    }
+  }
+  if( c!=cTerm ) return 0;    /* Missing terminator */
+  if( nAt==0 ) return 0;      /* No "@" found anywhere */
+  if( nDot==0 ) return 0;     /* No "." in the domain */
+
+  /* If we reach this point, the email address is valid */
+  return mprintf("%.*s", i, z);
+}
+
+/*
+** Scan the input string for a valid email address enclosed in <...>
+** If the string contains one or more email addresses, extract the first
+** one into memory obtained from mprintf() and return a pointer to it.
+** If no valid email address can be found, return NULL.
+*/
+char *alert_find_emailaddr(const char *zIn){
+  char *zOut = 0;
+  while( zIn!=0 ){
+     zIn = (const char*)strchr(zIn, '<');
+     if( zIn==0 ) break;
+     zIn++;
+     zOut = email_copy_addr(zIn, '>');
+     if( zOut!=0 ) break;
+  }
+  return zOut;
+}
+
+/*
+** SQL function:  find_emailaddr(X)
+**
+** Return the first valid email address of the form <...> in input string
+** X.  Or return NULL if not found.
+*/
+void alert_find_emailaddr_func(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  const char *zIn = (const char*)sqlite3_value_text(argv[0]);
+  char *zOut = alert_find_emailaddr(zIn);
+  if( zOut ){
+    sqlite3_result_text(context, zOut, -1, fossil_free);
+  }
+}
+
+/*
+** Return the hostname portion of an email address - the part following
+** the @
+*/
+char *alert_hostname(const char *zAddr){
+  char *z = strchr(zAddr, '@');
+  if( z ){
+    z++;
+  }else{
+    z = (char*)zAddr;
+  }
+  return z;
+}
+
+/*
+** Return a pointer to a fake email mailbox name that corresponds
+** to human-readable name zFromName.  The fake mailbox name is based
+** on a hash.  No huge problems arise if there is a hash collisions,
+** but it is still better if collisions can be avoided.
+**
+** The returned string is held in a static buffer and is overwritten
+** by each subsequent call to this routine.
+*/
+static char *alert_mailbox_name(const char *zFromName){
+  static char zHash[20];
+  unsigned int x = 0;
+  int n = 0;
+  while( zFromName[0] ){
+    n++;
+    x = x*1103515245 + 12345 + ((unsigned char*)zFromName)[0];
+    zFromName++;
+  }
+  sqlite3_snprintf(sizeof(zHash), zHash,
+      "noreply%x%08x", n, x);
+  return zHash;
+}
+
+/*
+** COMMAND: test-mailbox-hashname
+**
+** Usage: %fossil test-mailbox-hashname HUMAN-NAME ...
+**
+** Return the mailbox hash name corresponding to each human-readable
+** name on the command line.  This is a test interface for the
+** alert_mailbox_name() function.
+*/
+void alert_test_mailbox_hashname(void){
+  int i;
+  for(i=2; i<g.argc; i++){
+    fossil_print("%30s: %s\n", g.argv[i], alert_mailbox_name(g.argv[i]));
+  }
+}
+
+/*
+** Extract all To: header values from the email header supplied.
+** Store them in the array list.
+*/
+void email_header_to(Blob *pMsg, int *pnTo, char ***pazTo){
+  int nTo = 0;
+  char **azTo = 0;
+  Blob v;
+  char *z, *zAddr;
+  int i;
+  
+  email_header_value(pMsg, "to", &v);
+  z = blob_str(&v);
+  for(i=0; z[i]; i++){
+    if( z[i]=='<' && (zAddr = email_copy_addr(&z[i+1],'>'))!=0 ){
+      azTo = fossil_realloc(azTo, sizeof(azTo[0])*(nTo+1) );
+      azTo[nTo++] = zAddr;
+    }
+  }
+  *pnTo = nTo;
+  *pazTo = azTo;
+}
+
+/*
+** Free a list of To addresses obtained from a prior call to 
+** email_header_to()
+*/
+void email_header_to_free(int nTo, char **azTo){
+  int i;
+  for(i=0; i<nTo; i++) fossil_free(azTo[i]);
+  fossil_free(azTo);
+}
+
+/*
+** Send a single email message.
+**
+** The recepient(s) must be specified using  "To:" or "Cc:" or "Bcc:" fields
+** in the header.  Likewise, the header must contains a "Subject:" line.
+** The header might also include fields like "Message-Id:" or
+** "In-Reply-To:".
+**
+** This routine will add fields to the header as follows:
+**
+**     From:
+**     Date:
+**     Message-Id:
+**     Content-Type:
+**     Content-Transfer-Encoding:
+**     MIME-Version:
+**     X-Fossil-From:
+**     
+** The caller maintains ownership of the input Blobs.  This routine will
+** read the Blobs and send them onward to the email system, but it will
+** not free them.
+**
+** The Message-Id: field is added if there is not already a Message-Id
+** in the pHdr parameter.
+**
+** If the zFromName argument is not NULL, then it should be a human-readable
+** name or handle for the sender.  In that case, "From:" becomes a made-up
+** email address based on a hash of zFromName and the domain of email-self,
+** and an additional "X-Fossil-From:" field is inserted with the email-self
+** address.  Downstream software might use the X-Fossil-From header to set
+** the envelope-from address of the email.  If zFromName is a NULL pointer, 
+** then the "From:" is set to the email-self value and X-Fossil-From is
+** omitted.
+*/
+void alert_send(
+  AlertSender *p,           /* Emailer context */
+  Blob *pHdr,               /* Email header (incomplete) */
+  Blob *pBody,              /* Email body */
+  const char *zFromName     /* Optional human-readable name of sender */
+){
+  Blob all, *pOut;
+  u64 r1, r2;
+  if( p->mFlags & ALERT_TRACE ){
+    fossil_print("Sending email\n");
+  }
+  if( fossil_strcmp(p->zDest, "off")==0 ){
+    return;
+  }
+  if( fossil_strcmp(p->zDest, "blob")==0 ){
+    pOut = &p->out;
+    if( blob_size(pOut) ){
+      blob_appendf(pOut, "%.72c\n", '=');
+    }
+  }else{
+    blob_init(&all, 0, 0);
+    pOut = &all;
+  }
+  blob_append(pOut, blob_buffer(pHdr), blob_size(pHdr));
+  if( zFromName ){
+    blob_appendf(pOut, "From: %s <%s@%s>\r\n",
+       zFromName, alert_mailbox_name(zFromName), alert_hostname(p->zFrom));
+    blob_appendf(pOut, "X-Fossil-From: <%s>\r\n", p->zFrom);
+  }else{
+    blob_appendf(pOut, "From: <%s>\r\n", p->zFrom);
+  }
+  blob_appendf(pOut, "Date: %z\r\n", cgi_rfc822_datestamp(time(0)));
+  if( strstr(blob_str(pHdr), "\r\nMessage-Id:")==0 ){
+    /* Message-id format:  "<$(date)x$(random)@$(from-host)>" where $(date) is
+    ** the current unix-time in hex, $(random) is a 64-bit random number,
+    ** and $(from) is the domain part of the email-self setting. */
+    sqlite3_randomness(sizeof(r1), &r1);
+    r2 = time(0);
+    blob_appendf(pOut, "Message-Id: <%llxx%016llx@%s>\r\n",
+                 r2, r1, alert_hostname(p->zFrom));
+  }
+  blob_add_final_newline(pBody);
+  blob_appendf(pOut, "MIME-Version: 1.0\r\n");
+  blob_appendf(pOut, "Content-Type: text/plain; charset=\"UTF-8\"\r\n");
+#if 0
+  blob_appendf(pOut, "Content-Transfer-Encoding: base64\r\n\r\n");
+  append_base64(pOut, pBody);
+#else
+  blob_appendf(pOut, "Content-Transfer-Encoding: quoted-printable\r\n\r\n");
+  append_quoted(pOut, pBody);
+#endif
+  if( p->pStmt ){
+    int i, rc;
+    sqlite3_bind_text(p->pStmt, 1, blob_str(&all), -1, SQLITE_TRANSIENT);
+    for(i=0; i<100 && sqlite3_step(p->pStmt)==SQLITE_BUSY; i++){
+      sqlite3_sleep(10);
+    }
+    rc = sqlite3_reset(p->pStmt);
+    if( rc!=SQLITE_OK ){
+      emailerError(p, "Failed to insert email message into output queue.\n"
+                      "%s", sqlite3_errmsg(p->db));
+    }
+  }else if( p->zCmd ){
+    FILE *out = popen(p->zCmd, "w");
+    if( out ){
+      fwrite(blob_buffer(&all), 1, blob_size(&all), out);
+      fclose(out);
+    }else{
+      emailerError(p, "Could not open output pipe \"%s\"", p->zCmd);
+    }
+  }else if( p->zDir ){
+    char *zFile = file_time_tempname(p->zDir, ".email");
+    blob_write_to_file(&all, zFile);
+    fossil_free(zFile);
+  }else if( p->pSmtp ){
+    char **azTo = 0;
+    int nTo = 0;
+    email_header_to(pHdr, &nTo, &azTo);
+    if( nTo>0 ){
+      smtp_send_msg(p->pSmtp, p->zFrom, nTo, (const char**)azTo,blob_str(&all));
+      email_header_to_free(nTo, azTo);
+    }
+  }else if( strcmp(p->zDest, "stdout")==0 ){
+    char **azTo = 0;
+    int nTo = 0;
+    int i;
+    email_header_to(pHdr, &nTo, &azTo);
+    for(i=0; i<nTo; i++){
+      fossil_print("X-To-Test-%d: [%s]\r\n", i, azTo[i]);
+    }
+    email_header_to_free(nTo, azTo);
+    blob_add_final_newline(&all);
+    fossil_print("%s", blob_str(&all));
+  }
+  blob_reset(&all);
+}
+
+/*
+** SETTING: email-send-method         width=5 default=off
+** Determine the method used to send email.  Allowed values are
+** "off", "relay", "pipe", "dir", "db", and "stdout".  The "off" value
+** means no email is ever sent.  The "relay" value means emails are sent
+** to an Mail Sending Agent using SMTP located at email-send-relayhost.
+** The "pipe" value means email messages are piped into a command 
+** determined by the email-send-command setting. The "dir" value means
+** emails are written to individual files in a directory determined
+** by the email-send-dir setting.  The "db" value means that emails
+** are added to an SQLite database named by the* email-send-db setting.
+** The "stdout" value writes email text to standard output, for debugging.
+*/
+/*
+** SETTING: email-send-command       width=40
+** This is a command to which outbound email content is piped when the
+** email-send-method is set to "pipe".  The command must extract
+** recipient, sender, subject, and all other relevant information
+** from the email header.
+*/
+/*
+** SETTING: email-send-dir           width=40
+** This is a directory into which outbound emails are written as individual
+** files if the email-send-method is set to "dir".
+*/
+/*
+** SETTING: email-send-db            width=40
+** This is an SQLite database file into which outbound emails are written
+** if the email-send-method is set to "db".
+*/
+/*
+** SETTING: email-self               width=40
+** This is the email address for the repository.  Outbound emails add
+** this email address as the "From:" field.
+*/
+/*
+** SETTING: email-send-relayhost      width=40
+** This is the hostname and TCP port to which output email messages
+** are sent when email-send-method is "relay".  There should be an
+** SMTP server configured as a Mail Submission Agent listening on the
+** designated host and port and all times.
+*/
+
+
+/*
+** COMMAND: alerts
+** 
+** Usage: %fossil alerts SUBCOMMAND ARGS...
+**
+** Subcommands:
+**
+**    pending                 Show all pending alerts.  Useful for debugging.
+**
+**    reset                   Hard reset of all email notification tables
+**                            in the repository.  This erases all subscription
+**                            information.  ** Use with extreme care **
+**
+**    send                    Compose and send pending email alerts.
+**                            Some installations may want to do this via
+**                            a cron-job to make sure alerts are sent
+**                            in a timely manner.
+**                            Options:
+**
+**                               --digest     Send digests
+**                               --test       Write to standard output
+**
+**    settings [NAME VALUE]   With no arguments, list all email settings.
+**                            Or change the value of a single email setting.
+**
+**    status                  Report on the status of the email alert
+**                            subsystem
+**
+**    subscribers [PATTERN]   List all subscribers matching PATTERN.
+**
+**    test-message TO [OPTS]  Send a single email message using whatever
+**                            email sending mechanism is currently configured.
+**                            Use this for testing the email notification
+**                            configuration.  Options:
+**
+**                              --body FILENAME
+**                              --smtp-trace
+**                              --stdout
+**                              --subject|-S SUBJECT
+**
+**    unsubscribe EMAIL       Remove a single subscriber with the given EMAIL.
+*/
+void alert_cmd(void){
+  const char *zCmd;
+  int nCmd;
+  db_find_and_open_repository(0, 0);
+  alert_schema(0);
+  zCmd = g.argc>=3 ? g.argv[2] : "x";
+  nCmd = (int)strlen(zCmd);
+  if( strncmp(zCmd, "pending", nCmd)==0 ){
+    Stmt q;
+    verify_all_options();
+    if( g.argc!=3 ) usage("pending");
+    db_prepare(&q,"SELECT eventid, sentSep, sentDigest, sentMod"
+                  "  FROM pending_alert");
+    while( db_step(&q)==SQLITE_ROW ){
+      fossil_print("%10s %7s %10s %7s\n",
+         db_column_text(&q,0),
+         db_column_int(&q,1) ? "sentSep" : "",
+         db_column_int(&q,2) ? "sentDigest" : "",
+         db_column_int(&q,3) ? "sentMod" : "");
+    }
+    db_finalize(&q);
+  }else
+  if( strncmp(zCmd, "reset", nCmd)==0 ){
+    int c;
+    int bForce = find_option("force","f",0)!=0;
+    verify_all_options();
+    if( bForce ){
+      c = 'y';
+    }else{
+      Blob yn;
+      fossil_print(
+          "This will erase all content in the repository tables, thus\n"
+          "deleting all subscriber information.  The information will be\n"
+          "unrecoverable.\n");
+      prompt_user("Continue? (y/N) ", &yn);
+      c = blob_str(&yn)[0];
+      blob_reset(&yn);
+    }
+    if( c=='y' ){
+      alert_triggers_disable();
+      db_multi_exec(
+        "DROP TABLE IF EXISTS subscriber;\n"
+        "DROP TABLE IF EXISTS pending_alert;\n"
+        "DROP TABLE IF EXISTS alert_bounce;\n"
+        /* Legacy */
+        "DROP TABLE IF EXISTS alert_pending;\n"
+        "DROP TABLE IF EXISTS subscription;\n"
+      );
+      alert_schema(0);
+    }
+  }else
+  if( strncmp(zCmd, "send", nCmd)==0 ){
+    u32 eFlags = 0;
+    if( find_option("digest",0,0)!=0 ) eFlags |= SENDALERT_DIGEST;
+    if( find_option("test",0,0)!=0 ){
+      eFlags |= SENDALERT_PRESERVE|SENDALERT_STDOUT;
+    }
+    verify_all_options();
+    alert_send_alerts(eFlags);
+  }else
+  if( strncmp(zCmd, "settings", nCmd)==0 ){
+    int isGlobal = find_option("global",0,0)!=0;
+    int nSetting;
+    const Setting *pSetting = setting_info(&nSetting);
+    db_open_config(1, 0);
+    verify_all_options();
+    if( g.argc!=3 && g.argc!=5 ) usage("setting [NAME VALUE]");
+    if( g.argc==5 ){
+      const char *zLabel = g.argv[3];
+      if( strncmp(zLabel, "email-", 6)!=0
+       || (pSetting = db_find_setting(zLabel, 1))==0 ){
+        fossil_fatal("not a valid email setting: \"%s\"", zLabel);
+      }
+      db_set(pSetting->name, g.argv[4], isGlobal);
+      g.argc = 3;
+    }
+    pSetting = setting_info(&nSetting);
+    for(; nSetting>0; nSetting--, pSetting++ ){
+      if( strncmp(pSetting->name,"email-",6)!=0 ) continue;
+      print_setting(pSetting);
+    }
+  }else
+  if( strncmp(zCmd, "status", nCmd)==0 ){
+    int nSetting, n;
+    static const char *zFmt = "%-29s %d\n";
+    const Setting *pSetting = setting_info(&nSetting);
+    db_open_config(1, 0);
+    verify_all_options();
+    if( g.argc!=3 ) usage("status");
+    pSetting = setting_info(&nSetting);
+    for(; nSetting>0; nSetting--, pSetting++ ){
+      if( strncmp(pSetting->name,"email-",6)!=0 ) continue;
+      print_setting(pSetting);
+    }
+    n = db_int(0,"SELECT count(*) FROM pending_alert WHERE NOT sentSep");
+    fossil_print(zFmt/*works-like:"%s%d"*/, "pending-alerts", n);
+    n = db_int(0,"SELECT count(*) FROM pending_alert WHERE NOT sentDigest");
+    fossil_print(zFmt/*works-like:"%s%d"*/, "pending-digest-alerts", n);
+    n = db_int(0,"SELECT count(*) FROM subscriber");
+    fossil_print(zFmt/*works-like:"%s%d"*/, "total-subscribers", n);
+    n = db_int(0, "SELECT count(*) FROM subscriber WHERE sverified"
+                   " AND NOT sdonotcall AND length(ssub)>1");
+    fossil_print(zFmt/*works-like:"%s%d"*/, "active-subscribers", n);
+  }else
+  if( strncmp(zCmd, "subscribers", nCmd)==0 ){
+    Stmt q;
+    verify_all_options();
+    if( g.argc!=3 && g.argc!=4 ) usage("subscribers [PATTERN]");
+    if( g.argc==4 ){
+      char *zPattern = g.argv[3];
+      db_prepare(&q,
+        "SELECT semail FROM subscriber"
+        " WHERE semail LIKE '%%%q%%' OR suname LIKE '%%%q%%'"
+        "  OR semail GLOB '*%q*' or suname GLOB '*%q*'"
+        " ORDER BY semail",
+        zPattern, zPattern, zPattern, zPattern);
+    }else{
+      db_prepare(&q,
+        "SELECT semail FROM subscriber"
+        " ORDER BY semail");
+    }
+    while( db_step(&q)==SQLITE_ROW ){
+      fossil_print("%s\n", db_column_text(&q, 0));
+    }
+    db_finalize(&q);
+  }else
+  if( strncmp(zCmd, "test-message", nCmd)==0 ){
+    Blob prompt, body, hdr;
+    const char *zDest = find_option("stdout",0,0)!=0 ? "stdout" : 0;
+    int i;
+    u32 mFlags = ALERT_IMMEDIATE_FAIL;
+    const char *zSubject = find_option("subject", "S", 1);
+    const char *zSource = find_option("body", 0, 1);
+    AlertSender *pSender;
+    if( find_option("smtp-trace",0,0)!=0 ) mFlags |= ALERT_TRACE;
+    verify_all_options();
+    blob_init(&prompt, 0, 0);
+    blob_init(&body, 0, 0);
+    blob_init(&hdr, 0, 0);
+    blob_appendf(&hdr,"To: ");
+    for(i=3; i<g.argc; i++){
+      if( i>3 ) blob_append(&hdr, ", ", 2);
+      blob_appendf(&hdr, "<%s>", g.argv[i]);
+    }
+    blob_append(&hdr,"\r\n",2);
+    if( zSubject==0 ) zSubject = "fossil alerts test-message";
+    blob_appendf(&hdr, "Subject: %s\r\n", zSubject);
+    if( zSource ){
+      blob_read_from_file(&body, zSource, ExtFILE);
+    }else{
+      prompt_for_user_comment(&body, &prompt);
+    }
+    blob_add_final_newline(&body);
+    pSender = alert_sender_new(zDest, mFlags);
+    alert_send(pSender, &hdr, &body, 0);
+    alert_sender_free(pSender);
+    blob_reset(&hdr);
+    blob_reset(&body);
+    blob_reset(&prompt);
+  }else
+  if( strncmp(zCmd, "unsubscribe", nCmd)==0 ){
+    verify_all_options();
+    if( g.argc!=4 ) usage("unsubscribe EMAIL");
+    db_multi_exec(
+      "DELETE FROM subscriber WHERE semail=%Q", g.argv[3]);
+  }else
+  {
+    usage("pending|reset|send|setting|status|"
+          "subscribers|test-message|unsubscribe");
+  }
+}
+
+/*
+** Do error checking on a submitted subscription form.  Return TRUE
+** if the submission is valid.  Return false if any problems are seen.
+*/
+static int subscribe_error_check(
+  int *peErr,           /* Type of error */
+  char **pzErr,         /* Error message text */
+  int needCaptcha       /* True if captcha check needed */
+){
+  const char *zEAddr;
+  int i, j, n;
+  char c;
+
+  *peErr = 0;
+  *pzErr = 0;
+
+  /* Check the validity of the email address.
+  **
+  **  (1) Exactly one '@' character.
+  **  (2) No other characters besides [a-zA-Z0-9._+-]
+  **
+  **  The local part is currently more restrictive than RFC 5322 allows:
+  **  https://stackoverflow.com/a/2049510/142454  We will expand this as
+  **  necessary.
+  */
+  zEAddr = P("e");
+  if( zEAddr==0 ) return 0;
+  for(i=j=n=0; (c = zEAddr[i])!=0; i++){
+    if( c=='@' ){
+      n = i;
+      j++;
+      continue;
+    }
+    if( !fossil_isalnum(c) && c!='.' && c!='_' && c!='-' && c!='+' ){
+      *peErr = 1;
+      *pzErr = mprintf("illegal character in email address: 0x%x '%c'",
+                   c, c);
+      return 0;
+    }
+  }
+  if( j!=1 ){
+    *peErr = 1;
+    *pzErr = mprintf("email address should contain exactly one '@'");
+    return 0;
+  }
+  if( n<1 ){
+    *peErr = 1;
+    *pzErr = mprintf("name missing before '@' in email address");
+    return 0;
+  }
+  if( n>i-5 ){
+    *peErr = 1;
+    *pzErr = mprintf("email domain too short");
+     return 0;
+  }
+
+  /* Verify the captcha */
+  if( needCaptcha && !captcha_is_correct(1) ){
+    *peErr = 2;
+    *pzErr = mprintf("incorrect security code");
+    return 0;
+  }
+
+  /* Check to make sure the email address is available for reuse */
+  if( db_exists("SELECT 1 FROM subscriber WHERE semail=%Q", zEAddr) ){
+    *peErr = 1;
+    *pzErr = mprintf("this email address is used by someone else");
+    return 0;
+  }
+
+  /* If we reach this point, all is well */
+  return 1;
+}
+
+/*
+** Text of email message sent in order to confirm a subscription.
+*/
+static const char zConfirmMsg[] = 
+@ Someone has signed you up for email alerts on the Fossil repository
+@ at %s.
+@
+@ To confirm your subscription and begin receiving alerts, click on
+@ the following hyperlink:
+@
+@    %s/alerts/%s
+@
+@ Save the hyperlink above!  You can reuse this same hyperlink to
+@ unsubscribe or to change the kinds of alerts you receive.
+@
+@ If you do not want to subscribe, you can simply ignore this message.
+@ You will not be contacted again.
+@
+;
+
+/*
+** Append the text of an email confirmation message to the given
+** Blob.  The security code is in zCode.
+*/
+void alert_append_confirmation_message(Blob *pMsg, const char *zCode){
+  blob_appendf(pMsg, zConfirmMsg/*works-like:"%s%s%s"*/,
+                   g.zBaseURL, g.zBaseURL, zCode);
+}
+
+/*
+** WEBPAGE: subscribe
+**
+** Allow users to subscribe to email notifications.
+**
+** This page is usually run by users who are not logged in.
+** A logged-in user can add email notifications on the /alerts page.
+** Access to this page by a logged in user (other than an
+** administrator) results in a redirect to the /alerts page.
+**
+** Administrators can visit this page in order to sign up other
+** users.
+**
+** The Alerts permission ("7") is required to access this
+** page.  To allow anonymous passers-by to sign up for email
+** notification, set Email-Alerts on user "nobody" or "anonymous".
+*/
+void subscribe_page(void){
+  int needCaptcha;
+  unsigned int uSeed;
+  const char *zDecoded;
+  char *zCaptcha = 0;
+  char *zErr = 0;
+  int eErr = 0;
+  int di;
+
+  if( alert_webpages_disabled() ) return;
+  login_check_credentials();
+  if( !g.perm.EmailAlert ){
+    login_needed(g.anon.EmailAlert);
+    return;
+  }
+  if( login_is_individual()
+   && db_exists("SELECT 1 FROM subscriber WHERE suname=%Q",g.zLogin)
+  ){
+    /* This person is already signed up for email alerts.  Jump
+    ** to the screen that lets them edit their alert preferences.
+    ** Except, administrators can create subscriptions for others so
+    ** do not jump for them.
+    */
+    if( g.perm.Admin ){
+      /* Admins get a link to admin their own account, but they
+      ** stay on this page so that they can create subscriptions
+      ** for other people. */
+      style_submenu_element("My Subscription","%R/alerts");
+    }else{
+      /* Everybody else jumps to the page to administer their own
+      ** account only. */
+      cgi_redirectf("%R/alerts");
+      return;
+    }
+  }
+  alert_submenu_common();
+  needCaptcha = !login_is_individual();
+  if( P("submit")
+   && cgi_csrf_safe(1)
+   && subscribe_error_check(&eErr,&zErr,needCaptcha)
+  ){
+    /* A validated request for a new subscription has been received. */
+    char ssub[20];
+    const char *zEAddr = P("e");
+    sqlite3_int64 id;   /* New subscriber Id */
+    const char *zCode;  /* New subscriber code (in hex) */
+    int nsub = 0;
+    const char *suname = PT("suname");
+    if( suname==0 && needCaptcha==0 && !g.perm.Admin ) suname = g.zLogin;
+    if( suname && suname[0]==0 ) suname = 0;
+    if( PB("sa") ) ssub[nsub++] = 'a';
+    if( g.perm.Read && PB("sc") )    ssub[nsub++] = 'c';
+    if( g.perm.RdForum && PB("sf") ) ssub[nsub++] = 'f';
+    if( g.perm.RdTkt && PB("st") )   ssub[nsub++] = 't';
+    if( g.perm.RdWiki && PB("sw") )  ssub[nsub++] = 'w';
+    ssub[nsub] = 0;
+    db_multi_exec(
+      "INSERT INTO subscriber(semail,suname,"
+      "  sverified,sdonotcall,sdigest,ssub,sctime,mtime,smip)"
+      "VALUES(%Q,%Q,%d,0,%d,%Q,now(),now(),%Q)",
+      /* semail */    zEAddr,
+      /* suname */    suname,
+      /* sverified */ needCaptcha==0,
+      /* sdigest */   PB("di"),
+      /* ssub */      ssub,
+      /* smip */      g.zIpAddr
+    );
+    id = db_last_insert_rowid();
+    zCode = db_text(0,
+         "SELECT hex(subscriberCode) FROM subscriber WHERE subscriberId=%lld",
+         id);
+    if( !needCaptcha ){
+      /* The new subscription has been added on behalf of a logged-in user.
+      ** No verification is required.  Jump immediately to /alerts page.
+      */
+      cgi_redirectf("%R/alerts/%s", zCode);
+      return;
+    }else{
+      /* We need to send a verification email */
+      Blob hdr, body;
+      AlertSender *pSender = alert_sender_new(0,0);
+      blob_init(&hdr,0,0);
+      blob_init(&body,0,0);
+      blob_appendf(&hdr, "To: <%s>\n", zEAddr);
+      blob_appendf(&hdr, "Subject: Subscription verification\n");
+      alert_append_confirmation_message(&body, zCode);
+      alert_send(pSender, &hdr, &body, 0);
+      style_header("Email Alert Verification");
+      if( pSender->zErr ){
+        @ <h1>Internal Error</h1>
+        @ <p>The following internal error was encountered while trying
+        @ to send the confirmation email:
+        @ <blockquote><pre>
+        @ %h(pSender->zErr)
+        @ </pre></blockquote>
+      }else{
+        @ <p>An email has been sent to "%h(zEAddr)". That email contains a
+        @ hyperlink that you must click on in order to activate your
+        @ subscription.</p>
+      }
+      alert_sender_free(pSender);
+      style_footer();
+    }
+    return;
+  }
+  style_header("Signup For Email Alerts");
+  if( P("submit")==0 ){
+    /* If this is the first visit to this page (if this HTTP request did not
+    ** come from a prior Submit of the form) then default all of the
+    ** subscription options to "on" */
+    cgi_set_parameter_nocopy("sa","1",1);
+    if( g.perm.Read )    cgi_set_parameter_nocopy("sc","1",1);
+    if( g.perm.RdForum ) cgi_set_parameter_nocopy("sf","1",1);
+    if( g.perm.RdTkt )   cgi_set_parameter_nocopy("st","1",1);
+    if( g.perm.RdWiki )  cgi_set_parameter_nocopy("sw","1",1);
+  }
+  @ <p>To receive email notifications for changes to this
+  @ repository, fill out the form below and press "Submit" button.</p>
+  form_begin(0, "%R/subscribe");
+  @ <table class="subscribe">
+  @ <tr>
+  @  <td class="form_label">Email&nbsp;Address:</td>
+  @  <td><input type="text" name="e" value="%h(PD("e",""))" size="30"></td>
+  @ <tr>
+  if( eErr==1 ){
+    @ <tr><td><td><span class='loginError'>&uarr; %h(zErr)</span></td></tr>
+  }
+  @ </tr>
+  if( needCaptcha ){
+    uSeed = captcha_seed();
+    zDecoded = captcha_decode(uSeed);
+    zCaptcha = captcha_render(zDecoded);
+    @ <tr>
+    @  <td class="form_label">Security Code:</td>
+    @  <td><input type="text" name="captcha" value="" size="30">
+    @  <input type="hidden" name="captchaseed" value="%u(uSeed)"></td>
+    @ </tr>
+    if( eErr==2 ){
+      @ <tr><td><td><span class='loginError'>&uarr; %h(zErr)</span></td></tr>
+    }
+    @ </tr>
+  }
+  if( g.perm.Admin ){
+    @ <tr>
+    @  <td class="form_label">User:</td>
+    @  <td><input type="text" name="suname" value="%h(PD("suname",g.zLogin))" \
+    @  size="30"></td>
+    @ </tr>
+    if( eErr==3 ){
+      @ <tr><td><td><span class='loginError'>&uarr; %h(zErr)</span></td></tr>
+    }
+    @ </tr>
+  }
+  @ <tr>
+  @  <td class="form_label">Topics:</td>
+  @  <td><label><input type="checkbox" name="sa" %s(PCK("sa"))> \
+  @  Announcements</label><br>
+  if( g.perm.Read ){
+    @  <label><input type="checkbox" name="sc" %s(PCK("sc"))> \
+    @  Check-ins</label><br>
+  }
+  if( g.perm.RdForum ){
+    @  <label><input type="checkbox" name="sf" %s(PCK("sf"))> \
+    @  Forum Posts</label><br>
+  }
+  if( g.perm.RdTkt ){
+    @  <label><input type="checkbox" name="st" %s(PCK("st"))> \
+    @  Ticket changes</label><br>
+  }
+  if( g.perm.RdWiki ){
+    @  <label><input type="checkbox" name="sw" %s(PCK("sw"))> \
+    @  Wiki</label><br>
+  }
+  di = PB("di");
+  @ </td></tr>
+  @ <tr>
+  @  <td class="form_label">Delivery:</td>
+  @  <td><select size="1" name="di">
+  @     <option value="0" %s(di?"":"selected")>Individual Emails</option>
+  @     <option value="1" %s(di?"selected":"")>Daily Digest</option>
+  @     </select></td>
+  @ </tr>
+  if( g.perm.Admin ){
+    @ <tr>
+    @  <td class="form_label">Admin Options:</td><td>
+    @  <label><input type="checkbox" name="vi" %s(PCK("vi"))> \
+    @  Verified</label><br>
+    @  <label><input type="checkbox" name="dnc" %s(PCK("dnc"))> \
+    @  Do not call</label></td></tr>
+  }
+  @ <tr>
+  @  <td></td>
+  if( needCaptcha && !alert_enabled() ){
+    @  <td><input type="submit" name="submit" value="Submit" disabled>
+    @  (Email current disabled)</td>
+  }else{
+    @  <td><input type="submit" name="submit" value="Submit"></td>
+  }
+  @ </tr>
+  @ </table>
+  if( needCaptcha ){
+    @ <div class="captcha"><table class="captcha"><tr><td><pre class="captcha">
+    @ %h(zCaptcha)
+    @ </pre>
+    @ Enter the 8 characters above in the "Security Code" box
+    @ </td></tr></table></div>
+  }
+  @ </form>
+  fossil_free(zErr);
+  style_footer();
+}
+
+/*
+** Either shutdown or completely delete a subscription entry given
+** by the hex value zName.  Then paint a webpage that explains that
+** the entry has been removed.
+*/
+static void alert_unsubscribe(const char *zName){
+  char *zEmail;
+  zEmail = db_text(0, "SELECT semail FROM subscriber"
+                      " WHERE subscriberCode=hextoblob(%Q)", zName);
+  if( zEmail==0 ){
+    style_header("Unsubscribe Fail");
+    @ <p>Unable to locate a subscriber with the requested key</p>
+  }else{
+    db_multi_exec(
+      "DELETE FROM subscriber WHERE subscriberCode=hextoblob(%Q)",
+      zName
+    );
+    style_header("Unsubscribed");
+    @ <p>The "%h(zEmail)" email address has been delisted.
+    @ All traces of that email address have been removed</p>
+  }
+  style_footer();
+  return;
+}
+
+/*
+** WEBPAGE: alerts
+**
+** Edit email alert and notification settings.
+**
+** The subscriber is identified in either of two ways:
+**
+**    (1)  The name= query parameter contains the subscriberCode.
+**         
+**    (2)  The user is logged into an account other than "nobody" or
+**         "anonymous".  In that case the notification settings
+**         associated with that account can be edited without needing
+**         to know the subscriber code.
+*/
+void alert_page(void){
+  const char *zName = P("name");
+  Stmt q;
+  int sa, sc, sf, st, sw;
+  int sdigest, sdonotcall, sverified;
+  const char *ssub;
+  const char *semail;
+  const char *smip;
+  const char *suname;
+  const char *mtime;
+  const char *sctime;
+  int eErr = 0;
+  char *zErr = 0;
+
+  if( alert_webpages_disabled() ) return;
+  login_check_credentials();
+  if( !g.perm.EmailAlert ){
+    login_needed(g.anon.EmailAlert);
+    return;
+  }
+  if( zName==0 && login_is_individual() ){
+    zName = db_text(0, "SELECT hex(subscriberCode) FROM subscriber"
+                       " WHERE suname=%Q", g.zLogin);
+  }
+  if( zName==0 || !validate16(zName, -1) ){
+    cgi_redirect("subscribe");
+    return;
+  }
+  alert_submenu_common();
+  if( P("submit")!=0 && cgi_csrf_safe(1) ){
+    int sdonotcall = PB("sdonotcall");
+    int sdigest = PB("sdigest");
+    char ssub[10];
+    int nsub = 0;
+    if( PB("sa") )                   ssub[nsub++] = 'a';
+    if( g.perm.Read && PB("sc") )    ssub[nsub++] = 'c';
+    if( g.perm.RdForum && PB("sf") ) ssub[nsub++] = 'f';
+    if( g.perm.RdTkt && PB("st") )   ssub[nsub++] = 't';
+    if( g.perm.RdWiki && PB("sw") )  ssub[nsub++] = 'w';
+    ssub[nsub] = 0;
+    if( g.perm.Admin ){
+      const char *suname = PT("suname");
+      int sverified = PB("sverified");
+      if( suname && suname[0]==0 ) suname = 0;
+      db_multi_exec(
+        "UPDATE subscriber SET"
+        " sdonotcall=%d,"
+        " sdigest=%d,"
+        " ssub=%Q,"
+        " mtime=strftime('%%s','now'),"
+        " smip=%Q,"
+        " suname=%Q,"
+        " sverified=%d"
+        " WHERE subscriberCode=hextoblob(%Q)",
+        sdonotcall,
+        sdigest,
+        ssub,
+        g.zIpAddr,
+        suname,
+        sverified,
+        zName
+      );
+    }else{
+      db_multi_exec(
+        "UPDATE subscriber SET"
+        " sdonotcall=%d,"
+        " sdigest=%d,"
+        " ssub=%Q,"
+        " mtime=strftime('%%s','now'),"
+        " smip=%Q"
+        " WHERE subscriberCode=hextoblob(%Q)",
+        sdonotcall,
+        sdigest,
+        ssub,
+        g.zIpAddr,
+        zName
+      );
+    }
+  }
+  if( P("delete")!=0 && cgi_csrf_safe(1) ){
+    if( !PB("dodelete") ){
+      eErr = 9;
+      zErr = mprintf("Select this checkbox and press \"Unsubscribe\" again to"
+                     " unsubscribe");
+    }else{
+      alert_unsubscribe(zName);
+      return;
+    }
+  }
+  db_prepare(&q,
+    "SELECT"
+    "  semail,"                       /* 0 */
+    "  sverified,"                    /* 1 */
+    "  sdonotcall,"                   /* 2 */
+    "  sdigest,"                      /* 3 */
+    "  ssub,"                         /* 4 */
+    "  smip,"                         /* 5 */
+    "  suname,"                       /* 6 */
+    "  datetime(mtime,'unixepoch'),"  /* 7 */
+    "  datetime(sctime,'unixepoch')"  /* 8 */
+    " FROM subscriber WHERE subscriberCode=hextoblob(%Q)", zName);
+  if( db_step(&q)!=SQLITE_ROW ){
+    db_finalize(&q);
+    cgi_redirect("subscribe");
+    return;
+  }
+  style_header("Update Subscription");
+  semail = db_column_text(&q, 0);
+  sverified = db_column_int(&q, 1);
+  sdonotcall = db_column_int(&q, 2);
+  sdigest = db_column_int(&q, 3);
+  ssub = db_column_text(&q, 4);
+  sa = strchr(ssub,'a')!=0;
+  sc = strchr(ssub,'c')!=0;
+  sf = strchr(ssub,'f')!=0;
+  st = strchr(ssub,'t')!=0;
+  sw = strchr(ssub,'w')!=0;
+  smip = db_column_text(&q, 5);
+  suname = db_column_text(&q, 6);
+  mtime = db_column_text(&q, 7);
+  sctime = db_column_text(&q, 8);
+  if( !g.perm.Admin && !sverified ){
+    db_multi_exec(
+      "UPDATE subscriber SET sverified=1 WHERE subscriberCode=hextoblob(%Q)",
+      zName);
+    @ <h1>Your email alert subscription has been verified!</h1>
+    @ <p>Use the form below to update your subscription information.</p>
+    @ <p>Hint:  Bookmark this page so that you can more easily update
+    @ your subscription information in the future</p>
+  }else{
+    @ <p>Make changes to the email subscription shown below and
+    @ press "Submit".</p>
+  }
+  form_begin(0, "%R/alerts");
+  @ <input type="hidden" name="name" value="%h(zName)">
+  @ <table class="subscribe">
+  @ <tr>
+  @  <td class="form_label">Email&nbsp;Address:</td>
+  @  <td>%h(semail)</td>
+  @ </tr>
+  if( g.perm.Admin ){
+    @ <tr>
+    @  <td class='form_label'>Created:</td>
+    @  <td>%h(sctime)</td>
+    @ </tr>
+    @ <tr>
+    @  <td class='form_label'>Last Modified:</td>
+    @  <td>%h(mtime)</td>
+    @ </tr>
+    @ <tr>
+    @  <td class='form_label'>IP Address:</td>
+    @  <td>%h(smip)</td>
+    @ </tr>
+    @ <tr>
+    @  <td class="form_label">User:</td>
+    @  <td><input type="text" name="suname" value="%h(suname?suname:"")" \
+    @  size="30"></td>
+    @ </tr>
+  }
+  @ <tr>
+  @  <td class="form_label">Topics:</td>
+  @  <td><label><input type="checkbox" name="sa" %s(sa?"checked":"")>\
+  @  Announcements</label><br>
+  if( g.perm.Read ){
+    @  <label><input type="checkbox" name="sc" %s(sc?"checked":"")>\
+    @  Check-ins</label><br>
+  }
+  if( g.perm.RdForum ){
+    @  <label><input type="checkbox" name="sf" %s(sf?"checked":"")>\
+    @  Forum Posts</label><br>
+  }
+  if( g.perm.RdTkt ){
+    @  <label><input type="checkbox" name="st" %s(st?"checked":"")>\
+    @  Ticket changes</label><br>
+  }
+  if( g.perm.RdWiki ){
+    @  <label><input type="checkbox" name="sw" %s(sw?"checked":"")>\
+    @  Wiki</label>
+  }
+  @ </td></tr>
+  @ <tr>
+  @  <td class="form_label">Delivery:</td>
+  @  <td><select size="1" name="sdigest">
+  @     <option value="0" %s(sdigest?"":"selected")>Individual Emails</option>
+  @     <option value="1" %s(sdigest?"selected":"")>Daily Digest</option>
+  @     </select></td>
+  @ </tr>
+#if 0
+  @  <label><input type="checkbox" name="sdigest" %s(sdigest?"checked":"")>\
+  @  Daily digest only</label><br>
+#endif
+  if( g.perm.Admin ){
+    @ <tr>
+    @  <td class="form_label">Admin Options:</td><td>
+    @  <label><input type="checkbox" name="sdonotcall" \
+    @  %s(sdonotcall?"checked":"")> Do not call</label><br>
+    @  <label><input type="checkbox" name="sverified" \
+    @  %s(sverified?"checked":"")>\
+    @  Verified</label></td></tr>
+  }
+  if( eErr==9 ){
+    @ <tr>
+    @  <td class="form_label">Verify:</td><td>
+    @  <label><input type="checkbox" name="dodelete">
+    @  Unsubscribe</label>
+    @ <span class="loginError">&larr; %h(zErr)</span>
+    @ </td></tr>
+  }
+  @ <tr>
+  @  <td></td>
+  @  <td><input type="submit" name="submit" value="Submit">
+  @  <input type="submit" name="delete" value="Unsubscribe">
+  @ </tr>
+  @ </table>
+  @ </form>
+  fossil_free(zErr);
+  db_finalize(&q);
+  style_footer();
+}
+
+/* This is the message that gets sent to describe how to change
+** or modify a subscription
+*/
+static const char zUnsubMsg[] = 
+@ To changes your subscription settings at %s visit this link:
+@
+@    %s/alerts/%s
+@
+@ To completely unsubscribe from %s, visit the following link:
+@
+@    %s/unsubscribe/%s
+;
+
+/*
+** WEBPAGE: unsubscribe
+**
+** Users visit this page to be delisted from email alerts.
+**
+** If a valid subscriber code is supplied in the name= query parameter,
+** then that subscriber is delisted.
+**
+** Otherwise, If the users is logged in, then they are redirected
+** to the /alerts page where they have an unsubscribe button.
+**
+** Non-logged-in users with no name= query parameter are invited to enter
+** an email address to which will be sent the unsubscribe link that
+** contains the correct subscriber code.
+*/
+void unsubscribe_page(void){
+  const char *zName = P("name");
+  char *zErr = 0;
+  int eErr = 0;
+  unsigned int uSeed;
+  const char *zDecoded;
+  char *zCaptcha = 0;
+  int dx;
+  int bSubmit;
+  const char *zEAddr;
+  char *zCode = 0;
+
+  /* If a valid subscriber code is supplied, then unsubscribe immediately.
+  */
+  if( zName 
+   && db_exists("SELECT 1 FROM subscriber WHERE subscriberCode=hextoblob(%Q)",
+                zName)
+  ){
+    alert_unsubscribe(zName);
+    return;
+  }
+
+  /* Logged in users are redirected to the /alerts page */
+  login_check_credentials();
+  if( login_is_individual() ){
+    cgi_redirectf("%R/alerts");
+    return;
+  }
+
+  zEAddr = PD("e","");
+  dx = atoi(PD("dx","0"));
+  bSubmit = P("submit")!=0 && P("e")!=0 && cgi_csrf_safe(1);
+  if( bSubmit ){
+    if( !captcha_is_correct(1) ){
+      eErr = 2;
+      zErr = mprintf("enter the security code shown below");
+      bSubmit = 0;
+    }
+  }
+  if( bSubmit ){
+    zCode = db_text(0,"SELECT hex(subscriberCode) FROM subscriber"
+                      " WHERE semail=%Q", zEAddr);
+    if( zCode==0 ){
+      eErr = 1;
+      zErr = mprintf("not a valid email address");
+      bSubmit = 0;
+    }
+  }
+  if( bSubmit ){
+    /* If we get this far, it means that a valid unsubscribe request has
+    ** been submitted.  Send the appropriate email. */
+    Blob hdr, body;
+    AlertSender *pSender = alert_sender_new(0,0);
+    blob_init(&hdr,0,0);
+    blob_init(&body,0,0);
+    blob_appendf(&hdr, "To: <%s>\r\n", zEAddr);
+    blob_appendf(&hdr, "Subject: Unsubscribe Instructions\r\n");
+    blob_appendf(&body, zUnsubMsg/*works-like:"%s%s%s%s%s%s"*/,
+                  g.zBaseURL, g.zBaseURL, zCode, g.zBaseURL, g.zBaseURL, zCode);
+    alert_send(pSender, &hdr, &body, 0);
+    style_header("Unsubscribe Instructions Sent");
+    if( pSender->zErr ){
+      @ <h1>Internal Error</h1>
+      @ <p>The following error was encountered while trying to send an
+      @ email to %h(zEAddr):
+      @ <blockquote><pre>
+      @ %h(pSender->zErr)
+      @ </pre></blockquote>
+    }else{
+      @ <p>An email has been sent to "%h(zEAddr)" that explains how to
+      @ unsubscribe and/or modify your subscription settings</p>
+    }
+    alert_sender_free(pSender);
+    style_footer();
+    return;
+  }  
+
+  /* Non-logged-in users have to enter an email address to which is
+  ** sent a message containing the unsubscribe link.
+  */
+  style_header("Unsubscribe Request");
+  @ <p>Fill out the form below to request an email message that will
+  @ explain how to unsubscribe and/or change your subscription settings.</p>
+  @
+  form_begin(0, "%R/unsubscribe");
+  @ <table class="subscribe">
+  @ <tr>
+  @  <td class="form_label">Email&nbsp;Address:</td>
+  @  <td><input type="text" name="e" value="%h(zEAddr)" size="30"></td>
+  if( eErr==1 ){
+    @  <td><span class="loginError">&larr; %h(zErr)</span></td>
+  }
+  @ </tr>
+  uSeed = captcha_seed();
+  zDecoded = captcha_decode(uSeed);
+  zCaptcha = captcha_render(zDecoded);
+  @ <tr>
+  @  <td class="form_label">Security Code:</td>
+  @  <td><input type="text" name="captcha" value="" size="30">
+  @  <input type="hidden" name="captchaseed" value="%u(uSeed)"></td>
+  if( eErr==2 ){
+    @  <td><span class="loginError">&larr; %h(zErr)</span></td>
+  }
+  @ </tr>
+  @ <tr>
+  @  <td class="form_label">Options:</td>
+  @  <td><label><input type="radio" name="dx" value="0" %s(dx?"":"checked")>\
+  @  Modify subscription</label><br>
+  @  <label><input type="radio" name="dx" value="1" %s(dx?"checked":"")>\
+  @  Completely unsubscribe</label><br>
+  @ <tr>
+  @  <td></td>
+  @  <td><input type="submit" name="submit" value="Submit"></td>
+  @ </tr>
+  @ </table>
+  @ <div class="captcha"><table class="captcha"><tr><td><pre class="captcha">
+  @ %h(zCaptcha)
+  @ </pre>
+  @ Enter the 8 characters above in the "Security Code" box
+  @ </td></tr></table></div>
+  @ </form>
+  fossil_free(zErr);
+  style_footer();
+}
+
+/*
+** WEBPAGE: subscribers
+**
+** This page, accessible to administrators only,
+** shows a list of email notification email addresses.
+** Clicking on an email takes one to the /alerts page
+** for that email where the delivery settings can be
+** modified.
+*/
+void subscriber_list_page(void){
+  Blob sql;
+  Stmt q;
+  sqlite3_int64 iNow;
+  if( alert_webpages_disabled() ) return;
+  login_check_credentials();
+  if( !g.perm.Admin ){
+    login_needed(0);
+    return;
+  }
+  alert_submenu_common();
+  style_header("Subscriber List");
+  blob_init(&sql, 0, 0);
+  blob_append_sql(&sql,
+    "SELECT hex(subscriberCode),"          /* 0 */
+    "       semail,"                       /* 1 */
+    "       ssub,"                         /* 2 */
+    "       suname,"                       /* 3 */
+    "       sverified,"                    /* 4 */
+    "       sdigest,"                      /* 5 */
+    "       mtime,"                        /* 6 */
+    "       date(sctime,'unixepoch')"      /* 7 */
+    " FROM subscriber"
+  );
+  if( P("only")!=0 ){
+    blob_append_sql(&sql, " WHERE ssub LIKE '%%%q%%'", P("only"));
+    style_submenu_element("Show All","%R/subscribers");
+  }
+  blob_append_sql(&sql," ORDER BY mtime DESC");
+  db_prepare_blob(&q, &sql);
+  iNow = time(0);
+  @ <table border='1' class='sortable' \
+  @ data-init-sort='6' data-column-types='tttttKt'>
+  @ <thead>
+  @ <tr>
+  @ <th>Email
+  @ <th>Events
+  @ <th>Digest-Only?
+  @ <th>User
+  @ <th>Verified?
+  @ <th>Last change
+  @ <th>Created
+  @ </tr>
+  @ </thead><tbody>
+  while( db_step(&q)==SQLITE_ROW ){
+    sqlite3_int64 iMtime = db_column_int64(&q, 6);
+    double rAge = (iNow - iMtime)/86400.0;
+    @ <tr>
+    @ <td><a href='%R/alerts/%s(db_column_text(&q,0))'>\
+    @ %h(db_column_text(&q,1))</a></td>
+    @ <td>%h(db_column_text(&q,2))</td>
+    @ <td>%s(db_column_int(&q,5)?"digest":"")</td>
+    @ <td>%h(db_column_text(&q,3))</td>
+    @ <td>%s(db_column_int(&q,4)?"yes":"pending")</td>
+    @ <td data-sortkey='%010llx(iMtime)'>%z(human_readable_age(rAge))</td>
+    @ <td>%h(db_column_text(&q,7))</td>
+    @ </tr>
+  }
+  @ </tbody></table>
+  db_finalize(&q);
+  style_table_sorter();
+  style_footer();
+}
+
+#if LOCAL_INTERFACE
+/*
+** A single event that might appear in an alert is recorded as an
+** instance of the following object.
+*/
+struct EmailEvent {
+  int type;          /* 'c', 'f', 'm', 't', 'w' */
+  int needMod;       /* Pending moderator approval */
+  Blob hdr;          /* Header content, for forum entries */
+  Blob txt;          /* Text description to appear in an alert */
+  char *zFromName;   /* Human name of the sender */
+  EmailEvent *pNext; /* Next in chronological order */
+};
+#endif
+
+/*
+** Free a linked list of EmailEvent objects
+*/
+void alert_free_eventlist(EmailEvent *p){
+  while( p ){
+    EmailEvent *pNext = p->pNext;
+    blob_reset(&p->txt);
+    blob_reset(&p->hdr);
+    fossil_free(p->zFromName);
+    fossil_free(p);
+    p = pNext;
+  }
+}
+
+/*
+** Compute and return a linked list of EmailEvent objects
+** corresponding to the current content of the temp.wantalert
+** table which should be defined as follows:
+**
+**     CREATE TEMP TABLE wantalert(eventId TEXT, needMod BOOLEAN);
+*/
+EmailEvent *alert_compute_event_text(int *pnEvent, int doDigest){
+  Stmt q;
+  EmailEvent *p;
+  EmailEvent anchor;
+  EmailEvent *pLast;
+  const char *zUrl = db_get("email-url","http://localhost:8080");
+  const char *zFrom;
+  const char *zSub;
+
+
+  /* First do non-forum post events */
+  db_prepare(&q,
+    "SELECT"
+    " blob.uuid,"                /* 0 */
+    " datetime(event.mtime),"    /* 1 */
+    " coalesce(ecomment,comment)"
+    "  || ' (user: ' || coalesce(euser,user,'?')"
+    "  || (SELECT case when length(x)>0 then ' tags: ' || x else '' end"
+    "      FROM (SELECT group_concat(substr(tagname,5), ', ') AS x"
+    "              FROM tag, tagxref"
+    "             WHERE tagname GLOB 'sym-*' AND tag.tagid=tagxref.tagid"
+    "               AND tagxref.rid=blob.rid AND tagxref.tagtype>0))"
+    "  || ')' as comment,"       /* 2 */
+    " wantalert.eventId,"        /* 3 */
+    " wantalert.needMod"         /* 4 */
+    " FROM temp.wantalert, event, blob"
+    " WHERE blob.rid=event.objid"
+    "   AND event.objid=substr(wantalert.eventId,2)+0"
+    "   AND (%d OR eventId NOT GLOB 'f*')"
+    " ORDER BY event.mtime",
+    doDigest
+  );
+  memset(&anchor, 0, sizeof(anchor));
+  pLast = &anchor;
+  *pnEvent = 0;
+  while( db_step(&q)==SQLITE_ROW ){
+    const char *zType = "";
+    p = fossil_malloc( sizeof(EmailEvent) );
+    pLast->pNext = p;
+    pLast = p;
+    p->type = db_column_text(&q, 3)[0];
+    p->needMod = db_column_int(&q, 4);
+    p->zFromName = 0;
+    p->pNext = 0;
+    switch( p->type ){
+      case 'c':  zType = "Check-In";        break;
+      case 'f':  zType = "Forum post";      break;
+      case 't':  zType = "Wiki Edit";       break;
+      case 'w':  zType = "Ticket Change";   break;
+    }
+    blob_init(&p->hdr, 0, 0);
+    blob_init(&p->txt, 0, 0);
+    blob_appendf(&p->txt,"== %s %s ==\n%s\n%s/info/%.20s\n",
+      db_column_text(&q,1),
+      zType,
+      db_column_text(&q,2),
+      zUrl,
+      db_column_text(&q,0)
+    );
+    if( p->needMod ){
+      blob_appendf(&p->txt,
+        "** Pending moderator approval (%s/modreq) **\n",
+        zUrl
+      );
+    }
+    (*pnEvent)++;
+  }
+  db_finalize(&q);
+
+  /* Early-out if forumpost is not a table in this repository */
+  if( !db_table_exists("repository","forumpost") ){
+    return anchor.pNext;
+  }
+
+  /* For digests, the previous loop also handled forumposts already */
+  if( doDigest ){
+    return anchor.pNext;
+  }
+
+  /* If we reach this point, it means that forumposts exist and this
+  ** is a normal email alert.  Construct full-text forum post alerts
+  ** using a format that enables them to be sent as separate emails.
+  */
+  db_prepare(&q,
+    "SELECT"
+    " forumpost.fpid,"                                      /* 0 */
+    " (SELECT uuid FROM blob WHERE rid=forumpost.fpid),"    /* 1 */
+    " datetime(event.mtime),"                               /* 2 */
+    " substr(comment,instr(comment,':')+2),"                /* 3 */
+    " (SELECT uuid FROM blob WHERE rid=forumpost.firt),"    /* 4 */
+    " wantalert.needMod,"                                   /* 5 */
+    " coalesce(trim(substr(info,1,instr(info,'<')-1)),euser,user)"   /* 6 */
+    " FROM temp.wantalert, event, forumpost"
+    "      LEFT JOIN user ON (login=coalesce(euser,user))"
+    " WHERE event.objid=substr(wantalert.eventId,2)+0"
+    "   AND eventId GLOB 'f*'"
+    "   AND forumpost.fpid=event.objid"
+    " ORDER BY event.mtime"
+  );
+  zFrom = db_get("email-self",0);
+  zSub = db_get("email-subname","");
+  while( db_step(&q)==SQLITE_ROW ){
+    Manifest *pPost = manifest_get(db_column_int(&q,0), CFTYPE_FORUM, 0);
+    const char *zIrt;
+    const char *zUuid;
+    const char *zTitle;
+    const char *z;
+    if( pPost==0 ) continue;
+    p = fossil_malloc( sizeof(EmailEvent) );
+    pLast->pNext = p;
+    pLast = p;
+    p->type = 'f';
+    p->needMod = db_column_int(&q, 5);
+    z = db_column_text(&q,6);
+    p->zFromName = z && z[0] ? fossil_strdup(z) : 0;
+    p->pNext = 0;
+    blob_init(&p->hdr, 0, 0);
+    zUuid = db_column_text(&q, 1);
+    zTitle = db_column_text(&q, 3);
+    if( p->needMod ){
+      blob_appendf(&p->hdr, "Subject: %s Pending Moderation: %s\r\n",
+                   zSub, zTitle);
+    }else{
+      blob_appendf(&p->hdr, "Subject: %s %s\r\n", zSub, zTitle);
+      blob_appendf(&p->hdr, "Message-Id: <%.32s@%s>\r\n", 
+                   zUuid, alert_hostname(zFrom));
+      zIrt = db_column_text(&q, 4);
+      if( zIrt && zIrt[0] ){
+        blob_appendf(&p->hdr, "In-Reply-To: <%.32s@%s>\r\n",
+                     zIrt, alert_hostname(zFrom));
+      }
+    }
+    blob_init(&p->txt, 0, 0);
+    if( p->needMod ){
+      blob_appendf(&p->txt,
+        "** Pending moderator approval (%s/modreq) **\n",
+        zUrl
+      );
+    }
+    blob_appendf(&p->txt,
+      "Forum post by %s on %s\n",
+      pPost->zUser, db_column_text(&q, 2));
+    blob_appendf(&p->txt, "%s/forumpost/%S\n\n", zUrl, zUuid);
+    blob_append(&p->txt, pPost->zWiki, -1);
+    manifest_destroy(pPost);
+    (*pnEvent)++;
+  }
+  db_finalize(&q);
+
+  return anchor.pNext;
+}
+
+/*
+** Put a header on an alert email
+*/
+void email_header(Blob *pOut){
+  blob_appendf(pOut,
+    "This is an automated email reporting changes "
+    "on Fossil repository %s (%s/timeline)\n",
+    db_get("email-subname","(unknown)"),
+    db_get("email-url","http://localhost:8080"));
+}
+
+/*
+** Append the "unsubscribe" notification and other footer text to
+** the end of an email alert being assemblied in pOut.
+*/
+void alert_footer(Blob *pOut){
+  blob_appendf(pOut, "\n-- \nTo unsubscribe: %s/unsubscribe\n",
+     db_get("email-url","http://localhost:8080"));
+}
+
+/*
+** COMMAND:  test-alert
+**
+** Usage: %fossil test-alert EVENTID ...
+**
+** Generate the text of an email alert for all of the EVENTIDs
+** listed on the command-line.  Or if no events are listed on the
+** command line, generate text for all events named in the
+** pending_alert table.
+**
+** This command is intended for testing and debugging the logic
+** that generates email alert text.
+**
+** Options:
+**
+**      --digest           Generate digest alert text
+**      --needmod          Assume all events are pending moderator approval
+*/
+void test_alert_cmd(void){
+  Blob out;
+  int nEvent;
+  int needMod;
+  int doDigest;
+  EmailEvent *pEvent, *p;
+
+  doDigest = find_option("digest",0,0)!=0;
+  needMod = find_option("needmod",0,0)!=0;
+  db_find_and_open_repository(0, 0);
+  verify_all_options();
+  db_begin_transaction();
+  alert_schema(0);
+  db_multi_exec("CREATE TEMP TABLE wantalert(eventid TEXT, needMod BOOLEAN)");
+  if( g.argc==2 ){
+    db_multi_exec(
+      "INSERT INTO wantalert(eventId,needMod)"
+      " SELECT eventid, %d FROM pending_alert", needMod);
+  }else{
+    int i;
+    for(i=2; i<g.argc; i++){
+      db_multi_exec("INSERT INTO wantalert(eventId,needMod) VALUES(%Q,%d)",
+           g.argv[i], needMod);
+    }
+  }
+  blob_init(&out, 0, 0);
+  email_header(&out);
+  pEvent = alert_compute_event_text(&nEvent, doDigest);
+  for(p=pEvent; p; p=p->pNext){
+    blob_append(&out, "\n", 1);
+    if( blob_size(&p->hdr) ){
+      blob_append(&out, blob_buffer(&p->hdr), blob_size(&p->hdr));
+      blob_append(&out, "\n", 1);
+    }
+    blob_append(&out, blob_buffer(&p->txt), blob_size(&p->txt));
+  }
+  alert_free_eventlist(pEvent);
+  alert_footer(&out);
+  fossil_print("%s", blob_str(&out));
+  blob_reset(&out);
+  db_end_transaction(0);
+}
+
+/*
+** COMMAND:  test-add-alerts
+**
+** Usage: %fossil test-add-alerts [OPTIONS] EVENTID ...
+**
+** Add one or more events to the pending_alert queue.  Use this
+** command during testing to force email notifications for specific
+** events.
+**
+** EVENTIDs are text.  The first character is 'c', 'f', 't', or 'w'
+** for check-in, forum, ticket, or wiki.  The remaining text is a
+** integer that references the EVENT.OBJID value for the event.
+** Run /timeline?showid to see these OBJID values.
+**
+** Options:
+**
+**    --backoffice        Run alert_backoffice() after all alerts have
+**                        been added.  This will cause the alerts to be
+**                        sent out with the SENDALERT_TRACE option.
+**
+**    --debug             Like --backoffice, but add the SENDALERT_STDOUT
+**                        so that emails are printed to standard output
+**                        rather than being sent.
+**
+**    --digest            Process emails using SENDALERT_DIGEST
+*/
+void test_add_alert_cmd(void){
+  int i;
+  int doAuto = find_option("backoffice",0,0)!=0;
+  unsigned mFlags = 0;
+  if( find_option("debug",0,0)!=0 ){
+    doAuto = 1;
+    mFlags = SENDALERT_STDOUT;
+  }
+  if( find_option("digest",0,0)!=0 ){
+    mFlags |= SENDALERT_DIGEST;
+  }
+  db_find_and_open_repository(0, 0);
+  verify_all_options();
+  db_begin_write();
+  alert_schema(0);
+  for(i=2; i<g.argc; i++){
+    db_multi_exec("REPLACE INTO pending_alert(eventId) VALUES(%Q)", g.argv[i]);
+  }
+  db_end_transaction(0);
+  if( doAuto ){
+    alert_backoffice(SENDALERT_TRACE|mFlags);
+  }
+}
+
+#if INTERFACE
+/*
+** Flags for alert_send_alerts()
+*/
+#define SENDALERT_DIGEST      0x0001    /* Send a digest */
+#define SENDALERT_PRESERVE    0x0002    /* Do not mark the task as done */
+#define SENDALERT_STDOUT      0x0004    /* Print emails instead of sending */
+#define SENDALERT_TRACE       0x0008    /* Trace operation for debugging */
+
+#endif /* INTERFACE */
+
+/*
+** Send alert emails to subscribers.
+**
+** This procedure is run by either the backoffice, or in response to the
+** "fossil alerts send" command.  Details of operation are controlled by
+** the flags parameter.
+**
+** Here is a summary of what happens:
+**
+**   (1) Create a TEMP table wantalert(eventId,needMod) and fill it with
+**       all the events that we want to send alerts about.  The needMod
+**       flags is set if and only if the event is still awaiting
+**       moderator approval.  Events with the needMod flag are only
+**       shown to users that have moderator privileges.
+**
+**   (2) Call alert_compute_event_text() to compute a list of EmailEvent
+**       objects that describe all events about which we want to send
+**       alerts.
+**
+**   (3) Loop over all subscribers.  Compose and send one or more email
+**       messages to each subscriber that describe the events for
+**       which the subscriber has expressed interest and has
+**       appropriate privileges.
+**
+**   (4) Update the pending_alerts table to indicate that alerts have been
+**       sent.
+**
+** Update 2018-08-09:  Do step (3) before step (4).  Update the
+** pending_alerts table *before* the emails are sent.  That way, if
+** the process malfunctions or crashes, some notifications may never
+** be sent.  But that is better than some recurring bug causing
+** subscribers to be flooded with repeated notifications every 60
+** seconds!
+*/
+void alert_send_alerts(u32 flags){
+  EmailEvent *pEvents, *p;
+  int nEvent = 0;
+  Stmt q;
+  const char *zDigest = "false";
+  Blob hdr, body;
+  const char *zUrl;
+  const char *zRepoName;
+  const char *zFrom;
+  const char *zDest = (flags & SENDALERT_STDOUT) ? "stdout" : 0;
+  AlertSender *pSender = 0;
+  u32 senderFlags = 0;
+
+  if( g.fSqlTrace ) fossil_trace("-- BEGIN alert_send_alerts(%u)\n", flags);
+  alert_schema(0);
+  if( !alert_enabled() ) goto send_alert_done;
+  zUrl = db_get("email-url",0);
+  if( zUrl==0 ) goto send_alert_done;
+  zRepoName = db_get("email-subname",0);
+  if( zRepoName==0 ) goto send_alert_done;
+  zFrom = db_get("email-self",0);
+  if( zFrom==0 ) goto send_alert_done;
+  if( flags & SENDALERT_TRACE ){
+    senderFlags |= ALERT_TRACE;
+  }
+  pSender = alert_sender_new(zDest, senderFlags);
+
+  /* Step (1):  Compute the alerts that need sending
+  */
+  db_multi_exec(
+    "DROP TABLE IF EXISTS temp.wantalert;"
+    "CREATE TEMP TABLE wantalert(eventId TEXT, needMod BOOLEAN, sentMod);"
+  );
+  if( flags & SENDALERT_DIGEST ){
+    /* Unmoderated changes are never sent as part of a digest */
+    db_multi_exec(
+      "INSERT INTO wantalert(eventId,needMod)"
+      " SELECT eventid, 0"
+      "   FROM pending_alert"
+      "  WHERE sentDigest IS FALSE"
+      "    AND NOT EXISTS(SELECT 1 FROM private WHERE rid=substr(eventid,2));"
+    );
+    zDigest = "true";
+  }else{
+    /* Immediate alerts might include events that are subject to
+    ** moderator approval */
+    db_multi_exec(
+      "INSERT INTO wantalert(eventId,needMod,sentMod)"
+      " SELECT eventid,"
+      "        EXISTS(SELECT 1 FROM private WHERE rid=substr(eventid,2)),"
+      "        sentMod"
+      "   FROM pending_alert"
+      "  WHERE sentSep IS FALSE;"
+      "DELETE FROM wantalert WHERE needMod AND sentMod;"
+    );
+  }
+
+  /* Step 2: compute EmailEvent objects for every notification that
+  ** needs sending.
+  */
+  pEvents = alert_compute_event_text(&nEvent, (flags & SENDALERT_DIGEST)!=0);
+  if( nEvent==0 ) goto send_alert_done;
+
+  /* Step 4a: Update the pending_alerts table to designate the
+  ** alerts as having all been sent.  This is done *before* step (3)
+  ** so that a crash will not cause alerts to be sent multiple times.
+  ** Better a missed alert than being spammed with hundreds of alerts
+  ** due to a bug.
+  */
+  if( (flags & SENDALERT_PRESERVE)==0 ){
+    if( flags & SENDALERT_DIGEST ){
+      db_multi_exec(
+        "UPDATE pending_alert SET sentDigest=true"
+        " WHERE eventid IN (SELECT eventid FROM wantalert);"
+      );
+    }else{
+      db_multi_exec(
+        "UPDATE pending_alert SET sentSep=true"
+        " WHERE eventid IN (SELECT eventid FROM wantalert WHERE NOT needMod);"
+        "UPDATE pending_alert SET sentMod=true"
+        " WHERE eventid IN (SELECT eventid FROM wantalert WHERE needMod);"
+      );
+    }
+  }
+
+  /* Step 3: Loop over subscribers.  Send alerts
+  */
+  blob_init(&hdr, 0, 0);
+  blob_init(&body, 0, 0);
+  db_prepare(&q,
+     "SELECT"
+     " hex(subscriberCode),"  /* 0 */
+     " semail,"               /* 1 */
+     " ssub,"                 /* 2 */
+     " fullcap(user.cap)"     /* 3 */
+     " FROM subscriber LEFT JOIN user ON (login=suname)"
+     " WHERE sverified AND NOT sdonotcall"
+     "  AND sdigest IS %s",
+     zDigest/*safe-for-%s*/
+  );
+  while( db_step(&q)==SQLITE_ROW ){
+    const char *zCode = db_column_text(&q, 0);
+    const char *zSub = db_column_text(&q, 2);
+    const char *zEmail = db_column_text(&q, 1);
+    const char *zCap = db_column_text(&q, 3);
+    int nHit = 0;
+    for(p=pEvents; p; p=p->pNext){
+      if( strchr(zSub,p->type)==0 ) continue;
+      if( p->needMod ){
+        /* For events that require moderator approval, only send an alert
+        ** if the recipient is a moderator for that type of event */
+        char xType = '*';
+        switch( p->type ){
+          case 'f':  xType = '5';  break;
+          case 't':  xType = 'q';  break;
+          case 'w':  xType = 'l';  break;
+        }
+        if( strchr(zCap,xType)==0 ) continue;
+      }else if( strchr(zCap,'s')!=0 || strchr(zCap,'a')!=0 ){
+        /* Setup and admin users can get any notification that does not
+        ** require moderation */
+      }else{
+        /* Other users only see the alert if they have sufficient
+        ** privilege to view the event itself */
+        char xType = '*';
+        switch( p->type ){
+          case 'c':  xType = 'o';  break;
+          case 'f':  xType = '2';  break;
+          case 't':  xType = 'r';  break;
+          case 'w':  xType = 'j';  break;
+        }
+        if( strchr(zCap,xType)==0 ) continue;
+      }
+      if( blob_size(&p->hdr)>0 ){
+        /* This alert should be sent as a separate email */
+        Blob fhdr, fbody;
+        blob_init(&fhdr, 0, 0);
+        blob_appendf(&fhdr, "To: <%s>\r\n", zEmail);
+        blob_append(&fhdr, blob_buffer(&p->hdr), blob_size(&p->hdr));
+        blob_init(&fbody, blob_buffer(&p->txt), blob_size(&p->txt));
+        blob_appendf(&fbody, "\n-- \nSubscription info: %s/alerts/%s\n",
+           zUrl, zCode);
+        alert_send(pSender,&fhdr,&fbody,p->zFromName);
+        blob_reset(&fhdr);
+        blob_reset(&fbody);
+      }else{
+        /* Events other than forum posts are gathered together into
+        ** a single email message */
+        if( nHit==0 ){
+          blob_appendf(&hdr,"To: <%s>\r\n", zEmail);
+          blob_appendf(&hdr,"Subject: %s activity alert\r\n", zRepoName);
+          blob_appendf(&body,
+            "This is an automated email sent by the Fossil repository "
+            "at %s to report changes.\n",
+            zUrl
+          );
+        }
+        nHit++;
+        blob_append(&body, "\n", 1);
+        blob_append(&body, blob_buffer(&p->txt), blob_size(&p->txt));
+      }
+    }
+    if( nHit==0 ) continue;
+    blob_appendf(&body,"\n-- \nSubscription info: %s/alerts/%s\n",
+         zUrl, zCode);
+    alert_send(pSender,&hdr,&body,0);
+    blob_truncate(&hdr, 0);
+    blob_truncate(&body, 0);
+  }
+  blob_reset(&hdr);
+  blob_reset(&body);
+  db_finalize(&q);
+  alert_free_eventlist(pEvents);
+
+  /* Step 4b: Update the pending_alerts table to remove all of the
+  ** alerts that have been completely sent.
+  */
+  db_multi_exec("DELETE FROM pending_alert WHERE sentDigest AND sentSep;");
+
+send_alert_done:
+  alert_sender_free(pSender);
+  if( g.fSqlTrace ) fossil_trace("-- END alert_send_alerts(%u)\n", flags);
+}
+
+/*
+** Do backoffice processing for email notifications.  In other words,
+** check to see if any email notifications need to occur, and then
+** do them.
+**
+** This routine is intended to run in the background, after webpages.
+**
+** The mFlags option is zero or more of the SENDALERT_* flags.  Normally
+** this flag is zero, but the test-set-alert command sets it to
+** SENDALERT_TRACE.
+*/
+void alert_backoffice(u32 mFlags){
+  int iJulianDay;
+  if( !alert_tables_exist() ) return;
+  alert_send_alerts(mFlags);
+  iJulianDay = db_int(0, "SELECT julianday('now')");
+  if( iJulianDay>db_get_int("email-last-digest",0) ){
+    db_set_int("email-last-digest",iJulianDay,0);
+    alert_send_alerts(SENDALERT_DIGEST|mFlags);
+  }
+}
+
+/*
+** WEBPAGE: contact_admin
+**
+** A web-form to send an email message to the repository administrator,
+** or (with appropriate permissions) to anybody.
+*/
+void contact_admin_page(void){
+  const char *zAdminEmail = db_get("email-admin",0);
+  unsigned int uSeed = 0;
+  const char *zDecoded;
+  char *zCaptcha = 0;
+
+  login_check_credentials();
+  if( zAdminEmail==0 || zAdminEmail[0]==0 ){
+    style_header("Outbound Email Disabled");
+    @ <p>Outbound email is disabled on this repository
+    style_footer();
+    return;
+  }
+  if( P("submit")!=0 
+   && P("subject")!=0
+   && P("msg")!=0
+   && P("from")!=0
+   && cgi_csrf_safe(1)
+   && captcha_is_correct(0)
+  ){
+    Blob hdr, body;
+    AlertSender *pSender = alert_sender_new(0,0);
+    blob_init(&hdr, 0, 0);
+    blob_appendf(&hdr, "To: <%s>\r\nSubject: %s administrator message\r\n",
+                 zAdminEmail, db_get("email-subname","Fossil Repo"));
+    blob_init(&body, 0, 0);
+    blob_appendf(&body, "Message from [%s]\n", PT("from")/*safe-for-%s*/);
+    blob_appendf(&body, "Subject: [%s]\n\n", PT("subject")/*safe-for-%s*/);
+    blob_appendf(&body, "%s", PT("msg")/*safe-for-%s*/);
+    alert_send(pSender, &hdr, &body, 0);
+    style_header("Message Sent");
+    if( pSender->zErr ){
+      @ <h1>Internal Error</h1>
+      @ <p>The following error was reported by the system:
+      @ <blockquote><pre>
+      @ %h(pSender->zErr)
+      @ </pre></blockquote>
+    }else{
+      @ <p>Your message has been sent to the repository administrator.
+      @ Thank you for your input.</p>
+    }
+    alert_sender_free(pSender);
+    style_footer();
+    return;
+  }
+  if( captcha_needed() ){
+    uSeed = captcha_seed();
+    zDecoded = captcha_decode(uSeed);
+    zCaptcha = captcha_render(zDecoded);
+  }
+  style_header("Message To Administrator");
+  form_begin(0, "%R/contact_admin");
+  @ <p>Enter a message to the repository administrator below:</p>
+  @ <table class="subscribe">
+  if( zCaptcha ){
+    @ <tr>
+    @  <td class="form_label">Security&nbsp;Code:</td>
+    @  <td><input type="text" name="captcha" value="" size="10">
+    @  <input type="hidden" name="captchaseed" value="%u(uSeed)"></td>
+    @ </tr>
+  }
+  @ <tr>
+  @  <td class="form_label">Your&nbsp;Email&nbsp;Address:</td>
+  @  <td><input type="text" name="from" value="%h(PT("from"))" size="30"></td>
+  @ </tr>
+  @ <tr>
+  @  <td class="form_label">Subject:</td>
+  @  <td><input type="text" name="subject" value="%h(PT("subject"))"\
+  @  size="80"></td>
+  @ </tr>
+  @ <tr>
+  @  <td class="form_label">Message:</td>
+  @  <td><textarea name="msg" cols="80" rows="10" wrap="virtual">\
+  @ %h(PT("msg"))</textarea>
+  @ </tr>
+  @ <tr>
+  @   <td></td>
+  @   <td><input type="submit" name="submit" value="Send Message">
+  @ </tr>
+  @ </table>
+  if( zCaptcha ){
+    @ <div class="captcha"><table class="captcha"><tr><td><pre class="captcha">
+    @ %h(zCaptcha)
+    @ </pre>
+    @ Enter the 8 characters above in the "Security Code" box
+    @ </td></tr></table></div>
+  }
+  @ </form>
+  style_footer();
+}
+
+/*
+** Send an annoucement message described by query parameter.
+** Permission to do this has already been verified.
+*/
+static char *alert_send_announcement(void){
+  AlertSender *pSender;
+  char *zErr;
+  const char *zTo = PT("to");
+  char *zSubject = PT("subject");
+  int bAll = PB("all");
+  int bAA = PB("aa");
+  const char *zSub = db_get("email-subname", "[Fossil Repo]");
+  int bTest2 = fossil_strcmp(P("name"),"test2")==0;
+  Blob hdr, body;
+  blob_init(&body, 0, 0);
+  blob_init(&hdr, 0, 0);
+  blob_appendf(&body, "%s", PT("msg")/*safe-for-%s*/);
+  pSender = alert_sender_new(bTest2 ? "blob" : 0, 0);
+  if( zTo[0] ){
+    blob_appendf(&hdr, "To: <%s>\r\nSubject: %s %s\r\n", zTo, zSub, zSubject);
+    alert_send(pSender, &hdr, &body, 0);
+  }
+  if( bAll || bAA ){
+    Stmt q;
+    int nUsed = blob_size(&body);
+    const char *zURL =  db_get("email-url",0);
+    db_prepare(&q, "SELECT semail, hex(subscriberCode) FROM subscriber "
+                   " WHERE sverified AND NOT sdonotcall %s",
+                   bAll ? "" : " AND ssub LIKE '%a%'");
+    while( db_step(&q)==SQLITE_ROW ){
+      const char *zCode = db_column_text(&q, 1);
+      zTo = db_column_text(&q, 0);
+      blob_truncate(&hdr, 0);
+      blob_appendf(&hdr, "To: <%s>\r\nSubject: %s %s\r\n", zTo, zSub, zSubject);
+      if( zURL ){
+        blob_truncate(&body, nUsed);
+        blob_appendf(&body,"\n-- \nSubscription info: %s/alerts/%s\n",
+           zURL, zCode);
+      }
+      alert_send(pSender, &hdr, &body, 0);
+    }
+    db_finalize(&q);
+  }
+  if( bTest2 ){
+    /* If the URL is /announce/test2 instead of just /announce, then no
+    ** email is actually sent.  Instead, the text of the email that would
+    ** have been sent is displayed in the result window. */
+    @ <pre style='border: 2px solid blue; padding: 1ex'>
+    @ %h(blob_str(&pSender->out))
+    @ </pre>
+  }
+  zErr = pSender->zErr;
+  pSender->zErr = 0;
+  alert_sender_free(pSender);
+  return zErr;
+}
+
+
+/*
+** WEBPAGE: announce
+**
+** A web-form, available to users with the "Send-Announcement" or "A"
+** capability, that allows one to send announcements to whomever
+** has subscribed to receive announcements.  The administrator can
+** also send a message to an arbitrary email address and/or to all
+** subscribers regardless of whether or not they have elected to
+** receive announcements.
+*/
+void announce_page(void){
+  login_check_credentials();
+  if( !g.perm.Announce ){
+    login_needed(0);
+    return;
+  }
+  if( fossil_strcmp(P("name"),"test1")==0 ){
+    /* Visit the /announce/test1 page to see the CGI variables */
+    @ <p style='border: 1px solid black; padding: 1ex;'>
+    cgi_print_all(0, 0);
+    @ </p>
+  }else
+  if( P("submit")!=0 && cgi_csrf_safe(1) ){
+    char *zErr = alert_send_announcement();
+    style_header("Announcement Sent");
+    if( zErr ){
+      @ <h1>Internal Error</h1>
+      @ <p>The following error was reported by the system:
+      @ <blockquote><pre>
+      @ %h(zErr)
+      @ </pre></blockquote>
+    }else{
+      @ <p>The announcement has been sent.</p>
+    }
+    style_footer();    
+    return;
+  }
+  style_header("Send Announcement");
+  @ <form method="POST">
+  @ <table class="subscribe">
+  if( g.perm.Admin ){
+    int aa = PB("aa");
+    int all = PB("all");
+    const char *aack = aa ? "checked" : "";
+    const char *allck = all ? "checked" : "";
+    @ <tr>
+    @  <td class="form_label">To:</td>
+    @  <td><input type="text" name="to" value="%h(PT("to"))" size="30"><br>
+    @  <label><input type="checkbox" name="aa" %s(aack)> \
+    @  All "announcement" subscribers</label> \
+    @  <a href="%R/subscribers?only=a" target="_blank">(list)</a><br>
+    @  <label><input type="checkbox" name="all" %s(allck)> \
+    @  All subscribers</label> \
+    @  <a href="%R/subscribers" target="_blank">(list)</a><br></td>
+    @ </tr>
+  }
+  @ <tr>
+  @  <td class="form_label">Subject:</td>
+  @  <td><input type="text" name="subject" value="%h(PT("subject"))"\
+  @  size="80"></td>
+  @ </tr>
+  @ <tr>
+  @  <td class="form_label">Message:</td>
+  @  <td><textarea name="msg" cols="80" rows="10" wrap="virtual">\
+  @ %h(PT("msg"))</textarea>
+  @ </tr>
+  @ <tr>
+  @   <td></td>
+  @   <td><input type="submit" name="submit" value="Send Message">
+  @ </tr>
+  @ </table>
+  @ </form>
+  style_footer();
+}

Index: src/backoffice.c
==================================================================
--- src/backoffice.c
+++ src/backoffice.c
@@ -519,11 +519,11 @@
       fclose(pLog);
     }
   }
 
   /* Here is where the actual work of the backoffice happens */
-  email_backoffice(0);
+  alert_backoffice(0);
   smtp_cleanup();
 }
 
 /*
 ** COMMAND: backoffice

Index: src/browse.c
==================================================================
--- src/browse.c
+++ src/browse.c
@@ -121,10 +121,11 @@
 */
 void page_dir(void){
   char *zD = fossil_strdup(P("name"));
   int nD = zD ? strlen(zD)+1 : 0;
   int mxLen;
+  int n;
   char *zPrefix;
   Stmt q;
   const char *zCI = P("ci");
   int rid = 0;
   char *zUuid = 0;
@@ -267,13 +268,15 @@
 
   /* Generate a multi-column table listing the contents of zD[]
   ** directory.
   */
   mxLen = db_int(12, "SELECT max(length(x)) FROM localfiles /*scan*/");
+  n = db_int(1,"SELECT count(*) FROM localfiles; /*scan*/");
   if( mxLen<12 ) mxLen = 12;
+  mxLen += (mxLen+9)/10;
   db_prepare(&q, "SELECT x, u FROM localfiles ORDER BY x /*scan*/");
-  @ <div class="columns" style="column-width: %d(mxLen+(mxLen+9)/10)ex;">
+  @ <div class="columns" style="columns: %d(mxLen)ex %d(n);">
   @ <ul class="browser">
   while( db_step(&q)==SQLITE_ROW ){
     const char *zFN;
     zFN = db_column_text(&q, 0);
     if( zFN[0]=='/' ){

Index: src/capabilities.c
==================================================================
--- src/capabilities.c
+++ src/capabilities.c
@@ -205,90 +205,119 @@
   capability_expand(p);
   zOut = capability_string(p);
   sqlite3_result_text(context, zOut, -1, fossil_free);
   capability_free(p);
 }
+
+#if INTERFACE
+/*
+** Capabilities are grouped into "classes" as follows:
+*/
+#define CAPCLASS_CODE  0x0001
+#define CAPCLASS_WIKI  0x0002
+#define CAPCLASS_TKT   0x0004
+#define CAPCLASS_FORUM 0x0008
+#define CAPCLASS_DATA  0x0010
+#define CAPCLASS_ALERT 0x0020
+#define CAPCLASS_OTHER 0x0040
+#define CAPCLASS_SUPER 0x0080
+#define CAPCLASS_ALL   0xffff
+#endif /* INTERFACE */
+
+
+/*
+** The following structure holds descriptions of the various capabilities.
+*/
+static struct Caps {
+  char cCap;              /* The capability letter */
+  unsigned short eClass;  /* The "class" for this capability */
+  char *zAbbrev;          /* Abbreviated mnemonic name */
+  char *zOneLiner;        /* One-line summary */
+} aCap[] = {
+  { 'a', CAPCLASS_SUPER,
+    "Admin", "Create and delete users" },
+  { 'b', CAPCLASS_WIKI|CAPCLASS_TKT,
+    "Attach", "Add attchments to wiki or tickets" },
+  { 'c', CAPCLASS_TKT,
+    "Append-Tkt", "Append to existing tickets" },
+  { 'd', CAPCLASS_WIKI|CAPCLASS_TKT,
+    "Delete", "Delete wiki or tickets" },
+  { 'e', CAPCLASS_DATA,
+    "View-PII", "View sensitive info such as email addresses" },
+  { 'f', CAPCLASS_WIKI,
+    "New-Wiki", "Create new wiki pages" },
+  { 'g', CAPCLASS_DATA,
+    "Clone", "Clone the repository" },
+  { 'h', CAPCLASS_OTHER,
+    "Hyperlinks", "Show hyperlinks to detailed repository history" },
+  { 'i', CAPCLASS_CODE,
+    "Check-In", "Check-in code changes" },
+  { 'j', CAPCLASS_WIKI,
+    "Read-Wiki", "View wiki pages" },
+  { 'k', CAPCLASS_WIKI,
+    "Write-Wiki", "Edit wiki pages" },
+  { 'l', CAPCLASS_WIKI|CAPCLASS_SUPER,
+    "Mod-Wiki", "Moderator for wiki pages" },
+  { 'm', CAPCLASS_WIKI,
+    "Append-Wiki", "Append to wiki pages" },
+  { 'n', CAPCLASS_TKT,
+    "New-Tkt", "Create new tickets" },
+  { 'o', CAPCLASS_CODE,
+    "Check-Out", "Check out code" },
+  { 'p', CAPCLASS_OTHER,
+    "Password", "Change your own password" },
+  { 'q', CAPCLASS_TKT|CAPCLASS_SUPER,
+    "Mod-Tkt", "Moderate tickets" },
+  { 'r', CAPCLASS_TKT,
+    "Read-Tkt", "View tickets" },
+  { 's', CAPCLASS_SUPER,
+    "Superuser", "Setup and configure the respository" },
+  { 't', CAPCLASS_TKT,
+    "Reports", "Create new ticket report formats" },
+  { 'u', CAPCLASS_OTHER,
+    "Reader", "Inherit all the capabilities of the \"reader\" user" },
+  { 'v', CAPCLASS_OTHER,
+    "Developer", "Inherit all capabilities of the \"developer\" user" },
+  { 'w', CAPCLASS_TKT,
+    "Write-Tkt", "Edit tickets" },
+  { 'x', CAPCLASS_DATA,
+    "Private", "Push and/or pull private branches" },
+  { 'y', CAPCLASS_SUPER,
+    "Write-UV", "Push unversioned content" },
+  { 'z', CAPCLASS_CODE,
+    "Zip-Download", "Download a ZIP archive, tarball, or SQL archive" },
+  { '2', CAPCLASS_FORUM,
+    "Forum-Read", "Read forum posts by others" },
+  { '3', CAPCLASS_FORUM,
+    "Forum-Write", "Create new forum messages" },
+  { '4', CAPCLASS_FORUM,
+    "Forum-Trusted", "Create forum messages that bypass moderation" },
+  { '5', CAPCLASS_FORUM|CAPCLASS_SUPER,
+    "Forum-Mod", "Moderator for forum messages" },
+  { '6', CAPCLASS_FORUM|CAPCLASS_SUPER,
+    "Forum-Admin", "Set or remove capability '4' from other users" },
+  { '7', CAPCLASS_ALERT,
+    "Alerts", "Sign up for email alerts" },
+  { 'A', CAPCLASS_ALERT|CAPCLASS_SUPER,
+    "Announce", "Send announcements to all subscribers" },
+  { 'D', CAPCLASS_OTHER,
+    "Debug", "Enable debugging features" },
+};
+
 
 /*
 ** Generate HTML that lists all of the capability letters together with
 ** a brief summary of what each letter means.
 */
-void capabilities_table(void){
+void capabilities_table(unsigned mClass){
+  int i;
   @ <table>
-     @ <tr><th valign="top">a</th>
-     @   <td><i>Admin:</i> Create and delete users</td></tr>
-     @ <tr><th valign="top">b</th>
-     @   <td><i>Attach:</i> Add attachments to wiki or tickets</td></tr>
-     @ <tr><th valign="top">c</th>
-     @   <td><i>Append-Tkt:</i> Append to tickets</td></tr>
-     @ <tr><th valign="top">d</th>
-     @   <td><i>Delete:</i> Delete wiki and tickets</td></tr>
-     @ <tr><th valign="top">e</th>
-     @   <td><i>View-PII:</i> \
-     @ View sensitive data such as email addresses</td></tr>
-     @ <tr><th valign="top">f</th>
-     @   <td><i>New-Wiki:</i> Create new wiki pages</td></tr>
-     @ <tr><th valign="top">g</th>
-     @   <td><i>Clone:</i> Clone the repository</td></tr>
-     @ <tr><th valign="top">h</th>
-     @   <td><i>Hyperlinks:</i> Show hyperlinks to detailed
-     @   repository history</td></tr>
-     @ <tr><th valign="top">i</th>
-     @   <td><i>Check-In:</i> Commit new versions in the repository</td></tr>
-     @ <tr><th valign="top">j</th>
-     @   <td><i>Read-Wiki:</i> View wiki pages</td></tr>
-     @ <tr><th valign="top">k</th>
-     @   <td><i>Write-Wiki:</i> Edit wiki pages</td></tr>
-     @ <tr><th valign="top">l</th>
-     @   <td><i>Mod-Wiki:</i> Moderator for wiki pages</td></tr>
-     @ <tr><th valign="top">m</th>
-     @   <td><i>Append-Wiki:</i> Append to wiki pages</td></tr>
-     @ <tr><th valign="top">n</th>
-     @   <td><i>New-Tkt:</i> Create new tickets</td></tr>
-     @ <tr><th valign="top">o</th>
-     @   <td><i>Check-Out:</i> Check out versions</td></tr>
-     @ <tr><th valign="top">p</th>
-     @   <td><i>Password:</i> Change your own password</td></tr>
-     @ <tr><th valign="top">q</th>
-     @   <td><i>Mod-Tkt:</i> Moderator for tickets</td></tr>
-     @ <tr><th valign="top">r</th>
-     @   <td><i>Read-Tkt:</i> View tickets</td></tr>
-     @ <tr><th valign="top">s</th>
-     @   <td><i>Setup/Super-user:</i> Setup and configure this website</td></tr>
-     @ <tr><th valign="top">t</th>
-     @   <td><i>Tkt-Report:</i> Create new bug summary reports</td></tr>
-     @ <tr><th valign="top">u</th>
-     @   <td><i>Reader:</i> Inherit privileges of
-     @   user <tt>reader</tt></td></tr>
-     @ <tr><th valign="top">v</th>
-     @   <td><i>Developer:</i> Inherit privileges of
-     @   user <tt>developer</tt></td></tr>
-     @ <tr><th valign="top">w</th>
-     @   <td><i>Write-Tkt:</i> Edit tickets</td></tr>
-     @ <tr><th valign="top">x</th>
-     @   <td><i>Private:</i> Push and/or pull private branches</td></tr>
-     @ <tr><th valign="top">y</th>
-     @   <td><i>Write-Unver:</i> Push unversioned files</td></tr>
-     @ <tr><th valign="top">z</th>
-     @   <td><i>Zip download:</i> Download a ZIP archive or tarball</td></tr>
-     @ <tr><th valign="top">2</th>
-     @   <td><i>Forum-Read:</i> Read forum posts by others </td></tr>
-     @ <tr><th valign="top">3</th>
-     @   <td><i>Forum-Append:</i> Add new forum posts</td></tr>
-     @ <tr><th valign="top">4</th>
-     @   <td><i>Forum-Trusted:</i> Add pre-approved forum posts </td></tr>
-     @ <tr><th valign="top">5</th>
-     @   <td><i>Forum-Moderator:</i> Approve or disapprove forum posts</td></tr>
-     @ <tr><th valign="top">6</th>
-     @   <td><i>Forum-Supervisor:</i> \
-     @ Forum administrator: Set or remove capability "4" for other users
-     @ <tr><th valign="top">7</th>
-     @   <td><i>Email-Alerts:</i> Sign up for email nofications</td></tr>
-     @ <tr><th valign="top">A</th>
-     @   <td><i>Announce:</i> Send announcements</td></tr>
-     @ <tr><th valign="top">D</th>
-     @   <td><i>Debug:</i> Enable debugging features</td></tr>
+  for(i=0; i<sizeof(aCap)/sizeof(aCap[0]); i++){
+    if( (aCap[i].eClass & mClass)==0 ) continue;
+    @ <tr><th valign="top">%c(aCap[i].cCap)</th>
+    @  <td><i>%h(aCap[i].zAbbrev):</i> %h(aCap[i].zOneLiner)</td></tr>
+  }
   @ </table>
 }
 
 /*
 ** Generate a "capability summary table" that shows the major capabilities

Index: src/captcha.c
==================================================================
--- src/captcha.c
+++ src/captcha.c
@@ -539,11 +539,11 @@
 
   if( !captcha_needed() ) return;
   uSeed = captcha_seed();
   zDecoded = captcha_decode(uSeed);
   zCaptcha = captcha_render(zDecoded);
-  @ <div class="captcha"><table class="captcha"><tr><td><pre>
+  @ <div class="captcha"><table class="captcha"><tr><td><pre class="captcha">
   @ %h(zCaptcha)
   @ </pre>
   @ Enter security code shown above:
   @ <input type="hidden" name="captchaseed" value="%u(uSeed)" />
   @ <input type="text" name="captcha" size=8 />

Index: src/codecheck1.c
==================================================================
--- src/codecheck1.c
+++ src/codecheck1.c
@@ -398,10 +398,11 @@
   { "json_warn",               2, 0 },
   { "mprintf",                 1, 0 },
   { "socket_set_errmsg",       1, 0 },
   { "ssl_set_errmsg",          1, 0 },
   { "style_header",            1, FMT_HTML },
+  { "style_js_onload",         1, FMT_HTML },
   { "style_set_current_page",  1, FMT_URL },
   { "style_submenu_element",   2, FMT_URL },
   { "style_submenu_sql",       3, FMT_SQL },
   { "webpage_error",           1, FMT_SAFE },
   { "xhref",                   2, FMT_URL },

Index: src/configure.c
==================================================================
--- src/configure.c
+++ src/configure.c
@@ -99,10 +99,14 @@
   { "timeline-max-comment",   CONFIGSET_SKIN },
   { "timeline-plaintext",     CONFIGSET_SKIN },
   { "adunit",                 CONFIGSET_SKIN },
   { "adunit-omit-if-admin",   CONFIGSET_SKIN },
   { "adunit-omit-if-user",    CONFIGSET_SKIN },
+  { "sitemap-docidx",         CONFIGSET_SKIN },
+  { "sitemap-download",       CONFIGSET_SKIN },
+  { "sitemap-license",        CONFIGSET_SKIN },
+  { "sitemap-contact",        CONFIGSET_SKIN },
 
 #ifdef FOSSIL_ENABLE_TH1_DOCS
   { "th1-docs",               CONFIGSET_TH1 },
 #endif
 #ifdef FOSSIL_ENABLE_TH1_HOOKS
@@ -398,11 +402,11 @@
       thisMask = configure_is_exportable(aType[ii].zName);
     }
     if( (thisMask & groupMask)==0 ) return;
     if( (thisMask & checkMask)!=0 ){
       if( (thisMask & CONFIGSET_SCRIBER)!=0 ){
-        email_schema(1);
+        alert_schema(1);
       }
       checkMask &= ~thisMask;
     }
 
     blob_zero(&sql);
@@ -415,11 +419,11 @@
     }else{
       blob_append_sql(&sql, "INSERT OR IGNORE INTO ");
     }
     blob_append_sql(&sql, "\"%w\"(\"%w\",mtime",
          &zName[1], aType[ii].zPrimKey);
-    if( fossil_stricmp(zName,"/subscriber") ) email_schema(0);
+    if( fossil_stricmp(zName,"/subscriber") ) alert_schema(0);
     for(jj=2; jj<nToken; jj+=2){
        blob_append_sql(&sql, ",\"%w\"", azToken[jj]);
     }
     blob_append_sql(&sql,") VALUES(%s,%s",
        azToken[1] /*safe-for-%s*/, azToken[0]/*safe-for-%s*/);

Index: src/db.c
==================================================================
--- src/db.c
+++ src/db.c
@@ -1001,11 +1001,11 @@
   sqlite3_create_function(db, "capunion", 1, SQLITE_UTF8, 0,
                           0, capability_union_step, capability_union_finalize);
   sqlite3_create_function(db, "fullcap", 1, SQLITE_UTF8, 0,
                           capability_fullcap, 0, 0);
   sqlite3_create_function(db, "find_emailaddr", 1, SQLITE_UTF8, 0,
-                          email_find_emailaddr_func, 0, 0);
+                          alert_find_emailaddr_func, 0, 0);
 }
 
 #if USE_SEE
 /*
 ** This is a pointer to the saved database encryption key string.

Index: src/default_css.txt
==================================================================
--- src/default_css.txt
+++ src/default_css.txt
@@ -188,17 +188,20 @@
 }
 div.columns {
   padding: 0 2em 0 2em;
   max-width: 1000px;
 }
-div.columns ul {
+div.columns > ul {
   margin: 0;
-  padding: 0;
+  padding: 0 0 0 1em;
 }
-div.columns ul li:first-child {
+div.columns > ul li:first-child {
   margin-top:0px;
 }
+div.columns li {
+  break-inside: avoid;
+}
 .filetree {
   margin: 1em 0;
   line-height: 1.5;
 }
 .filetree > ul {
@@ -303,10 +306,13 @@
   padding: 10px;
   border-width: 4px;
   border-style: double;
   border-color: black;
 }
+pre.captcha {
+  font-size: 50%;
+}
 td.login_out_label {
   text-align: center;
 }
 span.loginError {
   color: red;

Index: src/doc.c
==================================================================
--- src/doc.c
+++ src/doc.c
@@ -467,10 +467,14 @@
 ** if the file is not found or could not be loaded.
 */
 int doc_load_content(int vid, const char *zName, Blob *pContent){
   int writable = db_is_writeable("repository");
   int rid;   /* The RID of the file being loaded */
+  if( writable ){
+    db_end_transaction(0);
+    db_begin_write();
+  }
   if( !db_table_exists("repository", "vcache") || !writable ){
     db_multi_exec(
       "CREATE %s TABLE IF NOT EXISTS vcache(\n"
       "  vid INTEGER,         -- check-in ID\n"
       "  fname TEXT,          -- filename\n"

DELETED src/email.c
Index: src/email.c
==================================================================
--- src/email.c
+++ /dev/null
@@ -1,2726 +0,0 @@
-/*
-** Copyright (c) 2018 D. Richard Hipp
-**
-** This program is free software; you can redistribute it and/or
-** modify it under the terms of the Simplified BSD License (also
-** known as the "2-Clause License" or "FreeBSD License".)
-**
-** This program is distributed in the hope that it will be useful,
-** but without any warranty; without even the implied warranty of
-** merchantability or fitness for a particular purpose.
-**
-** Author contact information:
-**   drh@hwaci.com
-**   http://www.hwaci.com/drh/
-**
-*******************************************************************************
-**
-** Logic for email notification, also known as "alerts".
-**
-** Are you looking for the code that reads and writes the internet
-** email protocol?  That is not here.  See the "smtp.c" file instead.
-** Yes, the choice of source code filenames is not the greatest, but
-** it is not so bad that changing them seems justified.
-*/ 
-#include "config.h"
-#include "email.h"
-#include <assert.h>
-#include <time.h>
-
-/*
-** Maximum size of the subscriberCode blob, in bytes
-*/
-#define SUBSCRIBER_CODE_SZ 32
-
-/*
-** SQL code to implement the tables needed by the email notification
-** system.
-*/
-static const char zEmailInit[] =
-@ DROP TABLE IF EXISTS repository.subscriber;
-@ -- Subscribers are distinct from users.  A person can have a log-in in
-@ -- the USER table without being a subscriber.  Or a person can be a
-@ -- subscriber without having a USER table entry.  Or they can have both.
-@ -- In the last case the suname column points from the subscriber entry
-@ -- to the USER entry.
-@ --
-@ -- The ssub field is a string where each character indicates a particular
-@ -- type of event to subscribe to.  Choices:
-@ --     a - Announcements
-@ --     c - Check-ins
-@ --     t - Ticket changes
-@ --     w - Wiki changes
-@ -- Probably different codes will be added in the future.  In the future
-@ -- we might also add a separate table that allows subscribing to email
-@ -- notifications for specific branches or tags or tickets.
-@ --
-@ CREATE TABLE repository.subscriber(
-@   subscriberId INTEGER PRIMARY KEY, -- numeric subscriber ID.  Internal use
-@   subscriberCode BLOB DEFAULT (randomblob(32)) UNIQUE, -- UUID for subscriber
-@   semail TEXT UNIQUE COLLATE nocase,-- email address
-@   suname TEXT,                      -- corresponding USER entry
-@   sverified BOOLEAN DEFAULT true,   -- email address verified
-@   sdonotcall BOOLEAN,               -- true for Do Not Call 
-@   sdigest BOOLEAN,                  -- true for daily digests only
-@   ssub TEXT,                        -- baseline subscriptions
-@   sctime INTDATE,                   -- When this entry was created. unixtime
-@   mtime INTDATE,                    -- Last change.  unixtime
-@   smip TEXT                         -- IP address of last change
-@ );
-@ CREATE INDEX repository.subscriberUname
-@   ON subscriber(suname) WHERE suname IS NOT NULL;
-@ 
-@ DROP TABLE IF EXISTS repository.pending_alert;
-@ -- Email notifications that need to be sent.
-@ --
-@ -- The first character of the eventid determines the event type.
-@ -- Remaining characters determine the specific event.  For example,
-@ -- 'c4413' means check-in with rid=4413.
-@ --
-@ CREATE TABLE repository.pending_alert(
-@   eventid TEXT PRIMARY KEY,         -- Object that changed
-@   sentSep BOOLEAN DEFAULT false,    -- individual alert sent
-@   sentDigest BOOLEAN DEFAULT false, -- digest alert sent
-@   sentMod BOOLEAN DEFAULT false     -- pending moderation alert sent
-@ ) WITHOUT ROWID;
-@ 
-@ DROP TABLE IF EXISTS repository.email_bounce;
-@ -- Record bounced emails.  If too many bounces are received within
-@ -- some defined time range, then cancel the subscription.  Older
-@ -- entries are periodically purged.
-@ --
-@ CREATE TABLE repository.email_bounce(
-@   subscriberId INTEGER, -- to whom the email was sent.
-@   sendTime INTEGER,     -- seconds since 1970 when email was sent
-@   rcvdTime INTEGER      -- seconds since 1970 when bounce was received
-@ );
-;
-
-/*
-** Return true if the email notification tables exist.
-*/
-int email_tables_exist(void){
-  return db_table_exists("repository", "subscriber");
-}
-
-/*
-** Make sure the table needed for email notification exist in the repository.
-**
-** If the bOnlyIfEnabled option is true, then tables are only created
-** if the email-send-method is something other than "off".
-*/
-void email_schema(int bOnlyIfEnabled){
-  if( !email_tables_exist() ){
-    if( bOnlyIfEnabled
-     && fossil_strcmp(db_get("email-send-method","off"),"off")==0
-    ){
-      return;  /* Don't create table for disabled email */
-    }
-    db_multi_exec(zEmailInit/*works-like:""*/);
-    email_triggers_enable();
-  }else if( !db_table_has_column("repository","pending_alert","sentMod") ){
-    db_multi_exec(
-      "ALTER TABLE repository.pending_alert"
-      " ADD COLUMN sentMod BOOLEAN DEFAULT false;"
-    );
-  }
-}
-
-/*
-** Enable triggers that automatically populate the pending_alert
-** table.
-*/
-void email_triggers_enable(void){
-  if( !db_table_exists("repository","pending_alert") ) return;
-  db_multi_exec(
-    "CREATE TRIGGER IF NOT EXISTS repository.email_trigger1\n"
-    "AFTER INSERT ON event BEGIN\n"
-    "  INSERT INTO pending_alert(eventid)\n"
-    "    SELECT printf('%%.1c%%d',new.type,new.objid) WHERE true\n"
-    "    ON CONFLICT(eventId) DO NOTHING;\n"
-    "END;"
-  );
-}
-
-/*
-** Disable triggers the event_pending triggers.
-**
-** This must be called before rebuilding the EVENT table, for example
-** via the "fossil rebuild" command.
-*/
-void email_triggers_disable(void){
-  db_multi_exec(
-    "DROP TRIGGER IF EXISTS repository.email_trigger1;\n"
-  );
-}
-
-/*
-** Return true if email alerts are active.
-*/
-int email_enabled(void){
-  if( !email_tables_exist() ) return 0;
-  if( fossil_strcmp(db_get("email-send-method","off"),"off")==0 ) return 0;
-  return 1;
-}
-
-/*
-** If the subscriber table does not exist, then paint an error message
-** web page and return true.
-**
-** If the subscriber table does exist, return 0 without doing anything.
-*/
-static int email_webpages_disabled(void){
-  if( email_tables_exist() ) return 0;
-  style_header("Email Alerts Are Disabled");
-  @ <p>Email alerts are disabled on this server</p>
-  style_footer();
-  return 1;
-}
-
-/*
-** Insert a "Subscriber List" submenu link if the current user
-** is an administrator.
-*/
-void email_submenu_common(void){
-  if( g.perm.Admin ){
-    if( fossil_strcmp(g.zPath,"subscribers") ){
-      style_submenu_element("List Subscribers","%R/subscribers");
-    }
-    if( fossil_strcmp(g.zPath,"subscribe") ){
-      style_submenu_element("Add New Subscriber","%R/subscribe");
-    }
-  }
-}
-
-
-/*
-** WEBPAGE: setup_notification
-**
-** Administrative page for configuring and controlling email notification.
-** Normally accessible via the /Admin/Notification menu.
-*/
-void setup_notification(void){
-  static const char *const azSendMethods[] = {
-    "off",   "Disabled",
-    "pipe",  "Pipe to a command",
-    "db",    "Store in a database",
-    "dir",   "Store in a directory",
-    "relay", "SMTP relay"
-  };
-  login_check_credentials();
-  if( !g.perm.Setup ){
-    login_needed(0);
-    return;
-  }
-  db_begin_transaction();
-
-  email_submenu_common();
-  style_submenu_element("Send Announcement","%R/announce");
-  style_header("Email Notification Setup");
-  @ <h1>Status</h1>
-  @ <table class="label-value">
-  if( email_enabled() ){
-    stats_for_email();
-  }else{
-    @ <th>Disabled</th>
-  }
-  @ </table>
-  @ <hr>
-  @ <h1> Configuration </h1>
-  @ <form action="%R/setup_notification" method="post"><div>
-  @ <input type="submit"  name="submit" value="Apply Changes" /><hr>
-  login_insert_csrf_secret();
-
-  entry_attribute("Canonical Server URL", 40, "email-url",
-                   "eurl", "", 0);
-  @ <p><b>Required.</b>
-  @ This is URL used as the basename for hyperlinks included in
-  @ email alert text.  Omit the trailing "/".
-  @ Suggested value: "%h(g.zBaseURL)"
-  @ (Property: "email-url")</p>
-  @ <hr>
-
-  entry_attribute("\"Return-Path\" email address", 20, "email-self",
-                   "eself", "", 0);
-  @ <p><b>Required.</b>
-  @ This is the email to which email notification bounces should be sent.
-  @ In cases where the email notification does not align with a specific
-  @ Fossil login account (for example, digest messages), this is also
-  @ the "From:" address of the email notification.
-  @ The system administrator should arrange for emails sent to this address
-  @ to be handed off to the "fossil email incoming" command so that Fossil
-  @ can handle bounces. (Property: "email-self")</p>
-  @ <hr>
-
-  entry_attribute("Repository Nickname", 16, "email-subname",
-                   "enn", "", 0);
-  @ <p><b>Required.</b>
-  @ This is short name used to identifies the repository in the
-  @ Subject: line of email alerts.  Traditionally this name is
-  @ included in square brackets.  Examples: "[fossil-src]", "[sqlite-src]".
-  @ (Property: "email-subname")</p>
-  @ <hr>
-
-  multiple_choice_attribute("Email Send Method", "email-send-method", "esm",
-       "off", count(azSendMethods)/2, azSendMethods);
-  @ <p>How to send email.  Requires auxiliary information from the fields
-  @ that follow.  Hint: Use the <a href="%R/announce">/announce</a> page
-  @ to send test message to debug this setting.
-  @ (Property: "email-send-method")</p>
-  email_schema(1);
-  entry_attribute("Pipe Email Text Into This Command", 60, "email-send-command",
-                   "ecmd", "sendmail -ti", 0);
-  @ <p>When the send method is "pipe to a command", this is the command
-  @ that is run.  Email messages are piped into the standard input of this
-  @ command.  The command is expected to extract the sender address,
-  @ recepient addresses, and subject from the header of the piped email
-  @ text.  (Property: "email-send-command")</p>
-
-  entry_attribute("Store Emails In This Database", 60, "email-send-db",
-                   "esdb", "", 0);
-  @ <p>When the send method is "store in a databaes", each email message is
-  @ stored in an SQLite database file with the name given here.
-  @ (Property: "email-send-db")</p>
-
-  entry_attribute("Store Emails In This Directory", 60, "email-send-dir",
-                   "esdir", "", 0);
-  @ <p>When the send method is "store in a directory", each email message is
-  @ stored as a separate file in the directory shown here.
-  @ (Property: "email-send-dir")</p>
-
-  entry_attribute("SMTP Relay Host", 60, "email-send-relayhost",
-                   "esrh", "", 0);
-  @ <p>When the send method is "SMTP relay", each email message is
-  @ transmitted via the SMTP protocol (rfc5321) to a "Mail Submission
-  @ Agent" or "MSA" (rfc4409) at the hostname shown here.  Optionally
-  @ append a colon and TCP port number (ex: smtp.example.com:587).
-  @ The default TCP port number is 25.
-  @ (Property: "email-send-relayhost")</p>
-  @ <hr>
-
-  entry_attribute("Administrator email address", 40, "email-admin",
-                   "eadmin", "", 0);
-  @ <p>This is the email for the human administrator for the system.
-  @ Abuse and trouble reports are send here.
-  @ (Property: "email-admin")</p>
-  @ <hr>
-
-  @ <p><input type="submit"  name="submit" value="Apply Changes" /></p>
-  @ </div></form>
-  db_end_transaction(0);
-  style_footer();
-}
-
-#if 0
-/*
-** Encode pMsg as MIME base64 and append it to pOut
-*/
-static void append_base64(Blob *pOut, Blob *pMsg){
-  int n, i, k;
-  char zBuf[100];
-  n = blob_size(pMsg);
-  for(i=0; i<n; i+=54){
-    k = translateBase64(blob_buffer(pMsg)+i, i+54<n ? 54 : n-i, zBuf);
-    blob_append(pOut, zBuf, k);
-    blob_append(pOut, "\r\n", 2);
-  }
-}
-#endif
-
-/*
-** Encode pMsg using the quoted-printable email encoding and
-** append it onto pOut
-*/
-static void append_quoted(Blob *pOut, Blob *pMsg){
-  char *zIn = blob_str(pMsg);
-  char c;
-  int iCol = 0;
-  while( (c = *(zIn++))!=0 ){
-    if( (c>='!' && c<='~' && c!='=' && c!=':')
-     || (c==' ' && zIn[0]!='\r' && zIn[0]!='\n')
-    ){
-      blob_append_char(pOut, c);
-      iCol++;
-      if( iCol>=70 ){
-        blob_append(pOut, "=\r\n", 3);
-        iCol = 0;
-      }
-    }else if( c=='\r' && zIn[0]=='\n' ){
-      zIn++;
-      blob_append(pOut, "\r\n", 2);
-      iCol = 0;
-    }else if( c=='\n' ){
-      blob_append(pOut, "\r\n", 2);
-      iCol = 0;
-    }else{
-      char x[3];
-      x[0] = '=';
-      x[1] = "0123456789ABCDEF"[(c>>4)&0xf];
-      x[2] = "0123456789ABCDEF"[c&0xf];
-      blob_append(pOut, x, 3);
-      iCol += 3;
-    }
-  }
-}
-
-#if defined(_WIN32) || defined(WIN32)
-# undef popen
-# define popen _popen
-# undef pclose
-# define pclose _pclose
-#endif
-
-#if INTERFACE
-/*
-** An instance of the following object is used to send emails.
-*/
-struct EmailSender {
-  sqlite3 *db;               /* Database emails are sent to */
-  sqlite3_stmt *pStmt;       /* Stmt to insert into the database */
-  const char *zDest;         /* How to send email. */
-  const char *zDb;           /* Name of database file */
-  const char *zDir;          /* Directory in which to store as email files */
-  const char *zCmd;          /* Command to run for each email */
-  const char *zFrom;         /* Emails come from here */
-  SmtpSession *pSmtp;        /* SMTP relay connection */
-  Blob out;                  /* For zDest=="blob" */
-  char *zErr;                /* Error message */
-  u32 mFlags;                /* Flags */
-  int bImmediateFail;        /* On any error, call fossil_fatal() */
-};
-
-/* Allowed values for mFlags to email_sender_new().
-*/
-#define EMAIL_IMMEDIATE_FAIL   0x0001   /* Call fossil_fatal() on any error */
-#define EMAIL_TRACE            0x0002   /* Log sending process on console */
-
-#endif /* INTERFACE */
-
-/*
-** Shutdown an emailer.  Clear all information other than the error message.
-*/
-static void emailerShutdown(EmailSender *p){
-  sqlite3_finalize(p->pStmt);
-  p->pStmt = 0;
-  sqlite3_close(p->db);
-  p->db = 0;
-  p->zDb = 0;
-  p->zDir = 0;
-  p->zCmd = 0;
-  if( p->pSmtp ){
-    smtp_client_quit(p->pSmtp);
-    smtp_session_free(p->pSmtp);
-    p->pSmtp = 0;
-  }
-  blob_reset(&p->out);
-}
-
-/*
-** Put the EmailSender into an error state.
-*/
-static void emailerError(EmailSender *p, const char *zFormat, ...){
-  va_list ap;
-  fossil_free(p->zErr);
-  va_start(ap, zFormat);
-  p->zErr = vmprintf(zFormat, ap);
-  va_end(ap);
-  emailerShutdown(p);
-  if( p->mFlags & EMAIL_IMMEDIATE_FAIL ){
-    fossil_fatal("%s", p->zErr);
-  }
-}
-
-/*
-** Free an email sender object
-*/
-void email_sender_free(EmailSender *p){
-  if( p ){
-    emailerShutdown(p);
-    fossil_free(p->zErr);
-    fossil_free(p);
-  }
-}
-
-/*
-** Get an email setting value.  Report an error if not configured.
-** Return 0 on success and one if there is an error.
-*/
-static int emailerGetSetting(
-  EmailSender *p,        /* Where to report the error */
-  const char **pzVal,    /* Write the setting value here */
-  const char *zName      /* Name of the setting */
-){
-  const char *z = db_get(zName, 0);
-  int rc = 0;
-  if( z==0 || z[0]==0 ){
-    emailerError(p, "missing \"%s\" setting", zName);
-    rc = 1;
-  }else{
-    *pzVal = z;
-  }
-  return rc;
-}
-
-/*
-** Create a new EmailSender object.
-**
-** The method used for sending email is determined by various email-*
-** settings, and especially email-send-method.  The repository
-** email-send-method can be overridden by the zAltDest argument to
-** cause a different sending mechanism to be used.  Pass "stdout" to
-** zAltDest to cause all emails to be printed to the console for
-** debugging purposes.
-**
-** The EmailSender object returned must be freed using email_sender_free().
-*/
-EmailSender *email_sender_new(const char *zAltDest, u32 mFlags){
-  EmailSender *p;
-
-  p = fossil_malloc(sizeof(*p));
-  memset(p, 0, sizeof(*p));
-  blob_init(&p->out, 0, 0);
-  p->mFlags = mFlags;
-  if( zAltDest ){
-    p->zDest = zAltDest;
-  }else{
-    p->zDest = db_get("email-send-method","off");
-  }
-  if( fossil_strcmp(p->zDest,"off")==0 ) return p;
-  if( emailerGetSetting(p, &p->zFrom, "email-self") ) return p;
-  if( fossil_strcmp(p->zDest,"db")==0 ){
-    char *zErr;
-    int rc;
-    if( emailerGetSetting(p, &p->zDb, "email-send-db") ) return p;
-    rc = sqlite3_open(p->zDb, &p->db);
-    if( rc ){
-      emailerError(p, "unable to open output database file \"%s\": %s",
-                   p->zDb, sqlite3_errmsg(p->db));
-      return p;
-    }
-    rc = sqlite3_exec(p->db, "CREATE TABLE IF NOT EXISTS email(\n"
-                          "  emailid INTEGER PRIMARY KEY,\n"
-                          "  msg TEXT\n);", 0, 0, &zErr);
-    if( zErr ){
-      emailerError(p, "CREATE TABLE failed with \"%s\"", zErr);
-      sqlite3_free(zErr);
-      return p;
-    }
-    rc = sqlite3_prepare_v2(p->db, "INSERT INTO email(msg) VALUES(?1)", -1,
-                            &p->pStmt, 0);
-    if( rc ){
-      emailerError(p, "cannot prepare INSERT statement: %s",
-                 sqlite3_errmsg(p->db));
-      return p;
-    }
-  }else if( fossil_strcmp(p->zDest, "pipe")==0 ){
-    emailerGetSetting(p, &p->zCmd, "email-send-command");
-  }else if( fossil_strcmp(p->zDest, "dir")==0 ){
-    emailerGetSetting(p, &p->zDir, "email-send-dir");
-  }else if( fossil_strcmp(p->zDest, "blob")==0 ){
-    blob_init(&p->out, 0, 0);
-  }else if( fossil_strcmp(p->zDest, "relay")==0 ){
-    const char *zRelay = 0;
-    emailerGetSetting(p, &zRelay, "email-send-relayhost");
-    if( zRelay ){
-      u32 smtpFlags = SMTP_DIRECT;
-      if( mFlags & EMAIL_TRACE ) smtpFlags |= SMTP_TRACE_STDOUT;
-      p->pSmtp = smtp_session_new(p->zFrom, zRelay, smtpFlags);
-      smtp_client_startup(p->pSmtp);
-    }
-  }
-  return p;
-}
-
-/*
-** Scan the header of the email message in pMsg looking for the
-** (first) occurrance of zField.  Fill pValue with the content of
-** that field.
-**
-** This routine initializes pValue.  Any prior content of pValue is
-** discarded (leaked).
-**
-** Return non-zero on success.  Return 0 if no instance of the header
-** is found.
-*/
-int email_header_value(Blob *pMsg, const char *zField, Blob *pValue){
-  int nField = (int)strlen(zField);
-  Blob line;
-  blob_rewind(pMsg);
-  blob_init(pValue,0,0);
-  while( blob_line(pMsg, &line) ){
-    int n, i;
-    char *z;
-    blob_trim(&line);
-    n = blob_size(&line);
-    if( n==0 ) return 0;
-    if( n<nField+1 ) continue;
-    z = blob_buffer(&line);
-    if( sqlite3_strnicmp(z, zField, nField)==0 && z[nField]==':' ){
-      for(i=nField+1; i<n && fossil_isspace(z[i]); i++){}
-      blob_init(pValue, z+i, n-i);
-      while( blob_line(pMsg, &line) ){
-        blob_trim(&line);
-        n = blob_size(&line);
-        if( n==0 ) break;
-        z = blob_buffer(&line);
-        if( !fossil_isspace(z[0]) ) break;
-        for(i=1; i<n && fossil_isspace(z[i]); i++){}
-        blob_append(pValue, " ", 1);
-        blob_append(pValue, z+i, n-i);
-      }
-      return 1;
-    }
-  }
-  return 0;
-}
-
-/*
-** Make a copy of the input string up to but not including the
-** first cTerm character.
-**
-** Verify that the string really that is to be copied really is a
-** valid email address.  If it is not, then return NULL.
-**
-** This routine is more restrictive than necessary.  It does not
-** allow comments, IP address, quoted strings, or certain uncommon
-** characters.  The only non-alphanumerics allowed in the local
-** part are "_", "+", "-" and "+".
-*/
-char *email_copy_addr(const char *z, char cTerm ){
-  int i;
-  int nAt = 0;
-  int nDot = 0;
-  char c;
-  if( z[0]=='.' ) return 0;  /* Local part cannot begin with "." */
-  for(i=0; (c = z[i])!=0 && c!=cTerm; i++){
-    if( fossil_isalnum(c) ){
-      /* Alphanumerics are always ok */
-    }else if( c=='@' ){
-      if( nAt ) return 0;   /* Only a single "@"  allowed */
-      if( i>64 ) return 0;  /* Local part too big */
-      nAt = 1;
-      nDot = 0;
-      if( i==0 ) return 0;  /* Disallow empty local part */
-      if( z[i-1]=='.' ) return 0; /* Last char of local cannot be "." */
-      if( z[i+1]=='.' || z[i+1]=='-' ){
-        return 0; /* Domain cannot begin with "." or "-" */
-      }
-    }else if( c=='-' ){
-      if( z[i+1]==cTerm ) return 0;  /* Last character cannot be "-" */
-    }else if( c=='.' ){
-      if( z[i+1]=='.' ) return 0;  /* Do not allow ".." */
-      if( z[i+1]==cTerm ) return 0;  /* Domain may not end with . */
-      nDot++;
-    }else if( (c=='_' || c=='+') && nAt==0 ){
-      /* _ and + are ok in the local part */
-    }else{
-      return 0;   /* Anything else is an error */
-    }
-  }
-  if( c!=cTerm ) return 0;    /* Missing terminator */
-  if( nAt==0 ) return 0;      /* No "@" found anywhere */
-  if( nDot==0 ) return 0;     /* No "." in the domain */
-
-  /* If we reach this point, the email address is valid */
-  return mprintf("%.*s", i, z);
-}
-
-/*
-** Scan the input string for a valid email address enclosed in <...>
-** If the string contains one or more email addresses, extract the first
-** one into memory obtained from mprintf() and return a pointer to it.
-** If no valid email address can be found, return NULL.
-*/
-char *email_find_emailaddr(const char *zIn){
-  char *zOut = 0;
-  while( zIn!=0 ){
-     zIn = (const char*)strchr(zIn, '<');
-     if( zIn==0 ) break;
-     zIn++;
-     zOut = email_copy_addr(zIn, '>');
-     if( zOut!=0 ) break;
-  }
-  return zOut;
-}
-
-/*
-** SQL function:  find_emailaddr(X)
-**
-** Return the first valid email address of the form <...> in input string
-** X.  Or return NULL if not found.
-*/
-void email_find_emailaddr_func(
-  sqlite3_context *context,
-  int argc,
-  sqlite3_value **argv
-){
-  const char *zIn = (const char*)sqlite3_value_text(argv[0]);
-  char *zOut = email_find_emailaddr(zIn);
-  if( zOut ){
-    sqlite3_result_text(context, zOut, -1, fossil_free);
-  }
-}
-
-/*
-** Return the hostname portion of an email address - the part following
-** the @
-*/
-char *email_hostname(const char *zAddr){
-  char *z = strchr(zAddr, '@');
-  if( z ){
-    z++;
-  }else{
-    z = (char*)zAddr;
-  }
-  return z;
-}
-
-/*
-** Return a pointer to a fake email mailbox name that corresponds
-** to human-readable name zFromName.  The fake mailbox name is based
-** on a hash.  No huge problems arise if there is a hash collisions,
-** but it is still better if collisions can be avoided.
-**
-** The returned string is held in a static buffer and is overwritten
-** by each subsequent call to this routine.
-*/
-static char *email_mailbox_name(const char *zFromName){
-  static char zHash[20];
-  unsigned int x = 0;
-  int n = 0;
-  while( zFromName[0] ){
-    n++;
-    x = x*1103515245 + 12345 + ((unsigned char*)zFromName)[0];
-    zFromName++;
-  }
-  sqlite3_snprintf(sizeof(zHash), zHash,
-      "noreply%x%08x", n, x);
-  return zHash;
-}
-
-/*
-** COMMAND: test-mailbox-hashname
-**
-** Usage: %fossil test-mailbox-hashname HUMAN-NAME ...
-**
-** Return the mailbox hash name corresponding to each human-readable
-** name on the command line.  This is a test interface for the
-** email_mailbox_name() function.
-*/
-void email_test_mailbox_hashname(void){
-  int i;
-  for(i=2; i<g.argc; i++){
-    fossil_print("%30s: %s\n", g.argv[i], email_mailbox_name(g.argv[i]));
-  }
-}
-
-/*
-** Extract all To: header values from the email header supplied.
-** Store them in the array list.
-*/
-void email_header_to(Blob *pMsg, int *pnTo, char ***pazTo){
-  int nTo = 0;
-  char **azTo = 0;
-  Blob v;
-  char *z, *zAddr;
-  int i;
-  
-  email_header_value(pMsg, "to", &v);
-  z = blob_str(&v);
-  for(i=0; z[i]; i++){
-    if( z[i]=='<' && (zAddr = email_copy_addr(&z[i+1],'>'))!=0 ){
-      azTo = fossil_realloc(azTo, sizeof(azTo[0])*(nTo+1) );
-      azTo[nTo++] = zAddr;
-    }
-  }
-  *pnTo = nTo;
-  *pazTo = azTo;
-}
-
-/*
-** Free a list of To addresses obtained from a prior call to 
-** email_header_to()
-*/
-void email_header_to_free(int nTo, char **azTo){
-  int i;
-  for(i=0; i<nTo; i++) fossil_free(azTo[i]);
-  fossil_free(azTo);
-}
-
-/*
-** Send a single email message.
-**
-** The recepient(s) must be specified using  "To:" or "Cc:" or "Bcc:" fields
-** in the header.  Likewise, the header must contains a "Subject:" line.
-** The header might also include fields like "Message-Id:" or
-** "In-Reply-To:".
-**
-** This routine will add fields to the header as follows:
-**
-**     From:
-**     Date:
-**     Message-Id:
-**     Content-Type:
-**     Content-Transfer-Encoding:
-**     MIME-Version:
-**     X-Fossil-From:
-**     
-** The caller maintains ownership of the input Blobs.  This routine will
-** read the Blobs and send them onward to the email system, but it will
-** not free them.
-**
-** The Message-Id: field is added if there is not already a Message-Id
-** in the pHdr parameter.
-**
-** If the zFromName argument is not NULL, then it should be a human-readable
-** name or handle for the sender.  In that case, "From:" becomes a made-up
-** email address based on a hash of zFromName and the domain of email-self,
-** and an additional "X-Fossil-From:" field is inserted with the email-self
-** address.  Downstream software might use the X-Fossil-From header to set
-** the envelope-from address of the email.  If zFromName is a NULL pointer, 
-** then the "From:" is set to the email-self value and X-Fossil-From is
-** omitted.
-*/
-void email_send(
-  EmailSender *p,           /* Emailer context */
-  Blob *pHdr,               /* Email header (incomplete) */
-  Blob *pBody,              /* Email body */
-  const char *zFromName     /* Optional human-readable name of sender */
-){
-  Blob all, *pOut;
-  u64 r1, r2;
-  if( p->mFlags & EMAIL_TRACE ){
-    fossil_print("Sending email\n");
-  }
-  if( fossil_strcmp(p->zDest, "off")==0 ){
-    return;
-  }
-  if( fossil_strcmp(p->zDest, "blob")==0 ){
-    pOut = &p->out;
-    if( blob_size(pOut) ){
-      blob_appendf(pOut, "%.72c\n", '=');
-    }
-  }else{
-    blob_init(&all, 0, 0);
-    pOut = &all;
-  }
-  blob_append(pOut, blob_buffer(pHdr), blob_size(pHdr));
-  if( zFromName ){
-    blob_appendf(pOut, "From: %s <%s@%s>\r\n",
-       zFromName, email_mailbox_name(zFromName), email_hostname(p->zFrom));
-    blob_appendf(pOut, "X-Fossil-From: <%s>\r\n", p->zFrom);
-  }else{
-    blob_appendf(pOut, "From: <%s>\r\n", p->zFrom);
-  }
-  blob_appendf(pOut, "Date: %z\r\n", cgi_rfc822_datestamp(time(0)));
-  if( strstr(blob_str(pHdr), "\r\nMessage-Id:")==0 ){
-    /* Message-id format:  "<$(date)x$(random)@$(from-host)>" where $(date) is
-    ** the current unix-time in hex, $(random) is a 64-bit random number,
-    ** and $(from) is the domain part of the email-self setting. */
-    sqlite3_randomness(sizeof(r1), &r1);
-    r2 = time(0);
-    blob_appendf(pOut, "Message-Id: <%llxx%016llx@%s>\r\n",
-                 r2, r1, email_hostname(p->zFrom));
-  }
-  blob_add_final_newline(pBody);
-  blob_appendf(pOut, "MIME-Version: 1.0\r\n");
-  blob_appendf(pOut, "Content-Type: text/plain; charset=\"UTF-8\"\r\n");
-#if 0
-  blob_appendf(pOut, "Content-Transfer-Encoding: base64\r\n\r\n");
-  append_base64(pOut, pBody);
-#else
-  blob_appendf(pOut, "Content-Transfer-Encoding: quoted-printable\r\n\r\n");
-  append_quoted(pOut, pBody);
-#endif
-  if( p->pStmt ){
-    int i, rc;
-    sqlite3_bind_text(p->pStmt, 1, blob_str(&all), -1, SQLITE_TRANSIENT);
-    for(i=0; i<100 && sqlite3_step(p->pStmt)==SQLITE_BUSY; i++){
-      sqlite3_sleep(10);
-    }
-    rc = sqlite3_reset(p->pStmt);
-    if( rc!=SQLITE_OK ){
-      emailerError(p, "Failed to insert email message into output queue.\n"
-                      "%s", sqlite3_errmsg(p->db));
-    }
-  }else if( p->zCmd ){
-    FILE *out = popen(p->zCmd, "w");
-    if( out ){
-      fwrite(blob_buffer(&all), 1, blob_size(&all), out);
-      fclose(out);
-    }else{
-      emailerError(p, "Could not open output pipe \"%s\"", p->zCmd);
-    }
-  }else if( p->zDir ){
-    char *zFile = file_time_tempname(p->zDir, ".email");
-    blob_write_to_file(&all, zFile);
-    fossil_free(zFile);
-  }else if( p->pSmtp ){
-    char **azTo = 0;
-    int nTo = 0;
-    email_header_to(pHdr, &nTo, &azTo);
-    if( nTo>0 ){
-      smtp_send_msg(p->pSmtp, p->zFrom, nTo, (const char**)azTo,blob_str(&all));
-      email_header_to_free(nTo, azTo);
-    }
-  }else if( strcmp(p->zDest, "stdout")==0 ){
-    char **azTo = 0;
-    int nTo = 0;
-    int i;
-    email_header_to(pHdr, &nTo, &azTo);
-    for(i=0; i<nTo; i++){
-      fossil_print("X-To-Test-%d: [%s]\r\n", i, azTo[i]);
-    }
-    email_header_to_free(nTo, azTo);
-    blob_add_final_newline(&all);
-    fossil_print("%s", blob_str(&all));
-  }
-  blob_reset(&all);
-}
-
-/*
-** SETTING: email-send-method         width=5 default=off
-** Determine the method used to send email.  Allowed values are
-** "off", "relay", "pipe", "dir", "db", and "stdout".  The "off" value
-** means no email is ever sent.  The "relay" value means emails are sent
-** to an Mail Sending Agent using SMTP located at email-send-relayhost.
-** The "pipe" value means email messages are piped into a command 
-** determined by the email-send-command setting. The "dir" value means
-** emails are written to individual files in a directory determined
-** by the email-send-dir setting.  The "db" value means that emails
-** are added to an SQLite database named by the* email-send-db setting.
-** The "stdout" value writes email text to standard output, for debugging.
-*/
-/*
-** SETTING: email-send-command       width=40
-** This is a command to which outbound email content is piped when the
-** email-send-method is set to "pipe".  The command must extract
-** recipient, sender, subject, and all other relevant information
-** from the email header.
-*/
-/*
-** SETTING: email-send-dir           width=40
-** This is a directory into which outbound emails are written as individual
-** files if the email-send-method is set to "dir".
-*/
-/*
-** SETTING: email-send-db            width=40
-** This is an SQLite database file into which outbound emails are written
-** if the email-send-method is set to "db".
-*/
-/*
-** SETTING: email-self               width=40
-** This is the email address for the repository.  Outbound emails add
-** this email address as the "From:" field.
-*/
-/*
-** SETTING: email-send-relayhost      width=40
-** This is the hostname and TCP port to which output email messages
-** are sent when email-send-method is "relay".  There should be an
-** SMTP server configured as a Mail Submission Agent listening on the
-** designated host and port and all times.
-*/
-
-
-/*
-** COMMAND: alerts
-** 
-** Usage: %fossil alerts SUBCOMMAND ARGS...
-**
-** Subcommands:
-**
-**    pending                 Show all pending alerts.  Useful for debugging.
-**
-**    reset                   Hard reset of all email notification tables
-**                            in the repository.  This erases all subscription
-**                            information.  ** Use with extreme care **
-**
-**    send                    Compose and send pending email alerts.
-**                            Some installations may want to do this via
-**                            a cron-job to make sure alerts are sent
-**                            in a timely manner.
-**                            Options:
-**
-**                               --digest     Send digests
-**                               --test       Write to standard output
-**
-**    settings [NAME VALUE]   With no arguments, list all email settings.
-**                            Or change the value of a single email setting.
-**
-**    status                  Report on the status of the email alert
-**                            subsystem
-**
-**    subscribers [PATTERN]   List all subscribers matching PATTERN.
-**
-**    test-message TO [OPTS]  Send a single email message using whatever
-**                            email sending mechanism is currently configured.
-**                            Use this for testing the email notification
-**                            configuration.  Options:
-**
-**                              --body FILENAME
-**                              --smtp-trace
-**                              --stdout
-**                              --subject|-S SUBJECT
-**
-**    unsubscribe EMAIL       Remove a single subscriber with the given EMAIL.
-*/
-void email_cmd(void){
-  const char *zCmd;
-  int nCmd;
-  db_find_and_open_repository(0, 0);
-  email_schema(0);
-  zCmd = g.argc>=3 ? g.argv[2] : "x";
-  nCmd = (int)strlen(zCmd);
-  if( strncmp(zCmd, "pending", nCmd)==0 ){
-    Stmt q;
-    verify_all_options();
-    if( g.argc!=3 ) usage("pending");
-    db_prepare(&q,"SELECT eventid, sentSep, sentDigest, sentMod"
-                  "  FROM pending_alert");
-    while( db_step(&q)==SQLITE_ROW ){
-      fossil_print("%10s %7s %10s %7s\n",
-         db_column_text(&q,0),
-         db_column_int(&q,1) ? "sentSep" : "",
-         db_column_int(&q,2) ? "sentDigest" : "",
-         db_column_int(&q,3) ? "sentMod" : "");
-    }
-    db_finalize(&q);
-  }else
-  if( strncmp(zCmd, "reset", nCmd)==0 ){
-    int c;
-    int bForce = find_option("force","f",0)!=0;
-    verify_all_options();
-    if( bForce ){
-      c = 'y';
-    }else{
-      Blob yn;
-      fossil_print(
-          "This will erase all content in the repository tables, thus\n"
-          "deleting all subscriber information.  The information will be\n"
-          "unrecoverable.\n");
-      prompt_user("Continue? (y/N) ", &yn);
-      c = blob_str(&yn)[0];
-      blob_reset(&yn);
-    }
-    if( c=='y' ){
-      email_triggers_disable();
-      db_multi_exec(
-        "DROP TABLE IF EXISTS subscriber;\n"
-        "DROP TABLE IF EXISTS pending_alert;\n"
-        "DROP TABLE IF EXISTS email_bounce;\n"
-        /* Legacy */
-        "DROP TABLE IF EXISTS email_pending;\n"
-        "DROP TABLE IF EXISTS subscription;\n"
-      );
-      email_schema(0);
-    }
-  }else
-  if( strncmp(zCmd, "send", nCmd)==0 ){
-    u32 eFlags = 0;
-    if( find_option("digest",0,0)!=0 ) eFlags |= SENDALERT_DIGEST;
-    if( find_option("test",0,0)!=0 ){
-      eFlags |= SENDALERT_PRESERVE|SENDALERT_STDOUT;
-    }
-    verify_all_options();
-    email_send_alerts(eFlags);
-  }else
-  if( strncmp(zCmd, "settings", nCmd)==0 ){
-    int isGlobal = find_option("global",0,0)!=0;
-    int nSetting;
-    const Setting *pSetting = setting_info(&nSetting);
-    db_open_config(1, 0);
-    verify_all_options();
-    if( g.argc!=3 && g.argc!=5 ) usage("setting [NAME VALUE]");
-    if( g.argc==5 ){
-      const char *zLabel = g.argv[3];
-      if( strncmp(zLabel, "email-", 6)!=0
-       || (pSetting = db_find_setting(zLabel, 1))==0 ){
-        fossil_fatal("not a valid email setting: \"%s\"", zLabel);
-      }
-      db_set(pSetting->name, g.argv[4], isGlobal);
-      g.argc = 3;
-    }
-    pSetting = setting_info(&nSetting);
-    for(; nSetting>0; nSetting--, pSetting++ ){
-      if( strncmp(pSetting->name,"email-",6)!=0 ) continue;
-      print_setting(pSetting);
-    }
-  }else
-  if( strncmp(zCmd, "status", nCmd)==0 ){
-    int nSetting, n;
-    static const char *zFmt = "%-29s %d\n";
-    const Setting *pSetting = setting_info(&nSetting);
-    db_open_config(1, 0);
-    verify_all_options();
-    if( g.argc!=3 ) usage("status");
-    pSetting = setting_info(&nSetting);
-    for(; nSetting>0; nSetting--, pSetting++ ){
-      if( strncmp(pSetting->name,"email-",6)!=0 ) continue;
-      print_setting(pSetting);
-    }
-    n = db_int(0,"SELECT count(*) FROM pending_alert WHERE NOT sentSep");
-    fossil_print(zFmt/*works-like:"%s%d"*/, "pending-alerts", n);
-    n = db_int(0,"SELECT count(*) FROM pending_alert WHERE NOT sentDigest");
-    fossil_print(zFmt/*works-like:"%s%d"*/, "pending-digest-alerts", n);
-    n = db_int(0,"SELECT count(*) FROM subscriber");
-    fossil_print(zFmt/*works-like:"%s%d"*/, "total-subscribers", n);
-    n = db_int(0, "SELECT count(*) FROM subscriber WHERE sverified"
-                   " AND NOT sdonotcall AND length(ssub)>1");
-    fossil_print(zFmt/*works-like:"%s%d"*/, "active-subscribers", n);
-  }else
-  if( strncmp(zCmd, "subscribers", nCmd)==0 ){
-    Stmt q;
-    verify_all_options();
-    if( g.argc!=3 && g.argc!=4 ) usage("subscribers [PATTERN]");
-    if( g.argc==4 ){
-      char *zPattern = g.argv[3];
-      db_prepare(&q,
-        "SELECT semail FROM subscriber"
-        " WHERE semail LIKE '%%%q%%' OR suname LIKE '%%%q%%'"
-        "  OR semail GLOB '*%q*' or suname GLOB '*%q*'"
-        " ORDER BY semail",
-        zPattern, zPattern, zPattern, zPattern);
-    }else{
-      db_prepare(&q,
-        "SELECT semail FROM subscriber"
-        " ORDER BY semail");
-    }
-    while( db_step(&q)==SQLITE_ROW ){
-      fossil_print("%s\n", db_column_text(&q, 0));
-    }
-    db_finalize(&q);
-  }else
-  if( strncmp(zCmd, "test-message", nCmd)==0 ){
-    Blob prompt, body, hdr;
-    const char *zDest = find_option("stdout",0,0)!=0 ? "stdout" : 0;
-    int i;
-    u32 mFlags = EMAIL_IMMEDIATE_FAIL;
-    const char *zSubject = find_option("subject", "S", 1);
-    const char *zSource = find_option("body", 0, 1);
-    EmailSender *pSender;
-    if( find_option("smtp-trace",0,0)!=0 ) mFlags |= EMAIL_TRACE;
-    verify_all_options();
-    blob_init(&prompt, 0, 0);
-    blob_init(&body, 0, 0);
-    blob_init(&hdr, 0, 0);
-    blob_appendf(&hdr,"To: ");
-    for(i=3; i<g.argc; i++){
-      if( i>3 ) blob_append(&hdr, ", ", 2);
-      blob_appendf(&hdr, "<%s>", g.argv[i]);
-    }
-    blob_append(&hdr,"\r\n",2);
-    if( zSubject==0 ) zSubject = "fossil alerts test-message";
-    blob_appendf(&hdr, "Subject: %s\r\n", zSubject);
-    if( zSource ){
-      blob_read_from_file(&body, zSource, ExtFILE);
-    }else{
-      prompt_for_user_comment(&body, &prompt);
-    }
-    blob_add_final_newline(&body);
-    pSender = email_sender_new(zDest, mFlags);
-    email_send(pSender, &hdr, &body, 0);
-    email_sender_free(pSender);
-    blob_reset(&hdr);
-    blob_reset(&body);
-    blob_reset(&prompt);
-  }else
-  if( strncmp(zCmd, "unsubscribe", nCmd)==0 ){
-    verify_all_options();
-    if( g.argc!=4 ) usage("unsubscribe EMAIL");
-    db_multi_exec(
-      "DELETE FROM subscriber WHERE semail=%Q", g.argv[3]);
-  }else
-  {
-    usage("pending|reset|send|setting|status|"
-          "subscribers|test-message|unsubscribe");
-  }
-}
-
-/*
-** Do error checking on a submitted subscription form.  Return TRUE
-** if the submission is valid.  Return false if any problems are seen.
-*/
-static int subscribe_error_check(
-  int *peErr,           /* Type of error */
-  char **pzErr,         /* Error message text */
-  int needCaptcha       /* True if captcha check needed */
-){
-  const char *zEAddr;
-  int i, j, n;
-  char c;
-
-  *peErr = 0;
-  *pzErr = 0;
-
-  /* Check the validity of the email address.
-  **
-  **  (1) Exactly one '@' character.
-  **  (2) No other characters besides [a-zA-Z0-9._+-]
-  **
-  **  The local part is currently more restrictive than RFC 5322 allows:
-  **  https://stackoverflow.com/a/2049510/142454  We will expand this as
-  **  necessary.
-  */
-  zEAddr = P("e");
-  if( zEAddr==0 ) return 0;
-  for(i=j=n=0; (c = zEAddr[i])!=0; i++){
-    if( c=='@' ){
-      n = i;
-      j++;
-      continue;
-    }
-    if( !fossil_isalnum(c) && c!='.' && c!='_' && c!='-' && c!='+' ){
-      *peErr = 1;
-      *pzErr = mprintf("illegal character in email address: 0x%x '%c'",
-                   c, c);
-      return 0;
-    }
-  }
-  if( j!=1 ){
-    *peErr = 1;
-    *pzErr = mprintf("email address should contain exactly one '@'");
-    return 0;
-  }
-  if( n<1 ){
-    *peErr = 1;
-    *pzErr = mprintf("name missing before '@' in email address");
-    return 0;
-  }
-  if( n>i-5 ){
-    *peErr = 1;
-    *pzErr = mprintf("email domain too short");
-     return 0;
-  }
-
-  /* Verify the captcha */
-  if( needCaptcha && !captcha_is_correct(1) ){
-    *peErr = 2;
-    *pzErr = mprintf("incorrect security code");
-    return 0;
-  }
-
-  /* Check to make sure the email address is available for reuse */
-  if( db_exists("SELECT 1 FROM subscriber WHERE semail=%Q", zEAddr) ){
-    *peErr = 1;
-    *pzErr = mprintf("this email address is used by someone else");
-    return 0;
-  }
-
-  /* If we reach this point, all is well */
-  return 1;
-}
-
-/*
-** Text of email message sent in order to confirm a subscription.
-*/
-static const char zConfirmMsg[] = 
-@ Someone has signed you up for email alerts on the Fossil repository
-@ at %s.
-@
-@ To confirm your subscription and begin receiving alerts, click on
-@ the following hyperlink:
-@
-@    %s/alerts/%s
-@
-@ Save the hyperlink above!  You can reuse this same hyperlink to
-@ unsubscribe or to change the kinds of alerts you receive.
-@
-@ If you do not want to subscribe, you can simply ignore this message.
-@ You will not be contacted again.
-@
-;
-
-/*
-** Append the text of an email confirmation message to the given
-** Blob.  The security code is in zCode.
-*/
-void email_append_confirmation_message(Blob *pMsg, const char *zCode){
-  blob_appendf(pMsg, zConfirmMsg/*works-like:"%s%s%s"*/,
-                   g.zBaseURL, g.zBaseURL, zCode);
-}
-
-/*
-** WEBPAGE: subscribe
-**
-** Allow users to subscribe to email notifications.
-**
-** This page is usually run by users who are not logged in.
-** A logged-in user can add email notifications on the /alerts page.
-** Access to this page by a logged in user (other than an
-** administrator) results in a redirect to the /alerts page.
-**
-** Administrators can visit this page in order to sign up other
-** users.
-**
-** The Email-Alerts permission ("7") is required to access this
-** page.  To allow anonymous passers-by to sign up for email
-** notification, set Email-Alerts on user "nobody" or "anonymous".
-*/
-void subscribe_page(void){
-  int needCaptcha;
-  unsigned int uSeed;
-  const char *zDecoded;
-  char *zCaptcha = 0;
-  char *zErr = 0;
-  int eErr = 0;
-
-  if( email_webpages_disabled() ) return;
-  login_check_credentials();
-  if( !g.perm.EmailAlert ){
-    login_needed(g.anon.EmailAlert);
-    return;
-  }
-  if( login_is_individual()
-   && db_exists("SELECT 1 FROM subscriber WHERE suname=%Q",g.zLogin)
-  ){
-    /* This person is already signed up for email alerts.  Jump
-    ** to the screen that lets them edit their alert preferences.
-    ** Except, administrators can create subscriptions for others so
-    ** do not jump for them.
-    */
-    if( g.perm.Admin ){
-      /* Admins get a link to admin their own account, but they
-      ** stay on this page so that they can create subscriptions
-      ** for other people. */
-      style_submenu_element("My Subscription","%R/alerts");
-    }else{
-      /* Everybody else jumps to the page to administer their own
-      ** account only. */
-      cgi_redirectf("%R/alerts");
-      return;
-    }
-  }
-  email_submenu_common();
-  needCaptcha = !login_is_individual();
-  if( P("submit")
-   && cgi_csrf_safe(1)
-   && subscribe_error_check(&eErr,&zErr,needCaptcha)
-  ){
-    /* A validated request for a new subscription has been received. */
-    char ssub[20];
-    const char *zEAddr = P("e");
-    sqlite3_int64 id;   /* New subscriber Id */
-    const char *zCode;  /* New subscriber code (in hex) */
-    int nsub = 0;
-    const char *suname = PT("suname");
-    if( suname==0 && needCaptcha==0 && !g.perm.Admin ) suname = g.zLogin;
-    if( suname && suname[0]==0 ) suname = 0;
-    if( PB("sa") ) ssub[nsub++] = 'a';
-    if( g.perm.Read && PB("sc") )    ssub[nsub++] = 'c';
-    if( g.perm.RdForum && PB("sf") ) ssub[nsub++] = 'f';
-    if( g.perm.RdTkt && PB("st") )   ssub[nsub++] = 't';
-    if( g.perm.RdWiki && PB("sw") )  ssub[nsub++] = 'w';
-    ssub[nsub] = 0;
-    db_multi_exec(
-      "INSERT INTO subscriber(semail,suname,"
-      "  sverified,sdonotcall,sdigest,ssub,sctime,mtime,smip)"
-      "VALUES(%Q,%Q,%d,0,%d,%Q,now(),now(),%Q)",
-      /* semail */    zEAddr,
-      /* suname */    suname,
-      /* sverified */ needCaptcha==0,
-      /* sdigest */   PB("di"),
-      /* ssub */      ssub,
-      /* smip */      g.zIpAddr
-    );
-    id = db_last_insert_rowid();
-    zCode = db_text(0,
-         "SELECT hex(subscriberCode) FROM subscriber WHERE subscriberId=%lld",
-         id);
-    if( !needCaptcha ){
-      /* The new subscription has been added on behalf of a logged-in user.
-      ** No verification is required.  Jump immediately to /alerts page.
-      */
-      cgi_redirectf("%R/alerts/%s", zCode);
-      return;
-    }else{
-      /* We need to send a verification email */
-      Blob hdr, body;
-      EmailSender *pSender = email_sender_new(0,0);
-      blob_init(&hdr,0,0);
-      blob_init(&body,0,0);
-      blob_appendf(&hdr, "To: <%s>\n", zEAddr);
-      blob_appendf(&hdr, "Subject: Subscription verification\n");
-      email_append_confirmation_message(&body, zCode);
-      email_send(pSender, &hdr, &body, 0);
-      style_header("Email Alert Verification");
-      if( pSender->zErr ){
-        @ <h1>Internal Error</h1>
-        @ <p>The following internal error was encountered while trying
-        @ to send the confirmation email:
-        @ <blockquote><pre>
-        @ %h(pSender->zErr)
-        @ </pre></blockquote>
-      }else{
-        @ <p>An email has been sent to "%h(zEAddr)". That email contains a
-        @ hyperlink that you must click on in order to activate your
-        @ subscription.</p>
-      }
-      email_sender_free(pSender);
-      style_footer();
-    }
-    return;
-  }
-  style_header("Signup For Email Alerts");
-  if( P("submit")==0 ){
-    /* If this is the first visit to this page (if this HTTP request did not
-    ** come from a prior Submit of the form) then default all of the
-    ** subscription options to "on" */
-    cgi_set_parameter_nocopy("sa","1",1);
-    if( g.perm.Read )    cgi_set_parameter_nocopy("sc","1",1);
-    if( g.perm.RdForum ) cgi_set_parameter_nocopy("sf","1",1);
-    if( g.perm.RdTkt )   cgi_set_parameter_nocopy("st","1",1);
-    if( g.perm.RdWiki )  cgi_set_parameter_nocopy("sw","1",1);
-  }
-  @ <p>To receive email notifications for changes to this
-  @ repository, fill out the form below and press "Submit" button.</p>
-  form_begin(0, "%R/subscribe");
-  @ <table class="subscribe">
-  @ <tr>
-  @  <td class="form_label">Email&nbsp;Address:</td>
-  @  <td><input type="text" name="e" value="%h(PD("e",""))" size="30"></td>
-  if( eErr==1 ){
-    @  <td><span class="loginError">&larr; %h(zErr)</span></td>
-  }
-  @ </tr>
-  if( needCaptcha ){
-    uSeed = captcha_seed();
-    zDecoded = captcha_decode(uSeed);
-    zCaptcha = captcha_render(zDecoded);
-    @ <tr>
-    @  <td class="form_label">Security Code:</td>
-    @  <td><input type="text" name="captcha" value="" size="30">
-    @  <input type="hidden" name="captchaseed" value="%u(uSeed)"></td>
-    if( eErr==2 ){
-      @  <td><span class="loginError">&larr; %h(zErr)</span></td>
-    }
-    @ </tr>
-  }
-  if( g.perm.Admin ){
-    @ <tr>
-    @  <td class="form_label">User:</td>
-    @  <td><input type="text" name="suname" value="%h(PD("suname",g.zLogin))" \
-    @  size="30"></td>
-    if( eErr==3 ){
-      @  <td><span class="loginError">&larr; %h(zErr)</span></td>
-    }
-    @ </tr>
-  }
-  @ <tr>
-  @  <td class="form_label">Options:</td>
-  @  <td><label><input type="checkbox" name="sa" %s(PCK("sa"))> \
-  @  Announcements</label><br>
-  if( g.perm.Read ){
-    @  <label><input type="checkbox" name="sc" %s(PCK("sc"))> \
-    @  Check-ins</label><br>
-  }
-  if( g.perm.RdForum ){
-    @  <label><input type="checkbox" name="sf" %s(PCK("sf"))> \
-    @  Forum Posts</label><br>
-  }
-  if( g.perm.RdTkt ){
-    @  <label><input type="checkbox" name="st" %s(PCK("st"))> \
-    @  Ticket changes</label><br>
-  }
-  if( g.perm.RdWiki ){
-    @  <label><input type="checkbox" name="sw" %s(PCK("sw"))> \
-    @  Wiki</label><br>
-  }
-  @  <label><input type="checkbox" name="di" %s(PCK("di"))> \
-  @  Daily digest only</label><br>
-  if( g.perm.Admin ){
-    @  <label><input type="checkbox" name="vi" %s(PCK("vi"))> \
-    @  Verified</label><br>
-    @  <label><input type="checkbox" name="dnc" %s(PCK("dnc"))> \
-    @  Do not call</label><br>
-  }
-  @ </td>
-  @ </tr>
-  @ <tr>
-  @  <td></td>
-  if( needCaptcha && !email_enabled() ){
-    @  <td><input type="submit" name="submit" value="Submit" disabled>
-    @  (Email current disabled)</td>
-  }else{
-    @  <td><input type="submit" name="submit" value="Submit"></td>
-  }
-  @ </tr>
-  @ </table>
-  if( needCaptcha ){
-    @ <div class="captcha"><table class="captcha"><tr><td><pre>
-    @ %h(zCaptcha)
-    @ </pre>
-    @ Enter the 8 characters above in the "Security Code" box
-    @ </td></tr></table></div>
-  }
-  @ </form>
-  fossil_free(zErr);
-  style_footer();
-}
-
-/*
-** Either shutdown or completely delete a subscription entry given
-** by the hex value zName.  Then paint a webpage that explains that
-** the entry has been removed.
-*/
-static void email_unsubscribe(const char *zName){
-  char *zEmail;
-  zEmail = db_text(0, "SELECT semail FROM subscriber"
-                      " WHERE subscriberCode=hextoblob(%Q)", zName);
-  if( zEmail==0 ){
-    style_header("Unsubscribe Fail");
-    @ <p>Unable to locate a subscriber with the requested key</p>
-  }else{
-    db_multi_exec(
-      "DELETE FROM subscriber WHERE subscriberCode=hextoblob(%Q)",
-      zName
-    );
-    style_header("Unsubscribed");
-    @ <p>The "%h(zEmail)" email address has been delisted.
-    @ All traces of that email address have been removed</p>
-  }
-  style_footer();
-  return;
-}
-
-/*
-** WEBPAGE: alerts
-**
-** Edit email alert and notification settings.
-**
-** The subscriber is identified in either of two ways:
-**
-**    (1)  The name= query parameter contains the subscriberCode.
-**         
-**    (2)  The user is logged into an account other than "nobody" or
-**         "anonymous".  In that case the notification settings
-**         associated with that account can be edited without needing
-**         to know the subscriber code.
-*/
-void alerts_page(void){
-  const char *zName = P("name");
-  Stmt q;
-  int sa, sc, sf, st, sw;
-  int sdigest, sdonotcall, sverified;
-  const char *ssub;
-  const char *semail;
-  const char *smip;
-  const char *suname;
-  const char *mtime;
-  const char *sctime;
-  int eErr = 0;
-  char *zErr = 0;
-
-  if( email_webpages_disabled() ) return;
-  login_check_credentials();
-  if( zName==0 && login_is_individual() ){
-    zName = db_text(0, "SELECT hex(subscriberCode) FROM subscriber"
-                       " WHERE suname=%Q", g.zLogin);
-  }
-  if( zName==0 || !validate16(zName, -1) ){
-    cgi_redirect("subscribe");
-    return;
-  }
-  email_submenu_common();
-  if( P("submit")!=0 && cgi_csrf_safe(1) ){
-    int sdonotcall = PB("sdonotcall");
-    int sdigest = PB("sdigest");
-    char ssub[10];
-    int nsub = 0;
-    if( PB("sa") )                   ssub[nsub++] = 'a';
-    if( g.perm.Read && PB("sc") )    ssub[nsub++] = 'c';
-    if( g.perm.RdForum && PB("sf") ) ssub[nsub++] = 'f';
-    if( g.perm.RdTkt && PB("st") )   ssub[nsub++] = 't';
-    if( g.perm.RdWiki && PB("sw") )  ssub[nsub++] = 'w';
-    ssub[nsub] = 0;
-    if( g.perm.Admin ){
-      const char *suname = PT("suname");
-      int sverified = PB("sverified");
-      if( suname && suname[0]==0 ) suname = 0;
-      db_multi_exec(
-        "UPDATE subscriber SET"
-        " sdonotcall=%d,"
-        " sdigest=%d,"
-        " ssub=%Q,"
-        " mtime=strftime('%%s','now'),"
-        " smip=%Q,"
-        " suname=%Q,"
-        " sverified=%d"
-        " WHERE subscriberCode=hextoblob(%Q)",
-        sdonotcall,
-        sdigest,
-        ssub,
-        g.zIpAddr,
-        suname,
-        sverified,
-        zName
-      );
-    }else{
-      db_multi_exec(
-        "UPDATE subscriber SET"
-        " sdonotcall=%d,"
-        " sdigest=%d,"
-        " ssub=%Q,"
-        " mtime=strftime('%%s','now'),"
-        " smip=%Q"
-        " WHERE subscriberCode=hextoblob(%Q)",
-        sdonotcall,
-        sdigest,
-        ssub,
-        g.zIpAddr,
-        zName
-      );
-    }
-  }
-  if( P("delete")!=0 && cgi_csrf_safe(1) ){
-    if( !PB("dodelete") ){
-      eErr = 9;
-      zErr = mprintf("Select this checkbox and press \"Unsubscribe\" to"
-                     " unsubscribe");
-    }else{
-      email_unsubscribe(zName);
-      return;
-    }
-  }
-  db_prepare(&q,
-    "SELECT"
-    "  semail,"                       /* 0 */
-    "  sverified,"                    /* 1 */
-    "  sdonotcall,"                   /* 2 */
-    "  sdigest,"                      /* 3 */
-    "  ssub,"                         /* 4 */
-    "  smip,"                         /* 5 */
-    "  suname,"                       /* 6 */
-    "  datetime(mtime,'unixepoch'),"  /* 7 */
-    "  datetime(sctime,'unixepoch')"  /* 8 */
-    " FROM subscriber WHERE subscriberCode=hextoblob(%Q)", zName);
-  if( db_step(&q)!=SQLITE_ROW ){
-    db_finalize(&q);
-    cgi_redirect("subscribe");
-    return;
-  }
-  style_header("Update Subscription");
-  semail = db_column_text(&q, 0);
-  sverified = db_column_int(&q, 1);
-  sdonotcall = db_column_int(&q, 2);
-  sdigest = db_column_int(&q, 3);
-  ssub = db_column_text(&q, 4);
-  sa = strchr(ssub,'a')!=0;
-  sc = strchr(ssub,'c')!=0;
-  sf = strchr(ssub,'f')!=0;
-  st = strchr(ssub,'t')!=0;
-  sw = strchr(ssub,'w')!=0;
-  smip = db_column_text(&q, 5);
-  suname = db_column_text(&q, 6);
-  mtime = db_column_text(&q, 7);
-  sctime = db_column_text(&q, 8);
-  if( !g.perm.Admin && !sverified ){
-    db_multi_exec(
-      "UPDATE subscriber SET sverified=1 WHERE subscriberCode=hextoblob(%Q)",
-      zName);
-    @ <h1>Your email alert subscription has been verified!</h1>
-    @ <p>Use the form below to update your subscription information.</p>
-    @ <p>Hint:  Bookmark this page so that you can more easily update
-    @ your subscription information in the future</p>
-  }else{
-    @ <p>Make changes to the email subscription shown below and
-    @ press "Submit".</p>
-  }
-  form_begin(0, "%R/alerts");
-  @ <input type="hidden" name="name" value="%h(zName)">
-  @ <table class="subscribe">
-  @ <tr>
-  @  <td class="form_label">Email&nbsp;Address:</td>
-  @  <td>%h(semail)</td>
-  @ </tr>
-  if( g.perm.Admin ){
-    @ <tr>
-    @  <td class='form_label'>Created:</td>
-    @  <td>%h(sctime)</td>
-    @ </tr>
-    @ <tr>
-    @  <td class='form_label'>Last Modified:</td>
-    @  <td>%h(mtime)</td>
-    @ </tr>
-    @ <tr>
-    @  <td class='form_label'>IP Address:</td>
-    @  <td>%h(smip)</td>
-    @ </tr>
-    @ <tr>
-    @  <td class="form_label">User:</td>
-    @  <td><input type="text" name="suname" value="%h(suname?suname:"")" \
-    @  size="30"></td>
-    @ </tr>
-  }
-  @ <tr>
-  @  <td class="form_label">Options:</td>
-  @  <td><label><input type="checkbox" name="sa" %s(sa?"checked":"")>\
-  @  Announcements</label><br>
-  if( g.perm.Read ){
-    @  <label><input type="checkbox" name="sc" %s(sc?"checked":"")>\
-    @  Check-ins</label><br>
-  }
-  if( g.perm.RdForum ){
-    @  <label><input type="checkbox" name="sf" %s(sf?"checked":"")>\
-    @  Forum Posts</label><br>
-  }
-  if( g.perm.RdTkt ){
-    @  <label><input type="checkbox" name="st" %s(st?"checked":"")>\
-    @  Ticket changes</label><br>
-  }
-  if( g.perm.RdWiki ){
-    @  <label><input type="checkbox" name="sw" %s(sw?"checked":"")>\
-    @  Wiki</label><br>
-  }
-  @  <label><input type="checkbox" name="sdigest" %s(sdigest?"checked":"")>\
-  @  Daily digest only</label><br>
-  if( g.perm.Admin ){
-    @  <label><input type="checkbox" name="sdonotcall" \
-    @  %s(sdonotcall?"checked":"")> Do not call</label><br>
-    @  <label><input type="checkbox" name="sverified" \
-    @  %s(sverified?"checked":"")>\
-    @  Verified</label><br>
-  }
-  @  <label><input type="checkbox" name="dodelete">
-  @  Unsubscribe</label> \
-  if( eErr==9 ){
-    @ <span class="loginError">&larr; %h(zErr)</span>\
-  }
-  @ <br>
-  @ </td></tr>
-  @ <tr>
-  @  <td></td>
-  @  <td><input type="submit" name="submit" value="Submit">
-  @  <input type="submit" name="delete" value="Unsubscribe">
-  @ </tr>
-  @ </table>
-  @ </form>
-  fossil_free(zErr);
-  db_finalize(&q);
-  style_footer();
-}
-
-/* This is the message that gets sent to describe how to change
-** or modify a subscription
-*/
-static const char zUnsubMsg[] = 
-@ To changes your subscription settings at %s visit this link:
-@
-@    %s/alerts/%s
-@
-@ To completely unsubscribe from %s, visit the following link:
-@
-@    %s/unsubscribe/%s
-;
-
-/*
-** WEBPAGE: unsubscribe
-**
-** Users visit this page to be delisted from email alerts.
-**
-** If a valid subscriber code is supplied in the name= query parameter,
-** then that subscriber is delisted.
-**
-** Otherwise, If the users is logged in, then they are redirected
-** to the /alerts page where they have an unsubscribe button.
-**
-** Non-logged-in users with no name= query parameter are invited to enter
-** an email address to which will be sent the unsubscribe link that
-** contains the correct subscriber code.
-*/
-void unsubscribe_page(void){
-  const char *zName = P("name");
-  char *zErr = 0;
-  int eErr = 0;
-  unsigned int uSeed;
-  const char *zDecoded;
-  char *zCaptcha = 0;
-  int dx;
-  int bSubmit;
-  const char *zEAddr;
-  char *zCode = 0;
-
-  /* If a valid subscriber code is supplied, then unsubscribe immediately.
-  */
-  if( zName 
-   && db_exists("SELECT 1 FROM subscriber WHERE subscriberCode=hextoblob(%Q)",
-                zName)
-  ){
-    email_unsubscribe(zName);
-    return;
-  }
-
-  /* Logged in users are redirected to the /alerts page */
-  login_check_credentials();
-  if( login_is_individual() ){
-    cgi_redirectf("%R/alerts");
-    return;
-  }
-
-  zEAddr = PD("e","");
-  dx = atoi(PD("dx","0"));
-  bSubmit = P("submit")!=0 && P("e")!=0 && cgi_csrf_safe(1);
-  if( bSubmit ){
-    if( !captcha_is_correct(1) ){
-      eErr = 2;
-      zErr = mprintf("enter the security code shown below");
-      bSubmit = 0;
-    }
-  }
-  if( bSubmit ){
-    zCode = db_text(0,"SELECT hex(subscriberCode) FROM subscriber"
-                      " WHERE semail=%Q", zEAddr);
-    if( zCode==0 ){
-      eErr = 1;
-      zErr = mprintf("not a valid email address");
-      bSubmit = 0;
-    }
-  }
-  if( bSubmit ){
-    /* If we get this far, it means that a valid unsubscribe request has
-    ** been submitted.  Send the appropriate email. */
-    Blob hdr, body;
-    EmailSender *pSender = email_sender_new(0,0);
-    blob_init(&hdr,0,0);
-    blob_init(&body,0,0);
-    blob_appendf(&hdr, "To: <%s>\r\n", zEAddr);
-    blob_appendf(&hdr, "Subject: Unsubscribe Instructions\r\n");
-    blob_appendf(&body, zUnsubMsg/*works-like:"%s%s%s%s%s%s"*/,
-                  g.zBaseURL, g.zBaseURL, zCode, g.zBaseURL, g.zBaseURL, zCode);
-    email_send(pSender, &hdr, &body, 0);
-    style_header("Unsubscribe Instructions Sent");
-    if( pSender->zErr ){
-      @ <h1>Internal Error</h1>
-      @ <p>The following error was encountered while trying to send an
-      @ email to %h(zEAddr):
-      @ <blockquote><pre>
-      @ %h(pSender->zErr)
-      @ </pre></blockquote>
-    }else{
-      @ <p>An email has been sent to "%h(zEAddr)" that explains how to
-      @ unsubscribe and/or modify your subscription settings</p>
-    }
-    email_sender_free(pSender);
-    style_footer();
-    return;
-  }  
-
-  /* Non-logged-in users have to enter an email address to which is
-  ** sent a message containing the unsubscribe link.
-  */
-  style_header("Unsubscribe Request");
-  @ <p>Fill out the form below to request an email message that will
-  @ explain how to unsubscribe and/or change your subscription settings.</p>
-  @
-  form_begin(0, "%R/unsubscribe");
-  @ <table class="subscribe">
-  @ <tr>
-  @  <td class="form_label">Email&nbsp;Address:</td>
-  @  <td><input type="text" name="e" value="%h(zEAddr)" size="30"></td>
-  if( eErr==1 ){
-    @  <td><span class="loginError">&larr; %h(zErr)</span></td>
-  }
-  @ </tr>
-  uSeed = captcha_seed();
-  zDecoded = captcha_decode(uSeed);
-  zCaptcha = captcha_render(zDecoded);
-  @ <tr>
-  @  <td class="form_label">Security Code:</td>
-  @  <td><input type="text" name="captcha" value="" size="30">
-  @  <input type="hidden" name="captchaseed" value="%u(uSeed)"></td>
-  if( eErr==2 ){
-    @  <td><span class="loginError">&larr; %h(zErr)</span></td>
-  }
-  @ </tr>
-  @ <tr>
-  @  <td class="form_label">Options:</td>
-  @  <td><label><input type="radio" name="dx" value="0" %s(dx?"":"checked")>\
-  @  Modify subscription</label><br>
-  @  <label><input type="radio" name="dx" value="1" %s(dx?"checked":"")>\
-  @  Completely unsubscribe</label><br>
-  @ <tr>
-  @  <td></td>
-  @  <td><input type="submit" name="submit" value="Submit"></td>
-  @ </tr>
-  @ </table>
-  @ <div class="captcha"><table class="captcha"><tr><td><pre>
-  @ %h(zCaptcha)
-  @ </pre>
-  @ Enter the 8 characters above in the "Security Code" box
-  @ </td></tr></table></div>
-  @ </form>
-  fossil_free(zErr);
-  style_footer();
-}
-
-/*
-** WEBPAGE: subscribers
-**
-** This page, accessible to administrators only,
-** shows a list of email notification email addresses.
-** Clicking on an email takes one to the /alerts page
-** for that email where the delivery settings can be
-** modified.
-*/
-void subscriber_list_page(void){
-  Blob sql;
-  Stmt q;
-  sqlite3_int64 iNow;
-  if( email_webpages_disabled() ) return;
-  login_check_credentials();
-  if( !g.perm.Admin ){
-    login_needed(0);
-    return;
-  }
-  email_submenu_common();
-  style_header("Subscriber List");
-  blob_init(&sql, 0, 0);
-  blob_append_sql(&sql,
-    "SELECT hex(subscriberCode),"          /* 0 */
-    "       semail,"                       /* 1 */
-    "       ssub,"                         /* 2 */
-    "       suname,"                       /* 3 */
-    "       sverified,"                    /* 4 */
-    "       sdigest,"                      /* 5 */
-    "       mtime,"                        /* 6 */
-    "       date(sctime,'unixepoch')"      /* 7 */
-    " FROM subscriber"
-  );
-  if( P("only")!=0 ){
-    blob_append_sql(&sql, " WHERE ssub LIKE '%%%q%%'", P("only"));
-    style_submenu_element("Show All","%R/subscribers");
-  }
-  blob_append_sql(&sql," ORDER BY mtime DESC");
-  db_prepare_blob(&q, &sql);
-  iNow = time(0);
-  @ <table border='1' class='sortable' \
-  @ data-init-sort='6' data-column-types='tttttKt'>
-  @ <thead>
-  @ <tr>
-  @ <th>Email
-  @ <th>Events
-  @ <th>Digest-Only?
-  @ <th>User
-  @ <th>Verified?
-  @ <th>Last change
-  @ <th>Created
-  @ </tr>
-  @ </thead><tbody>
-  while( db_step(&q)==SQLITE_ROW ){
-    sqlite3_int64 iMtime = db_column_int64(&q, 6);
-    double rAge = (iNow - iMtime)/86400.0;
-    @ <tr>
-    @ <td><a href='%R/alerts/%s(db_column_text(&q,0))'>\
-    @ %h(db_column_text(&q,1))</a></td>
-    @ <td>%h(db_column_text(&q,2))</td>
-    @ <td>%s(db_column_int(&q,5)?"digest":"")</td>
-    @ <td>%h(db_column_text(&q,3))</td>
-    @ <td>%s(db_column_int(&q,4)?"yes":"pending")</td>
-    @ <td data-sortkey='%010llx(iMtime)'>%z(human_readable_age(rAge))</td>
-    @ <td>%h(db_column_text(&q,7))</td>
-    @ </tr>
-  }
-  @ </tbody></table>
-  db_finalize(&q);
-  style_table_sorter();
-  style_footer();
-}
-
-#if LOCAL_INTERFACE
-/*
-** A single event that might appear in an alert is recorded as an
-** instance of the following object.
-*/
-struct EmailEvent {
-  int type;          /* 'c', 'f', 'm', 't', 'w' */
-  int needMod;       /* Pending moderator approval */
-  Blob hdr;          /* Header content, for forum entries */
-  Blob txt;          /* Text description to appear in an alert */
-  char *zFromName;   /* Human name of the sender */
-  EmailEvent *pNext; /* Next in chronological order */
-};
-#endif
-
-/*
-** Free a linked list of EmailEvent objects
-*/
-void email_free_eventlist(EmailEvent *p){
-  while( p ){
-    EmailEvent *pNext = p->pNext;
-    blob_reset(&p->txt);
-    blob_reset(&p->hdr);
-    fossil_free(p->zFromName);
-    fossil_free(p);
-    p = pNext;
-  }
-}
-
-/*
-** Compute and return a linked list of EmailEvent objects
-** corresponding to the current content of the temp.wantalert
-** table which should be defined as follows:
-**
-**     CREATE TEMP TABLE wantalert(eventId TEXT, needMod BOOLEAN);
-*/
-EmailEvent *email_compute_event_text(int *pnEvent, int doDigest){
-  Stmt q;
-  EmailEvent *p;
-  EmailEvent anchor;
-  EmailEvent *pLast;
-  const char *zUrl = db_get("email-url","http://localhost:8080");
-  const char *zFrom;
-  const char *zSub;
-
-
-  /* First do non-forum post events */
-  db_prepare(&q,
-    "SELECT"
-    " blob.uuid,"                /* 0 */
-    " datetime(event.mtime),"    /* 1 */
-    " coalesce(ecomment,comment)"
-    "  || ' (user: ' || coalesce(euser,user,'?')"
-    "  || (SELECT case when length(x)>0 then ' tags: ' || x else '' end"
-    "      FROM (SELECT group_concat(substr(tagname,5), ', ') AS x"
-    "              FROM tag, tagxref"
-    "             WHERE tagname GLOB 'sym-*' AND tag.tagid=tagxref.tagid"
-    "               AND tagxref.rid=blob.rid AND tagxref.tagtype>0))"
-    "  || ')' as comment,"       /* 2 */
-    " wantalert.eventId,"        /* 3 */
-    " wantalert.needMod"         /* 4 */
-    " FROM temp.wantalert, event, blob"
-    " WHERE blob.rid=event.objid"
-    "   AND event.objid=substr(wantalert.eventId,2)+0"
-    "   AND (%d OR eventId NOT GLOB 'f*')"
-    " ORDER BY event.mtime",
-    doDigest
-  );
-  memset(&anchor, 0, sizeof(anchor));
-  pLast = &anchor;
-  *pnEvent = 0;
-  while( db_step(&q)==SQLITE_ROW ){
-    const char *zType = "";
-    p = fossil_malloc( sizeof(EmailEvent) );
-    pLast->pNext = p;
-    pLast = p;
-    p->type = db_column_text(&q, 3)[0];
-    p->needMod = db_column_int(&q, 4);
-    p->zFromName = 0;
-    p->pNext = 0;
-    switch( p->type ){
-      case 'c':  zType = "Check-In";        break;
-      case 'f':  zType = "Forum post";      break;
-      case 't':  zType = "Wiki Edit";       break;
-      case 'w':  zType = "Ticket Change";   break;
-    }
-    blob_init(&p->hdr, 0, 0);
-    blob_init(&p->txt, 0, 0);
-    blob_appendf(&p->txt,"== %s %s ==\n%s\n%s/info/%.20s\n",
-      db_column_text(&q,1),
-      zType,
-      db_column_text(&q,2),
-      zUrl,
-      db_column_text(&q,0)
-    );
-    if( p->needMod ){
-      blob_appendf(&p->txt,
-        "** Pending moderator approval (%s/modreq) **\n",
-        zUrl
-      );
-    }
-    (*pnEvent)++;
-  }
-  db_finalize(&q);
-
-  /* Early-out if forumpost is not a table in this repository */
-  if( !db_table_exists("repository","forumpost") ){
-    return anchor.pNext;
-  }
-
-  /* For digests, the previous loop also handled forumposts already */
-  if( doDigest ){
-    return anchor.pNext;
-  }
-
-  /* If we reach this point, it means that forumposts exist and this
-  ** is a normal email alert.  Construct full-text forum post alerts
-  ** using a format that enables them to be sent as separate emails.
-  */
-  db_prepare(&q,
-    "SELECT"
-    " forumpost.fpid,"                                      /* 0 */
-    " (SELECT uuid FROM blob WHERE rid=forumpost.fpid),"    /* 1 */
-    " datetime(event.mtime),"                               /* 2 */
-    " substr(comment,instr(comment,':')+2),"                /* 3 */
-    " (SELECT uuid FROM blob WHERE rid=forumpost.firt),"    /* 4 */
-    " wantalert.needMod,"                                   /* 5 */
-    " coalesce(trim(substr(info,1,instr(info,'<')-1)),euser,user)"   /* 6 */
-    " FROM temp.wantalert, event, forumpost"
-    "      LEFT JOIN user ON (login=coalesce(euser,user))"
-    " WHERE event.objid=substr(wantalert.eventId,2)+0"
-    "   AND eventId GLOB 'f*'"
-    "   AND forumpost.fpid=event.objid"
-    " ORDER BY event.mtime"
-  );
-  zFrom = db_get("email-self",0);
-  zSub = db_get("email-subname","");
-  while( db_step(&q)==SQLITE_ROW ){
-    Manifest *pPost = manifest_get(db_column_int(&q,0), CFTYPE_FORUM, 0);
-    const char *zIrt;
-    const char *zUuid;
-    const char *zTitle;
-    const char *z;
-    if( pPost==0 ) continue;
-    p = fossil_malloc( sizeof(EmailEvent) );
-    pLast->pNext = p;
-    pLast = p;
-    p->type = 'f';
-    p->needMod = db_column_int(&q, 5);
-    z = db_column_text(&q,6);
-    p->zFromName = z && z[0] ? fossil_strdup(z) : 0;
-    p->pNext = 0;
-    blob_init(&p->hdr, 0, 0);
-    zUuid = db_column_text(&q, 1);
-    zTitle = db_column_text(&q, 3);
-    if( p->needMod ){
-      blob_appendf(&p->hdr, "Subject: %s Pending Moderation: %s\r\n",
-                   zSub, zTitle);
-    }else{
-      blob_appendf(&p->hdr, "Subject: %s %s\r\n", zSub, zTitle);
-      blob_appendf(&p->hdr, "Message-Id: <%.32s@%s>\r\n", 
-                   zUuid, email_hostname(zFrom));
-      zIrt = db_column_text(&q, 4);
-      if( zIrt && zIrt[0] ){
-        blob_appendf(&p->hdr, "In-Reply-To: <%.32s@%s>\r\n",
-                     zIrt, email_hostname(zFrom));
-      }
-    }
-    blob_init(&p->txt, 0, 0);
-    if( p->needMod ){
-      blob_appendf(&p->txt,
-        "** Pending moderator approval (%s/modreq) **\n",
-        zUrl
-      );
-    }
-    blob_appendf(&p->txt,
-      "Forum post by %s on %s\n",
-      pPost->zUser, db_column_text(&q, 2));
-    blob_appendf(&p->txt, "%s/forumpost/%S\n\n", zUrl, zUuid);
-    blob_append(&p->txt, pPost->zWiki, -1);
-    manifest_destroy(pPost);
-    (*pnEvent)++;
-  }
-  db_finalize(&q);
-
-  return anchor.pNext;
-}
-
-/*
-** Put a header on an alert email
-*/
-void email_header(Blob *pOut){
-  blob_appendf(pOut,
-    "This is an automated email reporting changes "
-    "on Fossil repository %s (%s/timeline)\n",
-    db_get("email-subname","(unknown)"),
-    db_get("email-url","http://localhost:8080"));
-}
-
-/*
-** Append the "unsubscribe" notification and other footer text to
-** the end of an email alert being assemblied in pOut.
-*/
-void email_footer(Blob *pOut){
-  blob_appendf(pOut, "\n-- \nTo unsubscribe: %s/unsubscribe\n",
-     db_get("email-url","http://localhost:8080"));
-}
-
-/*
-** COMMAND:  test-alert
-**
-** Usage: %fossil test-alert EVENTID ...
-**
-** Generate the text of an email alert for all of the EVENTIDs
-** listed on the command-line.  Or if no events are listed on the
-** command line, generate text for all events named in the
-** pending_alert table.
-**
-** This command is intended for testing and debugging the logic
-** that generates email alert text.
-**
-** Options:
-**
-**      --digest           Generate digest alert text
-**      --needmod          Assume all events are pending moderator approval
-*/
-void test_alert_cmd(void){
-  Blob out;
-  int nEvent;
-  int needMod;
-  int doDigest;
-  EmailEvent *pEvent, *p;
-
-  doDigest = find_option("digest",0,0)!=0;
-  needMod = find_option("needmod",0,0)!=0;
-  db_find_and_open_repository(0, 0);
-  verify_all_options();
-  db_begin_transaction();
-  email_schema(0);
-  db_multi_exec("CREATE TEMP TABLE wantalert(eventid TEXT, needMod BOOLEAN)");
-  if( g.argc==2 ){
-    db_multi_exec(
-      "INSERT INTO wantalert(eventId,needMod)"
-      " SELECT eventid, %d FROM pending_alert", needMod);
-  }else{
-    int i;
-    for(i=2; i<g.argc; i++){
-      db_multi_exec("INSERT INTO wantalert(eventId,needMod) VALUES(%Q,%d)",
-           g.argv[i], needMod);
-    }
-  }
-  blob_init(&out, 0, 0);
-  email_header(&out);
-  pEvent = email_compute_event_text(&nEvent, doDigest);
-  for(p=pEvent; p; p=p->pNext){
-    blob_append(&out, "\n", 1);
-    if( blob_size(&p->hdr) ){
-      blob_append(&out, blob_buffer(&p->hdr), blob_size(&p->hdr));
-      blob_append(&out, "\n", 1);
-    }
-    blob_append(&out, blob_buffer(&p->txt), blob_size(&p->txt));
-  }
-  email_free_eventlist(pEvent);
-  email_footer(&out);
-  fossil_print("%s", blob_str(&out));
-  blob_reset(&out);
-  db_end_transaction(0);
-}
-
-/*
-** COMMAND:  test-add-alerts
-**
-** Usage: %fossil test-add-alerts [OPTIONS] EVENTID ...
-**
-** Add one or more events to the pending_alert queue.  Use this
-** command during testing to force email notifications for specific
-** events.
-**
-** EVENTIDs are text.  The first character is 'c', 'f', 't', or 'w'
-** for check-in, forum, ticket, or wiki.  The remaining text is a
-** integer that references the EVENT.OBJID value for the event.
-** Run /timeline?showid to see these OBJID values.
-**
-** Options:
-**
-**    --backoffice        Run email_backoffice() after all alerts have
-**                        been added.  This will cause the alerts to be
-**                        sent out with the SENDALERT_TRACE option.
-**
-**    --debug             Like --backoffice, but add the SENDALERT_STDOUT
-**                        so that emails are printed to standard output
-**                        rather than being sent.
-**
-**    --digest            Process emails using SENDALERT_DIGEST
-*/
-void test_add_alert_cmd(void){
-  int i;
-  int doAuto = find_option("backoffice",0,0)!=0;
-  unsigned mFlags = 0;
-  if( find_option("debug",0,0)!=0 ){
-    doAuto = 1;
-    mFlags = SENDALERT_STDOUT;
-  }
-  if( find_option("digest",0,0)!=0 ){
-    mFlags |= SENDALERT_DIGEST;
-  }
-  db_find_and_open_repository(0, 0);
-  verify_all_options();
-  db_begin_write();
-  email_schema(0);
-  for(i=2; i<g.argc; i++){
-    db_multi_exec("REPLACE INTO pending_alert(eventId) VALUES(%Q)", g.argv[i]);
-  }
-  db_end_transaction(0);
-  if( doAuto ){
-    email_backoffice(SENDALERT_TRACE|mFlags);
-  }
-}
-
-#if INTERFACE
-/*
-** Flags for email_send_alerts()
-*/
-#define SENDALERT_DIGEST      0x0001    /* Send a digest */
-#define SENDALERT_PRESERVE    0x0002    /* Do not mark the task as done */
-#define SENDALERT_STDOUT      0x0004    /* Print emails instead of sending */
-#define SENDALERT_TRACE       0x0008    /* Trace operation for debugging */
-
-#endif /* INTERFACE */
-
-/*
-** Send alert emails to subscribers.
-**
-** This procedure is run by either the backoffice, or in response to the
-** "fossil alerts send" command.  Details of operation are controlled by
-** the flags parameter.
-**
-** Here is a summary of what happens:
-**
-**   (1) Create a TEMP table wantalert(eventId,needMod) and fill it with
-**       all the events that we want to send alerts about.  The needMod
-**       flags is set if and only if the event is still awaiting
-**       moderator approval.  Events with the needMod flag are only
-**       shown to users that have moderator privileges.
-**
-**   (2) Call email_compute_event_text() to compute a list of EmailEvent
-**       objects that describe all events about which we want to send
-**       alerts.
-**
-**   (3) Loop over all subscribers.  Compose and send one or more email
-**       messages to each subscriber that describe the events for
-**       which the subscriber has expressed interest and has
-**       appropriate privileges.
-**
-**   (4) Update the pending_alerts table to indicate that alerts have been
-**       sent.
-**
-** Update 2018-08-09:  Do step (3) before step (4).  Update the
-** pending_alerts table *before* the emails are sent.  That way, if
-** the process malfunctions or crashes, some notifications may never
-** be sent.  But that is better than some recurring bug causing
-** subscribers to be flooded with repeated notifications every 60
-** seconds!
-*/
-void email_send_alerts(u32 flags){
-  EmailEvent *pEvents, *p;
-  int nEvent = 0;
-  Stmt q;
-  const char *zDigest = "false";
-  Blob hdr, body;
-  const char *zUrl;
-  const char *zRepoName;
-  const char *zFrom;
-  const char *zDest = (flags & SENDALERT_STDOUT) ? "stdout" : 0;
-  EmailSender *pSender = 0;
-  u32 senderFlags = 0;
-
-  if( g.fSqlTrace ) fossil_trace("-- BEGIN email_send_alerts(%u)\n", flags);
-  email_schema(0);
-  if( !email_enabled() ) goto send_alerts_done;
-  zUrl = db_get("email-url",0);
-  if( zUrl==0 ) goto send_alerts_done;
-  zRepoName = db_get("email-subname",0);
-  if( zRepoName==0 ) goto send_alerts_done;
-  zFrom = db_get("email-self",0);
-  if( zFrom==0 ) goto send_alerts_done;
-  if( flags & SENDALERT_TRACE ){
-    senderFlags |= EMAIL_TRACE;
-  }
-  pSender = email_sender_new(zDest, senderFlags);
-
-  /* Step (1):  Compute the alerts that need sending
-  */
-  db_multi_exec(
-    "DROP TABLE IF EXISTS temp.wantalert;"
-    "CREATE TEMP TABLE wantalert(eventId TEXT, needMod BOOLEAN, sentMod);"
-  );
-  if( flags & SENDALERT_DIGEST ){
-    /* Unmoderated changes are never sent as part of a digest */
-    db_multi_exec(
-      "INSERT INTO wantalert(eventId,needMod)"
-      " SELECT eventid, 0"
-      "   FROM pending_alert"
-      "  WHERE sentDigest IS FALSE"
-      "    AND NOT EXISTS(SELECT 1 FROM private WHERE rid=substr(eventid,2));"
-    );
-    zDigest = "true";
-  }else{
-    /* Immediate alerts might include events that are subject to
-    ** moderator approval */
-    db_multi_exec(
-      "INSERT INTO wantalert(eventId,needMod,sentMod)"
-      " SELECT eventid,"
-      "        EXISTS(SELECT 1 FROM private WHERE rid=substr(eventid,2)),"
-      "        sentMod"
-      "   FROM pending_alert"
-      "  WHERE sentSep IS FALSE;"
-      "DELETE FROM wantalert WHERE needMod AND sentMod;"
-    );
-  }
-
-  /* Step 2: compute EmailEvent objects for every notification that
-  ** needs sending.
-  */
-  pEvents = email_compute_event_text(&nEvent, (flags & SENDALERT_DIGEST)!=0);
-  if( nEvent==0 ) goto send_alerts_done;
-
-  /* Step 4a: Update the pending_alerts table to designate the
-  ** alerts as having all been sent.  This is done *before* step (3)
-  ** so that a crash will not cause alerts to be sent multiple times.
-  ** Better a missed alert than being spammed with hundreds of alerts
-  ** due to a bug.
-  */
-  if( (flags & SENDALERT_PRESERVE)==0 ){
-    if( flags & SENDALERT_DIGEST ){
-      db_multi_exec(
-        "UPDATE pending_alert SET sentDigest=true"
-        " WHERE eventid IN (SELECT eventid FROM wantalert);"
-      );
-    }else{
-      db_multi_exec(
-        "UPDATE pending_alert SET sentSep=true"
-        " WHERE eventid IN (SELECT eventid FROM wantalert WHERE NOT needMod);"
-        "UPDATE pending_alert SET sentMod=true"
-        " WHERE eventid IN (SELECT eventid FROM wantalert WHERE needMod);"
-      );
-    }
-  }
-
-  /* Step 3: Loop over subscribers.  Send alerts
-  */
-  blob_init(&hdr, 0, 0);
-  blob_init(&body, 0, 0);
-  db_prepare(&q,
-     "SELECT"
-     " hex(subscriberCode),"  /* 0 */
-     " semail,"               /* 1 */
-     " ssub,"                 /* 2 */
-     " fullcap(user.cap)"     /* 3 */
-     " FROM subscriber LEFT JOIN user ON (login=suname)"
-     " WHERE sverified AND NOT sdonotcall"
-     "  AND sdigest IS %s",
-     zDigest/*safe-for-%s*/
-  );
-  while( db_step(&q)==SQLITE_ROW ){
-    const char *zCode = db_column_text(&q, 0);
-    const char *zSub = db_column_text(&q, 2);
-    const char *zEmail = db_column_text(&q, 1);
-    const char *zCap = db_column_text(&q, 3);
-    int nHit = 0;
-    for(p=pEvents; p; p=p->pNext){
-      if( strchr(zSub,p->type)==0 ) continue;
-      if( p->needMod ){
-        /* For events that require moderator approval, only send an alert
-        ** if the recipient is a moderator for that type of event */
-        char xType = '*';
-        switch( p->type ){
-          case 'f':  xType = '5';  break;
-          case 't':  xType = 'q';  break;
-          case 'w':  xType = 'l';  break;
-        }
-        if( strchr(zCap,xType)==0 ) continue;
-      }else if( strchr(zCap,'s')!=0 || strchr(zCap,'a')!=0 ){
-        /* Setup and admin users can get any notification that does not
-        ** require moderation */
-      }else{
-        /* Other users only see the alert if they have sufficient
-        ** privilege to view the event itself */
-        char xType = '*';
-        switch( p->type ){
-          case 'c':  xType = 'o';  break;
-          case 'f':  xType = '2';  break;
-          case 't':  xType = 'r';  break;
-          case 'w':  xType = 'j';  break;
-        }
-        if( strchr(zCap,xType)==0 ) continue;
-      }
-      if( blob_size(&p->hdr)>0 ){
-        /* This alert should be sent as a separate email */
-        Blob fhdr, fbody;
-        blob_init(&fhdr, 0, 0);
-        blob_appendf(&fhdr, "To: <%s>\r\n", zEmail);
-        blob_append(&fhdr, blob_buffer(&p->hdr), blob_size(&p->hdr));
-        blob_init(&fbody, blob_buffer(&p->txt), blob_size(&p->txt));
-        blob_appendf(&fbody, "\n-- \nSubscription info: %s/alerts/%s\n",
-           zUrl, zCode);
-        email_send(pSender,&fhdr,&fbody,p->zFromName);
-        blob_reset(&fhdr);
-        blob_reset(&fbody);
-      }else{
-        /* Events other than forum posts are gathered together into
-        ** a single email message */
-        if( nHit==0 ){
-          blob_appendf(&hdr,"To: <%s>\r\n", zEmail);
-          blob_appendf(&hdr,"Subject: %s activity alert\r\n", zRepoName);
-          blob_appendf(&body,
-            "This is an automated email sent by the Fossil repository "
-            "at %s to report changes.\n",
-            zUrl
-          );
-        }
-        nHit++;
-        blob_append(&body, "\n", 1);
-        blob_append(&body, blob_buffer(&p->txt), blob_size(&p->txt));
-      }
-    }
-    if( nHit==0 ) continue;
-    blob_appendf(&body,"\n-- \nSubscription info: %s/alerts/%s\n",
-         zUrl, zCode);
-    email_send(pSender,&hdr,&body,0);
-    blob_truncate(&hdr, 0);
-    blob_truncate(&body, 0);
-  }
-  blob_reset(&hdr);
-  blob_reset(&body);
-  db_finalize(&q);
-  email_free_eventlist(pEvents);
-
-  /* Step 4b: Update the pending_alerts table to remove all of the
-  ** alerts that have been completely sent.
-  */
-  db_multi_exec("DELETE FROM pending_alert WHERE sentDigest AND sentSep;");
-
-send_alerts_done:
-  email_sender_free(pSender);
-  if( g.fSqlTrace ) fossil_trace("-- END email_send_alerts(%u)\n", flags);
-}
-
-/*
-** Do backoffice processing for email notifications.  In other words,
-** check to see if any email notifications need to occur, and then
-** do them.
-**
-** This routine is intended to run in the background, after webpages.
-**
-** The mFlags option is zero or more of the SENDALERT_* flags.  Normally
-** this flag is zero, but the test-set-alert command sets it to
-** SENDALERT_TRACE.
-*/
-void email_backoffice(u32 mFlags){
-  int iJulianDay;
-  if( !email_tables_exist() ) return;
-  email_send_alerts(mFlags);
-  iJulianDay = db_int(0, "SELECT julianday('now')");
-  if( iJulianDay>db_get_int("email-last-digest",0) ){
-    db_set_int("email-last-digest",iJulianDay,0);
-    email_send_alerts(SENDALERT_DIGEST|mFlags);
-  }
-}
-
-/*
-** WEBPAGE: contact_admin
-**
-** A web-form to send an email message to the repository administrator,
-** or (with appropriate permissions) to anybody.
-*/
-void contact_admin_page(void){
-  const char *zAdminEmail = db_get("email-admin",0);
-  unsigned int uSeed = 0;
-  const char *zDecoded;
-  char *zCaptcha = 0;
-
-  login_check_credentials();
-  if( zAdminEmail==0 || zAdminEmail[0]==0 ){
-    style_header("Outbound Email Disabled");
-    @ <p>Outbound email is disabled on this repository
-    style_footer();
-    return;
-  }
-  if( P("submit")!=0 
-   && P("subject")!=0
-   && P("msg")!=0
-   && P("from")!=0
-   && cgi_csrf_safe(1)
-   && captcha_is_correct(0)
-  ){
-    Blob hdr, body;
-    EmailSender *pSender = email_sender_new(0,0);
-    blob_init(&hdr, 0, 0);
-    blob_appendf(&hdr, "To: <%s>\r\nSubject: %s administrator message\r\n",
-                 zAdminEmail, db_get("email-subname","Fossil Repo"));
-    blob_init(&body, 0, 0);
-    blob_appendf(&body, "Message from [%s]\n", PT("from")/*safe-for-%s*/);
-    blob_appendf(&body, "Subject: [%s]\n\n", PT("subject")/*safe-for-%s*/);
-    blob_appendf(&body, "%s", PT("msg")/*safe-for-%s*/);
-    email_send(pSender, &hdr, &body, 0);
-    style_header("Message Sent");
-    if( pSender->zErr ){
-      @ <h1>Internal Error</h1>
-      @ <p>The following error was reported by the system:
-      @ <blockquote><pre>
-      @ %h(pSender->zErr)
-      @ </pre></blockquote>
-    }else{
-      @ <p>Your message has been sent to the repository administrator.
-      @ Thank you for your input.</p>
-    }
-    email_sender_free(pSender);
-    style_footer();
-    return;
-  }
-  if( captcha_needed() ){
-    uSeed = captcha_seed();
-    zDecoded = captcha_decode(uSeed);
-    zCaptcha = captcha_render(zDecoded);
-  }
-  style_header("Message To Administrator");
-  form_begin(0, "%R/contact_admin");
-  @ <p>Enter a message to the repository administrator below:</p>
-  @ <table class="subscribe">
-  if( zCaptcha ){
-    @ <tr>
-    @  <td class="form_label">Security&nbsp;Code:</td>
-    @  <td><input type="text" name="captcha" value="" size="10">
-    @  <input type="hidden" name="captchaseed" value="%u(uSeed)"></td>
-    @ </tr>
-  }
-  @ <tr>
-  @  <td class="form_label">Your&nbsp;Email&nbsp;Address:</td>
-  @  <td><input type="text" name="from" value="%h(PT("from"))" size="30"></td>
-  @ </tr>
-  @ <tr>
-  @  <td class="form_label">Subject:</td>
-  @  <td><input type="text" name="subject" value="%h(PT("subject"))"\
-  @  size="80"></td>
-  @ </tr>
-  @ <tr>
-  @  <td class="form_label">Message:</td>
-  @  <td><textarea name="msg" cols="80" rows="10" wrap="virtual">\
-  @ %h(PT("msg"))</textarea>
-  @ </tr>
-  @ <tr>
-  @   <td></td>
-  @   <td><input type="submit" name="submit" value="Send Message">
-  @ </tr>
-  @ </table>
-  if( zCaptcha ){
-    @ <div class="captcha"><table class="captcha"><tr><td><pre>
-    @ %h(zCaptcha)
-    @ </pre>
-    @ Enter the 8 characters above in the "Security Code" box
-    @ </td></tr></table></div>
-  }
-  @ </form>
-  style_footer();
-}
-
-/*
-** Send an annoucement message described by query parameter.
-** Permission to do this has already been verified.
-*/
-static char *email_send_announcement(void){
-  EmailSender *pSender;
-  char *zErr;
-  const char *zTo = PT("to");
-  char *zSubject = PT("subject");
-  int bAll = PB("all");
-  int bAA = PB("aa");
-  const char *zSub = db_get("email-subname", "[Fossil Repo]");
-  int bTest2 = fossil_strcmp(P("name"),"test2")==0;
-  Blob hdr, body;
-  blob_init(&body, 0, 0);
-  blob_init(&hdr, 0, 0);
-  blob_appendf(&body, "%s", PT("msg")/*safe-for-%s*/);
-  pSender = email_sender_new(bTest2 ? "blob" : 0, 0);
-  if( zTo[0] ){
-    blob_appendf(&hdr, "To: <%s>\r\nSubject: %s %s\r\n", zTo, zSub, zSubject);
-    email_send(pSender, &hdr, &body, 0);
-  }
-  if( bAll || bAA ){
-    Stmt q;
-    int nUsed = blob_size(&body);
-    const char *zURL =  db_get("email-url",0);
-    db_prepare(&q, "SELECT semail, hex(subscriberCode) FROM subscriber "
-                   " WHERE sverified AND NOT sdonotcall %s",
-                   bAll ? "" : " AND ssub LIKE '%a%'");
-    while( db_step(&q)==SQLITE_ROW ){
-      const char *zCode = db_column_text(&q, 1);
-      zTo = db_column_text(&q, 0);
-      blob_truncate(&hdr, 0);
-      blob_appendf(&hdr, "To: <%s>\r\nSubject: %s %s\r\n", zTo, zSub, zSubject);
-      if( zURL ){
-        blob_truncate(&body, nUsed);
-        blob_appendf(&body,"\n-- \nSubscription info: %s/alerts/%s\n",
-           zURL, zCode);
-      }
-      email_send(pSender, &hdr, &body, 0);
-    }
-    db_finalize(&q);
-  }
-  if( bTest2 ){
-    /* If the URL is /announce/test2 instead of just /announce, then no
-    ** email is actually sent.  Instead, the text of the email that would
-    ** have been sent is displayed in the result window. */
-    @ <pre style='border: 2px solid blue; padding: 1ex'>
-    @ %h(blob_str(&pSender->out))
-    @ </pre>
-  }
-  zErr = pSender->zErr;
-  pSender->zErr = 0;
-  email_sender_free(pSender);
-  return zErr;
-}
-
-
-/*
-** WEBPAGE: announce
-**
-** A web-form, available to users with the "Send-Announcement" or "A"
-** capability, that allows one to send announcements to whomever
-** has subscribed to receive announcements.  The administrator can
-** also send a message to an arbitrary email address and/or to all
-** subscribers regardless of whether or not they have elected to
-** receive announcements.
-*/
-void announce_page(void){
-  login_check_credentials();
-  if( !g.perm.Announce ){
-    login_needed(0);
-    return;
-  }
-  if( fossil_strcmp(P("name"),"test1")==0 ){
-    /* Visit the /announce/test1 page to see the CGI variables */
-    @ <p style='border: 1px solid black; padding: 1ex;'>
-    cgi_print_all(0, 0);
-    @ </p>
-  }else
-  if( P("submit")!=0 && cgi_csrf_safe(1) ){
-    char *zErr = email_send_announcement();
-    style_header("Announcement Sent");
-    if( zErr ){
-      @ <h1>Internal Error</h1>
-      @ <p>The following error was reported by the system:
-      @ <blockquote><pre>
-      @ %h(zErr)
-      @ </pre></blockquote>
-    }else{
-      @ <p>The announcement has been sent.</p>
-    }
-    style_footer();    
-    return;
-  }
-  style_header("Send Announcement");
-  @ <form method="POST">
-  @ <table class="subscribe">
-  if( g.perm.Admin ){
-    int aa = PB("aa");
-    int all = PB("all");
-    const char *aack = aa ? "checked" : "";
-    const char *allck = all ? "checked" : "";
-    @ <tr>
-    @  <td class="form_label">To:</td>
-    @  <td><input type="text" name="to" value="%h(PT("to"))" size="30"><br>
-    @  <label><input type="checkbox" name="aa" %s(aack)> \
-    @  All "announcement" subscribers</label> \
-    @  <a href="%R/subscribers?only=a" target="_blank">(list)</a><br>
-    @  <label><input type="checkbox" name="all" %s(allck)> \
-    @  All subscribers</label> \
-    @  <a href="%R/subscribers" target="_blank">(list)</a><br></td>
-    @ </tr>
-  }
-  @ <tr>
-  @  <td class="form_label">Subject:</td>
-  @  <td><input type="text" name="subject" value="%h(PT("subject"))"\
-  @  size="80"></td>
-  @ </tr>
-  @ <tr>
-  @  <td class="form_label">Message:</td>
-  @  <td><textarea name="msg" cols="80" rows="10" wrap="virtual">\
-  @ %h(PT("msg"))</textarea>
-  @ </tr>
-  @ <tr>
-  @   <td></td>
-  @   <td><input type="submit" name="submit" value="Send Message">
-  @ </tr>
-  @ </table>
-  @ </form>
-  style_footer();
-}

Index: src/forum.c
==================================================================
--- src/forum.c
+++ src/forum.c
@@ -774,11 +774,11 @@
 **
 **   fpid=X        Hash of the post to be editted.  REQUIRED
 */
 void forumedit_page(void){
   int fpid;
-  Manifest *pPost;
+  Manifest *pPost = 0;
   const char *zMimetype = 0;
   const char *zContent = 0;
   const char *zTitle = 0;
   int isCsrfSafe;
   int isDelete = 0;
@@ -864,11 +864,11 @@
     style_header("Edit %s", zTitle ? "Post" : "Reply");
     @ <h1>Original Post:</h1>
     forum_render(pPost->zThreadTitle, pPost->zMimetype, pPost->zWiki,
                  "forumEdit");
     if( P("preview") ){
-      @ <h1>Preview Of Editted Post:</h1>
+      @ <h1>Preview of Edited Post:</h1>
       forum_render(zTitle, zMimetype, zContent,"forumEdit");
     }
     @ <h1>Revised Message:</h1>
     @ <form action="%R/forume2" method="POST">
     @ <input type="hidden" name="fpid" value="%h(P("fpid"))">
@@ -928,11 +928,13 @@
 **    x=X             Skip the first X threads
 */
 void forum_main_page(void){
   Stmt q;
   int iLimit, iOfst, iCnt;
+  int srchFlags;
   login_check_credentials();
+  srchFlags = search_restrict(SRCH_FORUM);
   if( !g.perm.RdForum ){
     login_needed(g.anon.RdForum);
     return;
   }
   style_header("Forum");
@@ -940,14 +942,16 @@
     style_submenu_element("New Message","%R/forumnew");
   }
   if( g.perm.ModForum && moderation_needed() ){
     style_submenu_element("Moderation Requests", "%R/modreq");
   }
-  if( search_screen(SRCH_FORUM, 0) ){
-    style_submenu_element("Recent Threads","%R/forum");
-    style_footer();
-    return;
+  if( (srchFlags & SRCH_FORUM)!=0 ){
+    if( search_screen(SRCH_FORUM, 0) ){
+      style_submenu_element("Recent Threads","%R/forum");
+      style_footer();
+      return;
+    }
   }
   iLimit = atoi(PD("n","25"));
   iOfst = atoi(PD("x","0"));
   iCnt = 0;
   if( db_table_exists("repository","forumpost") ){
@@ -990,11 +994,11 @@
         if( iOfst>0 ){
           @ <h1>Threads at least %s(zAge) old</h1>
         }else{
           @ <h1>Most recent threads</h1>
         }
-        @ <div class='fileage'><table width="100%%">
+        @ <div class='forumPosts fileage'><table width="100%%">
         if( iOfst>0 ){
           if( iOfst>iLimit ){
             @ <tr><td colspan="3">\
             @ %z(href("%R/forum?x=%d&n=%d",iOfst-iLimit,iLimit))\
             @ &uarr; Newer...</a></td></tr>

Index: src/json.c
==================================================================
--- src/json.c
+++ src/json.c
@@ -1890,10 +1890,19 @@
   ADD(Attach,"attachFile");
   ADD(TktFmt,"createTicketReport");
   ADD(RdAddr,"readPrivate");
   ADD(Zip,"zip");
   ADD(Private,"xferPrivate");
+  ADD(WrUnver,"writeUnversioned");
+  ADD(RdForum,"readForum");
+  ADD(WrForum,"writeForum");
+  ADD(WrTForum,"writeTrustedForum");
+  ADD(ModForum,"moderateForum");
+  ADD(AdminForum,"adminForum");
+  ADD(EmailAlert,"emailAlert");
+  ADD(Announce,"announce");
+  ADD(Debug,"debug");
 #undef ADD
   return payload;
 }
 
 /*

Index: src/login.c
==================================================================
--- src/login.c
+++ src/login.c
@@ -729,45 +729,41 @@
     if( anonFlag ){
       @ <td><input type="text" id="u" name="u" value="anonymous" size="30"></td>
     }else{
       @ <td><input type="text" id="u" name="u" value="" size="30" /></td>
     }
+    @ </tr>
+    @ <tr>
+    @  <td class="form_label">Password:</td>
+    @  <td><input type="password" id="p" name="p" value="" size="30" /></td>
+    @ </tr>
     if( P("HTTPS")==0 ){
-      @ <td width="15"><td rowspan="2">
-      @ <p class='securityWarning'>
-      @ Warning: Your password will be sent in the clear over an
+      @ <tr><td class="form_label">Warning:</td>
+      @ <td><span class='securityWarning'>
+      @ Your password will be sent in the clear over an
       @ unencrypted connection.
       if( g.sslNotAvailable ){
         @ No encrypted connection is available on this server.
       }else{
         @ Consider logging in at
         @ <a href='%s(g.zHttpsURL)'>%h(g.zHttpsURL)</a> instead.
       }
-      @ </p>
+      @ </span></td></tr>
     }
-    @ </tr>
-    @ <tr>
-    @  <td class="form_label">Password:</td>
-    @  <td><input type="password" id="p" name="p" value="" size="30" /></td>
-    @ </tr>
     if( g.zLogin==0 && (anonFlag || zGoto==0) ){
       zAnonPw = db_text(0, "SELECT pw FROM user"
                            " WHERE login='anonymous'"
                            "   AND cap!=''");
     }
     @ <tr>
     @   <td></td>
     @   <td><input type="submit" name="in" value="Login"></td>
-    @   <td colspan="2">&larr; Pressing this button grants\
-    @   permission to store a cookie
     @ </tr>
     if( !noAnon && login_self_register_available(0) ){
       @ <tr>
       @   <td></td>
       @   <td><input type="submit" name="self" value="Create A New Account">
-      @   <td colspan="2"> \
-      @   &larr; Don't have a login?  Click this button to create one.
       @ </tr>
     }
     @ </table>
     if( zAnonPw && !noAnon ){
       unsigned int uSeed = captcha_seed();
@@ -776,11 +772,12 @@
       char *zCaptcha = captcha_render(zDecoded);
   
       @ <p><input type="hidden" name="cs" value="%u(uSeed)" />
       @ Visitors may enter <b>anonymous</b> as the user-ID with
       @ the 8-character hexadecimal password shown below:</p>
-      @ <div class="captcha"><table class="captcha"><tr><td><pre>
+      @ <div class="captcha"><table class="captcha"><tr><td>\
+      @ <pre class="captcha">
       @ %h(zCaptcha)
       @ </pre></td></tr></table>
       if( bAutoCaptcha ) {
          @ <input type="button" value="Fill out captcha" id='autofillButton' \
          @ data-af='%s(zDecoded)' />
@@ -789,30 +786,32 @@
       @ </div>
       free(zCaptcha);
     }
     @ </form>
   }
-  if( login_is_individual() && g.perm.Password ){
-    if( email_enabled() ){
+  if( login_is_individual() ){
+    if( g.perm.EmailAlert && alert_enabled() ){
       @ <hr>
       @ <p>Configure <a href="%R/alerts">Email Alerts</a>
       @ for user <b>%h(g.zLogin)</b></p>
     }
-    @ <hr />
-    @ <p>Change Password for user <b>%h(g.zLogin)</b>:</p>
-    form_begin(0, "%R/login");
-    @ <table>
-    @ <tr><td class="form_label">Old Password:</td>
-    @ <td><input type="password" name="p" size="30" /></td></tr>
-    @ <tr><td class="form_label">New Password:</td>
-    @ <td><input type="password" name="n1" size="30" /></td></tr>
-    @ <tr><td class="form_label">Repeat New Password:</td>
-    @ <td><input type="password" name="n2" size="30" /></td></tr>
-    @ <tr><td></td>
-    @ <td><input type="submit" value="Change Password" /></td></tr>
-    @ </table>
-    @ </form>
+    if( g.perm.Password ){
+      @ <hr>
+      @ <p>Change Password for user <b>%h(g.zLogin)</b>:</p>
+      form_begin(0, "%R/login");
+      @ <table>
+      @ <tr><td class="form_label">Old Password:</td>
+      @ <td><input type="password" name="p" size="30" /></td></tr>
+      @ <tr><td class="form_label">New Password:</td>
+      @ <td><input type="password" name="n1" size="30" /></td></tr>
+      @ <tr><td class="form_label">Repeat New Password:</td>
+      @ <td><input type="password" name="n2" size="30" /></td></tr>
+      @ <tr><td></td>
+      @ <td><input type="submit" value="Change Password" /></td></tr>
+      @ </table>
+      @ </form>
+    }
   }
   style_footer();
 }
 
 /*
@@ -1194,11 +1193,13 @@
   ** permissions.
   */
   zPublicPages = db_get("public-pages",0);
   if( zPublicPages!=0 ){
     Glob *pGlob = glob_create(zPublicPages);
-    if( glob_match(pGlob, PD("REQUEST_URI","no-match")) ){
+    const char *zUri = PD("REQUEST_URI","");
+    zUri += (int)strlen(g.zTop);
+    if( glob_match(pGlob, zUri) ){
       login_set_capabilities(db_get("default-perms","u"), 0);
     }
     glob_free(pGlob);
   }
 }
@@ -1262,11 +1263,11 @@
                              p->NewTkt = p->Password = p->RdAddr =
                              p->TktFmt = p->Attach = p->ApndTkt =
                              p->ModWiki = p->ModTkt = p->Delete =
                              p->RdForum = p->WrForum = p->ModForum =
                              p->WrTForum = p->AdminForum =
-                             p->EmailAlert = p->Announce =
+                             p->EmailAlert = p->Announce = p->Debug =
                              p->WrUnver = p->Private = 1;
                              /* Fall thru into Read/Write */
       case 'i':   p->Read = p->Write = 1;                      break;
       case 'o':   p->Read = 1;                                 break;
       case 'z':   p->Zip = 1;                                  break;
@@ -1542,11 +1543,11 @@
   }
   zPerms = db_get("default-perms","u");
 
   /* Prompt the user for email alerts if this repository is configured for
   ** email alerts and if the default permissions include "7" */
-  canDoAlerts = email_tables_exist() && db_int(0,
+  canDoAlerts = alert_tables_exist() && db_int(0,
     "SELECT fullcap(%Q) GLOB '*7*'", zPerms
   );
   doAlerts = canDoAlerts && atoi(PD("alerts","1"))!=0;
 
   zUserID = PDT("u","");
@@ -1615,11 +1616,11 @@
     uid = db_int(0, "SELECT uid FROM user WHERE login=%Q", zUserID);
     login_set_user_cookie(zUserID, uid, NULL);
     if( doAlerts ){
       /* Also make the new user a subscriber. */
       Blob hdr, body;
-      EmailSender *pSender;
+      AlertSender *pSender;
       sqlite3_int64 id;   /* New subscriber Id */
       const char *zCode;  /* New subscriber code (in hex) */
       const char *zGoto = P("g");
       int nsub = 0;
       char ssub[20];
@@ -1653,17 +1654,17 @@
       }
       zCode = db_text(0,
            "SELECT hex(subscriberCode) FROM subscriber WHERE subscriberId=%lld",
            id);
       /* A verification email */
-      pSender = email_sender_new(0,0);
+      pSender = alert_sender_new(0,0);
       blob_init(&hdr,0,0);
       blob_init(&body,0,0);
       blob_appendf(&hdr, "To: <%s>\n", zEAddr);
       blob_appendf(&hdr, "Subject: Subscription verification\n");
-      email_append_confirmation_message(&body, zCode);
-      email_send(pSender, &hdr, &body, 0);
+      alert_append_confirmation_message(&body, zCode);
+      alert_send(pSender, &hdr, &body, 0);
       style_header("Email Verification");
       if( pSender->zErr ){
         @ <h1>Internal Error</h1>
         @ <p>The following internal error was encountered while trying
         @ to send the confirmation email:
@@ -1673,11 +1674,11 @@
       }else{
         @ <p>An email has been sent to "%h(zEAddr)". That email contains a
         @ hyperlink that you must click on in order to activate your
         @ subscription.</p>
       }
-      email_sender_free(pSender);
+      alert_sender_free(pSender);
       if( zGoto ){
         @ <p><a href='%h(zGoto)'>Continue</a>
       }
       style_footer();
       return;
@@ -1699,66 +1700,67 @@
   @ <p><input type="hidden" name="captchaseed" value="%u(uSeed)" />
   @ <table class="login_out">
   @ <tr>
   @   <td class="form_label" align="right">User ID:</td>
   @   <td><input type="text" name="u" value="%h(zUserID)" size="30"></td>
+  @
   if( iErrLine==1 ){
-    @   <td><span class='loginError'>&larr; %h(zErr)</span></td>
+    @ <tr><td><td><span class='loginError'>&uarr; %h(zErr)</span></td></tr>
   }
-  @ </tr>
   @ <tr>
   @   <td class="form_label" align="right">Display Name:</td>
   @   <td><input type="text" name="dn" value="%h(zDName)" size="30"></td>
+  @ </tr>
   if( iErrLine==2 ){
-    @   <td><span class='loginError'>&larr; %h(zErr)</span></td>
+    @ <tr><td><td><span class='loginError'>&uarr; %h(zErr)</span></td></tr>
   }
   @ </tr>
   @ <tr>
   @   <td class="form_label" align="right">Email Address:</td>
   @   <td><input type="text" name="ea" value="%h(zEAddr)" size="30"></td>
+  @ </tr>
   if( iErrLine==3 ){
-    @   <td><span class='loginError'>&larr; %h(zErr)</span></td>
+    @ <tr><td><td><span class='loginError'>&uarr; %h(zErr)</span></td></tr>
   }
-  @ </tr>
   if( canDoAlerts ){
     int a = atoi(PD("alerts","1"));
     @ <tr>
-    @   <td class="form_label" align="right">Receive Email Alerts?</td>
+    @   <td class="form_label" align="right">Email&nbsp;Alerts?</td>
     @   <td><select size='1' name='alerts'>
     @       <option value="1" %s(a?"selected":"")>Yes</option>
     @       <option value="0" %s(!a?"selected":"")>No</option>
     @   </select></td></tr>
   }
   @ <tr>
   @   <td class="form_label" align="right">Password:</td>
   @   <td><input type="password" name="p" value="%h(zPasswd)" size="30"></td>
+  @ <tr>
   if( iErrLine==4 ){
-    @   <td><span class='loginError'>&larr; %h(zErr)</span></td>
-  }else{
-    @   <td>&larr; Must be at least 6 characters</td>
+    @ <tr><td><td><span class='loginError'>&uarr; %h(zErr)</span></td></tr>
   }
-  @ </tr>
   @ <tr>
-  @   <td class="form_label" align="right">Confirm password:</td>
+  @   <td class="form_label" align="right">Confirm:</td>
   @   <td><input type="password" name="cp" value="%h(zConfirm)" size="30"></td>
+  @ </tr>
   if( iErrLine==5 ){
-    @   <td><span class='loginError'>&larr; %h(zErr)</span></td>
+    @ <tr><td><td><span class='loginError'>&uarr; %h(zErr)</span></td></tr>
   }
-  @ </tr>
   @ <tr>
-  @   <td class="form_label" align="right">Captcha text (below):</td>
+  @   <td class="form_label" align="right">Captcha:</td>
   @   <td><input type="text" name="captcha" value="" size="30"></td>
+  @ </tr>
   if( iErrLine==6 ){
-    @   <td><span class='loginError'>&larr; %h(zErr)</span></td>
+    @ <tr><td><td><span class='loginError'>&uarr; %h(zErr)</span></td></tr>
   }
-  @ </tr>
   @ <tr><td></td>
   @ <td><input type="submit" name="new" value="Register" /></td></tr>
   @ </table>
-  @ <div class="captcha"><table class="captcha"><tr><td><pre>
+  @ <div class="captcha"><table class="captcha"><tr><td><pre class="captcha">
   @ %h(zCaptcha)
-  @ </pre></td></tr></table></div>
+  @ </pre>
+  @ Enter this 8-letter code in the "Captcha" box above.
+  @ </td></tr></table></div>
   @ </form>
   style_footer();
 
   free(zCaptcha);
 }

Index: src/main.mk
==================================================================
--- src/main.mk
+++ src/main.mk
@@ -11,13 +11,15 @@
 #
 
 XBCC = $(BCC) $(BCCFLAGS)
 XTCC = $(TCC) -I. -I$(SRCDIR) -I$(OBJDIR) $(TCCFLAGS)
 
+TESTFLAGS := -quiet
 
 SRC = \
   $(SRCDIR)/add.c \
+  $(SRCDIR)/alerts.c \
   $(SRCDIR)/allrepo.c \
   $(SRCDIR)/attach.c \
   $(SRCDIR)/backoffice.c \
   $(SRCDIR)/bag.c \
   $(SRCDIR)/bisect.c \
@@ -44,11 +46,10 @@
   $(SRCDIR)/descendants.c \
   $(SRCDIR)/diff.c \
   $(SRCDIR)/diffcmd.c \
   $(SRCDIR)/dispatch.c \
   $(SRCDIR)/doc.c \
-  $(SRCDIR)/email.c \
   $(SRCDIR)/encode.c \
   $(SRCDIR)/etag.c \
   $(SRCDIR)/event.c \
   $(SRCDIR)/export.c \
   $(SRCDIR)/file.c \
@@ -177,10 +178,11 @@
   $(SRCDIR)/../skins/bootstrap/header.txt \
   $(SRCDIR)/../skins/default/css.txt \
   $(SRCDIR)/../skins/default/details.txt \
   $(SRCDIR)/../skins/default/footer.txt \
   $(SRCDIR)/../skins/default/header.txt \
+  $(SRCDIR)/../skins/default/js.txt \
   $(SRCDIR)/../skins/eagle/css.txt \
   $(SRCDIR)/../skins/eagle/details.txt \
   $(SRCDIR)/../skins/eagle/footer.txt \
   $(SRCDIR)/../skins/eagle/header.txt \
   $(SRCDIR)/../skins/enhanced1/css.txt \
@@ -223,10 +225,11 @@
   $(SRCDIR)/useredit.js \
   $(SRCDIR)/wiki.wiki
 
 TRANS_SRC = \
   $(OBJDIR)/add_.c \
+  $(OBJDIR)/alerts_.c \
   $(OBJDIR)/allrepo_.c \
   $(OBJDIR)/attach_.c \
   $(OBJDIR)/backoffice_.c \
   $(OBJDIR)/bag_.c \
   $(OBJDIR)/bisect_.c \
@@ -253,11 +256,10 @@
   $(OBJDIR)/descendants_.c \
   $(OBJDIR)/diff_.c \
   $(OBJDIR)/diffcmd_.c \
   $(OBJDIR)/dispatch_.c \
   $(OBJDIR)/doc_.c \
-  $(OBJDIR)/email_.c \
   $(OBJDIR)/encode_.c \
   $(OBJDIR)/etag_.c \
   $(OBJDIR)/event_.c \
   $(OBJDIR)/export_.c \
   $(OBJDIR)/file_.c \
@@ -360,10 +362,11 @@
   $(OBJDIR)/xfersetup_.c \
   $(OBJDIR)/zip_.c
 
 OBJ = \
  $(OBJDIR)/add.o \
+ $(OBJDIR)/alerts.o \
  $(OBJDIR)/allrepo.o \
  $(OBJDIR)/attach.o \
  $(OBJDIR)/backoffice.o \
  $(OBJDIR)/bag.o \
  $(OBJDIR)/bisect.o \
@@ -390,11 +393,10 @@
  $(OBJDIR)/descendants.o \
  $(OBJDIR)/diff.o \
  $(OBJDIR)/diffcmd.o \
  $(OBJDIR)/dispatch.o \
  $(OBJDIR)/doc.o \
- $(OBJDIR)/email.o \
  $(OBJDIR)/encode.o \
  $(OBJDIR)/etag.o \
  $(OBJDIR)/event.o \
  $(OBJDIR)/export.o \
  $(OBJDIR)/file.o \
@@ -546,11 +548,11 @@
 #
 # TESTFLAGS can also include names of specific test files to limit
 # the run to just those test cases.
 #
 test:	$(OBJDIR) $(APPNAME)
-	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) -quiet $(TESTFLAGS)
+	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) $(TESTFLAGS)
 
 $(OBJDIR)/VERSION.h:	$(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
 	$(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid  $(SRCDIR)/../manifest  $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
 
 $(OBJDIR)/default_css.h:	$(SRCDIR)/default_css.txt $(OBJDIR)/mkcss
@@ -695,10 +697,11 @@
 $(OBJDIR)/builtin_data.h: $(OBJDIR)/mkbuiltin $(EXTRA_FILES)
 	$(OBJDIR)/mkbuiltin --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
 
 $(OBJDIR)/headers:	$(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/default_css.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
 	$(OBJDIR)/makeheaders $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
+	$(OBJDIR)/alerts_.c:$(OBJDIR)/alerts.h \
 	$(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
 	$(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
 	$(OBJDIR)/backoffice_.c:$(OBJDIR)/backoffice.h \
 	$(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
 	$(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
@@ -725,11 +728,10 @@
 	$(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h \
 	$(OBJDIR)/diff_.c:$(OBJDIR)/diff.h \
 	$(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h \
 	$(OBJDIR)/dispatch_.c:$(OBJDIR)/dispatch.h \
 	$(OBJDIR)/doc_.c:$(OBJDIR)/doc.h \
-	$(OBJDIR)/email_.c:$(OBJDIR)/email.h \
 	$(OBJDIR)/encode_.c:$(OBJDIR)/encode.h \
 	$(OBJDIR)/etag_.c:$(OBJDIR)/etag.h \
 	$(OBJDIR)/event_.c:$(OBJDIR)/event.h \
 	$(OBJDIR)/export_.c:$(OBJDIR)/export.h \
 	$(OBJDIR)/file_.c:$(OBJDIR)/file.h \
@@ -843,10 +845,18 @@
 
 $(OBJDIR)/add.o:	$(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h
 	$(XTCC) -o $(OBJDIR)/add.o -c $(OBJDIR)/add_.c
 
 $(OBJDIR)/add.h:	$(OBJDIR)/headers
+
+$(OBJDIR)/alerts_.c:	$(SRCDIR)/alerts.c $(OBJDIR)/translate
+	$(OBJDIR)/translate $(SRCDIR)/alerts.c >$@
+
+$(OBJDIR)/alerts.o:	$(OBJDIR)/alerts_.c $(OBJDIR)/alerts.h $(SRCDIR)/config.h
+	$(XTCC) -o $(OBJDIR)/alerts.o -c $(OBJDIR)/alerts_.c
+
+$(OBJDIR)/alerts.h:	$(OBJDIR)/headers
 
 $(OBJDIR)/allrepo_.c:	$(SRCDIR)/allrepo.c $(OBJDIR)/translate
 	$(OBJDIR)/translate $(SRCDIR)/allrepo.c >$@
 
 $(OBJDIR)/allrepo.o:	$(OBJDIR)/allrepo_.c $(OBJDIR)/allrepo.h $(SRCDIR)/config.h
@@ -1084,18 +1094,10 @@
 $(OBJDIR)/doc.o:	$(OBJDIR)/doc_.c $(OBJDIR)/doc.h $(SRCDIR)/config.h
 	$(XTCC) -o $(OBJDIR)/doc.o -c $(OBJDIR)/doc_.c
 
 $(OBJDIR)/doc.h:	$(OBJDIR)/headers
 
-$(OBJDIR)/email_.c:	$(SRCDIR)/email.c $(OBJDIR)/translate
-	$(OBJDIR)/translate $(SRCDIR)/email.c >$@
-
-$(OBJDIR)/email.o:	$(OBJDIR)/email_.c $(OBJDIR)/email.h $(SRCDIR)/config.h
-	$(XTCC) -o $(OBJDIR)/email.o -c $(OBJDIR)/email_.c
-
-$(OBJDIR)/email.h:	$(OBJDIR)/headers
-
 $(OBJDIR)/encode_.c:	$(SRCDIR)/encode.c $(OBJDIR)/translate
 	$(OBJDIR)/translate $(SRCDIR)/encode.c >$@
 
 $(OBJDIR)/encode.o:	$(OBJDIR)/encode_.c $(OBJDIR)/encode.h $(SRCDIR)/config.h
 	$(XTCC) -o $(OBJDIR)/encode.o -c $(OBJDIR)/encode_.c

Index: src/makemake.tcl
==================================================================
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -26,10 +26,11 @@
 # Set the separate extra_files variable further down for how to add non-C
 # files, such as string and BLOB resources.
 #
 set src {
   add
+  alerts
   allrepo
   attach
   backoffice
   bag
   bisect
@@ -56,11 +57,10 @@
   descendants
   diff
   diffcmd
   dispatch
   doc
-  email
   encode
   etag
   event
   export
   file
@@ -286,10 +286,11 @@
 #
 
 XBCC = $(BCC) $(BCCFLAGS)
 XTCC = $(TCC) -I. -I$(SRCDIR) -I$(OBJDIR) $(TCCFLAGS)
 
+TESTFLAGS := -quiet
 }
 writeln -nonewline "SRC ="
 foreach s [lsort $src] {
   writeln -nonewline " \\\n  \$(SRCDIR)/$s.c"
 }
@@ -361,11 +362,11 @@
 #
 # TESTFLAGS can also include names of specific test files to limit
 # the run to just those test cases.
 #
 test:	$(OBJDIR) $(APPNAME)
-	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) -quiet $(TESTFLAGS)
+	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) $(TESTFLAGS)
 
 $(OBJDIR)/VERSION.h:	$(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
 	$(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
 		$(SRCDIR)/../manifest \
 		$(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
@@ -695,11 +696,11 @@
 endif
 
 #### Disable creation of the OpenSSL shared libraries.  Also, disable support
 #    for SSLv3 (i.e. thereby forcing the use of TLS).
 #
-SSLCONFIG += no-ssl3 enable-capieng no-weak-ssl-ciphers no-shared
+SSLCONFIG += no-ssl3 no-weak-ssl-ciphers no-shared
 
 #### When using zlib, make sure that OpenSSL is configured to use the zlib
 #    that Fossil knows about (i.e. the one within the source tree).
 #
 ifndef FOSSIL_ENABLE_MINIZ
@@ -1577,11 +1578,11 @@
 SSLLFLAGS = /nologo /opt:ref /debug
 SSLLIB    = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib
 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
 !message Using 'x64' platform for OpenSSL...
 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
-# SSLCONFIG = VC-WIN64A no-asm no-ssl3 enable-capieng no-weak-ssl-ciphers
+# SSLCONFIG = VC-WIN64A no-asm no-ssl3 no-weak-ssl-ciphers
 SSLCONFIG = VC-WIN64A no-asm
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
 SSLCONFIG = $(SSLCONFIG) shared
 !else
 SSLCONFIG = $(SSLCONFIG) no-shared
@@ -1592,16 +1593,16 @@
 !else
 SSLNMAKE  = ms\nt.mak all
 !endif
 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
 !if $(FOSSIL_DYNAMIC_BUILD)==0
-SSLCFLAGS = -DOPENSSL_NO_SSL3
+SSLCFLAGS = -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
 !endif
 !elseif "$(PLATFORM)"=="ia64"
 !message Using 'ia64' platform for OpenSSL...
 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
-# SSLCONFIG = VC-WIN64I no-asm no-ssl3 enable-capieng no-weak-ssl-ciphers
+# SSLCONFIG = VC-WIN64I no-asm no-ssl3 no-weak-ssl-ciphers
 SSLCONFIG = VC-WIN64I no-asm
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
 SSLCONFIG = $(SSLCONFIG) shared
 !else
 SSLCONFIG = $(SSLCONFIG) no-shared
@@ -1612,16 +1613,16 @@
 !else
 SSLNMAKE  = ms\nt.mak all
 !endif
 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
 !if $(FOSSIL_DYNAMIC_BUILD)==0
-SSLCFLAGS = -DOPENSSL_NO_SSL3
+SSLCFLAGS = -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
 !endif
 !else
 !message Assuming 'x86' platform for OpenSSL...
 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
-# SSLCONFIG = VC-WIN32 no-asm no-ssl3 enable-capieng no-weak-ssl-ciphers
+# SSLCONFIG = VC-WIN32 no-asm no-ssl3 no-weak-ssl-ciphers
 SSLCONFIG = VC-WIN32 no-asm
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
 SSLCONFIG = $(SSLCONFIG) shared
 !else
 SSLCONFIG = $(SSLCONFIG) no-shared
@@ -1632,11 +1633,11 @@
 !else
 SSLNMAKE  = ms\nt.mak all
 !endif
 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
 !if $(FOSSIL_DYNAMIC_BUILD)==0
-SSLCFLAGS = -DOPENSSL_NO_SSL3
+SSLCFLAGS = -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
 !endif
 !endif
 !endif
 
 !if $(FOSSIL_ENABLE_TCL)!=0

Index: src/markdown.md
==================================================================
--- src/markdown.md
+++ src/markdown.md
@@ -93,12 +93,12 @@
 
 > Placing **:** at the left, both, or right sides of a cell gives left-aligned,
 > centered, or right-aligned text, respectively.  By default, header cells are
 > centered, and body cells are left-aligned.
 
-> The leftmost **\|** is required if the first column contains at least one
-> blank cell.  The rightmost **\|** is optional.
+> The leftmost or rightmost **\|** is required only if the first or last column,
+> respectively, contains at least one blank cell.
 
 ## Miscellaneous ##
 
 > *   In-line images are made using **\!\[alt-text\]\(image-URL\)**.
 > *   Use HTML for advanced formatting such as forms.

Index: src/rebuild.c
==================================================================
--- src/rebuild.c
+++ src/rebuild.c
@@ -358,21 +358,21 @@
   ttyOutput = doOut;
   processCnt = 0;
   if (ttyOutput && !g.fQuiet) {
     percent_complete(0);
   }
-  email_triggers_disable();
+  alert_triggers_disable();
   rebuild_update_schema();
   blob_init(&sql, 0, 0);
   db_prepare(&q,
      "SELECT name FROM sqlite_master /*scan*/"
      " WHERE type='table'"
      " AND name NOT IN ('admin_log', 'blob','delta','rcvfrom','user','alias',"
                        "'config','shun','private','reportfmt',"
                        "'concealed','accesslog','modreq',"
                        "'purgeevent','purgeitem','unversioned',"
-                       "'subscriber','pending_alert','email_bounce')"
+                       "'subscriber','pending_alert','alert_bounce')"
      " AND name NOT GLOB 'sqlite_*'"
      " AND name NOT GLOB 'fx_*'"
   );
   while( db_step(&q)==SQLITE_ROW ){
     blob_appendf(&sql, "DROP TABLE IF EXISTS \"%w\";\n", db_column_text(&q,0));
@@ -449,11 +449,11 @@
   if( doClustering ) create_cluster();
   if( ttyOutput && !g.fQuiet && totalSize>0 ){
     processCnt += incrSize;
     percent_complete((processCnt*1000)/totalSize);
   }
-  email_triggers_enable();
+  alert_triggers_enable();
   if(!g.fQuiet && ttyOutput ){
     percent_complete(1000);
     fossil_print("\n");
   }
   return errCnt;

Index: src/security_audit.c
==================================================================
--- src/security_audit.c
+++ src/security_audit.c
@@ -390,11 +390,11 @@
   }
 
   @ <li><p> User capability summary:
   capability_summary();
 
-  if( email_enabled() ){
+  if( alert_enabled() ){
     @ <li><p> Email alert configuration summary:
     @ <table class="label-value">
     stats_for_email();
     @ </table>
   }else{

Index: src/setup.c
==================================================================
--- src/setup.c
+++ src/setup.c
@@ -886,10 +886,30 @@
   @ <p>Note:  To avoid a redirect loop or other problems, this entry must
   @ begin with "/" and it must specify a valid page.  For example,
   @ "<b>/home</b>" will work but "<b>home</b>" will not, since it omits the
   @ leading "/".</p>
   @ <p>(Property: "index-page")
+  @ <hr>
+  @ <p>Extra links to appear on the <a href="%R/sitemap">/sitemap</a> page.
+  @ Often these are filled in with links like 
+  @ "/doc/trunk/doc/<i>filename</i>.md" so that they refer to 
+  @ embedded documentation, or like "/wiki/<i>pagename</i>" to refer
+  @ to wiki pages.
+  @ Leave blank to omit.
+  @ <p>
+  entry_attribute("Documentation Index", 40, "sitemap-docidx", "smdocidx",
+                  "", 0);
+  @ (Property: sitemap-docidx)<br>
+  entry_attribute("Download", 40, "sitemap-download", "smdownload",
+                  "", 0);
+  @ (Property: sitemap-download)<br>
+  entry_attribute("License", 40, "sitemap-license", "smlicense",
+                  "", 0);
+  @ (Property: sitemap-license)<br>
+  entry_attribute("Contact", 40, "sitemap-contact", "smcontact",
+                  "", 0);
+  @ (Property: sitemap-contact)
   @ <hr />
   onoff_attribute("Use HTML as wiki markup language",
     "wiki-use-html", "wiki-use-html", 0, 0);
   @ <p>Use HTML as the wiki markup language. Wiki links will still be parsed
   @ but all other wiki formatting will be ignored. This option is helpful
@@ -1343,11 +1363,10 @@
   login_check_credentials();
   if( !g.perm.Setup ){
     login_needed(0);
     return;
   }
-  db_begin_transaction();
   style_header("Raw TH1 Commands");
   @ <p><b>Caution:</b> There are no restrictions on the TH1 that can be
   @ run by this page.  If Tcl integration was enabled at compile-time and
   @ the "tcl" setting is enabled, Tcl commands may be run as well.</p>
   @

Index: src/setupuser.c
==================================================================
--- src/setupuser.c
+++ src/setupuser.c
@@ -199,11 +199,11 @@
   @ <span class="usertype">anonymous</span>, and
   @ <span class="usertype">nobody</span>.
   @ </p></li>
   @
   @ <li><p>The permission flags are as follows:</p>
-  capabilities_table();
+  capabilities_table(CAPCLASS_ALL);
   @ </li>
   @ </ol>
   style_footer();
 }
 
@@ -213,11 +213,26 @@
 ** A documentation page showing the meaning of the various user capabilities
 ** code letters.
 */
 void setup_ucap_list(void){
   style_header("User Capability Codes");
-  capabilities_table();
+  @ <h1>All capabilities</h1>
+  capabilities_table(CAPCLASS_ALL);
+  @ <h1>Capabilities associated with checked-in content</h1>
+  capabilities_table(CAPCLASS_CODE);
+  @ <h1>Capabilities associated with data transfer and sync</h1>
+  capabilities_table(CAPCLASS_DATA);
+  @ <h1>Capabilities associated with the forum</h1>
+  capabilities_table(CAPCLASS_FORUM);
+  @ <h1>Capabilities associated with tickets</h1>
+  capabilities_table(CAPCLASS_TKT);
+  @ <h1>Capabilities associated with wiki</h1>
+  capabilities_table(CAPCLASS_WIKI);
+  @ <h1>Administrative capabilities</h1>
+  capabilities_table(CAPCLASS_SUPER);
+  @ <h1>Miscellaneous capabilities</h1>
+  capabilities_table(CAPCLASS_OTHER);
   style_footer();
 }
 
 /*
 ** Return true if zPw is a valid password string.  A valid
@@ -241,12 +256,12 @@
 */
 void user_edit(void){
   const char *zId, *zLogin, *zInfo, *zCap, *zPw;
   const char *zGroup;
   const char *zOldLogin;
-  int doWrite;
   int uid, i;
+  char *zDeleteVerify = 0;   /* Delete user verification text */
   int higherUser = 0;  /* True if user being edited is SETUP and the */
                        /* user doing the editing is ADMIN.  Disallow editing */
   const char *inherit[128];
   int a[128];
   const char *oa[128];
@@ -270,17 +285,48 @@
   if( P("can") ){
     /* User pressed the cancel button */
     cgi_redirect(cgi_referer("setup_ulist"));
     return;
   }
+
+  /* Check for requests to delete the user */
+  if( P("delete") && cgi_csrf_safe(1) ){
+    int n;
+    if( P("verifydelete") ){
+      /* Verified delete user request */
+      db_multi_exec("DELETE FROM user WHERE uid=%d", uid);
+      cgi_redirect(cgi_referer("setup_ulist"));
+      return;
+    }
+    n = db_int(0, "SELECT count(*) FROM event"
+                  " WHERE user=%Q AND objid NOT IN private",
+                  P("login"));
+    if( n==0 ){
+      zDeleteVerify = mprintf("Check this box and press \"Delete User\" again");
+    }else{
+      zDeleteVerify = mprintf(
+        "User \"%s\" has %d or more artifacts in the block-chain. "
+        "Delete anyhow?",
+        P("login")/*safe-for-%s*/, n);
+    }
+  }
 
   /* If we have all the necessary information, write the new or
   ** modified user record.  After writing the user record, redirect
   ** to the page that displays a list of users.
   */
-  doWrite = cgi_all("login","info","pw") && !higherUser && cgi_csrf_safe(1);
-  if( doWrite ){
+  if( !cgi_all("login","info","pw","apply") ){
+    /* need all of the above properties to make a change.  Since one or
+    ** more are missing, no-op */
+  }else if( higherUser ){
+    /* An Admin (a) user cannot edit a Superuser (s) */
+  }else if( zDeleteVerify!=0 ){
+    /* Need to verify a delete request */
+  }else if( !cgi_csrf_safe(1) ){
+    /* This might be a cross-site request forgery, so ignore it */
+  }else{
+    /* We have all the information we need to make the change to the user */
     char c;
     char zCap[70], zNm[4];
     zNm[0] = 'a';
     zNm[2] = 0;
     for(i=0, c='a'; c<='z'; c++){
@@ -560,11 +606,11 @@
   @  Enable Debug%s(B('D'))</label>
   @ </ul></div>
   @   </td>
   @ </tr>
   @ <tr>
-  @   <td class="usetupEditLabel">Selected Cap.:</td>
+  @   <td class="usetupEditLabel">Selected Cap:</td>
   @   <td>
   @     <span id="usetupEditCapability">(missing JS?)</span>
   @     <a href="%R/setup_ucap_list">(key)</a>
   @   </td>
   @ </tr>
@@ -590,13 +636,26 @@
     @ <input type="radio" name="all" value="1">
     @ Apply changes to all repositories in the "<b>%h(zGroup)</b>"
     @ login group.</td></tr>
   }
   if( !higherUser ){
+    if( zDeleteVerify ){
+      @ <tr>
+      @   <td valign="top" align="right">Verify:</td>
+      @   <td><label><input type="checkbox" name="verifydelete">\
+      @   Confirm Delete \
+      @   <span class="loginError">&larr; %h(zDeleteVerify)</span>
+      @   </label></td>
+      @ <tr>
+    }
     @ <tr>
     @   <td>&nbsp;</td>
-    @   <td><input type="submit" name="submit" value="Apply Changes" /></td>
+    @   <td><input type="submit" name="apply" value="Apply Changes">
+    if( !login_is_special(zLogin) ){
+      @   <input type="submit" name="delete" value="Delete User">
+    }
+    @   <input type="submit" name="can" value="Cancel"></td>
     @ </tr>
   }
   @ </table>
   @ </div></form>
   @ </div>

Index: src/shell.c
==================================================================
--- src/shell.c
+++ src/shell.c
@@ -2224,11 +2224,11 @@
   WIN32_FIND_DATAW fd;
   LPWSTR zUnicodeName;
   extern LPWSTR sqlite3_win32_utf8_to_unicode(const char*);
   zUnicodeName = sqlite3_win32_utf8_to_unicode(zPath);
   if( zUnicodeName ){
-    memset(&fd, 0, sizeof(WIN32_FIND_DATA));
+    memset(&fd, 0, sizeof(WIN32_FIND_DATAW));
     hFindFile = FindFirstFileW(zUnicodeName, &fd);
     if( hFindFile!=NULL ){
       pStatBuf->st_ctime = (time_t)fileTimeToUnixTime(&fd.ftCreationTime);
       pStatBuf->st_atime = (time_t)fileTimeToUnixTime(&fd.ftLastAccessTime);
       pStatBuf->st_mtime = (time_t)fileTimeToUnixTime(&fd.ftLastWriteTime);
@@ -3313,19 +3313,18 @@
     pCur->nPrefix = sqlite3_value_bytes(argv[iArg]);
     if( pCur->nPrefix>0 ){
       pCur->zPrefix = sqlite3_mprintf("%s", sqlite3_value_text(argv[iArg]));
       if( pCur->zPrefix==0 ) return SQLITE_NOMEM;
     }
-    iArg++;
+    iArg = 1;
   }
   if( idxNum & 2 ){
     pCur->nLine = sqlite3_value_bytes(argv[iArg]);
     if( pCur->nLine>0 ){
       pCur->zLine = sqlite3_mprintf("%s", sqlite3_value_text(argv[iArg]));
       if( pCur->zLine==0 ) return SQLITE_NOMEM;
     }
-    iArg++;
   }
   if( pCur->zLine!=0 && pCur->zPrefix==0 ){
     int i = pCur->nLine;
     while( i>0 && (isalnum(pCur->zLine[i-1]) || pCur->zLine[i-1]=='_') ){
       i--;

Index: src/sitemap.c
==================================================================
--- src/sitemap.c
+++ src/sitemap.c
@@ -29,73 +29,101 @@
 ** That is, this page is designed to hold links that are omitted from
 ** the main menu due to lack of space.
 */
 void sitemap_page(void){
   int srchFlags;
+  int inSublist = 0;
+  int i;
+  int isPopup = 0;         /* This is an XMLHttpRequest() for /sitemap */
+  const struct {
+    const char *zTitle;
+    const char *zProperty;
+  } aExtra[] = {
+    { "Documentation",  "sitemap-docidx" },
+    { "Download",       "sitemap-download" },
+    { "License",        "sitemap-license" },
+    { "Contact",        "sitemap-contact" },
+  };
+
   login_check_credentials();
+  if( P("popup")!=0 && cgi_csrf_safe(1) ){
+    /* If this is a POST from the same origin with the popup=1 parameter,
+    ** then disable anti-robot defenses */
+    isPopup = 1;
+    g.perm.Hyperlink = 1;
+    g.javascriptHyperlink = 0;
+  }
   srchFlags = search_restrict(SRCH_ALL);
-  style_header("Site Map");
-  style_adunit_config(ADUNIT_RIGHT_OK);
-#if 0
-  @ <p>
-  @ The following links are just a few of the many web-pages available for
-  @ this Fossil repository:
-  @ </p>
-  @
-#endif
-  @ <ul>
+  if( !isPopup ){
+    style_header("Site Map");
+    style_adunit_config(ADUNIT_RIGHT_OK);
+  }
+  @ <ul id="sitemap" class="columns" style="column-width:20em">
   @ <li>%z(href("%R/home"))Home Page</a>
+  for(i=0; i<sizeof(aExtra)/sizeof(aExtra[0]); i++){
+    char *z = db_get(aExtra[i].zProperty,0);
+    if( z==0 || z[0]==0 ) continue;
+    if( !inSublist ){
+      @ <ul>
+      inSublist = 1;
+    }
+    if( z[0]=='/' ){
+      @ <li>%z(href("%R%s",z))%s(aExtra[i].zTitle)</a></li>
+    }else{
+      @ <li>%z(href("%s",z))%s(aExtra[i].zTitle)</a></li>
+    }
+  }
   if( srchFlags & SRCH_DOC ){
-    @   <ul>
-    @   <li>%z(href("%R/docsrch"))Search Project Documentation</a></li>
-    @   </ul>
+    if( !inSublist ){
+      @ <ul>
+      inSublist = 1;
+    }
+    @ <li>%z(href("%R/docsrch"))Documentation Search</a></li>
+  }
+  if( inSublist ){
+    @ </ul>
+    inSublist = 0;    
   }
   @ </li>
   if( g.perm.Read ){
-    @ <li>%z(href("%R/tree"))File Browser</a></li>
+    @ <li>%z(href("%R/tree"))File Browser</a>
     @   <ul>
     @   <li>%z(href("%R/tree?type=tree&ci=trunk"))Tree-view,
     @        Trunk Check-in</a></li>
     @   <li>%z(href("%R/tree?type=flat"))Flat-view</a></li>
     @   <li>%z(href("%R/fileage?name=trunk"))File ages for Trunk</a></li>
+    @   <li>%z(href("%R/uvlist"))Unversioned Files</a>
     @ </ul>
   }
   if( g.perm.Read ){
-    @ <li>%z(href("%R/timeline?n=200"))Project Timeline</a></li>
+    @ <li>%z(href("%R/timeline"))Project Timeline</a>
     @ <ul>
     @   <li>%z(href("%R/reports"))Activity Reports</a></li>
     @   <li>%z(href("%R/timeline?n=all&namechng"))File name changes</a></li>
     @   <li>%z(href("%R/timeline?n=all&forks"))Forks</a></li>
     @   <li>%z(href("%R/timeline?a=1970-01-01&y=ci&n=10"))First 10
     @       check-ins</a></li>
     @ </ul>
+    @ </li>
   }
   if( g.perm.Read ){
-    @ <li>%z(href("%R/brlist"))Branches</a></li>
+    @ <li>%z(href("%R/brlist"))Branches</a>
     @ <ul>
+    @   <li>%z(href("%R/taglist"))Tags</a></li>
     @   <li>%z(href("%R/leaves"))Leaf Check-ins</a></li>
-    @   <li>%z(href("%R/taglist"))List of Tags</a></li>
     @ </ul>
     @ </li>
   }
-  if( g.perm.RdWiki ){
-    @ <li>%z(href("%R/wikihelp"))Wiki</a>
-    @   <ul>
-    if( srchFlags & SRCH_WIKI ){
-      @     <li>%z(href("%R/wikisrch"))Wiki Search</a></li>
-    }
-    @     <li>%z(href("%R/wcontent"))List of Wiki Pages</a></li>
-    @     <li>%z(href("%R/timeline?y=w"))Recent activity</a></li>
-    @     <li>%z(href("%R/wiki_rules"))Wiki Formatting Rules</a></li>
-    @     <li>%z(href("%R/md_rules"))Markdown Formatting Rules</a></li>
-    @     <li>%z(href("%R/wiki?name=Sandbox"))Sandbox</a></li>
-    @     <li>%z(href("%R/attachlist"))List of Attachments</a></li>
-    @   </ul>
-    @ </li>
+  if( srchFlags ){
+    @ <li>%z(href("%R/search"))Search</a></li>
   }
   if( g.perm.RdForum ){
-    @ <li>%z(href("%R/forum"))Forum</a></li>
+    @ <li>%z(href("%R/forum"))Forum</a>
+    @ <ul>
+    @   <li>%z(href("%R/timeline?y=f"))Recent activity</a></li>
+    @ </ul>
+    @ </li>
   }
   if( g.perm.RdTkt ){
     @ <li>%z(href("%R/reportlist"))Tickets</a>
     @   <ul>
     if( srchFlags & SRCH_TKT ){
@@ -104,17 +132,56 @@
     @   <li>%z(href("%R/timeline?y=t"))Recent activity</a></li>
     @   <li>%z(href("%R/attachlist"))List of Attachments</a></li>
     @   </ul>
     @ </li>
   }
-  if( g.perm.Read ){
-    @ <li>%z(href("%R/uvlist"))Unversioned Files</a>
+  if( g.perm.RdWiki ){
+    @ <li>%z(href("%R/wikihelp"))Wiki</a>
+    @   <ul>
+    if( srchFlags & SRCH_WIKI ){
+      @     <li>%z(href("%R/wikisrch"))Wiki Search</a></li>
+    }
+    @     <li>%z(href("%R/wcontent"))List of Wiki Pages</a></li>
+    @     <li>%z(href("%R/timeline?y=w"))Recent activity</a></li>
+    @     <li>%z(href("%R/wiki?name=Sandbox"))Sandbox</a></li>
+    @     <li>%z(href("%R/attachlist"))List of Attachments</a></li>
+    @   </ul>
+    @ </li>
+  }
+
+  if( !g.zLogin ){
+    @ <li>%z(href("%R/login"))Login</a>
+    if( login_self_register_available(0) ){
+       @ <ul>
+       @ <li>%z(href("%R/register"))Create a new account</a></li>
+       inSublist = 1;
+    }
+  }else {
+    @ <li>%z(href("%R/logout"))Logout</a>
+    if( g.perm.Password ){
+      @ <ul>
+      @ <li>%z(href("%R/logout"))Change Password</a></li>
+      inSublist = 1;
+    }
+  }
+  if( alert_enabled() && g.perm.EmailAlert ){
+    if( !inSublist ){
+      inSublist = 1;
+      @ <ul>
+    }
+    if( login_is_individual() ){
+      @ <li>%z(href("%R/alerts"))Email Alerts</a></li>
+    }else{
+      @ <li>%z(href("%R/subscribe"))Subscribe to Email Alerts</a></li>
+    }
   }
-  if( srchFlags ){
-    @ <li>%z(href("%R/search"))Full-Text Search</a></li>
+  if( inSublist ){
+    @ </ul>
+    inSublist = 0;
   }
-  @ <li>%z(href("%R/login"))Login/Logout/Change Password</a></li>
+  @ </li>
+
   if( g.perm.Read ){
     @ <li>%z(href("%R/stat"))Repository Status</a>
     @   <ul>
     @   <li>%z(href("%R/hash-collisions"))Collisions on hash prefixes</a></li>
     if( g.perm.Admin ){
@@ -124,12 +191,14 @@
     @   <li>%z(href("%R/bloblist"))List of Artifacts</a></li>
     @   <li>%z(href("%R/timewarps"))List of "Timewarp" Check-ins</a></li>
     @   </ul>
     @ </li>
   }
-  @ <li>On-line Documentation
+  @ <li>Help
   @   <ul>
+  @   <li>%z(href("%R/wiki_rules"))Wiki Formatting Rules</a></li>
+  @   <li>%z(href("%R/md_rules"))Markdown Formatting Rules</a></li>
   @   <li>%z(href("%R/help"))List of All Commands and Web Pages</a></li>
   @   <li>%z(href("%R/test-all-help"))All "help" text on a single page</a></li>
   @   <li>%z(href("%R/mimetype_list"))Filename suffix to mimetype map</a></li>
   @   </ul></li>
   if( g.perm.Admin ){
@@ -150,8 +219,10 @@
   }
   @   <li>%z(href("%R/hash-color-test"))Page to experiment with the automatic
   @       colors assigned to branch names</a>
   @   <li>%z(href("%R/test-captcha"))Random ASCII-art Captcha image</a></li>
   @   </ul></li>
-  @ </ul></li>
-  style_footer();
+  @ </ul>
+  if( !isPopup ){
+    style_footer();
+  }
 }

Index: src/skins.c
==================================================================
--- src/skins.c
+++ src/skins.c
@@ -55,13 +55,15 @@
   { "Khaki, No Logo",                    "khaki",             0 },
   { "Ardoise",                           "ardoise",           0 },
 };
 
 /*
-** A skin consists of four "files" named here:
+** A skin consists of five "files" named here:
 */
-static const char *azSkinFile[] = { "css", "header", "footer", "details" };
+static const char *azSkinFile[] = { 
+  "css", "header", "footer", "details", "js"
+};
 
 /*
 ** Alternative skins can be specified in the CGI script or by options
 ** on the "http", "ui", and "server" commands.  The alternative skin
 ** name must be one of the aBuiltinSkin[].zLabel names.  If there is
@@ -149,11 +151,11 @@
 
 /*
 ** The following routines return the various components of the skin
 ** that should be used for the current run.
 **
-** zWhat is one of:  "css", "header", "footer", "details".
+** zWhat is one of:  "css", "header", "footer", "details", "js"
 */
 const char *skin_get(const char *zWhat){
   const char *zOut;
   char *z;
   if( iDraftSkin ){
@@ -480,10 +482,11 @@
       @ <input type="submit" name="del2" value="Confirm - Delete The Skin" />
       @ <input type="submit" name="cancel" value="Cancel - Do Not Delete" />
       login_insert_csrf_secret();
       @ </div></form>
       style_footer();
+      db_end_transaction(1);
       return;
     }
     if( P("del2")!=0 && (zName = skinVarName(P("sn"), 1))!=0 ){
       db_multi_exec("DELETE FROM config WHERE name=%Q", zName);
     }
@@ -491,12 +494,14 @@
       const char *zDraft = P("name");
       if( sqlite3_strglob("draft[1-9]",zDraft)==0 ){
         db_multi_exec("DELETE FROM config WHERE name GLOB '%q-*'", zDraft);
       }
     }
-    if( skinRename() ) return;
-    if( skinSave(zCurrent) ) return;
+    if( skinRename() || skinSave(zCurrent) ){
+      db_end_transaction(0);
+      return;
+    }
   
     /* The user pressed one of the "Install" buttons. */
     if( P("load") && (z = P("sn"))!=0 && z[0] ){
       int seen = 0;
   
@@ -688,11 +693,11 @@
 ** WEBPAGE: setup_skinedit
 **
 ** Edit aspects of a skin determined by the w= query parameter.
 ** Requires Setup privileges.
 **
-**    w=NUM     -- 0=CSS, 1=footer, 2=header, 3=details
+**    w=NUM     -- 0=CSS, 1=footer, 2=header, 3=details, 4=js
 **    sk=NUM    -- the draft skin number
 */
 void setup_skinedit(void){
   static const struct sSkinAddr {
     const char *zFile;
@@ -701,20 +706,24 @@
   } aSkinAttr[] = {
     /* 0 */ { "css",     "CSS",             "CSS",     },
     /* 1 */ { "footer",  "Page Footer",     "Footer",  },
     /* 2 */ { "header",  "Page Header",     "Header",  },
     /* 3 */ { "details", "Display Details", "Details", },
+    /* 4 */ { "js",      "JavaScript",      "Script",  },
   };
   const char *zBasis;         /* The baseline file */
+  const char *zOrig;          /* Original content prior to editing */
   const char *zContent;       /* Content after editing */
+  const char *zDflt;          /* Default content */
   char *zDraft;               /* Which draft:  "draft%d" */
   char *zKey;                 /* CONFIG table key name: "draft%d-%s" */
   char *zTitle;               /* Title of this page */
   const char *zFile;          /* One of "css", "footer", "header", "details" */
   int iSkin;                  /* draft number.  1..9 */
   int ii;                     /* Index in aSkinAttr[] of this file */
   int j;                      /* Loop counter */
+  int isRevert = 0;           /* True if Revert-to-Baseline was pressed */
 
   login_check_credentials();
 
   /* Figure out which skin we are editing */
   iSkin = atoi(PD("sk","1"));
@@ -745,33 +754,41 @@
   zFile = aSkinAttr[ii].zFile;
   zDraft = mprintf("draft%d", iSkin);
   zKey = mprintf("draft%d-%s", iSkin, zFile);
   zTitle = mprintf("%s for Draft%d", aSkinAttr[ii].zTitle, iSkin);
   zBasis = PD("basis","current");
+  zDflt = skin_file_content(zBasis, zFile);
+  zOrig = db_get(zKey, zDflt);
+  zContent = PD(zFile,zOrig);
+  if( P("revert")!=0 && cgi_csrf_safe(0) ){
+    zContent = zDflt;
+    isRevert = 1;
+  }
 
   db_begin_transaction();
   style_header("%s", zTitle);
   for(j=0; j<count(aSkinAttr); j++){
-    if( j==ii ) continue;
     style_submenu_element(aSkinAttr[j].zSubmenu,
           "%R/setup_skinedit?w=%d&basis=%h&sk=%d",j,zBasis,iSkin);
   }
   @ <form action="%s(g.zTop)/setup_skinedit" method="post"><div>
   login_insert_csrf_secret();
   @ <input type='hidden' name='w' value='%d(ii)'>
   @ <input type='hidden' name='sk' value='%d(iSkin)'>
   @ <h2>Edit %s(zTitle):</h2>
-  zContent = textarea_attribute(
-        "",                      /* Text label */
-        10, 80,                  /* Height and width of the edit area */
-        zKey,                    /* Name of CONFIG table entry */
-        zFile,                              /* CGI query parameter name */
-        skin_file_content(zBasis, zFile),   /* Default value of the text */
-        0                                   /* Disabled flag */
-  );
+  if( P("submit") && cgi_csrf_safe(0) && strcmp(zOrig,zContent)!=0 ){
+    db_set(zKey, zContent, 0);
+  }
+  @ <textarea name="%s(zFile)" rows="10" cols="80">\
+  @ %h(zContent)</textarea>
   @ <br />
   @ <input type="submit" name="submit" value="Apply Changes" />
+  if( isRevert ){
+    @ &larr; Press to complete reversion to "%s(zBasis)"
+  }else if( fossil_strcmp(zContent,zDflt)!=0 ){
+    @ <input type="submit" name="revert" value='Revert To "%s(zBasis)"' />
+  }
   @ <hr />
   @ Baseline: \
   skin_emit_skin_selector("basis", zBasis, zDraft);
   @ <input type="submit" name="diff" value="Unified Diff" />
   @ <input type="submit" name="sbsdiff" value="Side-by-Side Diff" />
@@ -1002,10 +1019,12 @@
     @ Header</a>
     @ <li><a href='%R/setup_skinedit?w=1&sk=%d(iSkin)' target='_blank'>\
     @ Footer</a>
     @ <li><a href='%R/setup_skinedit?w=3&sk=%d(iSkin)' target='_blank'>\
     @ Details</a>
+    @ <li><a href='%R/setup_skinedit?w=4&sk=%d(iSkin)' target='_blank'>\
+    @ Javascript</a> (optional)
     @ </ul>
   }
   @
   @ <a name='step5'></a>
   @ <h1>Step 5: Verify The Draft Skin</h1>

Index: src/sqlite3.c
==================================================================
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -1156,11 +1156,11 @@
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
 ** [sqlite_version()] and [sqlite_source_id()].
 */
 #define SQLITE_VERSION        "3.25.0"
 #define SQLITE_VERSION_NUMBER 3025000
-#define SQLITE_SOURCE_ID      "2018-08-16 16:24:24 456842924bb33c0af8af29402f06e5f25b6791f698a0d12a080258b20b0cfb61"
+#define SQLITE_SOURCE_ID      "2018-09-10 19:34:06 74c381b573817d0212153278b5ee5d2238a27a727dcf7ee769365c47bb9fc40d"
 
 /*
 ** CAPI3REF: Run-Time Library Version Numbers
 ** KEYWORDS: sqlite3_version sqlite3_sourceid
 **
@@ -1503,10 +1503,11 @@
 ** the most recent error can be obtained using
 ** [sqlite3_extended_errcode()].
 */
 #define SQLITE_ERROR_MISSING_COLLSEQ   (SQLITE_ERROR | (1<<8))
 #define SQLITE_ERROR_RETRY             (SQLITE_ERROR | (2<<8))
+#define SQLITE_ERROR_SNAPSHOT          (SQLITE_ERROR | (3<<8))
 #define SQLITE_IOERR_READ              (SQLITE_IOERR | (1<<8))
 #define SQLITE_IOERR_SHORT_READ        (SQLITE_IOERR | (2<<8))
 #define SQLITE_IOERR_WRITE             (SQLITE_IOERR | (3<<8))
 #define SQLITE_IOERR_FSYNC             (SQLITE_IOERR | (4<<8))
 #define SQLITE_IOERR_DIR_FSYNC         (SQLITE_IOERR | (5<<8))
@@ -7471,10 +7472,11 @@
 #define SQLITE_INDEX_CONSTRAINT_NE        68
 #define SQLITE_INDEX_CONSTRAINT_ISNOT     69
 #define SQLITE_INDEX_CONSTRAINT_ISNOTNULL 70
 #define SQLITE_INDEX_CONSTRAINT_ISNULL    71
 #define SQLITE_INDEX_CONSTRAINT_IS        72
+#define SQLITE_INDEX_CONSTRAINT_FUNCTION 150
 
 /*
 ** CAPI3REF: Register A Virtual Table Implementation
 ** METHOD: sqlite3
 **
@@ -10083,15 +10085,15 @@
 ** SQLITE_ERROR is returned if either of these conditions is violated, or
 ** if schema S does not exist, or if the snapshot object is invalid.
 **
 ** ^A call to sqlite3_snapshot_open() will fail to open if the specified
 ** snapshot has been overwritten by a [checkpoint]. In this case 
-** SQLITE_BUSY_SNAPSHOT is returned.
+** SQLITE_ERROR_SNAPSHOT is returned.
 **
 ** If there is already a read transaction open when this function is 
 ** invoked, then the same read transaction remains open (on the same
-** database snapshot) if SQLITE_ERROR, SQLITE_BUSY or SQLITE_BUSY_SNAPSHOT
+** database snapshot) if SQLITE_ERROR, SQLITE_BUSY or SQLITE_ERROR_SNAPSHOT
 ** is returned. If another error code - for example SQLITE_PROTOCOL or an
 ** SQLITE_IOERR error code - is returned, then the final state of the
 ** read transaction is undefined. If SQLITE_OK is returned, then the 
 ** read transaction is now open on database snapshot P.
 **
@@ -13727,11 +13729,12 @@
 */
 #ifndef SQLITE_PTRSIZE
 # if defined(__SIZEOF_POINTER__)
 #   define SQLITE_PTRSIZE __SIZEOF_POINTER__
 # elif defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
-       defined(_M_ARM)   || defined(__arm__)    || defined(__x86)
+       defined(_M_ARM)   || defined(__arm__)    || defined(__x86)   ||    \
+      (defined(__TOS_AIX__) && !defined(__64BIT__))
 #   define SQLITE_PTRSIZE 4
 # else
 #   define SQLITE_PTRSIZE 8
 # endif
 #endif
@@ -13768,11 +13771,11 @@
 */
 #ifndef SQLITE_BYTEORDER
 # if defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
      defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)  ||    \
      defined(_M_AMD64) || defined(_M_ARM)     || defined(__x86)   ||    \
-     defined(__arm__)
+     defined(__arm__)  || defined(_M_ARM64)
 #   define SQLITE_BYTEORDER    1234
 # elif defined(sparc)    || defined(__ppc__)
 #   define SQLITE_BYTEORDER    4321
 # else
 #   define SQLITE_BYTEORDER 0
@@ -14023,10 +14026,11 @@
 typedef struct Module Module;
 typedef struct NameContext NameContext;
 typedef struct Parse Parse;
 typedef struct PreUpdate PreUpdate;
 typedef struct PrintfArguments PrintfArguments;
+typedef struct RenameToken RenameToken;
 typedef struct RowSet RowSet;
 typedef struct Savepoint Savepoint;
 typedef struct Select Select;
 typedef struct SQLiteThread SQLiteThread;
 typedef struct SelectDest SelectDest;
@@ -17008,13 +17012,15 @@
 
 /*
 ** Each token coming out of the lexer is an instance of
 ** this structure.  Tokens are also used as part of an expression.
 **
-** Note if Token.z==0 then Token.dyn and Token.n are undefined and
-** may contain random values.  Do not make any assumptions about Token.dyn
-** and Token.n when Token.z==0.
+** The memory that "z" points to is owned by other objects.  Take care
+** that the owner of the "z" string does not deallocate the string before
+** the Token goes out of scope!  Very often, the "z" points to some place
+** in the middle of the Parse.zSql text.  But it might also point to a
+** static string.
 */
 struct Token {
   const char *z;     /* Text of the token.  Not NULL-terminated! */
   unsigned int n;    /* Number of characters in this token */
 };
@@ -17815,12 +17821,14 @@
 
   Token sLastToken;       /* The last token parsed */
   ynVar nVar;               /* Number of '?' variables seen in the SQL so far */
   u8 iPkSortOrder;          /* ASC or DESC for INTEGER PRIMARY KEY */
   u8 explain;               /* True if the EXPLAIN flag is found on the query */
+#if !(defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_OMIT_ALTERTABLE))
+  u8 eParseMode;            /* PARSE_MODE_XXX constant */
+#endif
 #ifndef SQLITE_OMIT_VIRTUALTABLE
-  u8 declareVtab;           /* True if inside sqlite3_declare_vtab() */
   int nVtabLock;            /* Number of virtual tables to lock */
 #endif
   int nHeight;              /* Expression tree height of current sub-select */
 #ifndef SQLITE_OMIT_EXPLAIN
   int addrExplain;          /* Address of current OP_Explain opcode */
@@ -17827,10 +17835,11 @@
 #endif
   VList *pVList;            /* Mapping between variable names and numbers */
   Vdbe *pReprepare;         /* VM being reprepared (sqlite3Reprepare()) */
   const char *zTail;        /* All SQL text past the last semicolon parsed */
   Table *pNewTable;         /* A table being constructed by CREATE TABLE */
+  Index *pNewIndex;         /* An index being constructed by CREATE INDEX */
   Trigger *pNewTrigger;     /* Trigger under construct by a CREATE TRIGGER */
   const char *zAuthContext; /* The 6th parameter to db->xAuth callbacks */
 #ifndef SQLITE_OMIT_VIRTUALTABLE
   Token sArg;               /* Complete text of a module argument */
   Table **apVtabLock;       /* Pointer to virtual tables needing locking */
@@ -17837,11 +17846,19 @@
 #endif
   Table *pZombieTab;        /* List of Table objects to delete after code gen */
   TriggerPrg *pTriggerPrg;  /* Linked list of coded triggers */
   With *pWith;              /* Current WITH clause, or NULL */
   With *pWithToFree;        /* Free this WITH object at the end of the parse */
+#ifndef SQLITE_OMIT_ALTERTABLE
+  RenameToken *pRename;     /* Tokens subject to renaming by ALTER TABLE */
+#endif
 };
+
+#define PARSE_MODE_NORMAL        0
+#define PARSE_MODE_DECLARE_VTAB  1
+#define PARSE_MODE_RENAME_COLUMN 2
+#define PARSE_MODE_RENAME_TABLE  3
 
 /*
 ** Sizes and pointers of various parts of the Parse object.
 */
 #define PARSE_HDR_SZ offsetof(Parse,aTempReg) /* Recursive part w/o aColCache*/
@@ -17853,11 +17870,23 @@
 ** Return true if currently inside an sqlite3_declare_vtab() call.
 */
 #ifdef SQLITE_OMIT_VIRTUALTABLE
   #define IN_DECLARE_VTAB 0
 #else
-  #define IN_DECLARE_VTAB (pParse->declareVtab)
+  #define IN_DECLARE_VTAB (pParse->eParseMode==PARSE_MODE_DECLARE_VTAB)
+#endif
+
+#if defined(SQLITE_OMIT_ALTERTABLE)
+  #define IN_RENAME_OBJECT 0
+#else
+  #define IN_RENAME_OBJECT (pParse->eParseMode>=PARSE_MODE_RENAME_COLUMN)
+#endif
+
+#if defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_OMIT_ALTERTABLE)
+  #define IN_SPECIAL_PARSE 0
+#else
+  #define IN_SPECIAL_PARSE (pParse->eParseMode!=PARSE_MODE_NORMAL)
 #endif
 
 /*
 ** An instance of the following structure can be declared on a stack and used
 ** to save the Parse.zAuthContext value so that it can be restored later.
@@ -18032,12 +18061,18 @@
 typedef struct {
   sqlite3 *db;        /* The database being initialized */
   char **pzErrMsg;    /* Error message stored here */
   int iDb;            /* 0 for main database.  1 for TEMP, 2.. for ATTACHed */
   int rc;             /* Result code stored here */
+  u32 mInitFlags;     /* Flags controlling error messages */
 } InitData;
 
+/*
+** Allowed values for mInitFlags
+*/
+#define INITFLAG_AlterTable   0x0001  /* This is a reparse after ALTER TABLE */
+
 /*
 ** Structure containing global configuration data for the SQLite library.
 **
 ** This structure also contains some state information.
 */
@@ -18137,10 +18172,11 @@
     struct IdxExprTrans *pIdxTrans;           /* Convert idxed expr to column */
     ExprList *pGroupBy;                       /* GROUP BY clause */
     Select *pSelect;                          /* HAVING to WHERE clause ctx */
     struct WindowRewrite *pRewrite;           /* Window rewrite context */
     struct WhereConst *pConst;                /* WHERE clause constants */
+    struct RenameCtx *pRename;                /* RENAME COLUMN context */
   } u;
 };
 
 /* Forward declarations */
 SQLITE_PRIVATE int sqlite3WalkExpr(Walker*, Expr*);
@@ -18336,13 +18372,11 @@
 # define sqlite3Isdigit(x)   isdigit((unsigned char)(x))
 # define sqlite3Isxdigit(x)  isxdigit((unsigned char)(x))
 # define sqlite3Tolower(x)   tolower((unsigned char)(x))
 # define sqlite3Isquote(x)   ((x)=='"'||(x)=='\''||(x)=='['||(x)=='`')
 #endif
-#ifndef SQLITE_OMIT_COMPILEOPTION_DIAGS
 SQLITE_PRIVATE int sqlite3IsIdChar(u8);
-#endif
 
 /*
 ** Internal function prototypes
 */
 SQLITE_PRIVATE int sqlite3StrICmp(const char*,const char*);
@@ -18503,10 +18537,11 @@
 SQLITE_PRIVATE void sqlite3ExprListSetSpan(Parse*,ExprList*,const char*,const char*);
 SQLITE_PRIVATE void sqlite3ExprListDelete(sqlite3*, ExprList*);
 SQLITE_PRIVATE u32 sqlite3ExprListFlags(const ExprList*);
 SQLITE_PRIVATE int sqlite3Init(sqlite3*, char**);
 SQLITE_PRIVATE int sqlite3InitCallback(void*, int, char**, char**);
+SQLITE_PRIVATE int sqlite3InitOne(sqlite3*, int, char**, u32);
 SQLITE_PRIVATE void sqlite3Pragma(Parse*,Token*,Token*,Token*,int);
 #ifndef SQLITE_OMIT_VIRTUALTABLE
 SQLITE_PRIVATE Module *sqlite3PragmaVtabRegister(sqlite3*,const char *zName);
 #endif
 SQLITE_PRIVATE void sqlite3ResetAllSchemasOfConnection(sqlite3*);
@@ -18552,12 +18587,13 @@
 SQLITE_PRIVATE u32 sqlite3BitvecSize(Bitvec*);
 #ifndef SQLITE_UNTESTABLE
 SQLITE_PRIVATE int sqlite3BitvecBuiltinTest(int,int*);
 #endif
 
-SQLITE_PRIVATE RowSet *sqlite3RowSetInit(sqlite3*, void*, unsigned int);
-SQLITE_PRIVATE void sqlite3RowSetClear(RowSet*);
+SQLITE_PRIVATE RowSet *sqlite3RowSetInit(sqlite3*);
+SQLITE_PRIVATE void sqlite3RowSetDelete(void*);
+SQLITE_PRIVATE void sqlite3RowSetClear(void*);
 SQLITE_PRIVATE void sqlite3RowSetInsert(RowSet*, i64);
 SQLITE_PRIVATE int sqlite3RowSetTest(RowSet*, int iBatch, i64);
 SQLITE_PRIVATE int sqlite3RowSetNext(RowSet*, i64*);
 
 SQLITE_PRIVATE void sqlite3CreateView(Parse*,Token*,Token*,Token*,ExprList*,Select*,int,int);
@@ -18572,20 +18608,21 @@
 SQLITE_PRIVATE   int sqlite3DbMaskAllZero(yDbMask);
 #endif
 SQLITE_PRIVATE void sqlite3DropTable(Parse*, SrcList*, int, int);
 SQLITE_PRIVATE void sqlite3CodeDropTable(Parse*, Table*, int, int);
 SQLITE_PRIVATE void sqlite3DeleteTable(sqlite3*, Table*);
+SQLITE_PRIVATE void sqlite3FreeIndex(sqlite3*, Index*);
 #ifndef SQLITE_OMIT_AUTOINCREMENT
 SQLITE_PRIVATE   void sqlite3AutoincrementBegin(Parse *pParse);
 SQLITE_PRIVATE   void sqlite3AutoincrementEnd(Parse *pParse);
 #else
 # define sqlite3AutoincrementBegin(X)
 # define sqlite3AutoincrementEnd(X)
 #endif
 SQLITE_PRIVATE void sqlite3Insert(Parse*, SrcList*, Select*, IdList*, int, Upsert*);
 SQLITE_PRIVATE void *sqlite3ArrayAllocate(sqlite3*,void*,int,int*,int*);
-SQLITE_PRIVATE IdList *sqlite3IdListAppend(sqlite3*, IdList*, Token*);
+SQLITE_PRIVATE IdList *sqlite3IdListAppend(Parse*, IdList*, Token*);
 SQLITE_PRIVATE int sqlite3IdListIndex(IdList*,const char*);
 SQLITE_PRIVATE SrcList *sqlite3SrcListEnlarge(sqlite3*, SrcList*, int, int);
 SQLITE_PRIVATE SrcList *sqlite3SrcListAppend(sqlite3*, SrcList*, Token*, Token*);
 SQLITE_PRIVATE SrcList *sqlite3SrcListAppendFromTerm(Parse*, SrcList*, Token*, Token*,
                                       Token*, Select*, Expr*, IdList*);
@@ -18616,11 +18653,11 @@
 SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(Parse*,SrcList*,Expr*,ExprList*,ExprList*,u16,int);
 SQLITE_PRIVATE void sqlite3WhereEnd(WhereInfo*);
 SQLITE_PRIVATE LogEst sqlite3WhereOutputRowCount(WhereInfo*);
 SQLITE_PRIVATE int sqlite3WhereIsDistinct(WhereInfo*);
 SQLITE_PRIVATE int sqlite3WhereIsOrdered(WhereInfo*);
-SQLITE_PRIVATE int sqlite3WhereOrderedInnerLoop(WhereInfo*);
+SQLITE_PRIVATE int sqlite3WhereOrderByLimitOptLabel(WhereInfo*);
 SQLITE_PRIVATE int sqlite3WhereIsSorted(WhereInfo*);
 SQLITE_PRIVATE int sqlite3WhereContinueLabel(WhereInfo*);
 SQLITE_PRIVATE int sqlite3WhereBreakLabel(WhereInfo*);
 SQLITE_PRIVATE int sqlite3WhereOkOnePass(WhereInfo*, int*);
 #define ONEPASS_OFF      0        /* Use of ONEPASS not allowed */
@@ -18743,16 +18780,16 @@
 SQLITE_PRIVATE   void sqlite3CodeRowTriggerDirect(Parse *, Trigger *, Table *, int, int, int);
   void sqliteViewTriggers(Parse*, Table*, Expr*, int, ExprList*);
 SQLITE_PRIVATE   void sqlite3DeleteTriggerStep(sqlite3*, TriggerStep*);
 SQLITE_PRIVATE   TriggerStep *sqlite3TriggerSelectStep(sqlite3*,Select*,
                                         const char*,const char*);
-SQLITE_PRIVATE   TriggerStep *sqlite3TriggerInsertStep(sqlite3*,Token*, IdList*,
+SQLITE_PRIVATE   TriggerStep *sqlite3TriggerInsertStep(Parse*,Token*, IdList*,
                                         Select*,u8,Upsert*,
                                         const char*,const char*);
-SQLITE_PRIVATE   TriggerStep *sqlite3TriggerUpdateStep(sqlite3*,Token*,ExprList*, Expr*, u8,
+SQLITE_PRIVATE   TriggerStep *sqlite3TriggerUpdateStep(Parse*,Token*,ExprList*, Expr*, u8,
                                         const char*,const char*);
-SQLITE_PRIVATE   TriggerStep *sqlite3TriggerDeleteStep(sqlite3*,Token*, Expr*,
+SQLITE_PRIVATE   TriggerStep *sqlite3TriggerDeleteStep(Parse*,Token*, Expr*,
                                         const char*,const char*);
 SQLITE_PRIVATE   void sqlite3DeleteTrigger(sqlite3*, Trigger*);
 SQLITE_PRIVATE   void sqlite3UnlinkAndDeleteTrigger(sqlite3*,int,const char*);
 SQLITE_PRIVATE   u32 sqlite3TriggerColmask(Parse*,Trigger*,ExprList*,int,int,Table*,int);
 # define sqlite3ParseToplevel(p) ((p)->pToplevel ? (p)->pToplevel : (p))
@@ -18916,10 +18953,11 @@
 #endif
 SQLITE_PRIVATE void sqlite3RootPageMoved(sqlite3*, int, int, int);
 SQLITE_PRIVATE void sqlite3Reindex(Parse*, Token*, Token*);
 SQLITE_PRIVATE void sqlite3AlterFunctions(void);
 SQLITE_PRIVATE void sqlite3AlterRenameTable(Parse*, SrcList*, Token*);
+SQLITE_PRIVATE void sqlite3AlterRenameColumn(Parse*, SrcList*, Token*, Token*);
 SQLITE_PRIVATE int sqlite3GetToken(const unsigned char *, int *);
 SQLITE_PRIVATE void sqlite3NestedParse(Parse*, const char*, ...);
 SQLITE_PRIVATE void sqlite3ExpirePreparedStatements(sqlite3*, int);
 SQLITE_PRIVATE int sqlite3CodeSubselect(Parse*, Expr *, int, int);
 SQLITE_PRIVATE void sqlite3SelectPrep(Parse*, Select*, NameContext*);
@@ -18931,10 +18969,13 @@
 SQLITE_PRIVATE void sqlite3ResolveSelfReference(Parse*,Table*,int,Expr*,ExprList*);
 SQLITE_PRIVATE int sqlite3ResolveOrderGroupBy(Parse*, Select*, ExprList*, const char*);
 SQLITE_PRIVATE void sqlite3ColumnDefault(Vdbe *, Table *, int, int);
 SQLITE_PRIVATE void sqlite3AlterFinishAddColumn(Parse *, Token *);
 SQLITE_PRIVATE void sqlite3AlterBeginAddColumn(Parse *, SrcList *);
+SQLITE_PRIVATE void *sqlite3RenameTokenMap(Parse*, void*, Token*);
+SQLITE_PRIVATE void sqlite3RenameTokenRemap(Parse*, void *pTo, void *pFrom);
+SQLITE_PRIVATE void sqlite3RenameExprUnmap(Parse*, Expr*);
 SQLITE_PRIVATE CollSeq *sqlite3GetCollSeq(Parse*, u8, CollSeq *, const char*);
 SQLITE_PRIVATE char sqlite3AffinityType(const char*, Column*);
 SQLITE_PRIVATE void sqlite3Analyze(Parse*, Token*, Token*);
 SQLITE_PRIVATE int sqlite3InvokeBusyHandler(BusyHandler*, sqlite3_file*);
 SQLITE_PRIVATE int sqlite3FindDb(sqlite3*, Token*);
@@ -19785,10 +19826,13 @@
   VdbeCursor **apCsr;     /* Array of Vdbe cursors for parent frame */
   u8 *aOnce;              /* Bitmask used by OP_Once */
   void *token;            /* Copy of SubProgram.token */
   i64 lastRowid;          /* Last insert rowid (sqlite3.lastRowid) */
   AuxData *pAuxData;      /* Linked list of auxdata allocations */
+#if SQLITE_DEBUG
+  u32 iFrameMagic;        /* magic number for sanity checking */
+#endif
   int nCursor;            /* Number of entries in apCsr */
   int pc;                 /* Program Counter in parent (calling) frame */
   int nOp;                /* Size of aOp array */
   int nMem;               /* Number of entries in aMem */
   int nChildMem;          /* Number of memory cells for child frame */
@@ -19795,10 +19839,17 @@
   int nChildCsr;          /* Number of cursors for child frame */
   int nChange;            /* Statement changes (Vdbe.nChange)     */
   int nDbChange;          /* Value of db->nChange */
 };
 
+/* Magic number for sanity checking on VdbeFrame objects */
+#define SQLITE_FRAME_MAGIC 0x879fb71e
+
+/*
+** Return a pointer to the array of registers allocated for use
+** by a VdbeFrame.
+*/
 #define VdbeFrameMem(p) ((Mem *)&((u8 *)p)[ROUND8(sizeof(VdbeFrame))])
 
 /*
 ** Internally, the vdbe manipulates nearly all SQL values as Mem
 ** structures. Each Mem struct may cache multiple representations (string,
@@ -19809,12 +19860,10 @@
     double r;           /* Real value used when MEM_Real is set in flags */
     i64 i;              /* Integer value used when MEM_Int is set in flags */
     int nZero;          /* Extra zero bytes when MEM_Zero and MEM_Blob set */
     const char *zPType; /* Pointer type when MEM_Term|MEM_Subtype|MEM_Null */
     FuncDef *pDef;      /* Used only when flags==MEM_Agg */
-    RowSet *pRowSet;    /* Used only when flags==MEM_RowSet */
-    VdbeFrame *pFrame;  /* Used when flags==MEM_Frame */
   } u;
   u16 flags;          /* Some combination of MEM_Null, MEM_Str, MEM_Dyn, etc. */
   u8  enc;            /* SQLITE_UTF8, SQLITE_UTF16BE, SQLITE_UTF16LE */
   u8  eSubtype;       /* Subtype for this value */
   int n;              /* Number of characters in string value, excluding '\0' */
@@ -19854,12 +19903,12 @@
 #define MEM_Str       0x0002   /* Value is a string */
 #define MEM_Int       0x0004   /* Value is an integer */
 #define MEM_Real      0x0008   /* Value is a real number */
 #define MEM_Blob      0x0010   /* Value is a BLOB */
 #define MEM_AffMask   0x001f   /* Mask of affinity bits */
-#define MEM_RowSet    0x0020   /* Value is a RowSet object */
-#define MEM_Frame     0x0040   /* Value is a VdbeFrame object */
+/* Available          0x0020   */
+/* Available          0x0040   */
 #define MEM_Undefined 0x0080   /* Value is undefined */
 #define MEM_Cleared   0x0100   /* NULL set by OP_Null, not from data */
 #define MEM_TypeMask  0xc1ff   /* Mask of type bits */
 
 
@@ -19882,11 +19931,11 @@
 
 /* Return TRUE if Mem X contains dynamically allocated content - anything
 ** that needs to be deallocated to avoid a leak.
 */
 #define VdbeMemDynamic(X)  \
-  (((X)->flags&(MEM_Agg|MEM_Dyn|MEM_RowSet|MEM_Frame))!=0)
+  (((X)->flags&(MEM_Agg|MEM_Dyn))!=0)
 
 /*
 ** Clear any existing type flags from a Mem and replace them with f
 */
 #define MemSetTypeFlag(p, f) \
@@ -20095,11 +20144,14 @@
 #endif
 SQLITE_PRIVATE void sqlite3VdbeMemSetPointer(Mem*, void*, const char*, void(*)(void*));
 SQLITE_PRIVATE void sqlite3VdbeMemInit(Mem*,sqlite3*,u16);
 SQLITE_PRIVATE void sqlite3VdbeMemSetNull(Mem*);
 SQLITE_PRIVATE void sqlite3VdbeMemSetZeroBlob(Mem*,int);
-SQLITE_PRIVATE void sqlite3VdbeMemSetRowSet(Mem*);
+#ifdef SQLITE_DEBUG
+SQLITE_PRIVATE int sqlite3VdbeMemIsRowSet(const Mem*);
+#endif
+SQLITE_PRIVATE int sqlite3VdbeMemSetRowSet(Mem*);
 SQLITE_PRIVATE int sqlite3VdbeMemMakeWriteable(Mem*);
 SQLITE_PRIVATE int sqlite3VdbeMemStringify(Mem*, u8, u8);
 SQLITE_PRIVATE i64 sqlite3VdbeIntValue(Mem*);
 SQLITE_PRIVATE int sqlite3VdbeMemIntegerify(Mem*);
 SQLITE_PRIVATE double sqlite3VdbeRealValue(Mem*);
@@ -20116,11 +20168,15 @@
 #endif
 SQLITE_PRIVATE const char *sqlite3OpcodeName(int);
 SQLITE_PRIVATE int sqlite3VdbeMemGrow(Mem *pMem, int n, int preserve);
 SQLITE_PRIVATE int sqlite3VdbeMemClearAndResize(Mem *pMem, int n);
 SQLITE_PRIVATE int sqlite3VdbeCloseStatement(Vdbe *, int);
-SQLITE_PRIVATE void sqlite3VdbeFrameDelete(VdbeFrame*);
+#ifdef SQLITE_DEBUG
+SQLITE_PRIVATE int sqlite3VdbeFrameIsValid(VdbeFrame*);
+#endif
+SQLITE_PRIVATE void sqlite3VdbeFrameMemDel(void*);      /* Destructor on Mem */
+SQLITE_PRIVATE void sqlite3VdbeFrameDelete(VdbeFrame*); /* Actually deletes the Frame */
 SQLITE_PRIVATE int sqlite3VdbeFrameRestore(VdbeFrame *);
 #ifdef SQLITE_ENABLE_PREUPDATE_HOOK
 SQLITE_PRIVATE void sqlite3VdbePreUpdateHook(Vdbe*,VdbeCursor*,int,const char*,Table*,i64,int);
 #endif
 SQLITE_PRIVATE int sqlite3VdbeTransferError(Vdbe *p);
@@ -35215,11 +35271,11 @@
   assert( unixFileMutexNotheld(pFile) );
   unixEnterMutex();
   if( pFile->pInode ){
     unixInodeInfo *pInode = pFile->pInode;
     sqlite3_mutex_enter(pInode->pLockMutex);
-    if( pFile->pInode->nLock ){
+    if( pInode->nLock ){
       /* If there are outstanding locks, do not actually close the file just
       ** yet because that would clear those locks.  Instead, add the file
       ** descriptor to pInode->aPending.  It will be automatically closed when
       ** the last lock is cleared.
       */
@@ -49478,43 +49534,37 @@
 */
 #define ROWSET_SORTED  0x01   /* True if RowSet.pEntry is sorted */
 #define ROWSET_NEXT    0x02   /* True if sqlite3RowSetNext() has been called */
 
 /*
-** Turn bulk memory into a RowSet object.  N bytes of memory
-** are available at pSpace.  The db pointer is used as a memory context
-** for any subsequent allocations that need to occur.
-** Return a pointer to the new RowSet object.
-**
-** It must be the case that N is sufficient to make a Rowset.  If not
-** an assertion fault occurs.
-** 
-** If N is larger than the minimum, use the surplus as an initial
-** allocation of entries available to be filled.
+** Allocate a RowSet object.  Return NULL if a memory allocation
+** error occurs.
 */
-SQLITE_PRIVATE RowSet *sqlite3RowSetInit(sqlite3 *db, void *pSpace, unsigned int N){
-  RowSet *p;
-  assert( N >= ROUND8(sizeof(*p)) );
-  p = pSpace;
-  p->pChunk = 0;
-  p->db = db;
-  p->pEntry = 0;
-  p->pLast = 0;
-  p->pForest = 0;
-  p->pFresh = (struct RowSetEntry*)(ROUND8(sizeof(*p)) + (char*)p);
-  p->nFresh = (u16)((N - ROUND8(sizeof(*p)))/sizeof(struct RowSetEntry));
-  p->rsFlags = ROWSET_SORTED;
-  p->iBatch = 0;
+SQLITE_PRIVATE RowSet *sqlite3RowSetInit(sqlite3 *db){
+  RowSet *p = sqlite3DbMallocRawNN(db, sizeof(*p));
+  if( p ){
+    int N = sqlite3DbMallocSize(db, p);
+    p->pChunk = 0;
+    p->db = db;
+    p->pEntry = 0;
+    p->pLast = 0;
+    p->pForest = 0;
+    p->pFresh = (struct RowSetEntry*)(ROUND8(sizeof(*p)) + (char*)p);
+    p->nFresh = (u16)((N - ROUND8(sizeof(*p)))/sizeof(struct RowSetEntry));
+    p->rsFlags = ROWSET_SORTED;
+    p->iBatch = 0;
+  }
   return p;
 }
 
 /*
 ** Deallocate all chunks from a RowSet.  This frees all memory that
 ** the RowSet has allocated over its lifetime.  This routine is
 ** the destructor for the RowSet.
 */
-SQLITE_PRIVATE void sqlite3RowSetClear(RowSet *p){
+SQLITE_PRIVATE void sqlite3RowSetClear(void *pArg){
+  RowSet *p = (RowSet*)pArg;
   struct RowSetChunk *pChunk, *pNextChunk;
   for(pChunk=p->pChunk; pChunk; pChunk = pNextChunk){
     pNextChunk = pChunk->pNextChunk;
     sqlite3DbFree(p->db, pChunk);
   }
@@ -49523,10 +49573,20 @@
   p->pEntry = 0;
   p->pLast = 0;
   p->pForest = 0;
   p->rsFlags = ROWSET_SORTED;
 }
+
+/*
+** Deallocate all chunks from a RowSet.  This frees all memory that
+** the RowSet has allocated over its lifetime.  This routine is
+** the destructor for the RowSet.
+*/
+SQLITE_PRIVATE void sqlite3RowSetDelete(void *pArg){
+  sqlite3RowSetClear(pArg);
+  sqlite3DbFree(((RowSet*)pArg)->db, pArg);
+}
 
 /*
 ** Allocate a new RowSetEntry object that is associated with the
 ** given RowSet.  Return a pointer to the new and completely uninitialized
 ** objected.
@@ -51006,12 +51066,16 @@
 ** containing the state of the Pager object passed as an argument. This
 ** is intended to be used within debuggers. For example, as an alternative
 ** to "print *pPager" in gdb:
 **
 ** (gdb) printf "%s", print_pager_state(pPager)
+**
+** This routine has external linkage in order to suppress compiler warnings
+** about an unused function.  It is enclosed within SQLITE_DEBUG and so does
+** not appear in normal builds.
 */
-static char *print_pager_state(Pager *p){
+char *print_pager_state(Pager *p){
   static char zRet[1024];
 
   sqlite3_snprintf(1024, zRet,
       "Filename:      %s\n"
       "State:         %s errCode=%d\n"
@@ -57286,17 +57350,10 @@
 **
 ** The returned indicate the current (possibly updated) journal-mode.
 */
 SQLITE_PRIVATE int sqlite3PagerSetJournalMode(Pager *pPager, int eMode){
   u8 eOld = pPager->journalMode;    /* Prior journalmode */
-
-#ifdef SQLITE_DEBUG
-  /* The print_pager_state() routine is intended to be used by the debugger
-  ** only.  We invoke it once here to suppress a compiler warning. */
-  print_pager_state(pPager);
-#endif
-
 
   /* The eMode parameter is always valid */
   assert(      eMode==PAGER_JOURNALMODE_DELETE
             || eMode==PAGER_JOURNALMODE_TRUNCATE
             || eMode==PAGER_JOURNALMODE_PERSIST
@@ -57975,10 +58032,22 @@
 # define WALTRACE(X)  if(sqlite3WalTrace) sqlite3DebugPrintf X
 #else
 # define WALTRACE(X)
 #endif
 
+/*
+** WAL mode depends on atomic aligned 32-bit loads and stores in a few
+** places.  The following macros try to make this explicit.
+*/
+#if GCC_VESRION>=5004000
+# define AtomicLoad(PTR)       __atomic_load_n((PTR),__ATOMIC_RELAXED)
+# define AtomicStore(PTR,VAL)  __atomic_store_n((PTR),(VAL),__ATOMIC_RELAXED)
+#else
+# define AtomicLoad(PTR)       (*(PTR))
+# define AtomicStore(PTR,VAL)  (*(PTR) = (VAL))
+#endif
+
 /*
 ** The maximum (and only) versions of the wal and wal-index formats
 ** that may be interpreted by this version of SQLite.
 **
 ** If a client begins recovering a WAL file and finds that (a) the checksum
@@ -60272,11 +60341,11 @@
   if( pWal->pSnapshot && pWal->pSnapshot->mxFrame<mxFrame ){
     mxFrame = pWal->pSnapshot->mxFrame;
   }
 #endif
   for(i=1; i<WAL_NREADER; i++){
-    u32 thisMark = pInfo->aReadMark[i];
+    u32 thisMark = AtomicLoad(pInfo->aReadMark+i);
     if( mxReadMark<=thisMark && thisMark<=mxFrame ){
       assert( thisMark!=READMARK_NOT_USED );
       mxReadMark = thisMark;
       mxI = i;
     }
@@ -60285,11 +60354,11 @@
    && (mxReadMark<mxFrame || mxI==0)
   ){
     for(i=1; i<WAL_NREADER; i++){
       rc = walLockExclusive(pWal, WAL_READ_LOCK(i), 1);
       if( rc==SQLITE_OK ){
-        mxReadMark = pInfo->aReadMark[i] = mxFrame;
+        mxReadMark = AtomicStore(pInfo->aReadMark+i,mxFrame);
         mxI = i;
         walUnlockExclusive(pWal, WAL_READ_LOCK(i), 1);
         break;
       }else if( rc!=SQLITE_BUSY ){
         return rc;
@@ -60337,13 +60406,13 @@
   ** frame pWal->hdr.mxFrame - then the client would incorrectly assume
   ** that it can read version A from the database file. However, since
   ** we can guarantee that the checkpointer that set nBackfill could not
   ** see any pages past pWal->hdr.mxFrame, this problem does not come up.
   */
-  pWal->minFrame = pInfo->nBackfill+1;
+  pWal->minFrame = AtomicLoad(&pInfo->nBackfill)+1;
   walShmBarrier(pWal);
-  if( pInfo->aReadMark[mxI]!=mxReadMark
+  if( AtomicLoad(pInfo->aReadMark+mxI)!=mxReadMark
    || memcmp((void *)walIndexHdr(pWal), &pWal->hdr, sizeof(WalIndexHdr))
   ){
     walUnlockShared(pWal, WAL_READ_LOCK(mxI));
     return WAL_RETRY;
   }else{
@@ -60500,25 +60569,26 @@
 
       if( rc==SQLITE_OK ){
         /* Check that the wal file has not been wrapped. Assuming that it has
         ** not, also check that no checkpointer has attempted to checkpoint any
         ** frames beyond pSnapshot->mxFrame. If either of these conditions are
-        ** true, return SQLITE_BUSY_SNAPSHOT. Otherwise, overwrite pWal->hdr
+        ** true, return SQLITE_ERROR_SNAPSHOT. Otherwise, overwrite pWal->hdr
         ** with *pSnapshot and set *pChanged as appropriate for opening the
         ** snapshot.  */
         if( !memcmp(pSnapshot->aSalt, pWal->hdr.aSalt, sizeof(pWal->hdr.aSalt))
          && pSnapshot->mxFrame>=pInfo->nBackfillAttempted
         ){
           assert( pWal->readLock>0 );
           memcpy(&pWal->hdr, pSnapshot, sizeof(WalIndexHdr));
           *pChanged = bChanged;
         }else{
-          rc = SQLITE_BUSY_SNAPSHOT;
+          rc = SQLITE_ERROR_SNAPSHOT;
         }
 
         /* Release the shared CKPT lock obtained above. */
         walUnlockShared(pWal, WAL_CKPT_LOCK);
+        pWal->minFrame = 1;
       }
 
 
       if( rc!=SQLITE_OK ){
         sqlite3WalEndReadTransaction(pWal);
@@ -61506,11 +61576,11 @@
   if( rc==SQLITE_OK ){
     WalIndexHdr *pNew = (WalIndexHdr*)pSnapshot;
     if( memcmp(pNew->aSalt, pWal->hdr.aSalt, sizeof(pWal->hdr.aSalt))
      || pNew->mxFrame<walCkptInfo(pWal)->nBackfillAttempted
     ){
-      rc = SQLITE_BUSY_SNAPSHOT;
+      rc = SQLITE_ERROR_SNAPSHOT;
       walUnlockShared(pWal, WAL_CKPT_LOCK);
     }
   }
   return rc;
 }
@@ -73614,12 +73684,11 @@
   /* Cannot be both MEM_Int and MEM_Real at the same time */
   assert( (p->flags & (MEM_Int|MEM_Real))!=(MEM_Int|MEM_Real) );
 
   if( p->flags & MEM_Null ){
     /* Cannot be both MEM_Null and some other type */
-    assert( (p->flags & (MEM_Int|MEM_Real|MEM_Str|MEM_Blob
-                         |MEM_RowSet|MEM_Frame|MEM_Agg))==0 );
+    assert( (p->flags & (MEM_Int|MEM_Real|MEM_Str|MEM_Blob|MEM_Agg))==0 );
 
     /* If MEM_Null is set, then either the value is a pure NULL (the usual
     ** case) or it is a pointer set using sqlite3_bind_pointer() or
     ** sqlite3_result_pointer().  If a pointer, then MEM_Term must also be
     ** set.
@@ -73728,11 +73797,11 @@
 */
 SQLITE_PRIVATE int sqlite3VdbeChangeEncoding(Mem *pMem, int desiredEnc){
 #ifndef SQLITE_OMIT_UTF16
   int rc;
 #endif
-  assert( (pMem->flags&MEM_RowSet)==0 );
+  assert( !sqlite3VdbeMemIsRowSet(pMem) );
   assert( desiredEnc==SQLITE_UTF8 || desiredEnc==SQLITE_UTF16LE
            || desiredEnc==SQLITE_UTF16BE );
   if( !(pMem->flags&MEM_Str) || pMem->enc==desiredEnc ){
     return SQLITE_OK;
   }
@@ -73761,11 +73830,11 @@
 ** blob if bPreserve is true.  If bPreserve is false, any prior content
 ** in pMem->z is discarded.
 */
 SQLITE_PRIVATE SQLITE_NOINLINE int sqlite3VdbeMemGrow(Mem *pMem, int n, int bPreserve){
   assert( sqlite3VdbeCheckMemInvariants(pMem) );
-  assert( (pMem->flags&MEM_RowSet)==0 );
+  assert( !sqlite3VdbeMemIsRowSet(pMem) );
   testcase( pMem->db==0 );
 
   /* If the bPreserve flag is set to true, then the memory cell must already
   ** contain a valid string or blob value.  */
   assert( bPreserve==0 || pMem->flags&(MEM_Blob|MEM_Str) );
@@ -73849,11 +73918,11 @@
 **
 ** Return SQLITE_OK on success or SQLITE_NOMEM if malloc fails.
 */
 SQLITE_PRIVATE int sqlite3VdbeMemMakeWriteable(Mem *pMem){
   assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
-  assert( (pMem->flags&MEM_RowSet)==0 );
+  assert( !sqlite3VdbeMemIsRowSet(pMem) );
   if( (pMem->flags & (MEM_Str|MEM_Blob))!=0 ){
     if( ExpandBlob(pMem) ) return SQLITE_NOMEM;
     if( pMem->szMalloc==0 || pMem->z!=pMem->zMalloc ){
       int rc = vdbeMemAddTerminator(pMem);
       if( rc ) return rc;
@@ -73874,11 +73943,11 @@
 #ifndef SQLITE_OMIT_INCRBLOB
 SQLITE_PRIVATE int sqlite3VdbeMemExpandBlob(Mem *pMem){
   int nByte;
   assert( pMem->flags & MEM_Zero );
   assert( pMem->flags&MEM_Blob );
-  assert( (pMem->flags&MEM_RowSet)==0 );
+  assert( !sqlite3VdbeMemIsRowSet(pMem) );
   assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
 
   /* Set nByte to the number of bytes required to store the expanded blob. */
   nByte = pMem->n + pMem->u.nZero;
   if( nByte<=0 ){
@@ -73929,11 +73998,11 @@
 
   assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
   assert( !(fg&MEM_Zero) );
   assert( !(fg&(MEM_Str|MEM_Blob)) );
   assert( fg&(MEM_Int|MEM_Real) );
-  assert( (pMem->flags&MEM_RowSet)==0 );
+  assert( !sqlite3VdbeMemIsRowSet(pMem) );
   assert( EIGHT_BYTE_ALIGNMENT(pMem) );
 
 
   if( sqlite3VdbeMemClearAndResize(pMem, nByte) ){
     pMem->enc = 0;
@@ -74034,19 +74103,12 @@
     sqlite3VdbeMemFinalize(p, p->u.pDef);
     assert( (p->flags & MEM_Agg)==0 );
     testcase( p->flags & MEM_Dyn );
   }
   if( p->flags&MEM_Dyn ){
-    assert( (p->flags&MEM_RowSet)==0 );
     assert( p->xDel!=SQLITE_DYNAMIC && p->xDel!=0 );
     p->xDel((void *)p->z);
-  }else if( p->flags&MEM_RowSet ){
-    sqlite3RowSetClear(p->u.pRowSet);
-  }else if( p->flags&MEM_Frame ){
-    VdbeFrame *pFrame = p->u.pFrame;
-    pFrame->pParent = pFrame->v->pDelFrame;
-    pFrame->v->pDelFrame = pFrame;
   }
   p->flags = MEM_Null;
 }
 
 /*
@@ -74190,11 +74252,11 @@
 ** MEM_Int if we can.
 */
 SQLITE_PRIVATE void sqlite3VdbeIntegerAffinity(Mem *pMem){
   i64 ix;
   assert( pMem->flags & MEM_Real );
-  assert( (pMem->flags & MEM_RowSet)==0 );
+  assert( !sqlite3VdbeMemIsRowSet(pMem) );
   assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
   assert( EIGHT_BYTE_ALIGNMENT(pMem) );
 
   ix = doubleToInt64(pMem->u.r);
 
@@ -74217,11 +74279,11 @@
 /*
 ** Convert pMem to type integer.  Invalidate any prior representations.
 */
 SQLITE_PRIVATE int sqlite3VdbeMemIntegerify(Mem *pMem){
   assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
-  assert( (pMem->flags & MEM_RowSet)==0 );
+  assert( !sqlite3VdbeMemIsRowSet(pMem) );
   assert( EIGHT_BYTE_ALIGNMENT(pMem) );
 
   pMem->u.i = sqlite3VdbeIntValue(pMem);
   MemSetTypeFlag(pMem, MEM_Int);
   return SQLITE_OK;
@@ -74435,30 +74497,40 @@
     pMem->flags = MEM_Real;
   }
 }
 #endif
 
+#ifdef SQLITE_DEBUG
+/*
+** Return true if the Mem holds a RowSet object.  This routine is intended
+** for use inside of assert() statements.
+*/
+SQLITE_PRIVATE int sqlite3VdbeMemIsRowSet(const Mem *pMem){
+  return (pMem->flags&(MEM_Blob|MEM_Dyn))==(MEM_Blob|MEM_Dyn)
+         && pMem->xDel==sqlite3RowSetDelete;
+}
+#endif
+
 /*
 ** Delete any previous value and set the value of pMem to be an
 ** empty boolean index.
+**
+** Return SQLITE_OK on success and SQLITE_NOMEM if a memory allocation
+** error occurs.
 */
-SQLITE_PRIVATE void sqlite3VdbeMemSetRowSet(Mem *pMem){
+SQLITE_PRIVATE int sqlite3VdbeMemSetRowSet(Mem *pMem){
   sqlite3 *db = pMem->db;
+  RowSet *p;
   assert( db!=0 );
-  assert( (pMem->flags & MEM_RowSet)==0 );
+  assert( !sqlite3VdbeMemIsRowSet(pMem) );
   sqlite3VdbeMemRelease(pMem);
-  pMem->zMalloc = sqlite3DbMallocRawNN(db, 64);
-  if( db->mallocFailed ){
-    pMem->flags = MEM_Null;
-    pMem->szMalloc = 0;
-  }else{
-    assert( pMem->zMalloc );
-    pMem->szMalloc = sqlite3DbMallocSize(db, pMem->zMalloc);
-    pMem->u.pRowSet = sqlite3RowSetInit(db, pMem->zMalloc, pMem->szMalloc);
-    assert( pMem->u.pRowSet!=0 );
-    pMem->flags = MEM_RowSet;
-  }
+  p = sqlite3RowSetInit(db);
+  if( p==0 ) return SQLITE_NOMEM;
+  pMem->z = (char*)p;
+  pMem->flags = MEM_Blob|MEM_Dyn;
+  pMem->xDel = sqlite3RowSetDelete;
+  return SQLITE_OK;
 }
 
 /*
 ** Return true if the Mem object contains a TEXT or BLOB that is
 ** too large - whose size exceeds SQLITE_MAX_LENGTH.
@@ -74522,11 +74594,11 @@
   vdbeMemClearExternAndSetNull(pTo);
   assert( !VdbeMemDynamic(pTo) );
   sqlite3VdbeMemShallowCopy(pTo, pFrom, eType);
 }
 SQLITE_PRIVATE void sqlite3VdbeMemShallowCopy(Mem *pTo, const Mem *pFrom, int srcType){
-  assert( (pFrom->flags & MEM_RowSet)==0 );
+  assert( !sqlite3VdbeMemIsRowSet(pFrom) );
   assert( pTo->db==pFrom->db );
   if( VdbeMemDynamic(pTo) ){ vdbeClrCopy(pTo,pFrom,srcType); return; }
   memcpy(pTo, pFrom, MEMCELLSIZE);
   if( (pFrom->flags&MEM_Static)==0 ){
     pTo->flags &= ~(MEM_Dyn|MEM_Static|MEM_Ephem);
@@ -74540,11 +74612,11 @@
 ** freed before the copy is made.
 */
 SQLITE_PRIVATE int sqlite3VdbeMemCopy(Mem *pTo, const Mem *pFrom){
   int rc = SQLITE_OK;
 
-  assert( (pFrom->flags & MEM_RowSet)==0 );
+  assert( !sqlite3VdbeMemIsRowSet(pFrom) );
   if( VdbeMemDynamic(pTo) ) vdbeMemClearExternAndSetNull(pTo);
   memcpy(pTo, pFrom, MEMCELLSIZE);
   pTo->flags &= ~MEM_Dyn;
   if( pTo->flags&(MEM_Str|MEM_Blob) ){
     if( 0==(pFrom->flags&MEM_Static) ){
@@ -74598,11 +74670,11 @@
   int nByte = n;      /* New value for pMem->n */
   int iLimit;         /* Maximum allowed string or blob size */
   u16 flags = 0;      /* New value for pMem->flags */
 
   assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
-  assert( (pMem->flags & MEM_RowSet)==0 );
+  assert( !sqlite3VdbeMemIsRowSet(pMem) );
 
   /* If z is a NULL pointer, set pMem to contain an SQL NULL. */
   if( !z ){
     sqlite3VdbeMemSetNull(pMem);
     return SQLITE_OK;
@@ -74720,11 +74792,11 @@
   assert( sqlite3BtreeCursorIsValid(pCur) );
   assert( !VdbeMemDynamic(pMem) );
 
   /* Note: the calls to BtreeKeyFetch() and DataFetch() below assert() 
   ** that both the BtShared and database handle mutexes are held. */
-  assert( (pMem->flags & MEM_RowSet)==0 );
+  assert( !sqlite3VdbeMemIsRowSet(pMem) );
   zData = (char *)sqlite3BtreePayloadFetch(pCur, &available);
   assert( zData!=0 );
 
   if( offset+amt<=available ){
     pMem->z = &zData[offset];
@@ -74744,11 +74816,11 @@
 */
 static SQLITE_NOINLINE const void *valueToText(sqlite3_value* pVal, u8 enc){
   assert( pVal!=0 );
   assert( pVal->db==0 || sqlite3_mutex_held(pVal->db->mutex) );
   assert( (enc&3)==(enc&~SQLITE_UTF16_ALIGNED) );
-  assert( (pVal->flags & MEM_RowSet)==0 );
+  assert( !sqlite3VdbeMemIsRowSet(pVal) );
   assert( (pVal->flags & (MEM_Null))==0 );
   if( pVal->flags & (MEM_Blob|MEM_Str) ){
     if( ExpandBlob(pVal) ) return 0;
     pVal->flags |= MEM_Str;
     if( pVal->enc != (enc & ~SQLITE_UTF16_ALIGNED) ){
@@ -74787,11 +74859,11 @@
 */
 SQLITE_PRIVATE const void *sqlite3ValueText(sqlite3_value* pVal, u8 enc){
   if( !pVal ) return 0;
   assert( pVal->db==0 || sqlite3_mutex_held(pVal->db->mutex) );
   assert( (enc&3)==(enc&~SQLITE_UTF16_ALIGNED) );
-  assert( (pVal->flags & MEM_RowSet)==0 );
+  assert( !sqlite3VdbeMemIsRowSet(pVal) );
   if( (pVal->flags&(MEM_Str|MEM_Term))==(MEM_Str|MEM_Term) && pVal->enc==enc ){
     assert( sqlite3VdbeMemConsistentDualRep(pVal) );
     return pVal->z;
   }
   if( pVal->flags&MEM_Null ){
@@ -75354,15 +75426,15 @@
   const void *pRec,               /* Pointer to buffer containing record */
   int nRec,                       /* Size of buffer pRec in bytes */
   int iCol,                       /* Column to extract */
   sqlite3_value **ppVal           /* OUT: Extracted value */
 ){
-  u32 t;                          /* a column type code */
+  u32 t = 0;                      /* a column type code */
   int nHdr;                       /* Size of the header in the record */
   int iHdr;                       /* Next unread header byte */
   int iField;                     /* Next unread data byte */
-  int szField;                    /* Size of the current data field */
+  int szField = 0;                /* Size of the current data field */
   int i;                          /* Column index */
   u8 *a = (u8*)pRec;              /* Typecast byte array */
   Mem *pMem = *ppVal;             /* Write result into this Mem object */
 
   assert( iCol>0 );
@@ -75774,11 +75846,11 @@
 ** subsequent Explains until sqlite3VdbeExplainPop() is called.
 */
 SQLITE_PRIVATE void sqlite3VdbeExplain(Parse *pParse, u8 bPush, const char *zFmt, ...){
   if( pParse->explain==2 ){
     char *zMsg;
-    Vdbe *v = pParse->pVdbe;
+    Vdbe *v;
     va_list ap;
     int iThis;
     va_start(ap, zFmt);
     zMsg = sqlite3VMPrintf(pParse->db, zFmt, ap);
     va_end(ap);
@@ -77119,13 +77191,12 @@
       ** with no indexes using a single prepared INSERT statement, bind() 
       ** and reset(). Inserts are grouped into a transaction.
       */
       testcase( p->flags & MEM_Agg );
       testcase( p->flags & MEM_Dyn );
-      testcase( p->flags & MEM_Frame );
-      testcase( p->flags & MEM_RowSet );
-      if( p->flags&(MEM_Agg|MEM_Dyn|MEM_Frame|MEM_RowSet) ){
+      testcase( p->xDel==sqlite3VdbeFrameMemDel );
+      if( p->flags&(MEM_Agg|MEM_Dyn) ){
         sqlite3VdbeMemRelease(p);
       }else if( p->szMalloc ){
         sqlite3DbFreeNN(db, p->zMalloc);
         p->szMalloc = 0;
       }
@@ -77132,19 +77203,49 @@
 
       p->flags = MEM_Undefined;
     }while( (++p)<pEnd );
   }
 }
+
+#ifdef SQLITE_DEBUG
+/*
+** Verify that pFrame is a valid VdbeFrame pointer.  Return true if it is
+** and false if something is wrong.
+**
+** This routine is intended for use inside of assert() statements only.
+*/
+SQLITE_PRIVATE int sqlite3VdbeFrameIsValid(VdbeFrame *pFrame){
+  if( pFrame->iFrameMagic!=SQLITE_FRAME_MAGIC ) return 0;
+  return 1;
+}
+#endif
+
+
+/*
+** This is a destructor on a Mem object (which is really an sqlite3_value)
+** that deletes the Frame object that is attached to it as a blob.
+**
+** This routine does not delete the Frame right away.  It merely adds the
+** frame to a list of frames to be deleted when the Vdbe halts.
+*/
+SQLITE_PRIVATE void sqlite3VdbeFrameMemDel(void *pArg){
+  VdbeFrame *pFrame = (VdbeFrame*)pArg;
+  assert( sqlite3VdbeFrameIsValid(pFrame) );
+  pFrame->pParent = pFrame->v->pDelFrame;
+  pFrame->v->pDelFrame = pFrame;
+}
+
 
 /*
 ** Delete a VdbeFrame object and its contents. VdbeFrame objects are
 ** allocated by the OP_Program opcode in sqlite3VdbeExec().
 */
 SQLITE_PRIVATE void sqlite3VdbeFrameDelete(VdbeFrame *p){
   int i;
   Mem *aMem = VdbeFrameMem(p);
   VdbeCursor **apCsr = (VdbeCursor **)&aMem[p->nChildMem];
+  assert( sqlite3VdbeFrameIsValid(p) );
   for(i=0; i<p->nChildCsr; i++){
     sqlite3VdbeFreeCursor(p->v, apCsr[i]);
   }
   releaseMemArray(aMem, p->nChildMem);
   sqlite3VdbeDeleteAuxData(p->v->db, &p->pAuxData, -1, 0);
@@ -79419,11 +79520,11 @@
   int combined_flags;
 
   f1 = pMem1->flags;
   f2 = pMem2->flags;
   combined_flags = f1|f2;
-  assert( (combined_flags & MEM_RowSet)==0 );
+  assert( !sqlite3VdbeMemIsRowSet(pMem1) && !sqlite3VdbeMemIsRowSet(pMem2) );
  
   /* If one value is NULL, it is less than the other. If both values
   ** are NULL, return 0.
   */
   if( combined_flags&MEM_Null ){
@@ -82955,11 +83056,11 @@
     printf(" i:%lld", p->u.i);
 #ifndef SQLITE_OMIT_FLOATING_POINT
   }else if( p->flags & MEM_Real ){
     printf(" r:%g", p->u.r);
 #endif
-  }else if( p->flags & MEM_RowSet ){
+  }else if( sqlite3VdbeMemIsRowSet(p) ){
     printf(" (rowset)");
   }else{
     char zBuf[200];
     sqlite3VdbeMemPrettyPrint(p, zBuf);
     printf(" %s", zBuf);
@@ -88264,11 +88365,12 @@
 }
 
 /* Opcode: ParseSchema P1 * * P4 *
 **
 ** Read and parse all entries from the SQLITE_MASTER table of database P1
-** that match the WHERE clause P4. 
+** that match the WHERE clause P4.  If P4 is a NULL pointer, then the
+** entire schema for P1 is reparsed.
 **
 ** This opcode invokes the parser to create a new virtual machine,
 ** then runs the new virtual machine.  It is thus a re-entrant opcode.
 */
 case OP_ParseSchema: {
@@ -88288,15 +88390,26 @@
 #endif
 
   iDb = pOp->p1;
   assert( iDb>=0 && iDb<db->nDb );
   assert( DbHasProperty(db, iDb, DB_SchemaLoaded) );
-  /* Used to be a conditional */ {
+
+#ifndef SQLITE_OMIT_ALTERTABLE
+  if( pOp->p4.z==0 ){
+    sqlite3SchemaClear(db->aDb[iDb].pSchema);
+    db->mDbFlags &= ~DBFLAG_SchemaKnownOk;
+    rc = sqlite3InitOne(db, iDb, &p->zErrMsg, INITFLAG_AlterTable);
+    db->mDbFlags |= DBFLAG_SchemaChange;
+    p->expired = 0;
+  }else
+#endif
+  {
     zMaster = MASTER_NAME;
     initData.db = db;
     initData.iDb = pOp->p1;
     initData.pzErrMsg = &p->zErrMsg;
+    initData.mInitFlags = 0;
     zSql = sqlite3MPrintf(db,
        "SELECT name, rootpage, sql FROM '%q'.%s WHERE %s ORDER BY rowid",
        db->aDb[iDb].zDbSName, zMaster, pOp->p4.z);
     if( zSql==0 ){
       rc = SQLITE_NOMEM_BKPT;
@@ -88445,15 +88558,15 @@
 */
 case OP_RowSetAdd: {       /* in1, in2 */
   pIn1 = &aMem[pOp->p1];
   pIn2 = &aMem[pOp->p2];
   assert( (pIn2->flags & MEM_Int)!=0 );
-  if( (pIn1->flags & MEM_RowSet)==0 ){
-    sqlite3VdbeMemSetRowSet(pIn1);
-    if( (pIn1->flags & MEM_RowSet)==0 ) goto no_mem;
+  if( (pIn1->flags & MEM_Blob)==0 ){
+    if( sqlite3VdbeMemSetRowSet(pIn1) ) goto no_mem;
   }
-  sqlite3RowSetInsert(pIn1->u.pRowSet, pIn2->u.i);
+  assert( sqlite3VdbeMemIsRowSet(pIn1) );
+  sqlite3RowSetInsert((RowSet*)pIn1->z, pIn2->u.i);
   break;
 }
 
 /* Opcode: RowSetRead P1 P2 P3 * *
 ** Synopsis: r[P3]=rowset(P1)
@@ -88465,12 +88578,13 @@
 */
 case OP_RowSetRead: {       /* jump, in1, out3 */
   i64 val;
 
   pIn1 = &aMem[pOp->p1];
-  if( (pIn1->flags & MEM_RowSet)==0 
-   || sqlite3RowSetNext(pIn1->u.pRowSet, &val)==0
+  assert( (pIn1->flags & MEM_Blob)==0 || sqlite3VdbeMemIsRowSet(pIn1) );
+  if( (pIn1->flags & MEM_Blob)==0 
+   || sqlite3RowSetNext((RowSet*)pIn1->z, &val)==0
   ){
     /* The boolean index is empty */
     sqlite3VdbeMemSetNull(pIn1);
     VdbeBranchTaken(1,2);
     goto jump_to_p2_and_check_for_interrupt;
@@ -88515,24 +88629,23 @@
   assert( pIn3->flags&MEM_Int );
 
   /* If there is anything other than a rowset object in memory cell P1,
   ** delete it now and initialize P1 with an empty rowset
   */
-  if( (pIn1->flags & MEM_RowSet)==0 ){
-    sqlite3VdbeMemSetRowSet(pIn1);
-    if( (pIn1->flags & MEM_RowSet)==0 ) goto no_mem;
+  if( (pIn1->flags & MEM_Blob)==0 ){
+    if( sqlite3VdbeMemSetRowSet(pIn1) ) goto no_mem;
   }
-
+  assert( sqlite3VdbeMemIsRowSet(pIn1) );
   assert( pOp->p4type==P4_INT32 );
   assert( iSet==-1 || iSet>=0 );
   if( iSet ){
-    exists = sqlite3RowSetTest(pIn1->u.pRowSet, iSet, pIn3->u.i);
+    exists = sqlite3RowSetTest((RowSet*)pIn1->z, iSet, pIn3->u.i);
     VdbeBranchTaken(exists!=0,2);
     if( exists ) goto jump_to_p2;
   }
   if( iSet>=0 ){
-    sqlite3RowSetInsert(pIn1->u.pRowSet, pIn3->u.i);
+    sqlite3RowSetInsert((RowSet*)pIn1->z, pIn3->u.i);
   }
   break;
 }
 
 
@@ -88592,11 +88705,11 @@
 
   /* Register pRt is used to store the memory required to save the state
   ** of the current program, and the memory required at runtime to execute
   ** the trigger program. If this trigger has been fired before, then pRt 
   ** is already allocated. Otherwise, it must be initialized.  */
-  if( (pRt->flags&MEM_Frame)==0 ){
+  if( (pRt->flags&MEM_Blob)==0 ){
     /* SubProgram.nMem is set to the number of memory cells used by the 
     ** program stored in SubProgram.aOp. As well as these, one memory
     ** cell is required for each cursor used by the program. Set local
     ** variable nMem (and later, VdbeFrame.nChildMem) to this value.
     */
@@ -88610,12 +88723,14 @@
     pFrame = sqlite3DbMallocZero(db, nByte);
     if( !pFrame ){
       goto no_mem;
     }
     sqlite3VdbeMemRelease(pRt);
-    pRt->flags = MEM_Frame;
-    pRt->u.pFrame = pFrame;
+    pRt->flags = MEM_Blob|MEM_Dyn;
+    pRt->z = (char*)pFrame;
+    pRt->n = nByte;
+    pRt->xDel = sqlite3VdbeFrameMemDel;
 
     pFrame->v = p;
     pFrame->nChildMem = nMem;
     pFrame->nChildCsr = pProgram->nCsr;
     pFrame->pc = (int)(pOp - aOp);
@@ -88627,18 +88742,22 @@
     pFrame->nOp = p->nOp;
     pFrame->token = pProgram->token;
 #ifdef SQLITE_ENABLE_STMT_SCANSTATUS
     pFrame->anExec = p->anExec;
 #endif
+#ifdef SQLITE_DEBUG
+    pFrame->iFrameMagic = SQLITE_FRAME_MAGIC;
+#endif
 
     pEnd = &VdbeFrameMem(pFrame)[pFrame->nChildMem];
     for(pMem=VdbeFrameMem(pFrame); pMem!=pEnd; pMem++){
       pMem->flags = MEM_Undefined;
       pMem->db = db;
     }
   }else{
-    pFrame = pRt->u.pFrame;
+    pFrame = (VdbeFrame*)pRt->z;
+    assert( pRt->xDel==sqlite3VdbeFrameMemDel );
     assert( pProgram->nMem+pProgram->nCsr==pFrame->nChildMem 
         || (pProgram->nCsr==0 && pProgram->nMem+1==pFrame->nChildMem) );
     assert( pProgram->nCsr==pFrame->nChildCsr );
     assert( (int)(pOp - aOp)==pFrame->pc );
   }
@@ -92718,19 +92837,24 @@
   MergeEngine *pMerger,           /* MergeEngine to initialize */
   int eMode                       /* One of the INCRINIT_XXX constants */
 ){
   int rc = SQLITE_OK;             /* Return code */
   int i;                          /* For looping over PmaReader objects */
-  int nTree = pMerger->nTree;
+  int nTree;                      /* Number of subtrees to merge */
+
+  /* Failure to allocate the merge would have been detected prior to
+  ** invoking this routine */
+  assert( pMerger!=0 );
 
   /* eMode is always INCRINIT_NORMAL in single-threaded mode */
   assert( SQLITE_MAX_WORKER_THREADS>0 || eMode==INCRINIT_NORMAL );
 
   /* Verify that the MergeEngine is assigned to a single thread */
   assert( pMerger->pTask==0 );
   pMerger->pTask = pTask;
 
+  nTree = pMerger->nTree;
   for(i=0; i<nTree; i++){
     if( SQLITE_MAX_WORKER_THREADS>0 && eMode==INCRINIT_ROOT ){
       /* PmaReaders should be normally initialized in order, as if they are
       ** reading from the same temp file this makes for more linear file IO.
       ** However, in the INCRINIT_ROOT case, if PmaReader aReadr[nTask-1] is
@@ -94235,10 +94359,13 @@
           const char *zTabName = pItem->zAlias ? pItem->zAlias : pTab->zName;
           assert( zTabName!=0 );
           if( sqlite3StrICmp(zTabName, zTab)!=0 ){
             continue;
           }
+          if( IN_RENAME_OBJECT && pItem->zAlias ){
+            sqlite3RenameTokenRemap(pParse, 0, (void*)&pExpr->pTab);
+          }
         }
         if( 0==(cntTab++) ){
           pMatch = pItem;
         }
         for(j=0, pCol=pTab->aCol; j<pTab->nCol; j++, pCol++){
@@ -94320,13 +94447,19 @@
         if( iCol<pTab->nCol ){
           cnt++;
 #ifndef SQLITE_OMIT_UPSERT
           if( pExpr->iTable==2 ){
             testcase( iCol==(-1) );
-            pExpr->iTable = pNC->uNC.pUpsert->regData + iCol;
-            eNewExprOp = TK_REGISTER;
-            ExprSetProperty(pExpr, EP_Alias);
+            if( IN_RENAME_OBJECT ){
+              pExpr->iColumn = iCol;
+              pExpr->pTab = pTab;
+              eNewExprOp = TK_COLUMN;
+            }else{
+              pExpr->iTable = pNC->uNC.pUpsert->regData + iCol;
+              eNewExprOp = TK_REGISTER;
+              ExprSetProperty(pExpr, EP_Alias);
+            }
           }else
 #endif /* SQLITE_OMIT_UPSERT */
           {
 #ifndef SQLITE_OMIT_TRIGGER
             if( iCol<0 ){
@@ -94407,10 +94540,13 @@
           }
           resolveAlias(pParse, pEList, j, pExpr, "", nSubquery);
           cnt = 1;
           pMatch = 0;
           assert( zTab==0 && zDb==0 );
+          if( IN_RENAME_OBJECT ){
+            sqlite3RenameTokenRemap(pParse, 0, (void*)pExpr);
+          }
           goto lookupname_end;
         }
       } 
     }
 
@@ -94634,21 +94770,28 @@
       if( pExpr->op==TK_ID ){
         zDb = 0;
         zTable = 0;
         zColumn = pExpr->u.zToken;
       }else{
+        Expr *pLeft = pExpr->pLeft;
         notValid(pParse, pNC, "the \".\" operator", NC_IdxExpr);
         pRight = pExpr->pRight;
         if( pRight->op==TK_ID ){
           zDb = 0;
-          zTable = pExpr->pLeft->u.zToken;
-          zColumn = pRight->u.zToken;
         }else{
           assert( pRight->op==TK_DOT );
-          zDb = pExpr->pLeft->u.zToken;
-          zTable = pRight->pLeft->u.zToken;
-          zColumn = pRight->pRight->u.zToken;
+          zDb = pLeft->u.zToken;
+          pLeft = pRight->pLeft;
+          pRight = pRight->pRight;
+        }
+        zTable = pLeft->u.zToken;
+        zColumn = pRight->u.zToken;
+        if( IN_RENAME_OBJECT ){
+          sqlite3RenameTokenRemap(pParse, (void*)pExpr, (void*)pRight);
+        }
+        if( IN_RENAME_OBJECT ){
+          sqlite3RenameTokenRemap(pParse, (void*)&pExpr->pTab, (void*)pLeft);
         }
       }
       return lookupName(pParse, zDb, zTable, zColumn, pNC, pExpr);
     }
 
@@ -94728,60 +94871,62 @@
           notValid(pParse, pNC, "non-deterministic functions",
                    NC_IdxExpr|NC_PartIdx);
         }
       }
 
+      if( 0==IN_RENAME_OBJECT ){
 #ifndef SQLITE_OMIT_WINDOWFUNC
-      assert( is_agg==0 || (pDef->funcFlags & SQLITE_FUNC_MINMAX)
+        assert( is_agg==0 || (pDef->funcFlags & SQLITE_FUNC_MINMAX)
           || (pDef->xValue==0 && pDef->xInverse==0)
           || (pDef->xValue && pDef->xInverse && pDef->xSFunc && pDef->xFinalize)
-      );
-      if( pDef && pDef->xValue==0 && pExpr->pWin ){
-        sqlite3ErrorMsg(pParse, 
-            "%.*s() may not be used as a window function", nId, zId
-        );
-        pNC->nErr++;
-      }else if( 
-            (is_agg && (pNC->ncFlags & NC_AllowAgg)==0)
-         || (is_agg && (pDef->funcFlags & SQLITE_FUNC_WINDOW) && !pExpr->pWin)
-         || (is_agg && pExpr->pWin && (pNC->ncFlags & NC_AllowWin)==0)
-      ){
-        const char *zType;
-        if( (pDef->funcFlags & SQLITE_FUNC_WINDOW) || pExpr->pWin ){
-          zType = "window";
-        }else{
-          zType = "aggregate";
-        }
-        sqlite3ErrorMsg(pParse, "misuse of %s function %.*s()", zType, nId,zId);
-        pNC->nErr++;
-        is_agg = 0;
-      }
-#else
-      if( (is_agg && (pNC->ncFlags & NC_AllowAgg)==0) ){
-        sqlite3ErrorMsg(pParse, "misuse of aggregate function %.*s()", nId,zId);
-        pNC->nErr++;
-        is_agg = 0;
-      }
-#endif
-      else if( no_such_func && pParse->db->init.busy==0
+        );
+        if( pDef && pDef->xValue==0 && pExpr->pWin ){
+          sqlite3ErrorMsg(pParse, 
+              "%.*s() may not be used as a window function", nId, zId
+          );
+          pNC->nErr++;
+        }else if( 
+              (is_agg && (pNC->ncFlags & NC_AllowAgg)==0)
+           || (is_agg && (pDef->funcFlags & SQLITE_FUNC_WINDOW) && !pExpr->pWin)
+           || (is_agg && pExpr->pWin && (pNC->ncFlags & NC_AllowWin)==0)
+        ){
+          const char *zType;
+          if( (pDef->funcFlags & SQLITE_FUNC_WINDOW) || pExpr->pWin ){
+            zType = "window";
+          }else{
+            zType = "aggregate";
+          }
+          sqlite3ErrorMsg(pParse, "misuse of %s function %.*s()",zType,nId,zId);
+          pNC->nErr++;
+          is_agg = 0;
+        }
+#else
+        if( (is_agg && (pNC->ncFlags & NC_AllowAgg)==0) ){
+          sqlite3ErrorMsg(pParse,"misuse of aggregate function %.*s()",nId,zId);
+          pNC->nErr++;
+          is_agg = 0;
+        }
+#endif
+        else if( no_such_func && pParse->db->init.busy==0
 #ifdef SQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
-                && pParse->explain==0
+                  && pParse->explain==0
 #endif
-      ){
-        sqlite3ErrorMsg(pParse, "no such function: %.*s", nId, zId);
-        pNC->nErr++;
-      }else if( wrong_num_args ){
-        sqlite3ErrorMsg(pParse,"wrong number of arguments to function %.*s()",
-             nId, zId);
-        pNC->nErr++;
-      }
-      if( is_agg ){
+        ){
+          sqlite3ErrorMsg(pParse, "no such function: %.*s", nId, zId);
+          pNC->nErr++;
+        }else if( wrong_num_args ){
+          sqlite3ErrorMsg(pParse,"wrong number of arguments to function %.*s()",
+               nId, zId);
+          pNC->nErr++;
+        }
+        if( is_agg ){
 #ifndef SQLITE_OMIT_WINDOWFUNC
-        pNC->ncFlags &= ~(pExpr->pWin ? NC_AllowWin : NC_AllowAgg);
+          pNC->ncFlags &= ~(pExpr->pWin ? NC_AllowWin : NC_AllowAgg);
 #else
-        pNC->ncFlags &= ~NC_AllowAgg;
+          pNC->ncFlags &= ~NC_AllowAgg;
 #endif
+        }
       }
       sqlite3WalkExprList(pWalker, pList);
       if( is_agg ){
 #ifndef SQLITE_OMIT_WINDOWFUNC
         if( pExpr->pWin ){
@@ -97292,10 +97437,13 @@
     assert( pList->nExpr>0 );
     pItem = &pList->a[pList->nExpr-1];
     assert( pItem->zName==0 );
     pItem->zName = sqlite3DbStrNDup(pParse->db, pName->z, pName->n);
     if( dequote ) sqlite3Dequote(pItem->zName);
+    if( IN_RENAME_OBJECT ){
+      sqlite3RenameTokenMap(pParse, (void*)pItem->zName, pName);
+    }
   }
 }
 
 /*
 ** Set the ExprList.a[].zSpan element of the most recently added item
@@ -99364,11 +99512,11 @@
       ** control overloading) ends up as the second argument to the
       ** function.  The expression "A glob B" is equivalent to 
       ** "glob(B,A).  We want to use the A in "A glob B" to test
       ** for function overloading.  But we use the B term in "glob(B,A)".
       */
-      if( nFarg>=2 && (pExpr->flags & EP_InfixFunc) ){
+      if( nFarg>=2 && ExprHasProperty(pExpr, EP_InfixFunc) ){
         pDef = sqlite3VtabOverloadFunction(db, pDef, nFarg, pFarg->a[1].pExpr);
       }else if( nFarg>0 ){
         pDef = sqlite3VtabOverloadFunction(db, pDef, nFarg, pFarg->a[0].pExpr);
       }
 #endif
@@ -100990,356 +101138,10 @@
 ** The code in this file only exists if we are not omitting the
 ** ALTER TABLE logic from the build.
 */
 #ifndef SQLITE_OMIT_ALTERTABLE
 
-
-/*
-** This function is used by SQL generated to implement the 
-** ALTER TABLE command. The first argument is the text of a CREATE TABLE or
-** CREATE INDEX command. The second is a table name. The table name in 
-** the CREATE TABLE or CREATE INDEX statement is replaced with the third
-** argument and the result returned. Examples:
-**
-** sqlite_rename_table('CREATE TABLE abc(a, b, c)', 'def')
-**     -> 'CREATE TABLE def(a, b, c)'
-**
-** sqlite_rename_table('CREATE INDEX i ON abc(a)', 'def')
-**     -> 'CREATE INDEX i ON def(a, b, c)'
-*/
-static void renameTableFunc(
-  sqlite3_context *context,
-  int NotUsed,
-  sqlite3_value **argv
-){
-  unsigned char const *zSql = sqlite3_value_text(argv[0]);
-  unsigned char const *zTableName = sqlite3_value_text(argv[1]);
-
-  int token;
-  Token tname;
-  unsigned char const *zCsr = zSql;
-  int len = 0;
-  char *zRet;
-
-  sqlite3 *db = sqlite3_context_db_handle(context);
-
-  UNUSED_PARAMETER(NotUsed);
-
-  /* The principle used to locate the table name in the CREATE TABLE 
-  ** statement is that the table name is the first non-space token that
-  ** is immediately followed by a TK_LP or TK_USING token.
-  */
-  if( zSql ){
-    do {
-      if( !*zCsr ){
-        /* Ran out of input before finding an opening bracket. Return NULL. */
-        return;
-      }
-
-      /* Store the token that zCsr points to in tname. */
-      tname.z = (char*)zCsr;
-      tname.n = len;
-
-      /* Advance zCsr to the next token. Store that token type in 'token',
-      ** and its length in 'len' (to be used next iteration of this loop).
-      */
-      do {
-        zCsr += len;
-        len = sqlite3GetToken(zCsr, &token);
-      } while( token==TK_SPACE );
-      assert( len>0 || !*zCsr );
-    } while( token!=TK_LP && token!=TK_USING );
-
-    zRet = sqlite3MPrintf(db, "%.*s\"%w\"%s", (int)(((u8*)tname.z) - zSql),
-       zSql, zTableName, tname.z+tname.n);
-    sqlite3_result_text(context, zRet, -1, SQLITE_DYNAMIC);
-  }
-}
-
-/*
-** This C function implements an SQL user function that is used by SQL code
-** generated by the ALTER TABLE ... RENAME command to modify the definition
-** of any foreign key constraints that use the table being renamed as the 
-** parent table. It is passed three arguments:
-**
-**   1) The complete text of the CREATE TABLE statement being modified,
-**   2) The old name of the table being renamed, and
-**   3) The new name of the table being renamed.
-**
-** It returns the new CREATE TABLE statement. For example:
-**
-**   sqlite_rename_parent('CREATE TABLE t1(a REFERENCES t2)', 't2', 't3')
-**       -> 'CREATE TABLE t1(a REFERENCES t3)'
-*/
-#ifndef SQLITE_OMIT_FOREIGN_KEY
-static void renameParentFunc(
-  sqlite3_context *context,
-  int NotUsed,
-  sqlite3_value **argv
-){
-  sqlite3 *db = sqlite3_context_db_handle(context);
-  char *zOutput = 0;
-  char *zResult;
-  unsigned char const *zInput = sqlite3_value_text(argv[0]);
-  unsigned char const *zOld = sqlite3_value_text(argv[1]);
-  unsigned char const *zNew = sqlite3_value_text(argv[2]);
-
-  unsigned const char *z;         /* Pointer to token */
-  int n;                          /* Length of token z */
-  int token;                      /* Type of token */
-
-  UNUSED_PARAMETER(NotUsed);
-  if( zInput==0 || zOld==0 ) return;
-  for(z=zInput; *z; z=z+n){
-    n = sqlite3GetToken(z, &token);
-    if( token==TK_REFERENCES ){
-      char *zParent;
-      do {
-        z += n;
-        n = sqlite3GetToken(z, &token);
-      }while( token==TK_SPACE );
-
-      if( token==TK_ILLEGAL ) break;
-      zParent = sqlite3DbStrNDup(db, (const char *)z, n);
-      if( zParent==0 ) break;
-      sqlite3Dequote(zParent);
-      if( 0==sqlite3StrICmp((const char *)zOld, zParent) ){
-        char *zOut = sqlite3MPrintf(db, "%s%.*s\"%w\"", 
-            (zOutput?zOutput:""), (int)(z-zInput), zInput, (const char *)zNew
-        );
-        sqlite3DbFree(db, zOutput);
-        zOutput = zOut;
-        zInput = &z[n];
-      }
-      sqlite3DbFree(db, zParent);
-    }
-  }
-
-  zResult = sqlite3MPrintf(db, "%s%s", (zOutput?zOutput:""), zInput);
-  sqlite3_result_text(context, zResult, -1, SQLITE_DYNAMIC);
-  sqlite3DbFree(db, zOutput);
-}
-#endif
-
-#ifndef SQLITE_OMIT_TRIGGER
-/* This function is used by SQL generated to implement the
-** ALTER TABLE command. The first argument is the text of a CREATE TRIGGER 
-** statement. The second is a table name. The table name in the CREATE 
-** TRIGGER statement is replaced with the third argument and the result 
-** returned. This is analagous to renameTableFunc() above, except for CREATE
-** TRIGGER, not CREATE INDEX and CREATE TABLE.
-*/
-static void renameTriggerFunc(
-  sqlite3_context *context,
-  int NotUsed,
-  sqlite3_value **argv
-){
-  unsigned char const *zSql = sqlite3_value_text(argv[0]);
-  unsigned char const *zTableName = sqlite3_value_text(argv[1]);
-
-  int token;
-  Token tname;
-  int dist = 3;
-  unsigned char const *zCsr = zSql;
-  int len = 0;
-  char *zRet;
-  sqlite3 *db = sqlite3_context_db_handle(context);
-
-  UNUSED_PARAMETER(NotUsed);
-
-  /* The principle used to locate the table name in the CREATE TRIGGER 
-  ** statement is that the table name is the first token that is immediately
-  ** preceded by either TK_ON or TK_DOT and immediately followed by one
-  ** of TK_WHEN, TK_BEGIN or TK_FOR.
-  */
-  if( zSql ){
-    do {
-
-      if( !*zCsr ){
-        /* Ran out of input before finding the table name. Return NULL. */
-        return;
-      }
-
-      /* Store the token that zCsr points to in tname. */
-      tname.z = (char*)zCsr;
-      tname.n = len;
-
-      /* Advance zCsr to the next token. Store that token type in 'token',
-      ** and its length in 'len' (to be used next iteration of this loop).
-      */
-      do {
-        zCsr += len;
-        len = sqlite3GetToken(zCsr, &token);
-      }while( token==TK_SPACE );
-      assert( len>0 || !*zCsr );
-
-      /* Variable 'dist' stores the number of tokens read since the most
-      ** recent TK_DOT or TK_ON. This means that when a WHEN, FOR or BEGIN 
-      ** token is read and 'dist' equals 2, the condition stated above
-      ** to be met.
-      **
-      ** Note that ON cannot be a database, table or column name, so
-      ** there is no need to worry about syntax like 
-      ** "CREATE TRIGGER ... ON ON.ON BEGIN ..." etc.
-      */
-      dist++;
-      if( token==TK_DOT || token==TK_ON ){
-        dist = 0;
-      }
-    } while( dist!=2 || (token!=TK_WHEN && token!=TK_FOR && token!=TK_BEGIN) );
-
-    /* Variable tname now contains the token that is the old table-name
-    ** in the CREATE TRIGGER statement.
-    */
-    zRet = sqlite3MPrintf(db, "%.*s\"%w\"%s", (int)(((u8*)tname.z) - zSql),
-       zSql, zTableName, tname.z+tname.n);
-    sqlite3_result_text(context, zRet, -1, SQLITE_DYNAMIC);
-  }
-}
-#endif   /* !SQLITE_OMIT_TRIGGER */
-
-/*
-** Register built-in functions used to help implement ALTER TABLE
-*/
-SQLITE_PRIVATE void sqlite3AlterFunctions(void){
-  static FuncDef aAlterTableFuncs[] = {
-    FUNCTION(sqlite_rename_table,   2, 0, 0, renameTableFunc),
-#ifndef SQLITE_OMIT_TRIGGER
-    FUNCTION(sqlite_rename_trigger, 2, 0, 0, renameTriggerFunc),
-#endif
-#ifndef SQLITE_OMIT_FOREIGN_KEY
-    FUNCTION(sqlite_rename_parent,  3, 0, 0, renameParentFunc),
-#endif
-  };
-  sqlite3InsertBuiltinFuncs(aAlterTableFuncs, ArraySize(aAlterTableFuncs));
-}
-
-/*
-** This function is used to create the text of expressions of the form:
-**
-**   name=<constant1> OR name=<constant2> OR ...
-**
-** If argument zWhere is NULL, then a pointer string containing the text 
-** "name=<constant>" is returned, where <constant> is the quoted version
-** of the string passed as argument zConstant. The returned buffer is
-** allocated using sqlite3DbMalloc(). It is the responsibility of the
-** caller to ensure that it is eventually freed.
-**
-** If argument zWhere is not NULL, then the string returned is 
-** "<where> OR name=<constant>", where <where> is the contents of zWhere.
-** In this case zWhere is passed to sqlite3DbFree() before returning.
-** 
-*/
-static char *whereOrName(sqlite3 *db, char *zWhere, char *zConstant){
-  char *zNew;
-  if( !zWhere ){
-    zNew = sqlite3MPrintf(db, "name=%Q", zConstant);
-  }else{
-    zNew = sqlite3MPrintf(db, "%s OR name=%Q", zWhere, zConstant);
-    sqlite3DbFree(db, zWhere);
-  }
-  return zNew;
-}
-
-#if !defined(SQLITE_OMIT_FOREIGN_KEY) && !defined(SQLITE_OMIT_TRIGGER)
-/*
-** Generate the text of a WHERE expression which can be used to select all
-** tables that have foreign key constraints that refer to table pTab (i.e.
-** constraints for which pTab is the parent table) from the sqlite_master
-** table.
-*/
-static char *whereForeignKeys(Parse *pParse, Table *pTab){
-  FKey *p;
-  char *zWhere = 0;
-  for(p=sqlite3FkReferences(pTab); p; p=p->pNextTo){
-    zWhere = whereOrName(pParse->db, zWhere, p->pFrom->zName);
-  }
-  return zWhere;
-}
-#endif
-
-/*
-** Generate the text of a WHERE expression which can be used to select all
-** temporary triggers on table pTab from the sqlite_temp_master table. If
-** table pTab has no temporary triggers, or is itself stored in the 
-** temporary database, NULL is returned.
-*/
-static char *whereTempTriggers(Parse *pParse, Table *pTab){
-  Trigger *pTrig;
-  char *zWhere = 0;
-  const Schema *pTempSchema = pParse->db->aDb[1].pSchema; /* Temp db schema */
-
-  /* If the table is not located in the temp-db (in which case NULL is 
-  ** returned, loop through the tables list of triggers. For each trigger
-  ** that is not part of the temp-db schema, add a clause to the WHERE 
-  ** expression being built up in zWhere.
-  */
-  if( pTab->pSchema!=pTempSchema ){
-    sqlite3 *db = pParse->db;
-    for(pTrig=sqlite3TriggerList(pParse, pTab); pTrig; pTrig=pTrig->pNext){
-      if( pTrig->pSchema==pTempSchema ){
-        zWhere = whereOrName(db, zWhere, pTrig->zName);
-      }
-    }
-  }
-  if( zWhere ){
-    char *zNew = sqlite3MPrintf(pParse->db, "type='trigger' AND (%s)", zWhere);
-    sqlite3DbFree(pParse->db, zWhere);
-    zWhere = zNew;
-  }
-  return zWhere;
-}
-
-/*
-** Generate code to drop and reload the internal representation of table
-** pTab from the database, including triggers and temporary triggers.
-** Argument zName is the name of the table in the database schema at
-** the time the generated code is executed. This can be different from
-** pTab->zName if this function is being called to code part of an 
-** "ALTER TABLE RENAME TO" statement.
-*/
-static void reloadTableSchema(Parse *pParse, Table *pTab, const char *zName){
-  Vdbe *v;
-  char *zWhere;
-  int iDb;                   /* Index of database containing pTab */
-#ifndef SQLITE_OMIT_TRIGGER
-  Trigger *pTrig;
-#endif
-
-  v = sqlite3GetVdbe(pParse);
-  if( NEVER(v==0) ) return;
-  assert( sqlite3BtreeHoldsAllMutexes(pParse->db) );
-  iDb = sqlite3SchemaToIndex(pParse->db, pTab->pSchema);
-  assert( iDb>=0 );
-
-#ifndef SQLITE_OMIT_TRIGGER
-  /* Drop any table triggers from the internal schema. */
-  for(pTrig=sqlite3TriggerList(pParse, pTab); pTrig; pTrig=pTrig->pNext){
-    int iTrigDb = sqlite3SchemaToIndex(pParse->db, pTrig->pSchema);
-    assert( iTrigDb==iDb || iTrigDb==1 );
-    sqlite3VdbeAddOp4(v, OP_DropTrigger, iTrigDb, 0, 0, pTrig->zName, 0);
-  }
-#endif
-
-  /* Drop the table and index from the internal schema.  */
-  sqlite3VdbeAddOp4(v, OP_DropTable, iDb, 0, 0, pTab->zName, 0);
-
-  /* Reload the table, index and permanent trigger schemas. */
-  zWhere = sqlite3MPrintf(pParse->db, "tbl_name=%Q", zName);
-  if( !zWhere ) return;
-  sqlite3VdbeAddParseSchemaOp(v, iDb, zWhere);
-
-#ifndef SQLITE_OMIT_TRIGGER
-  /* Now, if the table is not stored in the temp database, reload any temp 
-  ** triggers. Don't use IN(...) in case SQLITE_OMIT_SUBQUERY is defined. 
-  */
-  if( (zWhere=whereTempTriggers(pParse, pTab))!=0 ){
-    sqlite3VdbeAddParseSchemaOp(v, 1, zWhere);
-  }
-#endif
-}
-
 /*
 ** Parameter zName is the name of a table that is about to be altered
 ** (either with ALTER TABLE ... RENAME TO or ALTER TABLE ... ADD COLUMN).
 ** If the table is a system table, this function leaves an error message
 ** in pParse->zErr (system tables may not be altered) and returns non-zero.
@@ -101351,10 +101153,53 @@
     sqlite3ErrorMsg(pParse, "table %s may not be altered", zName);
     return 1;
   }
   return 0;
 }
+
+/*
+** Generate code to verify that the schemas of database zDb and, if
+** bTemp is not true, database "temp", can still be parsed. This is
+** called at the end of the generation of an ALTER TABLE ... RENAME ...
+** statement to ensure that the operation has not rendered any schema
+** objects unusable.
+*/
+void renameTestSchema(Parse *pParse, const char *zDb, int bTemp){
+  sqlite3NestedParse(pParse, 
+      "SELECT 1 "
+      "FROM \"%w\".%s "
+      "WHERE name NOT LIKE 'sqlite_%%'"
+      " AND sql NOT LIKE 'create virtual%%'"
+      " AND sqlite_rename_test(%Q, sql, type, name, %d)=NULL ",
+      zDb, MASTER_NAME, 
+      zDb, bTemp
+  );
+
+  if( bTemp==0 ){
+    sqlite3NestedParse(pParse, 
+        "SELECT 1 "
+        "FROM temp.%s "
+        "WHERE name NOT LIKE 'sqlite_%%'"
+        " AND sql NOT LIKE 'create virtual%%'"
+        " AND sqlite_rename_test(%Q, sql, type, name, 1)=NULL ",
+        MASTER_NAME, zDb 
+    );
+  }
+}
+
+/*
+** Generate code to reload the schema for database iDb. And, if iDb!=1, for
+** the temp database as well.
+*/
+void renameReloadSchema(Parse *pParse, int iDb){
+  Vdbe *v = pParse->pVdbe;
+  if( v ){
+    sqlite3ChangeCookie(pParse, iDb);
+    sqlite3VdbeAddParseSchemaOp(pParse->pVdbe, iDb, 0);
+    if( iDb!=1 ) sqlite3VdbeAddParseSchemaOp(pParse->pVdbe, 1, 0);
+  }
+}
 
 /*
 ** Generate code to implement the "ALTER TABLE xxx RENAME TO yyy" 
 ** command. 
 */
@@ -101369,13 +101214,10 @@
   char *zName = 0;          /* NULL-terminated version of pName */ 
   sqlite3 *db = pParse->db; /* Database connection */
   int nTabName;             /* Number of UTF-8 characters in zTabName */
   const char *zTabName;     /* Original name of the table */
   Vdbe *v;
-#ifndef SQLITE_OMIT_TRIGGER
-  char *zWhere = 0;         /* Where clause to locate temp triggers */
-#endif
   VTable *pVTab = 0;        /* Non-zero if this is a v-tab with an xRename() */
   u32 savedDbFlags;         /* Saved value of db->mDbFlags */
 
   savedDbFlags = db->mDbFlags;  
   if( NEVER(db->mallocFailed) ) goto exit_rename_table;
@@ -101444,12 +101286,10 @@
   */
   v = sqlite3GetVdbe(pParse);
   if( v==0 ){
     goto exit_rename_table;
   }
-  sqlite3BeginWriteOperation(pParse, pVTab!=0, iDb);
-  sqlite3ChangeCookie(pParse, iDb);
 
   /* If this is a virtual table, invoke the xRename() function if
   ** one is defined. The xRename() callback will modify the names
   ** of any resources used by the v-table implementation (including other
   ** SQLite tables) that are identified by the name of the virtual table.
@@ -101465,48 +101305,35 @@
 
   /* figure out how many UTF-8 characters are in zName */
   zTabName = pTab->zName;
   nTabName = sqlite3Utf8CharLen(zTabName, -1);
 
-#if !defined(SQLITE_OMIT_FOREIGN_KEY) && !defined(SQLITE_OMIT_TRIGGER)
-  if( db->flags&SQLITE_ForeignKeys ){
-    /* If foreign-key support is enabled, rewrite the CREATE TABLE 
-    ** statements corresponding to all child tables of foreign key constraints
-    ** for which the renamed table is the parent table.  */
-    if( (zWhere=whereForeignKeys(pParse, pTab))!=0 ){
-      sqlite3NestedParse(pParse, 
-          "UPDATE \"%w\".%s SET "
-              "sql = sqlite_rename_parent(sql, %Q, %Q) "
-              "WHERE %s;", zDb, MASTER_NAME, zTabName, zName, zWhere);
-      sqlite3DbFree(db, zWhere);
-    }
-  }
-#endif
-
-  /* Modify the sqlite_master table to use the new table name. */
+  /* Rewrite all CREATE TABLE, INDEX, TRIGGER or VIEW statements in
+  ** the schema to use the new table name.  */
+  sqlite3NestedParse(pParse, 
+      "UPDATE \"%w\".%s SET "
+      "sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, %d) "
+      "WHERE (type!='index' OR tbl_name=%Q COLLATE nocase)"
+      "AND   name NOT LIKE 'sqlite_%%'"
+      , zDb, MASTER_NAME, zDb, zTabName, zName, (iDb==1), zTabName
+  );
+
+  /* Update the tbl_name and name columns of the sqlite_master table
+  ** as required.  */
   sqlite3NestedParse(pParse,
       "UPDATE %Q.%s SET "
-#ifdef SQLITE_OMIT_TRIGGER
-          "sql = sqlite_rename_table(sql, %Q), "
-#else
-          "sql = CASE "
-            "WHEN type = 'trigger' THEN sqlite_rename_trigger(sql, %Q)"
-            "ELSE sqlite_rename_table(sql, %Q) END, "
-#endif
           "tbl_name = %Q, "
           "name = CASE "
             "WHEN type='table' THEN %Q "
             "WHEN name LIKE 'sqlite_autoindex%%' AND type='index' THEN "
              "'sqlite_autoindex_' || %Q || substr(name,%d+18) "
             "ELSE name END "
       "WHERE tbl_name=%Q COLLATE nocase AND "
           "(type='table' OR type='index' OR type='trigger');", 
-      zDb, MASTER_NAME, zName, zName, zName, 
-#ifndef SQLITE_OMIT_TRIGGER
-      zName,
-#endif
-      zName, nTabName, zTabName
+      zDb, MASTER_NAME, 
+      zName, zName, zName, 
+      nTabName, zTabName
   );
 
 #ifndef SQLITE_OMIT_AUTOINCREMENT
   /* If the sqlite_sequence table exists in this database, then update 
   ** it with the new table name.
@@ -101516,39 +101343,27 @@
         "UPDATE \"%w\".sqlite_sequence set name = %Q WHERE name = %Q",
         zDb, zName, pTab->zName);
   }
 #endif
 
-#ifndef SQLITE_OMIT_TRIGGER
-  /* If there are TEMP triggers on this table, modify the sqlite_temp_master
-  ** table. Don't do this if the table being ALTERed is itself located in
-  ** the temp database.
-  */
-  if( (zWhere=whereTempTriggers(pParse, pTab))!=0 ){
+  /* If the table being renamed is not itself part of the temp database,
+  ** edit view and trigger definitions within the temp database 
+  ** as required.  */
+  if( iDb!=1 ){
     sqlite3NestedParse(pParse, 
         "UPDATE sqlite_temp_master SET "
-            "sql = sqlite_rename_trigger(sql, %Q), "
-            "tbl_name = %Q "
-            "WHERE %s;", zName, zName, zWhere);
-    sqlite3DbFree(db, zWhere);
-  }
-#endif
-
-#if !defined(SQLITE_OMIT_FOREIGN_KEY) && !defined(SQLITE_OMIT_TRIGGER)
-  if( db->flags&SQLITE_ForeignKeys ){
-    FKey *p;
-    for(p=sqlite3FkReferences(pTab); p; p=p->pNextTo){
-      Table *pFrom = p->pFrom;
-      if( pFrom!=pTab ){
-        reloadTableSchema(pParse, p->pFrom, pFrom->zName);
-      }
-    }
-  }
-#endif
-
-  /* Drop and reload the internal table schema. */
-  reloadTableSchema(pParse, pTab, zName);
+            "sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, 1), "
+            "tbl_name = "
+              "CASE WHEN tbl_name=%Q COLLATE nocase AND "
+              "          sqlite_rename_test(%Q, sql, type, name, 1) "
+              "THEN %Q ELSE tbl_name END "
+            "WHERE type IN ('view', 'trigger')"
+        , zDb, zTabName, zName, zTabName, zDb, zName);
+  }
+
+  renameReloadSchema(pParse, iDb);
+  renameTestSchema(pParse, zDb, iDb==1);
 
 exit_rename_table:
   sqlite3SrcListDelete(db, pSrc);
   sqlite3DbFree(db, zName);
   db->mDbFlags = savedDbFlags;
@@ -101570,16 +101385,15 @@
   const char *zTab;         /* Table name */
   char *zCol;               /* Null-terminated column definition */
   Column *pCol;             /* The new column */
   Expr *pDflt;              /* Default value for the new column */
   sqlite3 *db;              /* The database connection; */
-  Vdbe *v = pParse->pVdbe;  /* The prepared statement under construction */
+  Vdbe *v;                  /* The prepared statement under construction */
   int r1;                   /* Temporary registers */
 
   db = pParse->db;
   if( pParse->nErr || db->mallocFailed ) return;
-  assert( v!=0 );
   pNew = pParse->pNewTable;
   assert( pNew );
 
   assert( sqlite3BtreeHoldsAllMutexes(db) );
   iDb = sqlite3SchemaToIndex(db, pNew->pSchema);
@@ -101670,21 +101484,24 @@
 
   /* Make sure the schema version is at least 3.  But do not upgrade
   ** from less than 3 to 4, as that will corrupt any preexisting DESC
   ** index.
   */
-  r1 = sqlite3GetTempReg(pParse);
-  sqlite3VdbeAddOp3(v, OP_ReadCookie, iDb, r1, BTREE_FILE_FORMAT);
-  sqlite3VdbeUsesBtree(v, iDb);
-  sqlite3VdbeAddOp2(v, OP_AddImm, r1, -2);
-  sqlite3VdbeAddOp2(v, OP_IfPos, r1, sqlite3VdbeCurrentAddr(v)+2);
-  VdbeCoverage(v);
-  sqlite3VdbeAddOp3(v, OP_SetCookie, iDb, BTREE_FILE_FORMAT, 3);
-  sqlite3ReleaseTempReg(pParse, r1);
-
-  /* Reload the schema of the modified table. */
-  reloadTableSchema(pParse, pTab, pTab->zName);
+  v = sqlite3GetVdbe(pParse);
+  if( v ){
+    r1 = sqlite3GetTempReg(pParse);
+    sqlite3VdbeAddOp3(v, OP_ReadCookie, iDb, r1, BTREE_FILE_FORMAT);
+    sqlite3VdbeUsesBtree(v, iDb);
+    sqlite3VdbeAddOp2(v, OP_AddImm, r1, -2);
+    sqlite3VdbeAddOp2(v, OP_IfPos, r1, sqlite3VdbeCurrentAddr(v)+2);
+    VdbeCoverage(v);
+    sqlite3VdbeAddOp3(v, OP_SetCookie, iDb, BTREE_FILE_FORMAT, 3);
+    sqlite3ReleaseTempReg(pParse, r1);
+  }
+
+  /* Reload the table definition */
+  renameReloadSchema(pParse, iDb);
 }
 
 /*
 ** This function is called by the parser after the table-name in
 ** an "ALTER TABLE <table-name> ADD" statement is parsed. Argument 
@@ -101701,11 +101518,10 @@
 ** coding the "ALTER TABLE ... ADD" statement.
 */
 SQLITE_PRIVATE void sqlite3AlterBeginAddColumn(Parse *pParse, SrcList *pSrc){
   Table *pNew;
   Table *pTab;
-  Vdbe *v;
   int iDb;
   int i;
   int nAlloc;
   sqlite3 *db = pParse->db;
 
@@ -101765,20 +101581,1116 @@
   }
   pNew->pSchema = db->aDb[iDb].pSchema;
   pNew->addColOffset = pTab->addColOffset;
   pNew->nTabRef = 1;
 
-  /* Begin a transaction and increment the schema cookie.  */
-  sqlite3BeginWriteOperation(pParse, 0, iDb);
-  v = sqlite3GetVdbe(pParse);
-  if( !v ) goto exit_begin_add_column;
-  sqlite3ChangeCookie(pParse, iDb);
-
 exit_begin_add_column:
   sqlite3SrcListDelete(db, pSrc);
   return;
 }
+
+/*
+** Parameter pTab is the subject of an ALTER TABLE ... RENAME COLUMN
+** command. This function checks if the table is a view or virtual
+** table (columns of views or virtual tables may not be renamed). If so,
+** it loads an error message into pParse and returns non-zero.
+**
+** Or, if pTab is not a view or virtual table, zero is returned.
+*/
+#if !defined(SQLITE_OMIT_VIEW) || !defined(SQLITE_OMIT_VIRTUALTABLE)
+static int isRealTable(Parse *pParse, Table *pTab){
+  const char *zType = 0;
+#ifndef SQLITE_OMIT_VIEW
+  if( pTab->pSelect ){
+    zType = "view";
+  }
+#endif
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+  if( IsVirtual(pTab) ){
+    zType = "virtual table";
+  }
+#endif
+  if( zType ){
+    sqlite3ErrorMsg(
+        pParse, "cannot rename columns of %s \"%s\"", zType, pTab->zName
+    );
+    return 1;
+  }
+  return 0;
+}
+#else /* !defined(SQLITE_OMIT_VIEW) || !defined(SQLITE_OMIT_VIRTUALTABLE) */
+# define isRealTable(x,y) (0)
+#endif
+
+/*
+** Handles the following parser reduction:
+**
+**  cmd ::= ALTER TABLE pSrc RENAME COLUMN pOld TO pNew
+*/
+SQLITE_PRIVATE void sqlite3AlterRenameColumn(
+  Parse *pParse,                  /* Parsing context */
+  SrcList *pSrc,                  /* Table being altered.  pSrc->nSrc==1 */
+  Token *pOld,                    /* Name of column being changed */
+  Token *pNew                     /* New column name */
+){
+  sqlite3 *db = pParse->db;       /* Database connection */
+  Table *pTab;                    /* Table being updated */
+  int iCol;                       /* Index of column being renamed */
+  char *zOld = 0;                 /* Old column name */
+  char *zNew = 0;                 /* New column name */
+  const char *zDb;                /* Name of schema containing the table */
+  int iSchema;                    /* Index of the schema */
+  int bQuote;                     /* True to quote the new name */
+
+  /* Locate the table to be altered */
+  pTab = sqlite3LocateTableItem(pParse, 0, &pSrc->a[0]);
+  if( !pTab ) goto exit_rename_column;
+
+  /* Cannot alter a system table */
+  if( SQLITE_OK!=isSystemTable(pParse, pTab->zName) ) goto exit_rename_column;
+  if( SQLITE_OK!=isRealTable(pParse, pTab) ) goto exit_rename_column;
+
+  /* Which schema holds the table to be altered */  
+  iSchema = sqlite3SchemaToIndex(db, pTab->pSchema);
+  assert( iSchema>=0 );
+  zDb = db->aDb[iSchema].zDbSName;
+
+#ifndef SQLITE_OMIT_AUTHORIZATION
+  /* Invoke the authorization callback. */
+  if( sqlite3AuthCheck(pParse, SQLITE_ALTER_TABLE, zDb, pTab->zName, 0) ){
+    goto exit_rename_column;
+  }
+#endif
+
+  /* Make sure the old name really is a column name in the table to be
+  ** altered.  Set iCol to be the index of the column being renamed */
+  zOld = sqlite3NameFromToken(db, pOld);
+  if( !zOld ) goto exit_rename_column;
+  for(iCol=0; iCol<pTab->nCol; iCol++){
+    if( 0==sqlite3StrICmp(pTab->aCol[iCol].zName, zOld) ) break;
+  }
+  if( iCol==pTab->nCol ){
+    sqlite3ErrorMsg(pParse, "no such column: \"%s\"", zOld);
+    goto exit_rename_column;
+  }
+
+  /* Do the rename operation using a recursive UPDATE statement that
+  ** uses the sqlite_rename_column() SQL function to compute the new
+  ** CREATE statement text for the sqlite_master table.
+  */
+  zNew = sqlite3NameFromToken(db, pNew);
+  if( !zNew ) goto exit_rename_column;
+  assert( pNew->n>0 );
+  bQuote = sqlite3Isquote(pNew->z[0]);
+  sqlite3NestedParse(pParse, 
+      "UPDATE \"%w\".%s SET "
+      "sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, %d) "
+      "WHERE name NOT LIKE 'sqlite_%%' AND (type != 'index' OR tbl_name = %Q)"
+      " AND sql NOT LIKE 'create virtual%%'",
+      zDb, MASTER_NAME, 
+      zDb, pTab->zName, iCol, zNew, bQuote, iSchema==1,
+      pTab->zName
+  );
+
+  sqlite3NestedParse(pParse, 
+      "UPDATE temp.%s SET "
+      "sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, 1) "
+      "WHERE type IN ('trigger', 'view')",
+      MASTER_NAME, 
+      zDb, pTab->zName, iCol, zNew, bQuote
+  );
+
+  /* Drop and reload the database schema. */
+  renameReloadSchema(pParse, iSchema);
+  renameTestSchema(pParse, zDb, iSchema==1);
+
+ exit_rename_column:
+  sqlite3SrcListDelete(db, pSrc);
+  sqlite3DbFree(db, zOld);
+  sqlite3DbFree(db, zNew);
+  return;
+}
+
+/*
+** Each RenameToken object maps an element of the parse tree into
+** the token that generated that element.  The parse tree element
+** might be one of:
+**
+**     *  A pointer to an Expr that represents an ID
+**     *  The name of a table column in Column.zName
+**
+** A list of RenameToken objects can be constructed during parsing.
+** Each new object is created by sqlite3RenameTokenMap().
+** As the parse tree is transformed, the sqlite3RenameTokenRemap()
+** routine is used to keep the mapping current.
+**
+** After the parse finishes, renameTokenFind() routine can be used
+** to look up the actual token value that created some element in
+** the parse tree.
+*/
+struct RenameToken {
+  void *p;               /* Parse tree element created by token t */
+  Token t;               /* The token that created parse tree element p */
+  RenameToken *pNext;    /* Next is a list of all RenameToken objects */
+};
+
+/*
+** The context of an ALTER TABLE RENAME COLUMN operation that gets passed
+** down into the Walker.
+*/
+typedef struct RenameCtx RenameCtx;
+struct RenameCtx {
+  RenameToken *pList;             /* List of tokens to overwrite */
+  int nList;                      /* Number of tokens in pList */
+  int iCol;                       /* Index of column being renamed */
+  Table *pTab;                    /* Table being ALTERed */ 
+  const char *zOld;               /* Old column name */
+};
+
+#ifdef SQLITE_DEBUG
+/*
+** This function is only for debugging. It performs two tasks:
+**
+**   1. Checks that pointer pPtr does not already appear in the 
+**      rename-token list.
+**
+**   2. Dereferences each pointer in the rename-token list.
+**
+** The second is most effective when debugging under valgrind or
+** address-sanitizer or similar. If any of these pointers no longer 
+** point to valid objects, an exception is raised by the memory-checking 
+** tool.
+**
+** The point of this is to prevent comparisons of invalid pointer values.
+** Even though this always seems to work, it is undefined according to the
+** C standard. Example of undefined comparison:
+**
+**     sqlite3_free(x);
+**     if( x==y ) ...
+**
+** Technically, as x no longer points into a valid object or to the byte
+** following a valid object, it may not be used in comparison operations.
+*/
+void renameTokenCheckAll(Parse *pParse, void *pPtr){
+  if( pParse->nErr==0 && pParse->db->mallocFailed==0 ){
+    RenameToken *p;
+    u8 i = 0;
+    for(p=pParse->pRename; p; p=p->pNext){
+      if( p->p ){
+        assert( p->p!=pPtr );
+        i += *(u8*)(p->p);
+      }
+    }
+  }
+}
+#else
+# define renameTokenCheckAll(x,y)
+#endif
+
+/*
+** Add a new RenameToken object mapping parse tree element pPtr into
+** token *pToken to the Parse object currently under construction.
+**
+** Return a copy of pPtr.
+*/
+SQLITE_PRIVATE void *sqlite3RenameTokenMap(Parse *pParse, void *pPtr, Token *pToken){
+  RenameToken *pNew;
+  assert( pPtr || pParse->db->mallocFailed );
+  renameTokenCheckAll(pParse, pPtr);
+  pNew = sqlite3DbMallocZero(pParse->db, sizeof(RenameToken));
+  if( pNew ){
+    pNew->p = pPtr;
+    pNew->t = *pToken;
+    pNew->pNext = pParse->pRename;
+    pParse->pRename = pNew;
+  }
+
+  return pPtr;
+}
+
+/*
+** It is assumed that there is already a RenameToken object associated
+** with parse tree element pFrom. This function remaps the associated token
+** to parse tree element pTo.
+*/
+SQLITE_PRIVATE void sqlite3RenameTokenRemap(Parse *pParse, void *pTo, void *pFrom){
+  RenameToken *p;
+  renameTokenCheckAll(pParse, pTo);
+  for(p=pParse->pRename; p; p=p->pNext){
+    if( p->p==pFrom ){
+      p->p = pTo;
+      break;
+    }
+  }
+}
+
+/*
+** Walker callback used by sqlite3RenameExprUnmap().
+*/
+static int renameUnmapExprCb(Walker *pWalker, Expr *pExpr){
+  Parse *pParse = pWalker->pParse;
+  sqlite3RenameTokenRemap(pParse, 0, (void*)pExpr);
+  return WRC_Continue;
+}
+
+/*
+** Remove all nodes that are part of expression pExpr from the rename list.
+*/
+SQLITE_PRIVATE void sqlite3RenameExprUnmap(Parse *pParse, Expr *pExpr){
+  Walker sWalker;
+  memset(&sWalker, 0, sizeof(Walker));
+  sWalker.pParse = pParse;
+  sWalker.xExprCallback = renameUnmapExprCb;
+  sqlite3WalkExpr(&sWalker, pExpr);
+}
+
+/*
+** Free the list of RenameToken objects given in the second argument
+*/
+static void renameTokenFree(sqlite3 *db, RenameToken *pToken){
+  RenameToken *pNext;
+  RenameToken *p;
+  for(p=pToken; p; p=pNext){
+    pNext = p->pNext;
+    sqlite3DbFree(db, p);
+  }
+}
+
+/*
+** Search the Parse object passed as the first argument for a RenameToken
+** object associated with parse tree element pPtr. If found, remove it
+** from the Parse object and add it to the list maintained by the
+** RenameCtx object passed as the second argument.
+*/
+static void renameTokenFind(Parse *pParse, struct RenameCtx *pCtx, void *pPtr){
+  RenameToken **pp;
+  assert( pPtr!=0 );
+  for(pp=&pParse->pRename; (*pp); pp=&(*pp)->pNext){
+    if( (*pp)->p==pPtr ){
+      RenameToken *pToken = *pp;
+      *pp = pToken->pNext;
+      pToken->pNext = pCtx->pList;
+      pCtx->pList = pToken;
+      pCtx->nList++;
+      break;
+    }
+  }
+}
+
+/*
+** This is a Walker select callback. It does nothing. It is only required
+** because without a dummy callback, sqlite3WalkExpr() and similar do not
+** descend into sub-select statements.
+*/
+static int renameColumnSelectCb(Walker *pWalker, Select *p){
+  UNUSED_PARAMETER(pWalker);
+  UNUSED_PARAMETER(p);
+  return WRC_Continue;
+}
+
+/*
+** This is a Walker expression callback.
+**
+** For every TK_COLUMN node in the expression tree, search to see
+** if the column being references is the column being renamed by an
+** ALTER TABLE statement.  If it is, then attach its associated
+** RenameToken object to the list of RenameToken objects being
+** constructed in RenameCtx object at pWalker->u.pRename.
+*/
+static int renameColumnExprCb(Walker *pWalker, Expr *pExpr){
+  RenameCtx *p = pWalker->u.pRename;
+  if( pExpr->op==TK_TRIGGER 
+   && pExpr->iColumn==p->iCol 
+   && pWalker->pParse->pTriggerTab==p->pTab
+  ){
+    renameTokenFind(pWalker->pParse, p, (void*)pExpr);
+  }else if( pExpr->op==TK_COLUMN 
+   && pExpr->iColumn==p->iCol 
+   && p->pTab==pExpr->pTab
+  ){
+    renameTokenFind(pWalker->pParse, p, (void*)pExpr);
+  }
+  return WRC_Continue;
+}
+
+/*
+** The RenameCtx contains a list of tokens that reference a column that
+** is being renamed by an ALTER TABLE statement.  Return the "last"
+** RenameToken in the RenameCtx and remove that RenameToken from the
+** RenameContext.  "Last" means the last RenameToken encountered when
+** the input SQL is parsed from left to right.  Repeated calls to this routine
+** return all column name tokens in the order that they are encountered
+** in the SQL statement.
+*/
+static RenameToken *renameColumnTokenNext(RenameCtx *pCtx){
+  RenameToken *pBest = pCtx->pList;
+  RenameToken *pToken;
+  RenameToken **pp;
+
+  for(pToken=pBest->pNext; pToken; pToken=pToken->pNext){
+    if( pToken->t.z>pBest->t.z ) pBest = pToken;
+  }
+  for(pp=&pCtx->pList; *pp!=pBest; pp=&(*pp)->pNext);
+  *pp = pBest->pNext;
+
+  return pBest;
+}
+
+/*
+** An error occured while parsing or otherwise processing a database
+** object (either pParse->pNewTable, pNewIndex or pNewTrigger) as part of an
+** ALTER TABLE RENAME COLUMN program. The error message emitted by the
+** sub-routine is currently stored in pParse->zErrMsg. This function
+** adds context to the error message and then stores it in pCtx.
+*/
+static void renameColumnParseError(
+  sqlite3_context *pCtx, 
+  int bPost,
+  sqlite3_value *pType,
+  sqlite3_value *pObject,
+  Parse *pParse
+){
+  const char *zT = (const char*)sqlite3_value_text(pType);
+  const char *zN = (const char*)sqlite3_value_text(pObject);
+  char *zErr;
+
+  zErr = sqlite3_mprintf("error in %s %s%s: %s", 
+      zT, zN, (bPost ? " after rename" : ""),
+      pParse->zErrMsg
+  );
+  sqlite3_result_error(pCtx, zErr, -1);
+  sqlite3_free(zErr);
+}
+
+/*
+** For each name in the the expression-list pEList (i.e. each
+** pEList->a[i].zName) that matches the string in zOld, extract the 
+** corresponding rename-token from Parse object pParse and add it
+** to the RenameCtx pCtx.
+*/
+static void renameColumnElistNames(
+  Parse *pParse, 
+  RenameCtx *pCtx, 
+  ExprList *pEList, 
+  const char *zOld
+){
+  if( pEList ){
+    int i;
+    for(i=0; i<pEList->nExpr; i++){
+      char *zName = pEList->a[i].zName;
+      if( 0==sqlite3_stricmp(zName, zOld) ){
+        renameTokenFind(pParse, pCtx, (void*)zName);
+      }
+    }
+  }
+}
+
+/*
+** For each name in the the id-list pIdList (i.e. each pIdList->a[i].zName) 
+** that matches the string in zOld, extract the corresponding rename-token 
+** from Parse object pParse and add it to the RenameCtx pCtx.
+*/
+static void renameColumnIdlistNames(
+  Parse *pParse, 
+  RenameCtx *pCtx, 
+  IdList *pIdList, 
+  const char *zOld
+){
+  if( pIdList ){
+    int i;
+    for(i=0; i<pIdList->nId; i++){
+      char *zName = pIdList->a[i].zName;
+      if( 0==sqlite3_stricmp(zName, zOld) ){
+        renameTokenFind(pParse, pCtx, (void*)zName);
+      }
+    }
+  }
+}
+
+/*
+** Parse the SQL statement zSql using Parse object (*p). The Parse object
+** is initialized by this function before it is used.
+*/
+static int renameParseSql(
+  Parse *p,                       /* Memory to use for Parse object */
+  const char *zDb,                /* Name of schema SQL belongs to */
+  int bTable,                     /* 1 -> RENAME TABLE, 0 -> RENAME COLUMN */
+  sqlite3 *db,                    /* Database handle */
+  const char *zSql,               /* SQL to parse */
+  int bTemp                       /* True if SQL is from temp schema */
+){
+  int rc;
+  char *zErr = 0;
+
+  db->init.iDb = bTemp ? 1 : sqlite3FindDbName(db, zDb);
+
+  /* Parse the SQL statement passed as the first argument. If no error
+  ** occurs and the parse does not result in a new table, index or
+  ** trigger object, the database must be corrupt. */
+  memset(p, 0, sizeof(Parse));
+  p->eParseMode = (bTable ? PARSE_MODE_RENAME_TABLE : PARSE_MODE_RENAME_COLUMN);
+  p->db = db;
+  p->nQueryLoop = 1;
+  rc = sqlite3RunParser(p, zSql, &zErr);
+  assert( p->zErrMsg==0 );
+  assert( rc!=SQLITE_OK || zErr==0 );
+  assert( (0!=p->pNewTable) + (0!=p->pNewIndex) + (0!=p->pNewTrigger)<2 );
+  p->zErrMsg = zErr;
+  if( db->mallocFailed ) rc = SQLITE_NOMEM;
+  if( rc==SQLITE_OK 
+   && p->pNewTable==0 && p->pNewIndex==0 && p->pNewTrigger==0 
+  ){
+    rc = SQLITE_CORRUPT_BKPT;
+  }
+
+#ifdef SQLITE_DEBUG
+  /* Ensure that all mappings in the Parse.pRename list really do map to
+  ** a part of the input string.  */
+  if( rc==SQLITE_OK ){
+    int nSql = sqlite3Strlen30(zSql);
+    RenameToken *pToken;
+    for(pToken=p->pRename; pToken; pToken=pToken->pNext){
+      assert( pToken->t.z>=zSql && &pToken->t.z[pToken->t.n]<=&zSql[nSql] );
+    }
+  }
+#endif
+
+  db->init.iDb = 0;
+  return rc;
+}
+
+/*
+** This function edits SQL statement zSql, replacing each token identified
+** by the linked list pRename with the text of zNew. If argument bQuote is
+** true, then zNew is always quoted first. If no error occurs, the result
+** is loaded into context object pCtx as the result.
+**
+** Or, if an error occurs (i.e. an OOM condition), an error is left in
+** pCtx and an SQLite error code returned.
+*/
+static int renameEditSql(
+  sqlite3_context *pCtx,          /* Return result here */
+  RenameCtx *pRename,             /* Rename context */
+  const char *zSql,               /* SQL statement to edit */
+  const char *zNew,               /* New token text */
+  int bQuote                      /* True to always quote token */
+){
+  int nNew = sqlite3Strlen30(zNew);
+  int nSql = sqlite3Strlen30(zSql);
+  sqlite3 *db = sqlite3_context_db_handle(pCtx);
+  int rc = SQLITE_OK;
+  char *zQuot;
+  char *zOut;
+  int nQuot;
+
+  /* Set zQuot to point to a buffer containing a quoted copy of the 
+  ** identifier zNew. If the corresponding identifier in the original 
+  ** ALTER TABLE statement was quoted (bQuote==1), then set zNew to
+  ** point to zQuot so that all substitutions are made using the
+  ** quoted version of the new column name.  */
+  zQuot = sqlite3MPrintf(db, "\"%w\"", zNew);
+  if( zQuot==0 ){
+    return SQLITE_NOMEM;
+  }else{
+    nQuot = sqlite3Strlen30(zQuot);
+  }
+  if( bQuote ){
+    zNew = zQuot;
+    nNew = nQuot;
+  }
+
+  /* At this point pRename->pList contains a list of RenameToken objects
+  ** corresponding to all tokens in the input SQL that must be replaced
+  ** with the new column name. All that remains is to construct and
+  ** return the edited SQL string. */
+  assert( nQuot>=nNew );
+  zOut = sqlite3DbMallocZero(db, nSql + pRename->nList*nQuot + 1);
+  if( zOut ){
+    int nOut = nSql;
+    memcpy(zOut, zSql, nSql);
+    while( pRename->pList ){
+      int iOff;                   /* Offset of token to replace in zOut */
+      RenameToken *pBest = renameColumnTokenNext(pRename);
+
+      u32 nReplace;
+      const char *zReplace;
+      if( sqlite3IsIdChar(*pBest->t.z) ){
+        nReplace = nNew;
+        zReplace = zNew;
+      }else{
+        nReplace = nQuot;
+        zReplace = zQuot;
+      }
+
+      iOff = pBest->t.z - zSql;
+      if( pBest->t.n!=nReplace ){
+        memmove(&zOut[iOff + nReplace], &zOut[iOff + pBest->t.n], 
+            nOut - (iOff + pBest->t.n)
+        );
+        nOut += nReplace - pBest->t.n;
+        zOut[nOut] = '\0';
+      }
+      memcpy(&zOut[iOff], zReplace, nReplace);
+      sqlite3DbFree(db, pBest);
+    }
+
+    sqlite3_result_text(pCtx, zOut, -1, SQLITE_TRANSIENT);
+    sqlite3DbFree(db, zOut);
+  }else{
+    rc = SQLITE_NOMEM;
+  }
+
+  sqlite3_free(zQuot);
+  return rc;
+}
+
+/*
+** Resolve all symbols in the trigger at pParse->pNewTrigger, assuming
+** it was read from the schema of database zDb. Return SQLITE_OK if 
+** successful. Otherwise, return an SQLite error code and leave an error
+** message in the Parse object.
+*/
+static int renameResolveTrigger(Parse *pParse, const char *zDb){
+  sqlite3 *db = pParse->db;
+  Trigger *pNew = pParse->pNewTrigger;
+  TriggerStep *pStep;
+  NameContext sNC;
+  int rc = SQLITE_OK;
+
+  memset(&sNC, 0, sizeof(sNC));
+  sNC.pParse = pParse;
+  assert( pNew->pTabSchema );
+  pParse->pTriggerTab = sqlite3FindTable(db, pNew->table, 
+      db->aDb[sqlite3SchemaToIndex(db, pNew->pTabSchema)].zDbSName
+  );
+  pParse->eTriggerOp = pNew->op;
+
+  /* Resolve symbols in WHEN clause */
+  if( pNew->pWhen ){
+    rc = sqlite3ResolveExprNames(&sNC, pNew->pWhen);
+  }
+
+  for(pStep=pNew->step_list; rc==SQLITE_OK && pStep; pStep=pStep->pNext){
+    if( pStep->pSelect ){
+      sqlite3SelectPrep(pParse, pStep->pSelect, &sNC);
+      if( pParse->nErr ) rc = pParse->rc;
+    }
+    if( rc==SQLITE_OK && pStep->zTarget ){
+      Table *pTarget = sqlite3LocateTable(pParse, 0, pStep->zTarget, zDb);
+      if( pTarget==0 ){
+        rc = SQLITE_ERROR;
+      }else{
+        SrcList sSrc;
+        memset(&sSrc, 0, sizeof(sSrc));
+        sSrc.nSrc = 1;
+        sSrc.a[0].zName = pStep->zTarget;
+        sSrc.a[0].pTab = pTarget;
+        sNC.pSrcList = &sSrc;
+        if( pStep->pWhere ){
+          rc = sqlite3ResolveExprNames(&sNC, pStep->pWhere);
+        }
+        if( rc==SQLITE_OK ){
+          rc = sqlite3ResolveExprListNames(&sNC, pStep->pExprList);
+        }
+        assert( !pStep->pUpsert || (!pStep->pWhere && !pStep->pExprList) );
+        if( pStep->pUpsert ){
+          Upsert *pUpsert = pStep->pUpsert;
+          assert( rc==SQLITE_OK );
+          pUpsert->pUpsertSrc = &sSrc;
+          sNC.uNC.pUpsert = pUpsert;
+          sNC.ncFlags = NC_UUpsert;
+          rc = sqlite3ResolveExprListNames(&sNC, pUpsert->pUpsertTarget);
+          if( rc==SQLITE_OK ){
+            ExprList *pUpsertSet = pUpsert->pUpsertSet;
+            rc = sqlite3ResolveExprListNames(&sNC, pUpsertSet);
+          }
+          if( rc==SQLITE_OK ){
+            rc = sqlite3ResolveExprNames(&sNC, pUpsert->pUpsertWhere);
+          }
+          if( rc==SQLITE_OK ){
+            rc = sqlite3ResolveExprNames(&sNC, pUpsert->pUpsertTargetWhere);
+          }
+          sNC.ncFlags = 0;
+        }
+      }
+    }
+  }
+  return rc;
+}
+
+/*
+** Invoke sqlite3WalkExpr() or sqlite3WalkSelect() on all Select or Expr
+** objects that are part of the trigger passed as the second argument.
+*/
+static void renameWalkTrigger(Walker *pWalker, Trigger *pTrigger){
+  TriggerStep *pStep;
+
+  /* Find tokens to edit in WHEN clause */
+  sqlite3WalkExpr(pWalker, pTrigger->pWhen);
+
+  /* Find tokens to edit in trigger steps */
+  for(pStep=pTrigger->step_list; pStep; pStep=pStep->pNext){
+    sqlite3WalkSelect(pWalker, pStep->pSelect);
+    sqlite3WalkExpr(pWalker, pStep->pWhere);
+    sqlite3WalkExprList(pWalker, pStep->pExprList);
+    if( pStep->pUpsert ){
+      Upsert *pUpsert = pStep->pUpsert;
+      sqlite3WalkExprList(pWalker, pUpsert->pUpsertTarget);
+      sqlite3WalkExprList(pWalker, pUpsert->pUpsertSet);
+      sqlite3WalkExpr(pWalker, pUpsert->pUpsertWhere);
+      sqlite3WalkExpr(pWalker, pUpsert->pUpsertTargetWhere);
+    }
+  }
+}
+
+/*
+** Free the contents of Parse object (*pParse). Do not free the memory
+** occupied by the Parse object itself.
+*/
+static void renameParseCleanup(Parse *pParse){
+  sqlite3 *db = pParse->db;
+  if( pParse->pVdbe ){
+    sqlite3VdbeFinalize(pParse->pVdbe);
+  }
+  sqlite3DeleteTable(db, pParse->pNewTable);
+  if( pParse->pNewIndex ) sqlite3FreeIndex(db, pParse->pNewIndex);
+  sqlite3DeleteTrigger(db, pParse->pNewTrigger);
+  sqlite3DbFree(db, pParse->zErrMsg);
+  renameTokenFree(db, pParse->pRename);
+  sqlite3ParserReset(pParse);
+}
+
+/*
+** SQL function:
+**
+**     sqlite_rename_column(zSql, iCol, bQuote, zNew, zTable, zOld)
+**
+**   0. zSql:     SQL statement to rewrite
+**   1. type:     Type of object ("table", "view" etc.)
+**   2. object:   Name of object
+**   3. Database: Database name (e.g. "main")
+**   4. Table:    Table name
+**   5. iCol:     Index of column to rename
+**   6. zNew:     New column name
+**   7. bQuote:   Non-zero if the new column name should be quoted.
+**   8. bTemp:    True if zSql comes from temp schema
+**
+** Do a column rename operation on the CREATE statement given in zSql.
+** The iCol-th column (left-most is 0) of table zTable is renamed from zCol
+** into zNew.  The name should be quoted if bQuote is true.
+**
+** This function is used internally by the ALTER TABLE RENAME COLUMN command.
+** Though accessible to application code, it is not intended for use by
+** applications.  The existance of this function, and the way it works,
+** is subject to change without notice.
+**
+** If any of the parameters are out-of-bounds, then simply return NULL.
+** An out-of-bounds parameter can only occur when the application calls
+** this function directly.  The parameters will always be well-formed when
+** this routine is invoked by the bytecode for a legitimate ALTER TABLE
+** statement.
+*/
+static void renameColumnFunc(
+  sqlite3_context *context,
+  int NotUsed,
+  sqlite3_value **argv
+){
+  sqlite3 *db = sqlite3_context_db_handle(context);
+  RenameCtx sCtx;
+  const char *zSql = (const char*)sqlite3_value_text(argv[0]);
+  const char *zDb = (const char*)sqlite3_value_text(argv[3]);
+  const char *zTable = (const char*)sqlite3_value_text(argv[4]);
+  int iCol = sqlite3_value_int(argv[5]);
+  const char *zNew = (const char*)sqlite3_value_text(argv[6]);
+  int bQuote = sqlite3_value_int(argv[7]);
+  int bTemp = sqlite3_value_int(argv[8]);
+  const char *zOld;
+  int rc;
+  Parse sParse;
+  Walker sWalker;
+  Index *pIdx;
+  int i;
+  Table *pTab;
+#ifndef SQLITE_OMIT_AUTHORIZATION
+  sqlite3_xauth xAuth = db->xAuth;
+#endif
+
+  UNUSED_PARAMETER(NotUsed);
+  if( zSql==0 ) return;
+  if( zTable==0 ) return;
+  if( zNew==0 ) return;
+  if( iCol<0 ) return;
+  sqlite3BtreeEnterAll(db);
+  pTab = sqlite3FindTable(db, zTable, zDb);
+  if( pTab==0 || iCol>=pTab->nCol ){
+    sqlite3BtreeLeaveAll(db);
+    return;
+  }
+  zOld = pTab->aCol[iCol].zName;
+  memset(&sCtx, 0, sizeof(sCtx));
+  sCtx.iCol = ((iCol==pTab->iPKey) ? -1 : iCol);
+
+#ifndef SQLITE_OMIT_AUTHORIZATION
+  db->xAuth = 0;
+#endif
+  rc = renameParseSql(&sParse, zDb, 0, db, zSql, bTemp);
+
+  /* Find tokens that need to be replaced. */
+  memset(&sWalker, 0, sizeof(Walker));
+  sWalker.pParse = &sParse;
+  sWalker.xExprCallback = renameColumnExprCb;
+  sWalker.xSelectCallback = renameColumnSelectCb;
+  sWalker.u.pRename = &sCtx;
+
+  sCtx.pTab = pTab;
+  if( rc!=SQLITE_OK ) goto renameColumnFunc_done;
+  if( sParse.pNewTable ){
+    Select *pSelect = sParse.pNewTable->pSelect;
+    if( pSelect ){
+      sParse.rc = SQLITE_OK;
+      sqlite3SelectPrep(&sParse, sParse.pNewTable->pSelect, 0);
+      rc = (db->mallocFailed ? SQLITE_NOMEM : sParse.rc);
+      if( rc==SQLITE_OK ){
+        sqlite3WalkSelect(&sWalker, pSelect);
+      }
+      if( rc!=SQLITE_OK ) goto renameColumnFunc_done;
+    }else{
+      /* A regular table */
+      int bFKOnly = sqlite3_stricmp(zTable, sParse.pNewTable->zName);
+      FKey *pFKey;
+      assert( sParse.pNewTable->pSelect==0 );
+      sCtx.pTab = sParse.pNewTable;
+      if( bFKOnly==0 ){
+        renameTokenFind(
+            &sParse, &sCtx, (void*)sParse.pNewTable->aCol[iCol].zName
+        );
+        if( sCtx.iCol<0 ){
+          renameTokenFind(&sParse, &sCtx, (void*)&sParse.pNewTable->iPKey);
+        }
+        sqlite3WalkExprList(&sWalker, sParse.pNewTable->pCheck);
+        for(pIdx=sParse.pNewTable->pIndex; pIdx; pIdx=pIdx->pNext){
+          sqlite3WalkExprList(&sWalker, pIdx->aColExpr);
+        }
+      }
+
+      for(pFKey=sParse.pNewTable->pFKey; pFKey; pFKey=pFKey->pNextFrom){
+        for(i=0; i<pFKey->nCol; i++){
+          if( bFKOnly==0 && pFKey->aCol[i].iFrom==iCol ){
+            renameTokenFind(&sParse, &sCtx, (void*)&pFKey->aCol[i]);
+          }
+          if( 0==sqlite3_stricmp(pFKey->zTo, zTable)
+           && 0==sqlite3_stricmp(pFKey->aCol[i].zCol, zOld)
+          ){
+            renameTokenFind(&sParse, &sCtx, (void*)pFKey->aCol[i].zCol);
+          }
+        }
+      }
+    }
+  }else if( sParse.pNewIndex ){
+    sqlite3WalkExprList(&sWalker, sParse.pNewIndex->aColExpr);
+    sqlite3WalkExpr(&sWalker, sParse.pNewIndex->pPartIdxWhere);
+  }else{
+    /* A trigger */
+    TriggerStep *pStep;
+    rc = renameResolveTrigger(&sParse, (bTemp ? 0 : zDb));
+    if( rc!=SQLITE_OK ) goto renameColumnFunc_done;
+
+    for(pStep=sParse.pNewTrigger->step_list; pStep; pStep=pStep->pNext){
+      if( pStep->zTarget ){ 
+        Table *pTarget = sqlite3LocateTable(&sParse, 0, pStep->zTarget, zDb);
+        if( pTarget==pTab ){
+          if( pStep->pUpsert ){
+            ExprList *pUpsertSet = pStep->pUpsert->pUpsertSet;
+            renameColumnElistNames(&sParse, &sCtx, pUpsertSet, zOld);
+          }
+          renameColumnIdlistNames(&sParse, &sCtx, pStep->pIdList, zOld);
+          renameColumnElistNames(&sParse, &sCtx, pStep->pExprList, zOld);
+        }
+      }
+    }
+
+
+    /* Find tokens to edit in UPDATE OF clause */
+    if( sParse.pTriggerTab==pTab ){
+      renameColumnIdlistNames(&sParse, &sCtx,sParse.pNewTrigger->pColumns,zOld);
+    }
+
+    /* Find tokens to edit in various expressions and selects */
+    renameWalkTrigger(&sWalker, sParse.pNewTrigger);
+  }
+
+  assert( rc==SQLITE_OK );
+  rc = renameEditSql(context, &sCtx, zSql, zNew, bQuote);
+
+renameColumnFunc_done:
+  if( rc!=SQLITE_OK ){
+    if( sParse.zErrMsg ){
+      renameColumnParseError(context, 0, argv[1], argv[2], &sParse);
+    }else{
+      sqlite3_result_error_code(context, rc);
+    }
+  }
+
+  renameParseCleanup(&sParse);
+  renameTokenFree(db, sCtx.pList);
+#ifndef SQLITE_OMIT_AUTHORIZATION
+  db->xAuth = xAuth;
+#endif
+  sqlite3BtreeLeaveAll(db);
+}
+
+/*
+** Walker expression callback used by "RENAME TABLE". 
+*/
+static int renameTableExprCb(Walker *pWalker, Expr *pExpr){
+  RenameCtx *p = pWalker->u.pRename;
+  if( pExpr->op==TK_COLUMN && p->pTab==pExpr->pTab ){
+    renameTokenFind(pWalker->pParse, p, (void*)&pExpr->pTab);
+  }
+  return WRC_Continue;
+}
+
+/*
+** Walker select callback used by "RENAME TABLE". 
+*/
+static int renameTableSelectCb(Walker *pWalker, Select *pSelect){
+  int i;
+  RenameCtx *p = pWalker->u.pRename;
+  SrcList *pSrc = pSelect->pSrc;
+  for(i=0; i<pSrc->nSrc; i++){
+    struct SrcList_item *pItem = &pSrc->a[i];
+    if( pItem->pTab==p->pTab ){
+      renameTokenFind(pWalker->pParse, p, pItem->zName);
+    }
+  }
+
+  return WRC_Continue;
+}
+
+
+/*
+** This C function implements an SQL user function that is used by SQL code
+** generated by the ALTER TABLE ... RENAME command to modify the definition
+** of any foreign key constraints that use the table being renamed as the 
+** parent table. It is passed three arguments:
+**
+**   0: The database containing the table being renamed.
+**   1. type:     Type of object ("table", "view" etc.)
+**   2. object:   Name of object
+**   3: The complete text of the schema statement being modified,
+**   4: The old name of the table being renamed, and
+**   5: The new name of the table being renamed.
+**   6: True if the schema statement comes from the temp db.
+**
+** It returns the new schema statement. For example:
+**
+** sqlite_rename_table('main', 'CREATE TABLE t1(a REFERENCES t2)','t2','t3',0)
+**       -> 'CREATE TABLE t1(a REFERENCES t3)'
+*/
+static void renameTableFunc(
+  sqlite3_context *context,
+  int NotUsed,
+  sqlite3_value **argv
+){
+  sqlite3 *db = sqlite3_context_db_handle(context);
+  const char *zDb = (const char*)sqlite3_value_text(argv[0]);
+  const char *zInput = (const char*)sqlite3_value_text(argv[3]);
+  const char *zOld = (const char*)sqlite3_value_text(argv[4]);
+  const char *zNew = (const char*)sqlite3_value_text(argv[5]);
+  int bTemp = sqlite3_value_int(argv[6]);
+  UNUSED_PARAMETER(NotUsed);
+
+  if( zInput && zOld && zNew ){
+    Parse sParse;
+    int rc;
+    int bQuote = 1;
+    RenameCtx sCtx;
+    Walker sWalker;
+
+#ifndef SQLITE_OMIT_AUTHORIZATION
+    sqlite3_xauth xAuth = db->xAuth;
+    db->xAuth = 0;
+#endif
+
+    sqlite3BtreeEnterAll(db);
+
+    memset(&sCtx, 0, sizeof(RenameCtx));
+    sCtx.pTab = sqlite3FindTable(db, zOld, zDb);
+    memset(&sWalker, 0, sizeof(Walker));
+    sWalker.pParse = &sParse;
+    sWalker.xExprCallback = renameTableExprCb;
+    sWalker.xSelectCallback = renameTableSelectCb;
+    sWalker.u.pRename = &sCtx;
+
+    rc = renameParseSql(&sParse, zDb, 1, db, zInput, bTemp);
+
+    if( rc==SQLITE_OK ){
+      if( sParse.pNewTable ){
+        Table *pTab = sParse.pNewTable;
+
+        if( pTab->pSelect ){
+          NameContext sNC;
+          memset(&sNC, 0, sizeof(sNC));
+          sNC.pParse = &sParse;
+
+          sqlite3SelectPrep(&sParse, pTab->pSelect, &sNC);
+          if( sParse.nErr ) rc = sParse.rc;
+          sqlite3WalkSelect(&sWalker, pTab->pSelect);
+        }else{
+          /* Modify any FK definitions to point to the new table. */
+#ifndef SQLITE_OMIT_FOREIGN_KEY
+          if( db->flags & SQLITE_ForeignKeys ){
+            FKey *pFKey;
+            for(pFKey=pTab->pFKey; pFKey; pFKey=pFKey->pNextFrom){
+              if( sqlite3_stricmp(pFKey->zTo, zOld)==0 ){
+                renameTokenFind(&sParse, &sCtx, (void*)pFKey->zTo);
+              }
+            }
+          }
+#endif
+
+          /* If this is the table being altered, fix any table refs in CHECK
+          ** expressions. Also update the name that appears right after the
+          ** "CREATE [VIRTUAL] TABLE" bit. */
+          if( sqlite3_stricmp(zOld, pTab->zName)==0 ){
+            sCtx.pTab = pTab;
+            sqlite3WalkExprList(&sWalker, pTab->pCheck);
+            renameTokenFind(&sParse, &sCtx, pTab->zName);
+          }
+        }
+      }
+
+      else if( sParse.pNewIndex ){
+        renameTokenFind(&sParse, &sCtx, sParse.pNewIndex->zName);
+        sqlite3WalkExpr(&sWalker, sParse.pNewIndex->pPartIdxWhere);
+      }
+
+#ifndef SQLITE_OMIT_TRIGGER
+      else{
+        Trigger *pTrigger = sParse.pNewTrigger;
+        TriggerStep *pStep;
+        if( 0==sqlite3_stricmp(sParse.pNewTrigger->table, zOld) 
+            && sCtx.pTab->pSchema==pTrigger->pTabSchema
+          ){
+          renameTokenFind(&sParse, &sCtx, sParse.pNewTrigger->table);
+        }
+
+        rc = renameResolveTrigger(&sParse, bTemp ? 0 : zDb);
+        if( rc==SQLITE_OK ){
+          renameWalkTrigger(&sWalker, pTrigger);
+          for(pStep=pTrigger->step_list; pStep; pStep=pStep->pNext){
+            if( pStep->zTarget && 0==sqlite3_stricmp(pStep->zTarget, zOld) ){
+              renameTokenFind(&sParse, &sCtx, pStep->zTarget);
+            }
+          }
+        }
+      }
+#endif
+    }
+
+    if( rc==SQLITE_OK ){
+      rc = renameEditSql(context, &sCtx, zInput, zNew, bQuote);
+    }
+    if( rc!=SQLITE_OK ){
+      if( sParse.zErrMsg ){
+        renameColumnParseError(context, 0, argv[1], argv[2], &sParse);
+      }else{
+        sqlite3_result_error_code(context, rc);
+      }
+    }
+
+    renameParseCleanup(&sParse);
+    renameTokenFree(db, sCtx.pList);
+    sqlite3BtreeLeaveAll(db);
+#ifndef SQLITE_OMIT_AUTHORIZATION
+    db->xAuth = xAuth;
+#endif
+  }
+
+  return;
+}
+
+/*
+** An SQL user function that checks that there are no parse or symbol
+** resolution problems in a CREATE TRIGGER|TABLE|VIEW|INDEX statement.
+** After an ALTER TABLE .. RENAME operation is performed and the schema
+** reloaded, this function is called on each SQL statement in the schema
+** to ensure that it is still usable.
+**
+**   0: Database name ("main", "temp" etc.).
+**   1: SQL statement.
+**   2: Object type ("view", "table", "trigger" or "index").
+**   3: Object name.
+**   4: True if object is from temp schema.
+**
+** Unless it finds an error, this function normally returns NULL. However, it
+** returns integer value 1 if:
+**
+**   * the SQL argument creates a trigger, and
+**   * the table that the trigger is attached to is in database zDb.
+*/
+static void renameTableTest(
+  sqlite3_context *context,
+  int NotUsed,
+  sqlite3_value **argv
+){
+  sqlite3 *db = sqlite3_context_db_handle(context);
+  char const *zDb = (const char*)sqlite3_value_text(argv[0]);
+  char const *zInput = (const char*)sqlite3_value_text(argv[1]);
+  int bTemp = sqlite3_value_int(argv[4]);
+
+#ifndef SQLITE_OMIT_AUTHORIZATION
+  sqlite3_xauth xAuth = db->xAuth;
+  db->xAuth = 0;
+#endif
+
+  UNUSED_PARAMETER(NotUsed);
+  if( zDb && zInput ){
+    int rc;
+    Parse sParse;
+    rc = renameParseSql(&sParse, zDb, 1, db, zInput, bTemp);
+    if( rc==SQLITE_OK ){
+      if( sParse.pNewTable && sParse.pNewTable->pSelect ){
+        NameContext sNC;
+        memset(&sNC, 0, sizeof(sNC));
+        sNC.pParse = &sParse;
+        sqlite3SelectPrep(&sParse, sParse.pNewTable->pSelect, &sNC);
+        if( sParse.nErr ) rc = sParse.rc;
+      }
+
+      else if( sParse.pNewTrigger ){
+        rc = renameResolveTrigger(&sParse, bTemp ? 0 : zDb);
+        if( rc==SQLITE_OK ){
+          int i1 = sqlite3SchemaToIndex(db, sParse.pNewTrigger->pTabSchema);
+          int i2 = sqlite3FindDbName(db, zDb);
+          if( i1==i2 ) sqlite3_result_int(context, 1);
+        }
+      }
+    }
+
+    if( rc!=SQLITE_OK ){
+      renameColumnParseError(context, 1, argv[2], argv[3], &sParse);
+    }
+    renameParseCleanup(&sParse);
+  }
+
+#ifndef SQLITE_OMIT_AUTHORIZATION
+  db->xAuth = xAuth;
+#endif
+}
+
+/*
+** Register built-in functions used to help implement ALTER TABLE
+*/
+SQLITE_PRIVATE void sqlite3AlterFunctions(void){
+  static FuncDef aAlterTableFuncs[] = {
+    FUNCTION(sqlite_rename_column,  9, 0, 0, renameColumnFunc),
+    FUNCTION(sqlite_rename_table,  7, 0, 0, renameTableFunc),
+    FUNCTION(sqlite_rename_test,  5, 0, 0, renameTableTest),
+  };
+  sqlite3InsertBuiltinFuncs(aAlterTableFuncs, ArraySize(aAlterTableFuncs));
+}
 #endif  /* SQLITE_ALTER_TABLE */
 
 /************** End of alter.c ***********************************************/
 /************** Begin file analyze.c *****************************************/
 /*
@@ -104556,11 +105468,11 @@
   int rc;
 
   /* Don't do any authorization checks if the database is initialising
   ** or if the parser is being invoked from within sqlite3_declare_vtab.
   */
-  if( db->init.busy || IN_DECLARE_VTAB ){
+  if( db->init.busy || IN_SPECIAL_PARSE ){
     return SQLITE_OK;
   }
 
   if( db->xAuth==0 ){
     return SQLITE_OK;
@@ -105062,11 +105974,11 @@
 }
 
 /*
 ** Reclaim the memory used by an index
 */
-static void freeIndex(sqlite3 *db, Index *p){
+SQLITE_PRIVATE void sqlite3FreeIndex(sqlite3 *db, Index *p){
 #ifndef SQLITE_OMIT_ANALYZE
   sqlite3DeleteIndexSamples(db, p);
 #endif
   sqlite3ExprDelete(db, p->pPartIdxWhere);
   sqlite3ExprListDelete(db, p->aColExpr);
@@ -105102,11 +106014,11 @@
       while( ALWAYS(p) && p->pNext!=pIndex ){ p = p->pNext; }
       if( ALWAYS(p && p->pNext==pIndex) ){
         p->pNext = pIndex->pNext;
       }
     }
-    freeIndex(db, pIndex);
+    sqlite3FreeIndex(db, pIndex);
   }
   db->mDbFlags |= DBFLAG_SchemaChange;
 }
 
 /*
@@ -105248,11 +106160,11 @@
          &pIndex->pSchema->idxHash, zName, 0
       );
       assert( db==0 || sqlite3SchemaMutexHeld(db, 0, pIndex->pSchema) );
       assert( pOld==pIndex || pOld==0 );
     }
-    freeIndex(db, pIndex);
+    sqlite3FreeIndex(db, pIndex);
   }
 
   /* Delete any foreign keys attached to this table. */
   sqlite3FkDelete(db, pTable);
 
@@ -105406,11 +106318,11 @@
     if( iDb<0 ){
       sqlite3ErrorMsg(pParse, "unknown database %T", pName1);
       return -1;
     }
   }else{
-    assert( db->init.iDb==0 || db->init.busy
+    assert( db->init.iDb==0 || db->init.busy || IN_RENAME_OBJECT
              || (db->mDbFlags & DBFLAG_Vacuum)!=0);
     iDb = db->init.iDb;
     *pUnqual = pName1;
   }
   return iDb;
@@ -105501,10 +106413,13 @@
       sqlite3ErrorMsg(pParse, "temporary table name must be unqualified");
       return;
     }
     if( !OMIT_TEMPDB && isTemp ) iDb = 1;
     zName = sqlite3NameFromToken(db, pName);
+    if( IN_RENAME_OBJECT ){
+      sqlite3RenameTokenMap(pParse, (void*)zName, pName);
+    }
   }
   pParse->sNameToken = *pName;
   if( zName==0 ) return;
   if( SQLITE_OK!=sqlite3CheckObjectName(pParse, zName) ){
     goto begin_table_error;
@@ -105536,11 +106451,11 @@
   ** it does. The exception is if the statement being parsed was passed
   ** to an sqlite3_declare_vtab() call. In that case only the column names
   ** and types will be used, so there is no need to test for namespace
   ** collisions.
   */
-  if( !IN_DECLARE_VTAB ){
+  if( !IN_SPECIAL_PARSE ){
     char *zDb = db->aDb[iDb].zDbSName;
     if( SQLITE_OK!=sqlite3ReadSchema(pParse) ){
       goto begin_table_error;
     }
     pTable = sqlite3FindTable(db, zName, zDb);
@@ -105695,10 +106610,11 @@
     sqlite3ErrorMsg(pParse, "too many columns on %s", p->zName);
     return;
   }
   z = sqlite3DbMallocRaw(db, pName->n + pType->n + 2);
   if( z==0 ) return;
+  if( IN_RENAME_OBJECT ) sqlite3RenameTokenMap(pParse, (void*)z, pName);
   memcpy(z, pName->z, pName->n);
   z[pName->n] = 0;
   sqlite3Dequote(z);
   for(i=0; i<p->nCol; i++){
     if( sqlite3_stricmp(z, p->aCol[i].zName)==0 ){
@@ -105901,10 +106817,13 @@
       x.flags = EP_Skip;
       pCol->pDflt = sqlite3ExprDup(db, &x, EXPRDUP_REDUCE);
       sqlite3DbFree(db, x.u.zToken);
     }
   }
+  if( IN_RENAME_OBJECT ){
+    sqlite3RenameExprUnmap(pParse, pExpr);
+  }
   sqlite3ExprDelete(db, pExpr);
 }
 
 /*
 ** Backwards Compatibility Hack:
@@ -105992,10 +106911,13 @@
   if( nTerm==1
    && pCol
    && sqlite3StrICmp(sqlite3ColumnType(pCol,""), "INTEGER")==0
    && sortOrder!=SQLITE_SO_DESC
   ){
+    if( IN_RENAME_OBJECT && pList ){
+      sqlite3RenameTokenRemap(pParse, &pTab->iPKey, pList->a[0].pExpr);
+    }
     pTab->iPKey = iCol;
     pTab->keyConf = (u8)onError;
     assert( autoInc==0 || autoInc==1 );
     pTab->tabFlags |= autoInc*TF_Autoincrement;
     if( pList ) pParse->iPkSortOrder = pList->a[0].sortOrder;
@@ -106794,11 +107716,16 @@
   /* Make a copy of the entire SELECT statement that defines the view.
   ** This will force all the Expr.token.z values to be dynamically
   ** allocated rather than point to the input string - which means that
   ** they will persist after the current sqlite3_exec() call returns.
   */
-  p->pSelect = sqlite3SelectDup(db, pSelect, EXPRDUP_REDUCE);
+  if( IN_RENAME_OBJECT ){
+    p->pSelect = pSelect;
+    pSelect = 0;
+  }else{
+    p->pSelect = sqlite3SelectDup(db, pSelect, EXPRDUP_REDUCE);
+  }
   p->pCheck = sqlite3ExprListDup(db, pCNames, EXPRDUP_REDUCE);
   if( db->mallocFailed ) goto create_view_fail;
 
   /* Locate the end of the CREATE VIEW statement.  Make sEnd point to
   ** the end.
@@ -107362,10 +108289,13 @@
   }
   pFKey->pFrom = p;
   pFKey->pNextFrom = p->pFKey;
   z = (char*)&pFKey->aCol[nCol];
   pFKey->zTo = z;
+  if( IN_RENAME_OBJECT ){
+    sqlite3RenameTokenMap(pParse, (void*)z, pTo);
+  }
   memcpy(z, pTo->z, pTo->n);
   z[pTo->n] = 0;
   sqlite3Dequote(z);
   z += pTo->n+1;
   pFKey->nCol = nCol;
@@ -107384,16 +108314,22 @@
         sqlite3ErrorMsg(pParse, 
           "unknown column \"%s\" in foreign key definition", 
           pFromCol->a[i].zName);
         goto fk_end;
       }
+      if( IN_RENAME_OBJECT ){
+        sqlite3RenameTokenRemap(pParse, &pFKey->aCol[i], pFromCol->a[i].zName);
+      }
     }
   }
   if( pToCol ){
     for(i=0; i<nCol; i++){
       int n = sqlite3Strlen30(pToCol->a[i].zName);
       pFKey->aCol[i].zCol = z;
+      if( IN_RENAME_OBJECT ){
+        sqlite3RenameTokenRemap(pParse, z, pToCol->a[i].zName);
+      }
       memcpy(z, pToCol->a[i].zName, n);
       z[n] = 0;
       z += n+1;
     }
   }
@@ -107722,25 +108658,27 @@
     if( zName==0 ) goto exit_create_index;
     assert( pName->z!=0 );
     if( SQLITE_OK!=sqlite3CheckObjectName(pParse, zName) ){
       goto exit_create_index;
     }
-    if( !db->init.busy ){
-      if( sqlite3FindTable(db, zName, 0)!=0 ){
-        sqlite3ErrorMsg(pParse, "there is already a table named %s", zName);
+    if( !IN_RENAME_OBJECT ){
+      if( !db->init.busy ){
+        if( sqlite3FindTable(db, zName, 0)!=0 ){
+          sqlite3ErrorMsg(pParse, "there is already a table named %s", zName);
+          goto exit_create_index;
+        }
+      }
+      if( sqlite3FindIndex(db, zName, pDb->zDbSName)!=0 ){
+        if( !ifNotExist ){
+          sqlite3ErrorMsg(pParse, "index %s already exists", zName);
+        }else{
+          assert( !db->init.busy );
+          sqlite3CodeVerifySchema(pParse, iDb);
+        }
         goto exit_create_index;
       }
     }
-    if( sqlite3FindIndex(db, zName, pDb->zDbSName)!=0 ){
-      if( !ifNotExist ){
-        sqlite3ErrorMsg(pParse, "index %s already exists", zName);
-      }else{
-        assert( !db->init.busy );
-        sqlite3CodeVerifySchema(pParse, iDb);
-      }
-      goto exit_create_index;
-    }
   }else{
     int n;
     Index *pLoop;
     for(pLoop=pTab->pIndex, n=1; pLoop; pLoop=pLoop->pNext, n++){}
     zName = sqlite3MPrintf(db, "sqlite_autoindex_%s_%d", pTab->zName, n);
@@ -107751,17 +108689,17 @@
     /* Automatic index names generated from within sqlite3_declare_vtab()
     ** must have names that are distinct from normal automatic index names.
     ** The following statement converts "sqlite3_autoindex..." into
     ** "sqlite3_butoindex..." in order to make the names distinct.
     ** The "vtab_err.test" test demonstrates the need of this statement. */
-    if( IN_DECLARE_VTAB ) zName[7]++;
+    if( IN_SPECIAL_PARSE ) zName[7]++;
   }
 
   /* Check for authorization to create an index.
   */
 #ifndef SQLITE_OMIT_AUTHORIZATION
-  {
+  if( !IN_RENAME_OBJECT ){
     const char *zDb = pDb->zDbSName;
     if( sqlite3AuthCheck(pParse, SQLITE_INSERT, SCHEMA_TABLE(iDb), 0, zDb) ){
       goto exit_create_index;
     }
     i = SQLITE_CREATE_INDEX;
@@ -107844,11 +108782,16 @@
   **
   ** TODO: Issue a warning if two or more columns of the index are identical.
   ** TODO: Issue a warning if the table primary key is used as part of the
   ** index key.
   */
-  for(i=0, pListItem=pList->a; i<pList->nExpr; i++, pListItem++){
+  pListItem = pList->a;
+  if( IN_RENAME_OBJECT ){
+    pIndex->aColExpr = pList;
+    pList = 0;
+  }
+  for(i=0; i<pIndex->nKeyCol; i++, pListItem++){
     Expr *pCExpr;                  /* The i-th index expression */
     int requestedSortOrder;        /* ASC or DESC on the i-th expression */
     const char *zColl;             /* Collation sequence name */
 
     sqlite3StringToId(pListItem->pExpr);
@@ -107860,16 +108803,12 @@
         sqlite3ErrorMsg(pParse, "expressions prohibited in PRIMARY KEY and "
                                 "UNIQUE constraints");
         goto exit_create_index;
       }
       if( pIndex->aColExpr==0 ){
-        ExprList *pCopy = sqlite3ExprListDup(db, pList, 0);
-        pIndex->aColExpr = pCopy;
-        if( !db->mallocFailed ){
-          assert( pCopy!=0 );
-          pListItem = &pCopy->a[i];
-        }
+        pIndex->aColExpr = pList;
+        pList = 0;
       }
       j = XN_EXPR;
       pIndex->aiColumn[i] = XN_EXPR;
       pIndex->uniqNotNull = 0;
     }else{
@@ -108004,102 +108943,105 @@
         goto exit_create_index;
       }
     }
   }
 
-  /* Link the new Index structure to its table and to the other
-  ** in-memory database structures. 
-  */
-  assert( pParse->nErr==0 );
-  if( db->init.busy ){
-    Index *p;
-    assert( !IN_DECLARE_VTAB );
-    assert( sqlite3SchemaMutexHeld(db, 0, pIndex->pSchema) );
-    p = sqlite3HashInsert(&pIndex->pSchema->idxHash, 
-                          pIndex->zName, pIndex);
-    if( p ){
-      assert( p==pIndex );  /* Malloc must have failed */
-      sqlite3OomFault(db);
-      goto exit_create_index;
-    }
-    db->mDbFlags |= DBFLAG_SchemaChange;
-    if( pTblName!=0 ){
-      pIndex->tnum = db->init.newTnum;
-    }
-  }
-
-  /* If this is the initial CREATE INDEX statement (or CREATE TABLE if the
-  ** index is an implied index for a UNIQUE or PRIMARY KEY constraint) then
-  ** emit code to allocate the index rootpage on disk and make an entry for
-  ** the index in the sqlite_master table and populate the index with
-  ** content.  But, do not do this if we are simply reading the sqlite_master
-  ** table to parse the schema, or if this index is the PRIMARY KEY index
-  ** of a WITHOUT ROWID table.
-  **
-  ** If pTblName==0 it means this index is generated as an implied PRIMARY KEY
-  ** or UNIQUE index in a CREATE TABLE statement.  Since the table
-  ** has just been created, it contains no data and the index initialization
-  ** step can be skipped.
-  */
-  else if( HasRowid(pTab) || pTblName!=0 ){
-    Vdbe *v;
-    char *zStmt;
-    int iMem = ++pParse->nMem;
-
-    v = sqlite3GetVdbe(pParse);
-    if( v==0 ) goto exit_create_index;
-
-    sqlite3BeginWriteOperation(pParse, 1, iDb);
-
-    /* Create the rootpage for the index using CreateIndex. But before
-    ** doing so, code a Noop instruction and store its address in 
-    ** Index.tnum. This is required in case this index is actually a 
-    ** PRIMARY KEY and the table is actually a WITHOUT ROWID table. In 
-    ** that case the convertToWithoutRowidTable() routine will replace
-    ** the Noop with a Goto to jump over the VDBE code generated below. */
-    pIndex->tnum = sqlite3VdbeAddOp0(v, OP_Noop);
-    sqlite3VdbeAddOp3(v, OP_CreateBtree, iDb, iMem, BTREE_BLOBKEY);
-
-    /* Gather the complete text of the CREATE INDEX statement into
-    ** the zStmt variable
-    */
-    if( pStart ){
-      int n = (int)(pParse->sLastToken.z - pName->z) + pParse->sLastToken.n;
-      if( pName->z[n-1]==';' ) n--;
-      /* A named index with an explicit CREATE INDEX statement */
-      zStmt = sqlite3MPrintf(db, "CREATE%s INDEX %.*s",
-        onError==OE_None ? "" : " UNIQUE", n, pName->z);
-    }else{
-      /* An automatic index created by a PRIMARY KEY or UNIQUE constraint */
-      /* zStmt = sqlite3MPrintf(""); */
-      zStmt = 0;
-    }
-
-    /* Add an entry in sqlite_master for this index
-    */
-    sqlite3NestedParse(pParse, 
-        "INSERT INTO %Q.%s VALUES('index',%Q,%Q,#%d,%Q);",
-        db->aDb[iDb].zDbSName, MASTER_NAME,
-        pIndex->zName,
-        pTab->zName,
-        iMem,
-        zStmt
-    );
-    sqlite3DbFree(db, zStmt);
-
-    /* Fill the index with data and reparse the schema. Code an OP_Expire
-    ** to invalidate all pre-compiled statements.
-    */
-    if( pTblName ){
-      sqlite3RefillIndex(pParse, pIndex, iMem);
-      sqlite3ChangeCookie(pParse, iDb);
-      sqlite3VdbeAddParseSchemaOp(v, iDb,
-         sqlite3MPrintf(db, "name='%q' AND type='index'", pIndex->zName));
-      sqlite3VdbeAddOp2(v, OP_Expire, 0, 1);
-    }
-
-    sqlite3VdbeJumpHere(v, pIndex->tnum);
+  if( !IN_RENAME_OBJECT ){
+
+    /* Link the new Index structure to its table and to the other
+    ** in-memory database structures. 
+    */
+    assert( pParse->nErr==0 );
+    if( db->init.busy ){
+      Index *p;
+      assert( !IN_SPECIAL_PARSE );
+      assert( sqlite3SchemaMutexHeld(db, 0, pIndex->pSchema) );
+      p = sqlite3HashInsert(&pIndex->pSchema->idxHash, 
+          pIndex->zName, pIndex);
+      if( p ){
+        assert( p==pIndex );  /* Malloc must have failed */
+        sqlite3OomFault(db);
+        goto exit_create_index;
+      }
+      db->mDbFlags |= DBFLAG_SchemaChange;
+      if( pTblName!=0 ){
+        pIndex->tnum = db->init.newTnum;
+      }
+    }
+
+    /* If this is the initial CREATE INDEX statement (or CREATE TABLE if the
+    ** index is an implied index for a UNIQUE or PRIMARY KEY constraint) then
+    ** emit code to allocate the index rootpage on disk and make an entry for
+    ** the index in the sqlite_master table and populate the index with
+    ** content.  But, do not do this if we are simply reading the sqlite_master
+    ** table to parse the schema, or if this index is the PRIMARY KEY index
+    ** of a WITHOUT ROWID table.
+    **
+    ** If pTblName==0 it means this index is generated as an implied PRIMARY KEY
+    ** or UNIQUE index in a CREATE TABLE statement.  Since the table
+    ** has just been created, it contains no data and the index initialization
+    ** step can be skipped.
+    */
+    else if( HasRowid(pTab) || pTblName!=0 ){
+      Vdbe *v;
+      char *zStmt;
+      int iMem = ++pParse->nMem;
+
+      v = sqlite3GetVdbe(pParse);
+      if( v==0 ) goto exit_create_index;
+
+      sqlite3BeginWriteOperation(pParse, 1, iDb);
+
+      /* Create the rootpage for the index using CreateIndex. But before
+      ** doing so, code a Noop instruction and store its address in 
+      ** Index.tnum. This is required in case this index is actually a 
+      ** PRIMARY KEY and the table is actually a WITHOUT ROWID table. In 
+      ** that case the convertToWithoutRowidTable() routine will replace
+      ** the Noop with a Goto to jump over the VDBE code generated below. */
+      pIndex->tnum = sqlite3VdbeAddOp0(v, OP_Noop);
+      sqlite3VdbeAddOp3(v, OP_CreateBtree, iDb, iMem, BTREE_BLOBKEY);
+
+      /* Gather the complete text of the CREATE INDEX statement into
+      ** the zStmt variable
+      */
+      if( pStart ){
+        int n = (int)(pParse->sLastToken.z - pName->z) + pParse->sLastToken.n;
+        if( pName->z[n-1]==';' ) n--;
+        /* A named index with an explicit CREATE INDEX statement */
+        zStmt = sqlite3MPrintf(db, "CREATE%s INDEX %.*s",
+            onError==OE_None ? "" : " UNIQUE", n, pName->z);
+      }else{
+        /* An automatic index created by a PRIMARY KEY or UNIQUE constraint */
+        /* zStmt = sqlite3MPrintf(""); */
+        zStmt = 0;
+      }
+
+      /* Add an entry in sqlite_master for this index
+      */
+      sqlite3NestedParse(pParse, 
+          "INSERT INTO %Q.%s VALUES('index',%Q,%Q,#%d,%Q);",
+          db->aDb[iDb].zDbSName, MASTER_NAME,
+          pIndex->zName,
+          pTab->zName,
+          iMem,
+          zStmt
+          );
+      sqlite3DbFree(db, zStmt);
+
+      /* Fill the index with data and reparse the schema. Code an OP_Expire
+      ** to invalidate all pre-compiled statements.
+      */
+      if( pTblName ){
+        sqlite3RefillIndex(pParse, pIndex, iMem);
+        sqlite3ChangeCookie(pParse, iDb);
+        sqlite3VdbeAddParseSchemaOp(v, iDb,
+            sqlite3MPrintf(db, "name='%q' AND type='index'", pIndex->zName));
+        sqlite3VdbeAddOp2(v, OP_Expire, 0, 1);
+      }
+
+      sqlite3VdbeJumpHere(v, pIndex->tnum);
+    }
   }
 
   /* When adding an index to the list of indices for a table, make
   ** sure all indices labeled OE_Replace come after all those labeled
   ** OE_Ignore.  This is necessary for the correct constraint check
@@ -108119,14 +109061,19 @@
       pIndex->pNext = pOther->pNext;
       pOther->pNext = pIndex;
     }
     pIndex = 0;
   }
+  else if( IN_RENAME_OBJECT ){
+    assert( pParse->pNewIndex==0 );
+    pParse->pNewIndex = pIndex;
+    pIndex = 0;
+  }
 
   /* Clean up before exiting */
 exit_create_index:
-  if( pIndex ) freeIndex(db, pIndex);
+  if( pIndex ) sqlite3FreeIndex(db, pIndex);
   sqlite3ExprDelete(db, pPIWhere);
   sqlite3ExprListDelete(db, pList);
   sqlite3SrcListDelete(db, pTblName);
   sqlite3DbFree(db, zName);
 }
@@ -108291,11 +109238,12 @@
 ** Append a new element to the given IdList.  Create a new IdList if
 ** need be.
 **
 ** A new IdList is returned, or NULL if malloc() fails.
 */
-SQLITE_PRIVATE IdList *sqlite3IdListAppend(sqlite3 *db, IdList *pList, Token *pToken){
+SQLITE_PRIVATE IdList *sqlite3IdListAppend(Parse *pParse, IdList *pList, Token *pToken){
+  sqlite3 *db = pParse->db;
   int i;
   if( pList==0 ){
     pList = sqlite3DbMallocZero(db, sizeof(IdList) );
     if( pList==0 ) return 0;
   }
@@ -108309,10 +109257,13 @@
   if( i<0 ){
     sqlite3IdListDelete(db, pList);
     return 0;
   }
   pList->a[i].zName = sqlite3NameFromToken(db, pToken);
+  if( IN_RENAME_OBJECT && pList->a[i].zName ){
+    sqlite3RenameTokenMap(pParse, (void*)pList->a[i].zName, pToken);
+  }
   return pList;
 }
 
 /*
 ** Delete an IdList.
@@ -108555,10 +109506,16 @@
   if( p==0 ){
     goto append_from_error;
   }
   assert( p->nSrc>0 );
   pItem = &p->a[p->nSrc-1];
+  assert( (pTable==0)==(pDatabase==0) );
+  assert( pItem->zName==0 || pDatabase!=0 );
+  if( IN_RENAME_OBJECT && pItem->zName ){
+    Token *pToken = (ALWAYS(pDatabase) && pDatabase->z) ? pDatabase : pTable;
+    sqlite3RenameTokenMap(pParse, pItem->zName, pToken);
+  }
   assert( pAlias!=0 );
   if( pAlias->n ){
     pItem->zAlias = sqlite3NameFromToken(db, pAlias);
   }
   pItem->pSelect = pSubquery;
@@ -116930,10 +117887,16 @@
   void (*str_appendchar)(sqlite3_str*, int N, char C);
   void (*str_reset)(sqlite3_str*);
   int (*str_errcode)(sqlite3_str*);
   int (*str_length)(sqlite3_str*);
   char *(*str_value)(sqlite3_str*);
+  int (*create_window_function)(sqlite3*,const char*,int,int,void*,
+                            void (*xStep)(sqlite3_context*,int,sqlite3_value**),
+                            void (*xFinal)(sqlite3_context*),
+                            void (*xValue)(sqlite3_context*),
+                            void (*xInv)(sqlite3_context*,int,sqlite3_value**),
+                            void(*xDestroy)(void*));
 };
 
 /*
 ** This is the function signature used for all extension entry points.  It
 ** is also defined in the file "loadext.c".
@@ -117215,10 +118178,12 @@
 #define sqlite3_str_appendchar         sqlite3_api->str_appendchar
 #define sqlite3_str_reset              sqlite3_api->str_reset
 #define sqlite3_str_errcode            sqlite3_api->str_errcode
 #define sqlite3_str_length             sqlite3_api->str_length
 #define sqlite3_str_value              sqlite3_api->str_value
+/* Version 3.25.0 and later */
+#define sqlite3_create_window_function sqlite3_api->create_window_function
 #endif /* !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) */
 
 #if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)
   /* This case when the file really is being compiled as a loadable 
   ** extension */
@@ -117668,11 +118633,13 @@
   sqlite3_str_appendall,
   sqlite3_str_appendchar,
   sqlite3_str_reset,
   sqlite3_str_errcode,
   sqlite3_str_length,
-  sqlite3_str_value
+  sqlite3_str_value,
+  /* Version 3.25.0 and later */
+  sqlite3_create_window_function
 };
 
 /*
 ** Attempt to load an SQLite extension library contained in the file
 ** zFile.  The entry point is zProc.  zProc may be 0 in which case a
@@ -120913,11 +121880,10 @@
     sqlite3_str_appendf(&acc, "%c\"%s\"", cSep, pragCName[j]);
     cSep = ',';
   }
   if( i==0 ){
     sqlite3_str_appendf(&acc, "(\"%s\"", pPragma->zName);
-    cSep = ',';
     i++;
   }
   j = 0;
   if( pPragma->mPragFlg & PragFlg_Result1 ){
     sqlite3_str_appendall(&acc, ",arg HIDDEN");
@@ -121206,19 +122172,27 @@
   InitData *pData,     /* Initialization context */
   const char *zObj,    /* Object being parsed at the point of error */
   const char *zExtra   /* Error information */
 ){
   sqlite3 *db = pData->db;
-  if( !db->mallocFailed && (db->flags & SQLITE_WriteSchema)==0 ){
+  if( db->mallocFailed ){
+    pData->rc = SQLITE_NOMEM_BKPT;
+  }else if( pData->pzErrMsg[0]!=0 ){
+    /* A error message has already been generated.  Do not overwrite it */
+  }else if( pData->mInitFlags & INITFLAG_AlterTable ){
+    *pData->pzErrMsg = sqlite3DbStrDup(db, zExtra);
+    pData->rc = SQLITE_ERROR;
+  }else if( db->flags & SQLITE_WriteSchema ){
+    pData->rc = SQLITE_CORRUPT_BKPT;
+  }else{
     char *z;
     if( zObj==0 ) zObj = "?";
     z = sqlite3MPrintf(db, "malformed database schema (%s)", zObj);
     if( zExtra && zExtra[0] ) z = sqlite3MPrintf(db, "%z - %s", z, zExtra);
-    sqlite3DbFree(db, *pData->pzErrMsg);
     *pData->pzErrMsg = z;
+    pData->rc = SQLITE_CORRUPT_BKPT;
   }
-  pData->rc = db->mallocFailed ? SQLITE_NOMEM_BKPT : SQLITE_CORRUPT_BKPT;
 }
 
 /*
 ** This is the callback routine for the code that initializes the
 ** database.  See sqlite3Init() below for additional information.
@@ -121266,11 +122240,11 @@
     db->init.orphanTrigger = 0;
     TESTONLY(rcp = ) sqlite3_prepare(db, argv[2], -1, &pStmt, 0);
     rc = db->errCode;
     assert( (rc&0xFF)==(rcp&0xFF) );
     db->init.iDb = saved_iDb;
-    assert( saved_iDb==0 || (db->mDbFlags & DBFLAG_Vacuum)!=0 );
+    /* assert( saved_iDb==0 || (db->mDbFlags & DBFLAG_Vacuum)!=0 ); */
     if( SQLITE_OK!=rc ){
       if( db->init.orphanTrigger ){
         assert( iDb==1 );
       }else{
         pData->rc = rc;
@@ -121313,11 +122287,11 @@
 ** database file is given by iDb.  iDb==0 is used for the main
 ** database.  iDb==1 should never be used.  iDb>=2 is used for
 ** auxiliary databases.  Return one of the SQLITE_ error codes to
 ** indicate success or failure.
 */
-static int sqlite3InitOne(sqlite3 *db, int iDb, char **pzErrMsg){
+SQLITE_PRIVATE int sqlite3InitOne(sqlite3 *db, int iDb, char **pzErrMsg, u32 mFlags){
   int rc;
   int i;
 #ifndef SQLITE_OMIT_DEPRECATED
   int size;
 #endif
@@ -121348,10 +122322,11 @@
   azArg[3] = 0;
   initData.db = db;
   initData.iDb = iDb;
   initData.rc = SQLITE_OK;
   initData.pzErrMsg = pzErrMsg;
+  initData.mInitFlags = mFlags;
   sqlite3InitCallback(&initData, 3, (char **)azArg, 0);
   if( initData.rc ){
     rc = initData.rc;
     goto error_out;
   }
@@ -121554,18 +122529,18 @@
   assert( db->init.busy==0 );
   ENC(db) = SCHEMA_ENC(db);
   assert( db->nDb>0 );
   /* Do the main schema first */
   if( !DbHasProperty(db, 0, DB_SchemaLoaded) ){
-    rc = sqlite3InitOne(db, 0, pzErrMsg);
+    rc = sqlite3InitOne(db, 0, pzErrMsg, 0);
     if( rc ) return rc;
   }
   /* All other schemas after the main schema. The "temp" schema must be last */
   for(i=db->nDb-1; i>0; i--){
     assert( i==1 || sqlite3BtreeHoldsMutex(db->aDb[i].pBt) );
     if( !DbHasProperty(db, i, DB_SchemaLoaded) ){
-      rc = sqlite3InitOne(db, i, pzErrMsg);
+      rc = sqlite3InitOne(db, i, pzErrMsg, 0);
       if( rc ) return rc;
     }
   }
   if( commit_internal ){
     sqlite3CommitInternalChanges(db);
@@ -122158,12 +123133,12 @@
   int iECursor;         /* Cursor number for the sorter */
   int regReturn;        /* Register holding block-output return address */
   int labelBkOut;       /* Start label for the block-output subroutine */
   int addrSortIndex;    /* Address of the OP_SorterOpen or OP_OpenEphemeral */
   int labelDone;        /* Jump here when done, ex: LIMIT reached */
+  int labelOBLopt;      /* Jump here when sorter is full */
   u8 sortFlags;         /* Zero or more SORTFLAG_* bits */
-  u8 bOrderedInnerLoop; /* ORDER BY correctly sorts the inner loop */
 #ifdef SQLITE_ENABLE_SORTER_REFERENCES
   u8 nDefer;            /* Number of valid entries in aDefer[] */
   struct DeferredCsr {
     Table *pTab;        /* Table definition */
     int iCsr;           /* Cursor number for table */
@@ -122783,14 +123758,14 @@
     ** are already LIMIT+OFFSET items in the sorter, delete the largest
     ** entry before inserting the new one. This way there are never more 
     ** than LIMIT+OFFSET items in the sorter.
     **
     ** If the new record does not need to be inserted into the sorter,
-    ** jump to the next iteration of the loop. Or, if the
-    ** pSort->bOrderedInnerLoop flag is set to indicate that the inner
-    ** loop delivers items in sorted order, jump to the next iteration
-    ** of the outer loop.
+    ** jump to the next iteration of the loop. If the pSort->labelOBLopt
+    ** value is not zero, then it is a label of where to jump.  Otherwise,
+    ** just bypass the row insert logic.  See the header comment on the
+    ** sqlite3WhereOrderByLimitOptLabel() function for additional info.
     */
     int iCsr = pSort->iECursor;
     sqlite3VdbeAddOp2(v, OP_IfNotZero, iLimit, sqlite3VdbeCurrentAddr(v)+4);
     VdbeCoverage(v);
     sqlite3VdbeAddOp2(v, OP_Last, iCsr, 0);
@@ -122808,13 +123783,12 @@
     op = OP_IdxInsert;
   }
   sqlite3VdbeAddOp4Int(v, op, pSort->iECursor, regRecord,
                        regBase+nOBSat, nBase-nOBSat);
   if( iSkip ){
-    assert( pSort->bOrderedInnerLoop==0 || pSort->bOrderedInnerLoop==1 );
     sqlite3VdbeChangeP2(v, iSkip,
-         sqlite3VdbeCurrentAddr(v) + pSort->bOrderedInnerLoop);
+         pSort->labelOBLopt ? pSort->labelOBLopt : sqlite3VdbeCurrentAddr(v));
   }
 }
 
 /*
 ** Add code to implement the OFFSET
@@ -128150,11 +129124,11 @@
     if( sDistinct.isTnct && sqlite3WhereIsDistinct(pWInfo) ){
       sDistinct.eTnctType = sqlite3WhereIsDistinct(pWInfo);
     }
     if( sSort.pOrderBy ){
       sSort.nOBSat = sqlite3WhereIsOrdered(pWInfo);
-      sSort.bOrderedInnerLoop = sqlite3WhereOrderedInnerLoop(pWInfo);
+      sSort.labelOBLopt = sqlite3WhereOrderByLimitOptLabel(pWInfo);
       if( sSort.nOBSat==sSort.pOrderBy->nExpr ){
         sSort.pOrderBy = 0;
       }
     }
 
@@ -129071,18 +130045,20 @@
   zName = sqlite3NameFromToken(db, pName);
   if( !zName || SQLITE_OK!=sqlite3CheckObjectName(pParse, zName) ){
     goto trigger_cleanup;
   }
   assert( sqlite3SchemaMutexHeld(db, iDb, 0) );
-  if( sqlite3HashFind(&(db->aDb[iDb].pSchema->trigHash),zName) ){
-    if( !noErr ){
-      sqlite3ErrorMsg(pParse, "trigger %T already exists", pName);
-    }else{
-      assert( !db->init.busy );
-      sqlite3CodeVerifySchema(pParse, iDb);
-    }
-    goto trigger_cleanup;
+  if( !IN_RENAME_OBJECT ){
+    if( sqlite3HashFind(&(db->aDb[iDb].pSchema->trigHash),zName) ){
+      if( !noErr ){
+        sqlite3ErrorMsg(pParse, "trigger %T already exists", pName);
+      }else{
+        assert( !db->init.busy );
+        sqlite3CodeVerifySchema(pParse, iDb);
+      }
+      goto trigger_cleanup;
+    }
   }
 
   /* Do not create a trigger on a system table */
   if( sqlite3StrNICmp(pTab->zName, "sqlite_", 7)==0 ){
     sqlite3ErrorMsg(pParse, "cannot create trigger on system table");
@@ -129102,11 +130078,11 @@
         " trigger on table: %S", pTableName, 0);
     goto trigger_cleanup;
   }
 
 #ifndef SQLITE_OMIT_AUTHORIZATION
-  {
+  if( !IN_RENAME_OBJECT ){
     int iTabDb = sqlite3SchemaToIndex(db, pTab->pSchema);
     int code = SQLITE_CREATE_TRIGGER;
     const char *zDb = db->aDb[iTabDb].zDbSName;
     const char *zDbTrig = isTemp ? db->aDb[1].zDbSName : zDb;
     if( iTabDb==1 || isTemp ) code = SQLITE_CREATE_TEMP_TRIGGER;
@@ -129136,12 +130112,19 @@
   pTrigger->table = sqlite3DbStrDup(db, pTableName->a[0].zName);
   pTrigger->pSchema = db->aDb[iDb].pSchema;
   pTrigger->pTabSchema = pTab->pSchema;
   pTrigger->op = (u8)op;
   pTrigger->tr_tm = tr_tm==TK_BEFORE ? TRIGGER_BEFORE : TRIGGER_AFTER;
-  pTrigger->pWhen = sqlite3ExprDup(db, pWhen, EXPRDUP_REDUCE);
-  pTrigger->pColumns = sqlite3IdListDup(db, pColumns);
+  if( IN_RENAME_OBJECT ){
+    sqlite3RenameTokenRemap(pParse, pTrigger->table, pTableName->a[0].zName);
+    pTrigger->pWhen = pWhen;
+    pWhen = 0;
+  }else{
+    pTrigger->pWhen = sqlite3ExprDup(db, pWhen, EXPRDUP_REDUCE);
+  }
+  pTrigger->pColumns = pColumns;
+  pColumns = 0;
   assert( pParse->pNewTrigger==0 );
   pParse->pNewTrigger = pTrigger;
 
 trigger_cleanup:
   sqlite3DbFree(db, zName);
@@ -129185,10 +130168,18 @@
   if( sqlite3FixTriggerStep(&sFix, pTrig->step_list) 
    || sqlite3FixExpr(&sFix, pTrig->pWhen) 
   ){
     goto triggerfinish_cleanup;
   }
+
+#ifndef SQLITE_OMIT_ALTERTABLE
+  if( IN_RENAME_OBJECT ){
+    assert( !db->init.busy );
+    pParse->pNewTrigger = pTrig;
+    pTrig = 0;
+  }else
+#endif
 
   /* if we are not initializing,
   ** build the sqlite_master entry
   */
   if( !db->init.busy ){
@@ -129227,11 +130218,11 @@
     }
   }
 
 triggerfinish_cleanup:
   sqlite3DeleteTrigger(db, pTrig);
-  assert( !pParse->pNewTrigger );
+  assert( IN_RENAME_OBJECT || !pParse->pNewTrigger );
   sqlite3DeleteTriggerStep(db, pStepList);
 }
 
 /*
 ** Duplicate a range of text from an SQL statement, then convert all
@@ -129274,16 +130265,17 @@
 ** holds both the TriggerStep object and the TriggerStep.target.z string.
 **
 ** If an OOM error occurs, NULL is returned and db->mallocFailed is set.
 */
 static TriggerStep *triggerStepAllocate(
-  sqlite3 *db,                /* Database connection */
+  Parse *pParse,              /* Parser context */
   u8 op,                      /* Trigger opcode */
   Token *pName,               /* The target name */
   const char *zStart,         /* Start of SQL text */
   const char *zEnd            /* End of SQL text */
 ){
+  sqlite3 *db = pParse->db;
   TriggerStep *pTriggerStep;
 
   pTriggerStep = sqlite3DbMallocZero(db, sizeof(TriggerStep) + pName->n + 1);
   if( pTriggerStep ){
     char *z = (char*)&pTriggerStep[1];
@@ -129290,10 +130282,13 @@
     memcpy(z, pName->z, pName->n);
     sqlite3Dequote(z);
     pTriggerStep->zTarget = z;
     pTriggerStep->op = op;
     pTriggerStep->zSpan = triggerSpanDup(db, zStart, zEnd);
+    if( IN_RENAME_OBJECT ){
+      sqlite3RenameTokenMap(pParse, pTriggerStep->zTarget, pName);
+    }
   }
   return pTriggerStep;
 }
 
 /*
@@ -129302,26 +130297,32 @@
 **
 ** The parser calls this routine when it sees an INSERT inside the
 ** body of a trigger.
 */
 SQLITE_PRIVATE TriggerStep *sqlite3TriggerInsertStep(
-  sqlite3 *db,        /* The database connection */
+  Parse *pParse,      /* Parser */
   Token *pTableName,  /* Name of the table into which we insert */
   IdList *pColumn,    /* List of columns in pTableName to insert into */
   Select *pSelect,    /* A SELECT statement that supplies values */
   u8 orconf,          /* The conflict algorithm (OE_Abort, OE_Replace, etc.) */
   Upsert *pUpsert,    /* ON CONFLICT clauses for upsert */
   const char *zStart, /* Start of SQL text */
   const char *zEnd    /* End of SQL text */
 ){
+  sqlite3 *db = pParse->db;
   TriggerStep *pTriggerStep;
 
   assert(pSelect != 0 || db->mallocFailed);
 
-  pTriggerStep = triggerStepAllocate(db, TK_INSERT, pTableName, zStart, zEnd);
+  pTriggerStep = triggerStepAllocate(pParse, TK_INSERT, pTableName,zStart,zEnd);
   if( pTriggerStep ){
-    pTriggerStep->pSelect = sqlite3SelectDup(db, pSelect, EXPRDUP_REDUCE);
+    if( IN_RENAME_OBJECT ){
+      pTriggerStep->pSelect = pSelect;
+      pSelect = 0;
+    }else{
+      pTriggerStep->pSelect = sqlite3SelectDup(db, pSelect, EXPRDUP_REDUCE);
+    }
     pTriggerStep->pIdList = pColumn;
     pTriggerStep->pUpsert = pUpsert;
     pTriggerStep->orconf = orconf;
   }else{
     testcase( pColumn );
@@ -129338,24 +130339,32 @@
 ** Construct a trigger step that implements an UPDATE statement and return
 ** a pointer to that trigger step.  The parser calls this routine when it
 ** sees an UPDATE statement inside the body of a CREATE TRIGGER.
 */
 SQLITE_PRIVATE TriggerStep *sqlite3TriggerUpdateStep(
-  sqlite3 *db,         /* The database connection */
+  Parse *pParse,          /* Parser */
   Token *pTableName,   /* Name of the table to be updated */
   ExprList *pEList,    /* The SET clause: list of column and new values */
   Expr *pWhere,        /* The WHERE clause */
   u8 orconf,           /* The conflict algorithm. (OE_Abort, OE_Ignore, etc) */
   const char *zStart,  /* Start of SQL text */
   const char *zEnd     /* End of SQL text */
 ){
+  sqlite3 *db = pParse->db;
   TriggerStep *pTriggerStep;
 
-  pTriggerStep = triggerStepAllocate(db, TK_UPDATE, pTableName, zStart, zEnd);
+  pTriggerStep = triggerStepAllocate(pParse, TK_UPDATE, pTableName,zStart,zEnd);
   if( pTriggerStep ){
-    pTriggerStep->pExprList = sqlite3ExprListDup(db, pEList, EXPRDUP_REDUCE);
-    pTriggerStep->pWhere = sqlite3ExprDup(db, pWhere, EXPRDUP_REDUCE);
+    if( IN_RENAME_OBJECT ){
+      pTriggerStep->pExprList = pEList;
+      pTriggerStep->pWhere = pWhere;
+      pEList = 0;
+      pWhere = 0;
+    }else{
+      pTriggerStep->pExprList = sqlite3ExprListDup(db, pEList, EXPRDUP_REDUCE);
+      pTriggerStep->pWhere = sqlite3ExprDup(db, pWhere, EXPRDUP_REDUCE);
+    }
     pTriggerStep->orconf = orconf;
   }
   sqlite3ExprListDelete(db, pEList);
   sqlite3ExprDelete(db, pWhere);
   return pTriggerStep;
@@ -129365,21 +130374,27 @@
 ** Construct a trigger step that implements a DELETE statement and return
 ** a pointer to that trigger step.  The parser calls this routine when it
 ** sees a DELETE statement inside the body of a CREATE TRIGGER.
 */
 SQLITE_PRIVATE TriggerStep *sqlite3TriggerDeleteStep(
-  sqlite3 *db,            /* Database connection */
+  Parse *pParse,          /* Parser */
   Token *pTableName,      /* The table from which rows are deleted */
   Expr *pWhere,           /* The WHERE clause */
   const char *zStart,     /* Start of SQL text */
   const char *zEnd        /* End of SQL text */
 ){
+  sqlite3 *db = pParse->db;
   TriggerStep *pTriggerStep;
 
-  pTriggerStep = triggerStepAllocate(db, TK_DELETE, pTableName, zStart, zEnd);
+  pTriggerStep = triggerStepAllocate(pParse, TK_DELETE, pTableName,zStart,zEnd);
   if( pTriggerStep ){
-    pTriggerStep->pWhere = sqlite3ExprDup(db, pWhere, EXPRDUP_REDUCE);
+    if( IN_RENAME_OBJECT ){
+      pTriggerStep->pWhere = pWhere;
+      pWhere = 0;
+    }else{
+      pTriggerStep->pWhere = sqlite3ExprDup(db, pWhere, EXPRDUP_REDUCE);
+    }
     pTriggerStep->orconf = OE_Default;
   }
   sqlite3ExprDelete(db, pWhere);
   return pTriggerStep;
 }
@@ -131184,14 +132199,16 @@
   int iCur              /* Cursor for pIdx (or pTab if pIdx==NULL) */
 ){
   Vdbe *v = pParse->pVdbe;
   sqlite3 *db = pParse->db;
   SrcList *pSrc;            /* FROM clause for the UPDATE */
-  int iDataCur = pUpsert->iDataCur;
+  int iDataCur;
 
   assert( v!=0 );
+  assert( pUpsert!=0 );
   VdbeNoopComment((v, "Begin DO UPDATE of UPSERT"));
+  iDataCur = pUpsert->iDataCur;
   if( pIdx && iCur!=iDataCur ){
     if( HasRowid(pTab) ){
       int regRowid = sqlite3GetTempReg(pParse);
       sqlite3VdbeAddOp2(v, OP_IdxRowid, iCur, regRowid);
       sqlite3VdbeAddOp3(v, OP_SeekRowid, iDataCur, 0, regRowid);
@@ -132371,11 +133388,11 @@
   }
   pTab = pCtx->pTab;
   assert( IsVirtual(pTab) );
 
   memset(&sParse, 0, sizeof(sParse));
-  sParse.declareVtab = 1;
+  sParse.eParseMode = PARSE_MODE_DECLARE_VTAB;
   sParse.db = db;
   sParse.nQueryLoop = 1;
   if( SQLITE_OK==sqlite3RunParser(&sParse, zCreateTable, &zErr) 
    && sParse.pNewTable
    && !db->mallocFailed
@@ -132412,11 +133429,11 @@
   }else{
     sqlite3ErrorWithMsg(db, SQLITE_ERROR, (zErr ? "%s" : 0), zErr);
     sqlite3DbFree(db, zErr);
     rc = SQLITE_ERROR;
   }
-  sParse.declareVtab = 0;
+  sParse.eParseMode = PARSE_MODE_NORMAL;
 
   if( sParse.pVdbe ){
     sqlite3VdbeFinalize(sParse.pVdbe);
   }
   sqlite3DeleteTable(db, sParse.pNewTable);
@@ -134310,11 +135327,11 @@
 ** an access of the index rather than the original table.
 */
 static int codeCursorHintFixExpr(Walker *pWalker, Expr *pExpr){
   int rc = WRC_Continue;
   struct CCurHint *pHint = pWalker->u.pCCurHint;
-  if( pExpr->op==TK_COLUMN && !ExprHasProperty(pExpr, EP_FixedCol) ){
+  if( pExpr->op==TK_COLUMN ){
     if( pExpr->iTable!=pHint->iTabCur ){
       Vdbe *v = pWalker->pParse->pVdbe;
       int reg = ++pWalker->pParse->nMem;   /* Register for column value */
       sqlite3ExprCodeGetColumnOfTable(
           v, pExpr->pTab, pExpr->iTable, pExpr->iColumn, reg
@@ -135897,27 +136914,10 @@
   }else if( op==TK_STRING ){
     z = (u8*)pRight->u.zToken;
   }
   if( z ){
 
-    /* If the RHS begins with a digit or a minus sign, then the LHS must
-    ** be an ordinary column (not a virtual table column) with TEXT affinity.
-    ** Otherwise the LHS might be numeric and "lhs >= rhs" would be false
-    ** even though "lhs LIKE rhs" is true.  But if the RHS does not start
-    ** with a digit or '-', then "lhs LIKE rhs" will always be false if
-    ** the LHS is numeric and so the optimization still works.
-    */
-    if( sqlite3Isdigit(z[0]) || z[0]=='-' ){
-      if( pLeft->op!=TK_COLUMN 
-       || sqlite3ExprAffinity(pLeft)!=SQLITE_AFF_TEXT 
-       || IsVirtual(pLeft->pTab)  /* Value might be numeric */
-      ){
-        sqlite3ValueFree(pVal);
-        return 0;
-      }
-    }
-
     /* Count the number of prefix characters prior to the first wildcard */
     cnt = 0;
     while( (c=z[cnt])!=0 && c!=wc[0] && c!=wc[1] && c!=wc[2] ){
       cnt++;
       if( c==wc[3] && z[cnt]!=0 ) cnt++;
@@ -135946,10 +136946,36 @@
         for(iFrom=iTo=0; iFrom<cnt; iFrom++){
           if( zNew[iFrom]==wc[3] ) iFrom++;
           zNew[iTo++] = zNew[iFrom];
         }
         zNew[iTo] = 0;
+
+        /* If the RHS begins with a digit or a minus sign, then the LHS must be
+        ** an ordinary column (not a virtual table column) with TEXT affinity.
+        ** Otherwise the LHS might be numeric and "lhs >= rhs" would be false
+        ** even though "lhs LIKE rhs" is true.  But if the RHS does not start
+        ** with a digit or '-', then "lhs LIKE rhs" will always be false if
+        ** the LHS is numeric and so the optimization still works.
+        **
+        ** 2018-09-10 ticket c94369cae9b561b1f996d0054bfab11389f9d033
+        ** The RHS pattern must not be '/%' because the termination condition
+        ** will then become "x<'0'" and if the affinity is numeric, will then
+        ** be converted into "x<0", which is incorrect.
+        */
+        if( sqlite3Isdigit(zNew[0])
+         || zNew[0]=='-'
+         || (zNew[0]+1=='0' && iTo==1)
+        ){
+          if( pLeft->op!=TK_COLUMN 
+           || sqlite3ExprAffinity(pLeft)!=SQLITE_AFF_TEXT 
+           || IsVirtual(pLeft->pTab)  /* Value might be numeric */
+          ){
+            sqlite3ExprDelete(db, pPrefix);
+            sqlite3ValueFree(pVal);
+            return 0;
+          }
+        }
       }
       *ppPrefix = pPrefix;
 
       /* If the RHS pattern is a bound parameter, make arrangements to
       ** reprepare the statement when that parameter is rebound */
@@ -136007,10 +137033,11 @@
 ** of virtual table in forms (5) or (7) then return 2.
 **
 ** If the expression matches none of the patterns above, return 0.
 */
 static int isAuxiliaryVtabOperator(
+  sqlite3 *db,                    /* Parsing context */
   Expr *pExpr,                    /* Test this expression */
   unsigned char *peOp2,           /* OUT: 0 for MATCH, or else an op2 value */
   Expr **ppLeft,                  /* Column expression to left of MATCH/op2 */
   Expr **ppRight                  /* Expression to left of MATCH/op2 */
 ){
@@ -136030,20 +137057,58 @@
 
     pList = pExpr->x.pList;
     if( pList==0 || pList->nExpr!=2 ){
       return 0;
     }
+
+    /* Built-in operators MATCH, GLOB, LIKE, and REGEXP attach to a
+    ** virtual table on their second argument, which is the same as
+    ** the left-hand side operand in their in-fix form.
+    **
+    **       vtab_column MATCH expression
+    **       MATCH(expression,vtab_column)
+    */
     pCol = pList->a[1].pExpr;
-    if( pCol->op!=TK_COLUMN || !IsVirtual(pCol->pTab) ){
-      return 0;
-    }
-    for(i=0; i<ArraySize(aOp); i++){
-      if( sqlite3StrICmp(pExpr->u.zToken, aOp[i].zOp)==0 ){
-        *peOp2 = aOp[i].eOp2;
-        *ppRight = pList->a[0].pExpr;
-        *ppLeft = pCol;
-        return 1;
+    if( pCol->op==TK_COLUMN && IsVirtual(pCol->pTab) ){
+      for(i=0; i<ArraySize(aOp); i++){
+        if( sqlite3StrICmp(pExpr->u.zToken, aOp[i].zOp)==0 ){
+          *peOp2 = aOp[i].eOp2;
+          *ppRight = pList->a[0].pExpr;
+          *ppLeft = pCol;
+          return 1;
+        }
+      }
+    }
+
+    /* We can also match against the first column of overloaded
+    ** functions where xFindFunction returns a value of at least
+    ** SQLITE_INDEX_CONSTRAINT_FUNCTION.
+    **
+    **      OVERLOADED(vtab_column,expression)
+    **
+    ** Historically, xFindFunction expected to see lower-case function
+    ** names.  But for this use case, xFindFunction is expected to deal
+    ** with function names in an arbitrary case.
+    */
+    pCol = pList->a[0].pExpr;
+    if( pCol->op==TK_COLUMN && IsVirtual(pCol->pTab) ){
+      sqlite3_vtab *pVtab;
+      sqlite3_module *pMod;
+      void (*xNotUsed)(sqlite3_context*,int,sqlite3_value**);
+      void *pNotUsed;
+      pVtab = sqlite3GetVTable(db, pCol->pTab)->pVtab;
+      assert( pVtab!=0 );
+      assert( pVtab->pModule!=0 );
+      pMod = (sqlite3_module *)pVtab->pModule;
+      if( pMod->xFindFunction!=0 ){
+        i = pMod->xFindFunction(pVtab,2, pExpr->u.zToken, &xNotUsed, &pNotUsed);
+        if( i>=SQLITE_INDEX_CONSTRAINT_FUNCTION ){
+          *peOp2 = i;
+          *ppRight = pList->a[1].pExpr;
+          *ppLeft = pCol;
+          return 1;
+        }
       }
     }
   }else if( pExpr->op==TK_NE || pExpr->op==TK_ISNOT || pExpr->op==TK_NOTNULL ){
     int res = 0;
     Expr *pLeft = pExpr->pLeft;
@@ -136487,11 +137552,11 @@
         assert( !ExprHasProperty(pNew, EP_xIsSelect) );
         pNew->x.pList = pList;
         idxNew = whereClauseInsert(pWC, pNew, TERM_VIRTUAL|TERM_DYNAMIC);
         testcase( idxNew==0 );
         exprAnalyze(pSrc, pWC, idxNew);
-        pTerm = &pWC->a[idxTerm];
+        /* pTerm = &pWC->a[idxTerm]; // would be needed if pTerm where used again */
         markTermAsChild(pWC, idxNew, idxTerm);
       }else{
         sqlite3ExprListDelete(db, pList);
       }
     }
@@ -136904,11 +137969,11 @@
   ** virtual tables.  The native query optimizer does not attempt
   ** to do anything with MATCH functions.
   */
   if( pWC->op==TK_AND ){
     Expr *pRight = 0, *pLeft = 0;
-    int res = isAuxiliaryVtabOperator(pExpr, &eOp2, &pLeft, &pRight);
+    int res = isAuxiliaryVtabOperator(db, pExpr, &eOp2, &pLeft, &pRight);
     while( res-- > 0 ){
       int idxNew;
       WhereTerm *pNewTerm;
       Bitmask prereqColumn, prereqExpr;
 
@@ -137280,19 +138345,42 @@
 SQLITE_PRIVATE int sqlite3WhereIsOrdered(WhereInfo *pWInfo){
   return pWInfo->nOBSat;
 }
 
 /*
-** Return TRUE if the innermost loop of the WHERE clause implementation
-** returns rows in ORDER BY order for complete run of the inner loop.
+** In the ORDER BY LIMIT optimization, if the inner-most loop is known
+** to emit rows in increasing order, and if the last row emitted by the
+** inner-most loop did not fit within the sorter, then we can skip all
+** subsequent rows for the current iteration of the inner loop (because they
+** will not fit in the sorter either) and continue with the second inner
+** loop - the loop immediately outside the inner-most.
 **
-** Across multiple iterations of outer loops, the output rows need not be
-** sorted.  As long as rows are sorted for just the innermost loop, this
-** routine can return TRUE.
+** When a row does not fit in the sorter (because the sorter already
+** holds LIMIT+OFFSET rows that are smaller), then a jump is made to the
+** label returned by this function.
+**
+** If the ORDER BY LIMIT optimization applies, the jump destination should
+** be the continuation for the second-inner-most loop.  If the ORDER BY
+** LIMIT optimization does not apply, then the jump destination should
+** be the continuation for the inner-most loop.
+**
+** It is always safe for this routine to return the continuation of the
+** inner-most loop, in the sense that a correct answer will result.  
+** Returning the continuation the second inner loop is an optimization
+** that might make the code run a little faster, but should not change
+** the final answer.
 */
-SQLITE_PRIVATE int sqlite3WhereOrderedInnerLoop(WhereInfo *pWInfo){
-  return pWInfo->bOrderedInnerLoop;
+SQLITE_PRIVATE int sqlite3WhereOrderByLimitOptLabel(WhereInfo *pWInfo){
+  WhereLevel *pInner;
+  if( !pWInfo->bOrderedInnerLoop ){
+    /* The ORDER BY LIMIT optimization does not apply.  Jump to the 
+    ** continuation of the inner-most loop. */
+    return pWInfo->iContinue;
+  }
+  pInner = &pWInfo->a[pWInfo->nLevel-1];
+  assert( pInner->addrNxt!=0 );
+  return pInner->addrNxt;
 }
 
 /*
 ** Return the VDBE address or label to jump to in order to continue
 ** immediately with the next row of a WHERE clause.
@@ -138156,10 +139244,24 @@
     testcase( pTerm->eOperator & WO_IS );
     testcase( pTerm->eOperator & WO_ISNULL );
     testcase( pTerm->eOperator & WO_ALL );
     if( (pTerm->eOperator & ~(WO_EQUIV))==0 ) continue;
     if( pTerm->wtFlags & TERM_VNULL ) continue;
+    if( (pSrc->fg.jointype & JT_LEFT)!=0
+     && !ExprHasProperty(pTerm->pExpr, EP_FromJoin)
+     && (pTerm->eOperator & (WO_IS|WO_ISNULL))
+    ){
+      /* An "IS" term in the WHERE clause where the virtual table is the rhs
+      ** of a LEFT JOIN. Do not pass this term to the virtual table
+      ** implementation, as this can lead to incorrect results from SQL such
+      ** as:
+      **
+      **   "LEFT JOIN vtab WHERE vtab.col IS NULL"  */
+      testcase( pTerm->eOperator & WO_ISNULL );
+      testcase( pTerm->eOperator & WO_IS );
+      continue;
+    }
     assert( pTerm->u.leftColumn>=(-1) );
     pIdxCons[j].iColumn = pTerm->u.leftColumn;
     pIdxCons[j].iTermOffset = i;
     op = pTerm->eOperator & WO_ALL;
     if( op==WO_IN ) op = WO_EQ;
@@ -141461,10 +142563,11 @@
                  WHERE_DISTINCTBY, nLoop-1, pFrom->aLoop[nLoop-1], &notUsed);
     if( rc==pWInfo->pResultSet->nExpr ){
       pWInfo->eDistinct = WHERE_DISTINCT_ORDERED;
     }
   }
+  pWInfo->bOrderedInnerLoop = 0;
   if( pWInfo->pOrderBy ){
     if( pWInfo->wctrlFlags & WHERE_DISTINCTBY ){
       if( pFrom->isOrdered==pWInfo->pOrderBy->nExpr ){
         pWInfo->eDistinct = WHERE_DISTINCT_ORDERED;
       }
@@ -144864,14 +145967,25 @@
   ** that created the expression.
   */
   static Expr *tokenExpr(Parse *pParse, int op, Token t){
     Expr *p = sqlite3DbMallocRawNN(pParse->db, sizeof(Expr)+t.n+1);
     if( p ){
-      memset(p, 0, sizeof(Expr));
+      /* memset(p, 0, sizeof(Expr)); */
       p->op = (u8)op;
+      p->affinity = 0;
       p->flags = EP_Leaf;
       p->iAgg = -1;
+      p->pLeft = p->pRight = 0;
+      p->x.pList = 0;
+      p->pAggInfo = 0;
+      p->pTab = 0;
+      p->op2 = 0;
+      p->iTable = 0;
+      p->iColumn = 0;
+#ifndef SQLITE_OMIT_WINDOWFUNC
+      p->pWin = 0;
+#endif
       p->u.zToken = (char*)&p[1];
       memcpy(p->u.zToken, t.z, t.n);
       p->u.zToken[t.n] = 0;
       if( sqlite3Isquote(p->u.zToken[0]) ){
         if( p->u.zToken[0]=='"' ) p->flags |= EP_DblQuoted;
@@ -144878,19 +145992,23 @@
         sqlite3Dequote(p->u.zToken);
       }
 #if SQLITE_MAX_EXPR_DEPTH>0
       p->nHeight = 1;
 #endif  
+      if( IN_RENAME_OBJECT ){
+        return (Expr*)sqlite3RenameTokenMap(pParse, (void*)p, &t);
+      }
     }
     return p;
   }
+
 
   /* A routine to convert a binary TK_IS or TK_ISNOT expression into a
   ** unary TK_ISNULL or TK_NOTNULL expression. */
   static void binaryToUnaryIfNull(Parse *pParse, Expr *pY, Expr *pA, int op){
     sqlite3 *db = pParse->db;
-    if( pA && pY && pY->op==TK_NULL ){
+    if( pA && pY && pY->op==TK_NULL && !IN_RENAME_OBJECT ){
       pA->op = (u8)op;
       sqlite3ExprDelete(db, pA->pRight);
       pA->pRight = 0;
     }
   }
@@ -145014,21 +146132,21 @@
 #define sqlite3ParserCTX_PDECL ,Parse *pParse
 #define sqlite3ParserCTX_PARAM ,pParse
 #define sqlite3ParserCTX_FETCH Parse *pParse=yypParser->pParse;
 #define sqlite3ParserCTX_STORE yypParser->pParse=pParse;
 #define YYFALLBACK 1
-#define YYNSTATE             518
-#define YYNRULE              366
+#define YYNSTATE             521
+#define YYNRULE              367
 #define YYNTOKEN             155
-#define YY_MAX_SHIFT         517
-#define YY_MIN_SHIFTREDUCE   752
-#define YY_MAX_SHIFTREDUCE   1117
-#define YY_ERROR_ACTION      1118
-#define YY_ACCEPT_ACTION     1119
-#define YY_NO_ACTION         1120
-#define YY_MIN_REDUCE        1121
-#define YY_MAX_REDUCE        1486
+#define YY_MAX_SHIFT         520
+#define YY_MIN_SHIFTREDUCE   756
+#define YY_MAX_SHIFTREDUCE   1122
+#define YY_ERROR_ACTION      1123
+#define YY_ACCEPT_ACTION     1124
+#define YY_NO_ACTION         1125
+#define YY_MIN_REDUCE        1126
+#define YY_MAX_REDUCE        1492
 /************* End control #defines *******************************************/
 #define YY_NLOOKAHEAD ((int)(sizeof(yy_lookahead)/sizeof(yy_lookahead[0])))
 
 /* Define the yytestcase() macro to be a no-op if is not already defined
 ** otherwise.
@@ -145093,211 +146211,211 @@
 **  yy_default[]       Default action for each state.
 **
 *********** Begin parsing tables **********************************************/
 #define YY_ACTTAB_COUNT (2009)
 static const YYACTIONTYPE yy_action[] = {
- /*     0 */   365,  105,  102,  197,  105,  102,  197,  512, 1119,    1,
- /*    10 */     1,  517,    2, 1123,  512, 1187, 1166, 1450,  272,  367,
- /*    20 */   127, 1384, 1192, 1192, 1187, 1161,  178, 1200,   64,   64,
- /*    30 */   474,  883,  319,  425,  345,   37,   37,  804,  359,  884,
- /*    40 */   506,  506,  506,  112,  113,  103, 1095, 1095,  949,  952,
- /*    50 */   942,  942,  110,  110,  111,  111,  111,  111,  362,  250,
- /*    60 */   250,  512,  250,  250,  494,  512,  306,  512,  456,  512,
- /*    70 */  1074,  488,  509,  475,    6,  509,  805,  134,  495,  226,
- /*    80 */   194,  425,   37,   37,  512,  206,   64,   64,   64,   64,
+ /*     0 */   368,  105,  102,  197,  105,  102,  197,  515, 1124,    1,
+ /*    10 */     1,  520,    2, 1128,  515, 1192, 1171, 1456,  275,  370,
+ /*    20 */   127, 1389, 1197, 1197, 1192, 1166,  178, 1205,   64,   64,
+ /*    30 */   477,  887,  322,  428,  348,   37,   37,  808,  362,  888,
+ /*    40 */   509,  509,  509,  112,  113,  103, 1100, 1100,  953,  956,
+ /*    50 */   946,  946,  110,  110,  111,  111,  111,  111,  365,  252,
+ /*    60 */   252,  515,  252,  252,  497,  515,  309,  515,  459,  515,
+ /*    70 */  1079,  491,  512,  478,    6,  512,  809,  134,  498,  228,
+ /*    80 */   194,  428,   37,   37,  515,  208,   64,   64,   64,   64,
  /*    90 */    13,   13,  109,  109,  109,  109,  108,  108,  107,  107,
- /*   100 */   107,  106,  398,  255,  378,   13,   13,  395,  394,  425,
- /*   110 */   250,  250,  367,  473,  402, 1099, 1074, 1075, 1076,  383,
- /*   120 */  1101,  387,  494,  509,  494, 1417, 1413,  301, 1100,  304,
- /*   130 */  1251,  493,  367,  496,   16,   16,  112,  113,  103, 1095,
- /*   140 */  1095,  949,  952,  942,  942,  110,  110,  111,  111,  111,
- /*   150 */   111,  259, 1102,  492, 1102,  398,  112,  113,  103, 1095,
- /*   160 */  1095,  949,  952,  942,  942,  110,  110,  111,  111,  111,
- /*   170 */   111,  129, 1419,  340, 1414,  336, 1054,  489, 1052,  260,
- /*   180 */    73,  105,  102,  197,  990,  109,  109,  109,  109,  108,
- /*   190 */   108,  107,  107,  107,  106,  398,  367,  111,  111,  111,
- /*   200 */   111,  104,  489,   89, 1426,  109,  109,  109,  109,  108,
- /*   210 */   108,  107,  107,  107,  106,  398,  111,  111,  111,  111,
- /*   220 */   112,  113,  103, 1095, 1095,  949,  952,  942,  942,  110,
+ /*   100 */   107,  106,  401,  258,  381,   13,   13,  398,  397,  428,
+ /*   110 */   252,  252,  370,  476,  405, 1104, 1079, 1080, 1081,  386,
+ /*   120 */  1106,  390,  497,  512,  497, 1423, 1419,  304, 1105,  307,
+ /*   130 */  1256,  496,  370,  499,   16,   16,  112,  113,  103, 1100,
+ /*   140 */  1100,  953,  956,  946,  946,  110,  110,  111,  111,  111,
+ /*   150 */   111,  262, 1107,  495, 1107,  401,  112,  113,  103, 1100,
+ /*   160 */  1100,  953,  956,  946,  946,  110,  110,  111,  111,  111,
+ /*   170 */   111,  129, 1425,  343, 1420,  339, 1059,  492, 1057,  263,
+ /*   180 */    73,  105,  102,  197,  994,  109,  109,  109,  109,  108,
+ /*   190 */   108,  107,  107,  107,  106,  401,  370,  111,  111,  111,
+ /*   200 */   111,  104,  492,   89, 1432,  109,  109,  109,  109,  108,
+ /*   210 */   108,  107,  107,  107,  106,  401,  111,  111,  111,  111,
+ /*   220 */   112,  113,  103, 1100, 1100,  953,  956,  946,  946,  110,
  /*   230 */   110,  111,  111,  111,  111,  109,  109,  109,  109,  108,
- /*   240 */   108,  107,  107,  107,  106,  398,  114,  108,  108,  107,
- /*   250 */   107,  107,  106,  398,  109,  109,  109,  109,  108,  108,
- /*   260 */   107,  107,  107,  106,  398,  152,  396,  396,  396,  109,
- /*   270 */   109,  109,  109,  108,  108,  107,  107,  107,  106,  398,
- /*   280 */   178,  490, 1406,  431, 1032, 1480, 1074,  512, 1480,  367,
- /*   290 */   418,  294,  354,  409,   74, 1074,  109,  109,  109,  109,
- /*   300 */   108,  108,  107,  107,  107,  106,  398, 1407,   37,   37,
- /*   310 */  1425,  271,  503,  112,  113,  103, 1095, 1095,  949,  952,
- /*   320 */   942,  942,  110,  110,  111,  111,  111,  111, 1430,  517,
- /*   330 */     2, 1123, 1074, 1075, 1076,  427,  272, 1074,  127,  363,
- /*   340 */   929, 1074, 1075, 1076,  218, 1200,  909,  455,  452,  451,
- /*   350 */   389,  167,  512, 1030,  152,  442,  920,  450,  152,  870,
- /*   360 */   919,  286,  109,  109,  109,  109,  108,  108,  107,  107,
- /*   370 */   107,  106,  398,   13,   13,  258,  849,  250,  250,  225,
- /*   380 */   106,  398,  367, 1074, 1075, 1076,  308,  385, 1074,  293,
- /*   390 */   509,  919,  919,  921,  229,  320, 1250, 1383, 1417,  487,
- /*   400 */   271,  503,   12,  206,  271,  503,  112,  113,  103, 1095,
- /*   410 */  1095,  949,  952,  942,  942,  110,  110,  111,  111,  111,
- /*   420 */   111, 1434,  283, 1123,  285, 1074, 1092,  245,  272, 1093,
- /*   430 */   127,  384,  402,  386, 1074, 1075, 1076, 1200,  159,  236,
- /*   440 */   253,  318,  458,  313,  457,  223,  786,  105,  102,  197,
- /*   450 */   510,  311,  838,  838,  442,  109,  109,  109,  109,  108,
- /*   460 */   108,  107,  107,  107,  106,  398,  512,  511,  512,  250,
- /*   470 */   250, 1074, 1075, 1076,  432,  367, 1093,  929, 1454,  790,
- /*   480 */   271,  503,  509,  105,  102,  197,  333,   63,   63,   64,
- /*   490 */    64,   27,  786,  920,  284,  206, 1349,  919,  512,  112,
- /*   500 */   113,  103, 1095, 1095,  949,  952,  942,  942,  110,  110,
- /*   510 */   111,  111,  111,  111,  107,  107,  107,  106,  398,   49,
- /*   520 */    49,  512,   28, 1074,  402,  494,  418,  294,  919,  919,
- /*   530 */   921,  186,  465, 1074,  464,  995,  995,  439,  512, 1074,
- /*   540 */   331,  512,   45,   45, 1078,  339,  173,  168,  109,  109,
- /*   550 */   109,  109,  108,  108,  107,  107,  107,  106,  398,   13,
- /*   560 */    13,  203,   13,   13,  250,  250, 1190, 1190,  367, 1074,
- /*   570 */  1075, 1076,  783,  262,    5,  356,  491,  509,  466, 1074,
- /*   580 */  1075, 1076,  395,  394, 1074, 1074, 1075, 1076,    3,  279,
- /*   590 */  1074, 1078,  112,  113,  103, 1095, 1095,  949,  952,  942,
- /*   600 */   942,  110,  110,  111,  111,  111,  111,  250,  250, 1011,
- /*   610 */   218, 1074,  869,  455,  452,  451,  939,  939,  950,  953,
- /*   620 */   509,  250,  250,  450, 1012, 1074,  442, 1102, 1204, 1102,
- /*   630 */  1074, 1075, 1076,  512,  509,  423, 1074, 1075, 1076, 1013,
- /*   640 */   509,  109,  109,  109,  109,  108,  108,  107,  107,  107,
- /*   650 */   106,  398, 1047,  512,   50,   50,  512, 1074, 1075, 1076,
- /*   660 */   824,  367, 1046,  376,  408, 1059, 1353,  205,  405,  769,
- /*   670 */   825, 1074, 1075, 1076,   64,   64,  319,   64,   64, 1297,
- /*   680 */   943,  408,  407, 1353, 1355,  112,  113,  103, 1095, 1095,
- /*   690 */   949,  952,  942,  942,  110,  110,  111,  111,  111,  111,
- /*   700 */   291,  479,  512, 1032, 1481,  512,  431, 1481,  351, 1115,
- /*   710 */   480,  992,  909,  482,  463,  992,  132,  178,   33,  447,
- /*   720 */  1198,  136,  403,   64,   64,  476,   64,   64,  416,  366,
- /*   730 */   280, 1141,  250,  250,  109,  109,  109,  109,  108,  108,
- /*   740 */   107,  107,  107,  106,  398,  509,  222,  437,  408,  263,
- /*   750 */  1353,  263,  250,  250,  367,  293,  413,  281,  930,  393,
- /*   760 */   972,  467,  397,  250,  250,  509,    9,  470,  229,  497,
- /*   770 */   351, 1031, 1030, 1482,  352,  371,  509, 1116,  112,  113,
- /*   780 */   103, 1095, 1095,  949,  952,  942,  942,  110,  110,  111,
- /*   790 */   111,  111,  111,  250,  250, 1011,  512, 1342,  292,  250,
- /*   800 */   250,  250,  250, 1093,  372,  247,  509,  442,  868,  319,
- /*   810 */  1012,  477,  509,  195,  509,  431,  270,   15,   15,  512,
- /*   820 */   311,  512,   95,  512,   93, 1013,  364,  109,  109,  109,
- /*   830 */   109,  108,  108,  107,  107,  107,  106,  398,  512, 1116,
- /*   840 */    39,   39,   51,   51,   52,   52,  500,  367,  512, 1199,
- /*   850 */  1093,  914,  436,  338,  133,  433,  221,  220,  219,   53,
- /*   860 */    53,  319, 1392,  757,  758,  759,  512,  367,   88,   54,
- /*   870 */    54,  112,  113,  103, 1095, 1095,  949,  952,  942,  942,
- /*   880 */   110,  110,  111,  111,  111,  111,  274,   55,   55,  196,
- /*   890 */   512,  112,  113,  103, 1095, 1095,  949,  952,  942,  942,
- /*   900 */   110,  110,  111,  111,  111,  111,  135,  261, 1144,  373,
- /*   910 */   512,   40,   40,  512,  868,  512,  989,  512,  989,  116,
+ /*   240 */   108,  107,  107,  107,  106,  401,  114,  108,  108,  107,
+ /*   250 */   107,  107,  106,  401,  109,  109,  109,  109,  108,  108,
+ /*   260 */   107,  107,  107,  106,  401,  152,  399,  399,  399,  109,
+ /*   270 */   109,  109,  109,  108,  108,  107,  107,  107,  106,  401,
+ /*   280 */   178,  493, 1412,  434, 1037, 1486, 1079,  515, 1486,  370,
+ /*   290 */   421,  297,  357,  412,   74, 1079,  109,  109,  109,  109,
+ /*   300 */   108,  108,  107,  107,  107,  106,  401, 1413,   37,   37,
+ /*   310 */  1431,  274,  506,  112,  113,  103, 1100, 1100,  953,  956,
+ /*   320 */   946,  946,  110,  110,  111,  111,  111,  111, 1436,  520,
+ /*   330 */     2, 1128, 1079, 1080, 1081,  430,  275, 1079,  127,  366,
+ /*   340 */   933, 1079, 1080, 1081,  220, 1205,  913,  458,  455,  454,
+ /*   350 */   392,  167,  515, 1035,  152,  445,  924,  453,  152,  874,
+ /*   360 */   923,  289,  109,  109,  109,  109,  108,  108,  107,  107,
+ /*   370 */   107,  106,  401,   13,   13,  261,  853,  252,  252,  227,
+ /*   380 */   106,  401,  370, 1079, 1080, 1081,  311,  388, 1079,  296,
+ /*   390 */   512,  923,  923,  925,  231,  323, 1255, 1388, 1423,  490,
+ /*   400 */   274,  506,   12,  208,  274,  506,  112,  113,  103, 1100,
+ /*   410 */  1100,  953,  956,  946,  946,  110,  110,  111,  111,  111,
+ /*   420 */   111, 1440,  286, 1128,  288, 1079, 1097,  247,  275, 1098,
+ /*   430 */   127,  387,  405,  389, 1079, 1080, 1081, 1205,  159,  238,
+ /*   440 */   255,  321,  461,  316,  460,  225,  790,  105,  102,  197,
+ /*   450 */   513,  314,  842,  842,  445,  109,  109,  109,  109,  108,
+ /*   460 */   108,  107,  107,  107,  106,  401,  515,  514,  515,  252,
+ /*   470 */   252, 1079, 1080, 1081,  435,  370, 1098,  933, 1460,  794,
+ /*   480 */   274,  506,  512,  105,  102,  197,  336,   63,   63,   64,
+ /*   490 */    64,   27,  790,  924,  287,  208, 1354,  923,  515,  112,
+ /*   500 */   113,  103, 1100, 1100,  953,  956,  946,  946,  110,  110,
+ /*   510 */   111,  111,  111,  111,  107,  107,  107,  106,  401,   49,
+ /*   520 */    49,  515,   28, 1079,  405,  497,  421,  297,  923,  923,
+ /*   530 */   925,  186,  468, 1079,  467,  999,  999,  442,  515, 1079,
+ /*   540 */   334,  515,   45,   45, 1083,  342,  173,  168,  109,  109,
+ /*   550 */   109,  109,  108,  108,  107,  107,  107,  106,  401,   13,
+ /*   560 */    13,  205,   13,   13,  252,  252, 1195, 1195,  370, 1079,
+ /*   570 */  1080, 1081,  787,  265,    5,  359,  494,  512,  469, 1079,
+ /*   580 */  1080, 1081,  398,  397, 1079, 1079, 1080, 1081,    3,  282,
+ /*   590 */  1079, 1083,  112,  113,  103, 1100, 1100,  953,  956,  946,
+ /*   600 */   946,  110,  110,  111,  111,  111,  111,  252,  252, 1015,
+ /*   610 */   220, 1079,  873,  458,  455,  454,  943,  943,  954,  957,
+ /*   620 */   512,  252,  252,  453, 1016, 1079,  445, 1107, 1209, 1107,
+ /*   630 */  1079, 1080, 1081,  515,  512,  426, 1079, 1080, 1081, 1017,
+ /*   640 */   512,  109,  109,  109,  109,  108,  108,  107,  107,  107,
+ /*   650 */   106,  401, 1052,  515,   50,   50,  515, 1079, 1080, 1081,
+ /*   660 */   828,  370, 1051,  379,  411, 1064, 1358,  207,  408,  773,
+ /*   670 */   829, 1079, 1080, 1081,   64,   64,  322,   64,   64, 1302,
+ /*   680 */   947,  411,  410, 1358, 1360,  112,  113,  103, 1100, 1100,
+ /*   690 */   953,  956,  946,  946,  110,  110,  111,  111,  111,  111,
+ /*   700 */   294,  482,  515, 1037, 1487,  515,  434, 1487,  354, 1120,
+ /*   710 */   483,  996,  913,  485,  466,  996,  132,  178,   33,  450,
+ /*   720 */  1203,  136,  406,   64,   64,  479,   64,   64,  419,  369,
+ /*   730 */   283, 1146,  252,  252,  109,  109,  109,  109,  108,  108,
+ /*   740 */   107,  107,  107,  106,  401,  512,  224,  440,  411,  266,
+ /*   750 */  1358,  266,  252,  252,  370,  296,  416,  284,  934,  396,
+ /*   760 */   976,  470,  400,  252,  252,  512,    9,  473,  231,  500,
+ /*   770 */   354, 1036, 1035, 1488,  355,  374,  512, 1121,  112,  113,
+ /*   780 */   103, 1100, 1100,  953,  956,  946,  946,  110,  110,  111,
+ /*   790 */   111,  111,  111,  252,  252, 1015,  515, 1347,  295,  252,
+ /*   800 */   252,  252,  252, 1098,  375,  249,  512,  445,  872,  322,
+ /*   810 */  1016,  480,  512,  195,  512,  434,  273,   15,   15,  515,
+ /*   820 */   314,  515,   95,  515,   93, 1017,  367,  109,  109,  109,
+ /*   830 */   109,  108,  108,  107,  107,  107,  106,  401,  515, 1121,
+ /*   840 */    39,   39,   51,   51,   52,   52,  503,  370,  515, 1204,
+ /*   850 */  1098,  918,  439,  341,  133,  436,  223,  222,  221,   53,
+ /*   860 */    53,  322, 1400,  761,  762,  763,  515,  370,   88,   54,
+ /*   870 */    54,  112,  113,  103, 1100, 1100,  953,  956,  946,  946,
+ /*   880 */   110,  110,  111,  111,  111,  111,  407,   55,   55,  196,
+ /*   890 */   515,  112,  113,  103, 1100, 1100,  953,  956,  946,  946,
+ /*   900 */   110,  110,  111,  111,  111,  111,  135,  264, 1149,  376,
+ /*   910 */   515,   40,   40,  515,  872,  515,  993,  515,  993,  116,
  /*   920 */   109,  109,  109,  109,  108,  108,  107,  107,  107,  106,
- /*   930 */   398,   41,   41,  512,   43,   43,   44,   44,   56,   56,
+ /*   930 */   401,   41,   41,  515,   43,   43,   44,   44,   56,   56,
  /*   940 */   109,  109,  109,  109,  108,  108,  107,  107,  107,  106,
- /*   950 */   398,  512,  376,  512,   57,   57,  512,  795,  512,  376,
- /*   960 */   512,  442,  793,  512,  320,  512,  275,  512, 1453,  512,
- /*   970 */  1282,  813,   58,   58,   14,   14,  512,   59,   59,  118,
- /*   980 */   118,   60,   60,  512,   46,   46,   61,   61,   62,   62,
- /*   990 */    47,   47,  512,  190,  189,   91,  512,  140,  140,  512,
- /*  1000 */   391,  512,  844, 1195,  141,  141,  512,  843,  512,  793,
- /*  1010 */   512,  410,  512,   69,   69,  367,  278,   48,   48,  256,
- /*  1020 */    65,   65,  119,  119,  244,  244,  257,   66,   66,  120,
- /*  1030 */   120,  121,  121,  117,  117,  367,  512,  509,  380,  112,
- /*  1040 */   113,  103, 1095, 1095,  949,  952,  942,  942,  110,  110,
- /*  1050 */   111,  111,  111,  111,  512,  868,  512,  139,  139,  112,
- /*  1060 */   113,  103, 1095, 1095,  949,  952,  942,  942,  110,  110,
- /*  1070 */   111,  111,  111,  111, 1282,  138,  138,  125,  125,  512,
- /*  1080 */    12,  512, 1351, 1282,  512,  442,  131, 1282,  109,  109,
- /*  1090 */   109,  109,  108,  108,  107,  107,  107,  106,  398,  512,
- /*  1100 */   124,  124,  122,  122,  512,  123,  123,  512,  109,  109,
- /*  1110 */   109,  109,  108,  108,  107,  107,  107,  106,  398,  512,
- /*  1120 */    68,   68,  460,  779,  512,   70,   70,  299,   67,   67,
- /*  1130 */  1027,  251,  251,  353, 1282,  191,  196, 1427,  462, 1296,
- /*  1140 */    38,   38,  381,   94,  509,   42,   42,  177,  844,  271,
- /*  1150 */   503,  382,  417,  843,  420,  438,  505,  373,  374,  153,
- /*  1160 */   252,  868,  429,  367,  222,  249,  194,  883,  182,  290,
- /*  1170 */   779,  988,   88,  988,  463,  884,  906,  911,  424,  426,
- /*  1180 */   228,  228,  228,  367,   17,  803,  802,  112,  113,  103,
- /*  1190 */  1095, 1095,  949,  952,  942,  942,  110,  110,  111,  111,
- /*  1200 */   111,  111,  392,  295,  810,  811,   88,  112,  101,  103,
- /*  1210 */  1095, 1095,  949,  952,  942,  942,  110,  110,  111,  111,
- /*  1220 */   111,  111,  372,  419,  448,  309,  979,  224,   88,  975,
- /*  1230 */   877,  841,  224,  228,  100,  923,  109,  109,  109,  109,
- /*  1240 */   108,  108,  107,  107,  107,  106,  398,   86,  430,  777,
- /*  1250 */   842, 1236,  130,  100, 1235,  412,  109,  109,  109,  109,
- /*  1260 */   108,  108,  107,  107,  107,  106,  398,  317, 1443, 1397,
- /*  1270 */  1170,  287, 1169,  979, 1372, 1371,  367,  316,  434,  296,
- /*  1280 */  1232, 1223,  923,  300,  303,  305,  307, 1183, 1168, 1167,
- /*  1290 */   312,  321,  322, 1244, 1281, 1219,  367,  268, 1230,  499,
- /*  1300 */   498,  113,  103, 1095, 1095,  949,  952,  942,  942,  110,
- /*  1310 */   110,  111,  111,  111,  111, 1287, 1150,  443,  242,  184,
- /*  1320 */  1216, 1143,  103, 1095, 1095,  949,  952,  942,  942,  110,
- /*  1330 */   110,  111,  111,  111,  111, 1132, 1131, 1133, 1437,  350,
- /*  1340 */   411,  324,  188,   98,  504,  289,    4,  326,  315,  109,
- /*  1350 */   109,  109,  109,  108,  108,  107,  107,  107,  106,  398,
- /*  1360 */   507,  328, 1266, 1274,  358,  453,  282,  192, 1346,  109,
- /*  1370 */   109,  109,  109,  108,  108,  107,  107,  107,  106,  398,
- /*  1380 */    11, 1166, 1345,  399, 1440,  330,  502, 1110,  231,  428,
- /*  1390 */  1391,  343,  187,   98,  504,  501,    4, 1107, 1389,  375,
- /*  1400 */   422,  155,   72,  165,   75,  152,  149,   86,  414, 1263,
- /*  1410 */   507,  157,  415,  160,  929,  161,  162,  163,  446, 1271,
- /*  1420 */    96,   96,    8,   30,  208, 1277,  357,   97,  355,  399,
- /*  1430 */   514,  513,  421,  399,  919,   31,  169,  435, 1340,  212,
- /*  1440 */    80,  441,  243,  214, 1360,  501,  298,  174,  444,  302,
- /*  1450 */   215,  271,  503, 1134,  216,  360,  485,  459,  388, 1186,
- /*  1460 */   361,  484, 1185,  795,  929,  919,  919,  921,  922,   24,
- /*  1470 */    96,   96, 1184, 1158, 1177,  314, 1157,   97, 1176,  399,
- /*  1480 */   514,  513,  469, 1156,  919, 1452,  390,  266,   98,  504,
- /*  1490 */   267,    4,  472,  478,  483,   85, 1227,  333,  230,  492,
- /*  1500 */  1408,  332,  323,  115,   10,  507, 1228,  181,  335,   98,
- /*  1510 */   504,  337,    4,   92,   87,  919,  919,  921,  922,   24,
- /*  1520 */  1429, 1063,  401, 1226,  481,  254,  507,  325,  399,  327,
- /*  1530 */   349,  349,  348,  239,  346, 1225,  329,  766, 1209, 1326,
- /*  1540 */   501,  183, 1208,  341,  269,  342,  237, 1069, 1140,  399,
- /*  1550 */   199,  485,  277,   29,  515,  241,  486,  238,  516,  929,
- /*  1560 */   276,  501,  240, 1129, 1124,   96,   96, 1376,  142,  154,
- /*  1570 */   369,  370,   97,  143,  399,  514,  513, 1377,  128,  919,
- /*  1580 */   929, 1375,  144,  753,  400, 1374,   96,   96,  848, 1154,
- /*  1590 */   201, 1153,  185,   97,  264,  399,  514,  513,  202,   71,
- /*  1600 */   919,  146, 1151,  273,  198,  404,  126,  987,  200,  985,
- /*  1610 */   919,  919,  921,  922,   24,  903,  156,  145,  204,  158,
- /*  1620 */   827,   98,  504,  288,    4,  207, 1001,  164,  147,  907,
- /*  1630 */   377,  919,  919,  921,  922,   24,  379,  148,  507,  166,
- /*  1640 */    76,   77,  368, 1004,   78,   79,  209,  271,  503,  210,
- /*  1650 */  1000,  137,   18,  297,  211,  228,  440, 1104,  213,  171,
- /*  1660 */    32,  399,  768,  993,  170,  316,  445,  217,  449,  806,
- /*  1670 */   406,  310,  172,  501,   81,   19,   20,  454,   82,   83,
- /*  1680 */   265,  150,  179,  461,  485,  151,  180,  955,   84,  484,
- /*  1690 */  1035,   34,  929,   35,  468, 1036,  193,  471,   96,   96,
- /*  1700 */   246,  248,  876,  175,  871,   97,  100,  399,  514,  513,
- /*  1710 */  1063,  401,  919,  227,  254, 1053,   21,   22, 1049,  349,
- /*  1720 */   349,  348,  239,  346, 1040,  176,  766,  334, 1051,    7,
- /*  1730 */    88,   98,  504,  970,    4,  233,   23,  956,  954,  199,
- /*  1740 */   958,  277, 1010,  919,  919,  921,  922,   24,  507,  276,
- /*  1750 */   232, 1009,  959,   25,   36,  508,  924,  778,   99,   26,
- /*  1760 */   347,   90,  504,  837,    4,  234,  344,  235, 1445, 1064,
- /*  1770 */  1120,  399, 1120, 1444, 1120, 1120, 1120, 1120,  507,  201,
- /*  1780 */  1120, 1120, 1120,  501, 1120, 1120, 1120,  202, 1120, 1120,
- /*  1790 */   146, 1120, 1120, 1120, 1120, 1120, 1120,  200, 1120, 1120,
- /*  1800 */  1120,  399,  929, 1120, 1120, 1120, 1120, 1120,   96,   96,
- /*  1810 */  1120, 1120, 1120,  501, 1120,   97, 1120,  399,  514,  513,
- /*  1820 */  1120, 1120,  919, 1120, 1120, 1120, 1120, 1120, 1120, 1120,
- /*  1830 */  1120,  368,  929, 1120, 1120, 1120,  271,  503,   96,   96,
- /*  1840 */  1120, 1120, 1120, 1120, 1120,   97, 1120,  399,  514,  513,
- /*  1850 */  1120, 1120,  919,  919,  919,  921,  922,   24, 1120,  406,
- /*  1860 */  1120, 1120, 1120,  254, 1120, 1120, 1120, 1120,  349,  349,
- /*  1870 */   348,  239,  346, 1120, 1120,  766, 1120, 1120, 1120, 1120,
- /*  1880 */  1120, 1120, 1120,  919,  919,  921,  922,   24,  199, 1120,
- /*  1890 */   277, 1120, 1120, 1120, 1120, 1120, 1120, 1120,  276, 1120,
- /*  1900 */  1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120,
- /*  1910 */  1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120,
- /*  1920 */  1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120,  201, 1120,
- /*  1930 */  1120, 1120, 1120, 1120, 1120, 1120,  202, 1120, 1120,  146,
- /*  1940 */  1120, 1120, 1120, 1120, 1120, 1120,  200, 1120, 1120, 1120,
- /*  1950 */  1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120,
- /*  1960 */  1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120,
- /*  1970 */  1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120,
- /*  1980 */   368, 1120, 1120, 1120, 1120,  271,  503, 1120, 1120, 1120,
- /*  1990 */  1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120,
- /*  2000 */  1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120,  406,
+ /*   950 */   401,  515,  379,  515,   57,   57,  515,  799,  515,  379,
+ /*   960 */   515,  445,  200,  515,  323,  515, 1397,  515, 1459,  515,
+ /*   970 */  1287,  817,   58,   58,   14,   14,  515,   59,   59,  118,
+ /*   980 */   118,   60,   60,  515,   46,   46,   61,   61,   62,   62,
+ /*   990 */    47,   47,  515,  190,  189,   91,  515,  140,  140,  515,
+ /*  1000 */   394,  515,  277, 1200,  141,  141,  515, 1115,  515,  992,
+ /*  1010 */   515,  992,  515,   69,   69,  370,  278,   48,   48,  259,
+ /*  1020 */    65,   65,  119,  119,  246,  246,  260,   66,   66,  120,
+ /*  1030 */   120,  121,  121,  117,  117,  370,  515,  512,  383,  112,
+ /*  1040 */   113,  103, 1100, 1100,  953,  956,  946,  946,  110,  110,
+ /*  1050 */   111,  111,  111,  111,  515,  872,  515,  139,  139,  112,
+ /*  1060 */   113,  103, 1100, 1100,  953,  956,  946,  946,  110,  110,
+ /*  1070 */   111,  111,  111,  111, 1287,  138,  138,  125,  125,  515,
+ /*  1080 */    12,  515,  281, 1287,  515,  445,  131, 1287,  109,  109,
+ /*  1090 */   109,  109,  108,  108,  107,  107,  107,  106,  401,  515,
+ /*  1100 */   124,  124,  122,  122,  515,  123,  123,  515,  109,  109,
+ /*  1110 */   109,  109,  108,  108,  107,  107,  107,  106,  401,  515,
+ /*  1120 */    68,   68,  463,  783,  515,   70,   70,  302,   67,   67,
+ /*  1130 */  1032,  253,  253,  356, 1287,  191,  196, 1433,  465, 1301,
+ /*  1140 */    38,   38,  384,   94,  512,   42,   42,  177,  848,  274,
+ /*  1150 */   506,  385,  420,  847, 1356,  441,  508,  376,  377,  153,
+ /*  1160 */   423,  872,  432,  370,  224,  251,  194,  887,  182,  293,
+ /*  1170 */   783,  848,   88,  254,  466,  888,  847,  915,  807,  806,
+ /*  1180 */   230, 1241,  910,  370,   17,  413,  797,  112,  113,  103,
+ /*  1190 */  1100, 1100,  953,  956,  946,  946,  110,  110,  111,  111,
+ /*  1200 */   111,  111,  395,  814,  815, 1175,  983,  112,  101,  103,
+ /*  1210 */  1100, 1100,  953,  956,  946,  946,  110,  110,  111,  111,
+ /*  1220 */   111,  111,  375,  422,  427,  429,  298,  230,  230,   88,
+ /*  1230 */  1240,  451,  312,  797,  226,   88,  109,  109,  109,  109,
+ /*  1240 */   108,  108,  107,  107,  107,  106,  401,   86,  433,  979,
+ /*  1250 */   927,  881,  226,  983,  230,  415,  109,  109,  109,  109,
+ /*  1260 */   108,  108,  107,  107,  107,  106,  401,  320,  845,  781,
+ /*  1270 */   846,  100,  130,  100, 1403,  290,  370,  319, 1377, 1376,
+ /*  1280 */   437, 1449,  299, 1237,  303,  306,  308,  310, 1188, 1174,
+ /*  1290 */  1173, 1172,  315,  324,  325, 1228,  370,  927, 1249,  271,
+ /*  1300 */  1286,  113,  103, 1100, 1100,  953,  956,  946,  946,  110,
+ /*  1310 */   110,  111,  111,  111,  111, 1224, 1235,  502,  501, 1292,
+ /*  1320 */  1221, 1155,  103, 1100, 1100,  953,  956,  946,  946,  110,
+ /*  1330 */   110,  111,  111,  111,  111, 1148, 1137, 1136, 1138, 1443,
+ /*  1340 */   446,  244,  184,   98,  507,  188,    4,  353,  327,  109,
+ /*  1350 */   109,  109,  109,  108,  108,  107,  107,  107,  106,  401,
+ /*  1360 */   510,  329,  331,  199,  414,  456,  292,  285,  318,  109,
+ /*  1370 */   109,  109,  109,  108,  108,  107,  107,  107,  106,  401,
+ /*  1380 */    11, 1271, 1279,  402,  361,  192, 1171, 1351,  431,  505,
+ /*  1390 */   346, 1350,  333,   98,  507,  504,    4,  187, 1446, 1115,
+ /*  1400 */   233, 1396,  155, 1394, 1112,  152,   72,   75,  378,  425,
+ /*  1410 */   510,  165,  149,  157,  933, 1276,   86,   30, 1268,  417,
+ /*  1420 */    96,   96,    8,  160,  161,  162,  163,   97,  418,  402,
+ /*  1430 */   517,  516,  449,  402,  923,  210,  358,  424, 1282,  438,
+ /*  1440 */   169,  214,  360, 1345,   80,  504,   31,  444, 1365,  301,
+ /*  1450 */   245,  274,  506,  216,  174,  305,  488,  447,  217,  462,
+ /*  1460 */  1139,  487,  218,  363,  933,  923,  923,  925,  926,   24,
+ /*  1470 */    96,   96, 1191, 1190, 1189,  391, 1182,   97, 1163,  402,
+ /*  1480 */   517,  516,  799,  364,  923, 1162,  317, 1161,   98,  507,
+ /*  1490 */  1181,    4, 1458,  472,  393,  269,  270,  475,  481, 1232,
+ /*  1500 */    85, 1233,  326,  328,  232,  510,  495, 1231,  330,   98,
+ /*  1510 */   507, 1230,    4,  486,  335,  923,  923,  925,  926,   24,
+ /*  1520 */  1435, 1068,  404,  181,  336,  256,  510,  115,  402,  332,
+ /*  1530 */   352,  352,  351,  241,  349, 1214, 1414,  770,  338,   10,
+ /*  1540 */   504,  340,  272,   92, 1331, 1213,   87,  183,  484,  402,
+ /*  1550 */   201,  488,  280,  239,  344,  345,  489, 1145,   29,  933,
+ /*  1560 */   279,  504, 1074,  518,  240,   96,   96,  242,  243,  519,
+ /*  1570 */  1134, 1129,   97,  154,  402,  517,  516,  372,  373,  923,
+ /*  1580 */   933,  142,  143,  128, 1381,  267,   96,   96,  852,  757,
+ /*  1590 */   203,  144,  403,   97, 1382,  402,  517,  516,  204, 1380,
+ /*  1600 */   923,  146, 1379, 1159, 1158,   71, 1156,  276,  202,  185,
+ /*  1610 */   923,  923,  925,  926,   24,  198,  257,  126,  991,  989,
+ /*  1620 */   907,   98,  507,  156,    4,  145,  158,  206,  831,  209,
+ /*  1630 */   291,  923,  923,  925,  926,   24, 1005,  911,  510,  164,
+ /*  1640 */   147,  380,  371,  382,  166,   76,   77,  274,  506,  148,
+ /*  1650 */    78,   79, 1008,  211,  212, 1004,  137,  213,   18,  300,
+ /*  1660 */   230,  402,  997, 1109,  443,  215,   32,  170,  171,  772,
+ /*  1670 */   409,  448,  319,  504,  219,  172,  452,   81,   19,  457,
+ /*  1680 */   313,   20,   82,  268,  488,  150,  810,  179,   83,  487,
+ /*  1690 */   464,  151,  933,  180,  959,   84, 1040,   34,   96,   96,
+ /*  1700 */   471, 1041,   35,  474,  193,   97,  248,  402,  517,  516,
+ /*  1710 */  1068,  404,  923,  250,  256,  880,  229,  175,  875,  352,
+ /*  1720 */   352,  351,  241,  349,  100,   21,  770,   22, 1054, 1056,
+ /*  1730 */     7,   98,  507, 1045,    4,  337, 1058,   23,  974,  201,
+ /*  1740 */   176,  280,   88,  923,  923,  925,  926,   24,  510,  279,
+ /*  1750 */   960,  958,  962, 1014,  963, 1013,  235,  234,   25,   36,
+ /*  1760 */    99,   90,  507,  928,    4,  511,  350,  782,   26,  841,
+ /*  1770 */   236,  402,  347, 1069,  237, 1125, 1125, 1451,  510,  203,
+ /*  1780 */  1450, 1125, 1125,  504, 1125, 1125, 1125,  204, 1125, 1125,
+ /*  1790 */   146, 1125, 1125, 1125, 1125, 1125, 1125,  202, 1125, 1125,
+ /*  1800 */  1125,  402,  933, 1125, 1125, 1125, 1125, 1125,   96,   96,
+ /*  1810 */  1125, 1125, 1125,  504, 1125,   97, 1125,  402,  517,  516,
+ /*  1820 */  1125, 1125,  923, 1125, 1125, 1125, 1125, 1125, 1125, 1125,
+ /*  1830 */  1125,  371,  933, 1125, 1125, 1125,  274,  506,   96,   96,
+ /*  1840 */  1125, 1125, 1125, 1125, 1125,   97, 1125,  402,  517,  516,
+ /*  1850 */  1125, 1125,  923,  923,  923,  925,  926,   24, 1125,  409,
+ /*  1860 */  1125, 1125, 1125,  256, 1125, 1125, 1125, 1125,  352,  352,
+ /*  1870 */   351,  241,  349, 1125, 1125,  770, 1125, 1125, 1125, 1125,
+ /*  1880 */  1125, 1125, 1125,  923,  923,  925,  926,   24,  201, 1125,
+ /*  1890 */   280, 1125, 1125, 1125, 1125, 1125, 1125, 1125,  279, 1125,
+ /*  1900 */  1125, 1125, 1125, 1125, 1125, 1125, 1125, 1125, 1125, 1125,
+ /*  1910 */  1125, 1125, 1125, 1125, 1125, 1125, 1125, 1125, 1125, 1125,
+ /*  1920 */  1125, 1125, 1125, 1125, 1125, 1125, 1125, 1125,  203, 1125,
+ /*  1930 */  1125, 1125, 1125, 1125, 1125, 1125,  204, 1125, 1125,  146,
+ /*  1940 */  1125, 1125, 1125, 1125, 1125, 1125,  202, 1125, 1125, 1125,
+ /*  1950 */  1125, 1125, 1125, 1125, 1125, 1125, 1125, 1125, 1125, 1125,
+ /*  1960 */  1125, 1125, 1125, 1125, 1125, 1125, 1125, 1125, 1125, 1125,
+ /*  1970 */  1125, 1125, 1125, 1125, 1125, 1125, 1125, 1125, 1125, 1125,
+ /*  1980 */   371, 1125, 1125, 1125, 1125,  274,  506, 1125, 1125, 1125,
+ /*  1990 */  1125, 1125, 1125, 1125, 1125, 1125, 1125, 1125, 1125, 1125,
+ /*  2000 */  1125, 1125, 1125, 1125, 1125, 1125, 1125, 1125,  409,
 };
 static const YYCODETYPE yy_lookahead[] = {
  /*     0 */   184,  238,  239,  240,  238,  239,  240,  163,  155,  156,
  /*    10 */   157,  158,  159,  160,  163,  191,  192,  183,  165,   19,
  /*    20 */   167,  258,  202,  203,  200,  191,  163,  174,  184,  185,
@@ -145392,16 +146510,16 @@
  /*   910 */   163,  184,  185,  163,  132,  163,  141,  163,  143,   22,
  /*   920 */    92,   93,   94,   95,   96,   97,   98,   99,  100,  101,
  /*   930 */   102,  184,  185,  163,  184,  185,  184,  185,  184,  185,
  /*   940 */    92,   93,   94,   95,   96,   97,   98,   99,  100,  101,
  /*   950 */   102,  163,  163,  163,  184,  185,  163,  115,  163,  163,
- /*   960 */   163,  163,   59,  163,  163,  163,  163,  163,   23,  163,
+ /*   960 */   163,  163,   15,  163,  163,  163,  163,  163,   23,  163,
  /*   970 */   163,   26,  184,  185,  184,  185,  163,  184,  185,  184,
  /*   980 */   185,  184,  185,  163,  184,  185,  184,  185,  184,  185,
  /*   990 */   184,  185,  163,   96,   97,  147,  163,  184,  185,  163,
- /*  1000 */   199,  163,  124,  205,  184,  185,  163,  129,  163,  106,
- /*  1010 */   163,  234,  163,  184,  185,   19,  163,  184,  185,  230,
+ /*  1000 */   199,  163,  163,  205,  184,  185,  163,   60,  163,  141,
+ /*  1010 */   163,  143,  163,  184,  185,   19,  163,  184,  185,  230,
  /*  1020 */   184,  185,  184,  185,  206,  207,  230,  184,  185,  184,
  /*  1030 */   185,  184,  185,  184,  185,   19,  163,  219,  231,   43,
  /*  1040 */    44,   45,   46,   47,   48,   49,   50,   51,   52,   53,
  /*  1050 */    54,   55,   56,   57,  163,   26,  163,  184,  185,   43,
  /*  1060 */    44,   45,   46,   47,   48,   49,   50,   51,   52,   53,
@@ -145411,74 +146529,74 @@
  /*  1100 */   184,  185,  184,  185,  163,  184,  185,  163,   92,   93,
  /*  1110 */    94,   95,   96,   97,   98,   99,  100,  101,  102,  163,
  /*  1120 */   184,  185,   98,   59,  163,  184,  185,  205,  184,  185,
  /*  1130 */    23,  206,  207,   26,  163,   26,  107,  153,  154,  237,
  /*  1140 */   184,  185,  231,  147,  219,  184,  185,  249,  124,  127,
- /*  1150 */   128,  231,  254,  129,  118,  231,  177,  178,  262,  263,
- /*  1160 */    22,  132,   19,   19,   46,  223,  224,   31,   24,   23,
- /*  1170 */   106,  141,   26,  143,  272,   39,  140,   23,   23,   23,
- /*  1180 */    26,   26,   26,   19,   22,  109,  110,   43,   44,   45,
+ /*  1150 */   128,  231,  254,  129,  163,  231,  177,  178,  262,  263,
+ /*  1160 */   118,  132,   19,   19,   46,  223,  224,   31,   24,   23,
+ /*  1170 */   106,  124,   26,   22,  272,   39,  129,   23,  109,  110,
+ /*  1180 */    26,  163,  140,   19,   22,  234,   59,   43,   44,   45,
  /*  1190 */    46,   47,   48,   49,   50,   51,   52,   53,   54,   55,
- /*  1200 */    56,   57,  231,   23,    7,    8,   26,   43,   44,   45,
+ /*  1200 */    56,   57,  231,    7,    8,  193,   59,   43,   44,   45,
  /*  1210 */    46,   47,   48,   49,   50,   51,   52,   53,   54,   55,
- /*  1220 */    56,   57,  104,   61,   23,   23,   59,   26,   26,   23,
- /*  1230 */    23,   23,   26,   26,   26,   59,   92,   93,   94,   95,
+ /*  1220 */    56,   57,  104,   61,   23,   23,   23,   26,   26,   26,
+ /*  1230 */   163,   23,   23,  106,   26,   26,   92,   93,   94,   95,
  /*  1240 */    96,   97,   98,   99,  100,  101,  102,  138,  105,   23,
- /*  1250 */    23,  163,   26,   26,  163,  163,   92,   93,   94,   95,
- /*  1260 */    96,   97,   98,   99,  100,  101,  102,  110,  130,  163,
- /*  1270 */   193,  163,  193,  106,  163,  163,   19,  120,  163,  163,
- /*  1280 */   163,  225,  106,  163,  163,  163,  163,  163,  193,  163,
- /*  1290 */   163,  163,  163,  163,  163,  163,   19,  222,  163,  203,
+ /*  1250 */    59,   23,   26,  106,   26,  163,   92,   93,   94,   95,
+ /*  1260 */    96,   97,   98,   99,  100,  101,  102,  110,   23,   23,
+ /*  1270 */    23,   26,   26,   26,  163,  163,   19,  120,  163,  163,
+ /*  1280 */   163,  130,  163,  163,  163,  163,  163,  163,  163,  193,
+ /*  1290 */   193,  163,  163,  163,  163,  225,   19,  106,  163,  222,
  /*  1300 */   163,   44,   45,   46,   47,   48,   49,   50,   51,   52,
- /*  1310 */    53,   54,   55,   56,   57,  163,  163,  251,  250,  209,
+ /*  1310 */    53,   54,   55,   56,   57,  163,  163,  203,  163,  163,
  /*  1320 */   222,  163,   45,   46,   47,   48,   49,   50,   51,   52,
- /*  1330 */    53,   54,   55,   56,   57,  163,  163,  163,  163,  161,
- /*  1340 */   226,  222,  182,   19,   20,  256,   22,  222,  187,   92,
+ /*  1330 */    53,   54,   55,   56,   57,  163,  163,  163,  163,  163,
+ /*  1340 */   251,  250,  209,   19,   20,  182,   22,  161,  222,   92,
  /*  1350 */    93,   94,   95,   96,   97,   98,   99,  100,  101,  102,
- /*  1360 */    36,  222,  213,  213,  213,  188,  226,  196,  187,   92,
+ /*  1360 */    36,  222,  222,  260,  226,  188,  256,  226,  187,   92,
  /*  1370 */    93,   94,   95,   96,   97,   98,   99,  100,  101,  102,
- /*  1380 */   210,  192,  187,   59,  166,  226,  244,   60,  130,  256,
- /*  1390 */   170,  212,  210,   19,   20,   71,   22,   38,  170,  170,
- /*  1400 */   104,  260,  257,   22,  257,   81,   43,  138,   18,  213,
- /*  1410 */    36,  201,  170,  204,   90,  204,  204,  204,   18,  236,
- /*  1420 */    96,   97,   48,  235,  169,  201,  236,  103,  213,  105,
- /*  1430 */   106,  107,  213,   59,  110,  235,  201,  170,  213,  169,
- /*  1440 */   146,   62,  170,  169,  253,   71,  252,   22,  189,  170,
- /*  1450 */   169,  127,  128,  170,  169,  189,   82,  104,   64,  186,
- /*  1460 */   189,   87,  186,  115,   90,  141,  142,  143,  144,  145,
- /*  1470 */    96,   97,  186,  186,  194,  186,  188,  103,  194,  105,
- /*  1480 */   106,  107,  189,  186,  110,  186,  102,  246,   19,   20,
- /*  1490 */   246,   22,  189,  133,   84,  104,  228,   22,  170,  134,
- /*  1500 */   269,  271,  227,  137,   22,   36,  228,  216,  216,   19,
- /*  1510 */    20,  170,   22,  146,  136,  141,  142,  143,  144,  145,
- /*  1520 */     0,    1,    2,  228,  135,    5,   36,  227,   59,  227,
- /*  1530 */    10,   11,   12,   13,   14,  228,  227,   17,  217,  241,
- /*  1540 */    71,  215,  217,  214,  243,  213,   25,   13,  173,   59,
- /*  1550 */    30,   82,   32,   26,  172,    6,   87,  164,  162,   90,
- /*  1560 */    40,   71,  164,  162,  162,   96,   97,  182,  176,  263,
- /*  1570 */   266,  266,  103,  176,  105,  106,  107,  182,  190,  110,
- /*  1580 */    90,  182,  176,    4,    3,  182,   96,   97,   98,  182,
- /*  1590 */    70,  182,   22,  103,  190,  105,  106,  107,   78,  182,
- /*  1600 */   110,   81,  182,  151,   15,   89,   16,   23,   88,   23,
- /*  1610 */   141,  142,  143,  144,  145,  128,  139,  119,   24,  131,
- /*  1620 */    20,   19,   20,   16,   22,  133,    1,  131,  119,  140,
- /*  1630 */    61,  141,  142,  143,  144,  145,   37,  119,   36,  139,
- /*  1640 */    53,   53,  122,  105,   53,   53,   34,  127,  128,  130,
- /*  1650 */     1,    5,   22,  149,  104,   26,   41,   75,  130,  104,
- /*  1660 */    24,   59,   20,   68,   68,  120,   19,  114,   67,   28,
- /*  1670 */   150,   23,   22,   71,   22,   22,   22,   67,   22,  138,
- /*  1680 */    67,   37,   23,   22,   82,  153,   23,   23,   26,   87,
- /*  1690 */    23,   22,   90,   22,   24,   23,  130,   24,   96,   97,
- /*  1700 */    23,   23,  105,   22,  132,  103,   26,  105,  106,  107,
- /*  1710 */     1,    2,  110,   34,    5,   75,   34,   34,   85,   10,
- /*  1720 */    11,   12,   13,   14,   23,   26,   17,   24,   83,   44,
- /*  1730 */    26,   19,   20,   23,   22,   22,   34,   23,   23,   30,
- /*  1740 */    23,   32,   23,  141,  142,  143,  144,  145,   36,   40,
- /*  1750 */    26,   23,   11,   22,   22,   26,   23,   23,   22,   22,
- /*  1760 */    15,   19,   20,  124,   22,  130,   23,  130,  130,    1,
- /*  1770 */   277,   59,  277,  130,  277,  277,  277,  277,   36,   70,
- /*  1780 */   277,  277,  277,   71,  277,  277,  277,   78,  277,  277,
+ /*  1380 */   210,  213,  213,   59,  213,  196,  192,  187,  256,  244,
+ /*  1390 */   212,  187,  226,   19,   20,   71,   22,  210,  166,   60,
+ /*  1400 */   130,  170,  260,  170,   38,   81,  257,  257,  170,  104,
+ /*  1410 */    36,   22,   43,  201,   90,  236,  138,  235,  213,   18,
+ /*  1420 */    96,   97,   48,  204,  204,  204,  204,  103,  170,  105,
+ /*  1430 */   106,  107,   18,   59,  110,  169,  213,  213,  201,  170,
+ /*  1440 */   201,  169,  236,  213,  146,   71,  235,   62,  253,  252,
+ /*  1450 */   170,  127,  128,  169,   22,  170,   82,  189,  169,  104,
+ /*  1460 */   170,   87,  169,  189,   90,  141,  142,  143,  144,  145,
+ /*  1470 */    96,   97,  186,  186,  186,   64,  194,  103,  186,  105,
+ /*  1480 */   106,  107,  115,  189,  110,  188,  186,  186,   19,   20,
+ /*  1490 */   194,   22,  186,  189,  102,  246,  246,  189,  133,  228,
+ /*  1500 */   104,  228,  227,  227,  170,   36,  134,  228,  227,   19,
+ /*  1510 */    20,  228,   22,   84,  271,  141,  142,  143,  144,  145,
+ /*  1520 */     0,    1,    2,  216,   22,    5,   36,  137,   59,  227,
+ /*  1530 */    10,   11,   12,   13,   14,  217,  269,   17,  216,   22,
+ /*  1540 */    71,  170,  243,  146,  241,  217,  136,  215,  135,   59,
+ /*  1550 */    30,   82,   32,   25,  214,  213,   87,  173,   26,   90,
+ /*  1560 */    40,   71,   13,  172,  164,   96,   97,  164,    6,  162,
+ /*  1570 */   162,  162,  103,  263,  105,  106,  107,  266,  266,  110,
+ /*  1580 */    90,  176,  176,  190,  182,  190,   96,   97,   98,    4,
+ /*  1590 */    70,  176,    3,  103,  182,  105,  106,  107,   78,  182,
+ /*  1600 */   110,   81,  182,  182,  182,  182,  182,  151,   88,   22,
+ /*  1610 */   141,  142,  143,  144,  145,   15,   89,   16,   23,   23,
+ /*  1620 */   128,   19,   20,  139,   22,  119,  131,   24,   20,  133,
+ /*  1630 */    16,  141,  142,  143,  144,  145,    1,  140,   36,  131,
+ /*  1640 */   119,   61,  122,   37,  139,   53,   53,  127,  128,  119,
+ /*  1650 */    53,   53,  105,   34,  130,    1,    5,  104,   22,  149,
+ /*  1660 */    26,   59,   68,   75,   41,  130,   24,   68,  104,   20,
+ /*  1670 */   150,   19,  120,   71,  114,   22,   67,   22,   22,   67,
+ /*  1680 */    23,   22,   22,   67,   82,   37,   28,   23,  138,   87,
+ /*  1690 */    22,  153,   90,   23,   23,   26,   23,   22,   96,   97,
+ /*  1700 */    24,   23,   22,   24,  130,  103,   23,  105,  106,  107,
+ /*  1710 */     1,    2,  110,   23,    5,  105,   34,   22,  132,   10,
+ /*  1720 */    11,   12,   13,   14,   26,   34,   17,   34,   85,   83,
+ /*  1730 */    44,   19,   20,   23,   22,   24,   75,   34,   23,   30,
+ /*  1740 */    26,   32,   26,  141,  142,  143,  144,  145,   36,   40,
+ /*  1750 */    23,   23,   23,   23,   11,   23,   22,   26,   22,   22,
+ /*  1760 */    22,   19,   20,   23,   22,   26,   15,   23,   22,  124,
+ /*  1770 */   130,   59,   23,    1,  130,  277,  277,  130,   36,   70,
+ /*  1780 */   130,  277,  277,   71,  277,  277,  277,   78,  277,  277,
  /*  1790 */    81,  277,  277,  277,  277,  277,  277,   88,  277,  277,
  /*  1800 */   277,   59,   90,  277,  277,  277,  277,  277,   96,   97,
  /*  1810 */   277,  277,  277,   71,  277,  103,  277,  105,  106,  107,
  /*  1820 */   277,  277,  110,  277,  277,  277,  277,  277,  277,  277,
  /*  1830 */   277,  122,   90,  277,  277,  277,  127,  128,   96,   97,
@@ -145499,11 +146617,11 @@
  /*  1980 */   122,  277,  277,  277,  277,  127,  128,  277,  277,  277,
  /*  1990 */   277,  277,  277,  277,  277,  277,  277,  277,  277,  277,
  /*  2000 */   277,  277,  277,  277,  277,  277,  277,  277,  150,  277,
  /*  2010 */   277,  277,  277,  277,  277,  277,  277,  277,  277,
 };
-#define YY_SHIFT_COUNT    (517)
+#define YY_SHIFT_COUNT    (520)
 #define YY_SHIFT_MIN      (0)
 #define YY_SHIFT_MAX      (1858)
 static const unsigned short int yy_shift_ofst[] = {
  /*     0 */  1709, 1520, 1858, 1324, 1324,  277, 1374, 1469, 1602, 1712,
  /*    10 */  1712, 1712,  273,    0,    0,  113, 1016, 1712, 1712, 1712,
@@ -145523,46 +146641,47 @@
  /*   150 */   597,  464,  474,  262,  681,  531,  531,  531,  531,  531,
  /*   160 */   531,  531,  531,  531,  531,  531,  531,  531,  531,  531,
  /*   170 */   531,  531,  531,  531,  531,  531,  531,  173,  485,  984,
  /*   180 */   984,  576,  485,   19, 1022, 2009, 2009, 2009,  387,  250,
  /*   190 */   250,  525,  502,  278,  552,  227,  480,  566,  531,  531,
- /*   200 */   531,  531,  531,  531,  531,  531,  639,  531,  531,  531,
- /*   210 */   531,  531,  531,  531,  531,  531,  531,  531,  531,    2,
- /*   220 */     2,    2,  531,  531,  531,  531,  782,  531,  531,  531,
- /*   230 */   744,  531,  531,  783,  531,  531,  531,  531,  531,  531,
- /*   240 */   531,  531,  419,  682,  327,  370,  370,  370,  370, 1029,
- /*   250 */   327,  327, 1024,  897,  856, 1109,  706,  706, 1143, 1109,
- /*   260 */  1109, 1143,  842,  945, 1118, 1136, 1136, 1136,  706,  676,
- /*   270 */   400,  878,  694, 1327, 1258, 1258, 1359, 1359, 1258, 1296,
- /*   280 */  1381, 1363, 1269, 1390, 1390, 1390, 1390, 1258, 1400, 1269,
- /*   290 */  1269, 1296, 1381, 1363, 1363, 1269, 1258, 1400, 1294, 1379,
- /*   300 */  1258, 1400, 1425, 1258, 1400, 1258, 1400, 1425, 1353, 1353,
- /*   310 */  1353, 1394, 1425, 1353, 1348, 1353, 1394, 1353, 1353, 1425,
- /*   320 */  1384, 1384, 1425, 1360, 1391, 1360, 1391, 1360, 1391, 1360,
- /*   330 */  1391, 1258, 1365, 1410, 1475, 1366, 1365, 1482, 1258, 1367,
- /*   340 */  1366, 1378, 1389, 1269, 1521, 1527, 1534, 1534, 1549, 1549,
- /*   350 */  1549, 2009, 2009, 2009, 2009, 2009, 2009, 2009, 2009, 2009,
- /*   360 */  2009, 2009, 2009, 2009, 2009, 2009, 2009,  570,  345,  686,
- /*   370 */   748,   50,  740, 1064, 1107,  469,  537, 1036, 1146, 1162,
- /*   380 */  1154, 1155, 1156, 1180, 1201, 1202,  903, 1076, 1197, 1157,
- /*   390 */  1167, 1206, 1207, 1208,  775, 1030, 1226, 1227, 1176, 1138,
- /*   400 */  1579, 1581, 1570, 1452, 1589, 1516, 1590, 1584, 1586, 1487,
- /*   410 */  1477, 1498, 1594, 1488, 1600, 1492, 1607, 1625, 1496, 1489,
- /*   420 */  1509, 1569, 1599, 1500, 1587, 1588, 1591, 1592, 1518, 1538,
- /*   430 */  1612, 1519, 1649, 1646, 1630, 1550, 1504, 1595, 1629, 1596,
- /*   440 */  1582, 1615, 1528, 1555, 1636, 1642, 1647, 1545, 1553, 1650,
- /*   450 */  1601, 1652, 1653, 1648, 1654, 1610, 1641, 1656, 1613, 1644,
- /*   460 */  1659, 1541, 1661, 1532, 1663, 1664, 1662, 1667, 1669, 1670,
- /*   470 */  1672, 1671, 1673, 1566, 1677, 1678, 1597, 1679, 1681, 1572,
- /*   480 */  1680, 1682, 1680, 1683, 1633, 1640, 1645, 1685, 1701, 1703,
- /*   490 */  1699, 1704, 1702, 1710, 1680, 1714, 1715, 1717, 1719, 1724,
- /*   500 */  1728, 1713, 1741, 1731, 1732, 1733, 1734, 1736, 1737, 1729,
- /*   510 */  1639, 1635, 1637, 1638, 1643, 1743, 1745, 1768,
+ /*   200 */   531,  531,  531,  531,  531,  531,  531,  531,  639,  531,
+ /*   210 */   531,  531,  531,  531,  531,  531,  531,  531,  531,  531,
+ /*   220 */   531,    2,    2,    2,  531,  531,  531,  531,  782,  531,
+ /*   230 */   531,  531,  744,  531,  531,  783,  531,  531,  531,  531,
+ /*   240 */   531,  531,  531,  531,  419,  682,  327,  370,  370,  370,
+ /*   250 */   370, 1029,  327,  327, 1024,  897,  856,  947, 1109,  706,
+ /*   260 */   706, 1143, 1109, 1109, 1143,  842,  945, 1118, 1136, 1136,
+ /*   270 */  1136,  706,  676,  400, 1047,  694, 1339, 1270, 1270, 1366,
+ /*   280 */  1366, 1270, 1305, 1389, 1369, 1278, 1401, 1401, 1401, 1401,
+ /*   290 */  1270, 1414, 1278, 1278, 1305, 1389, 1369, 1369, 1278, 1270,
+ /*   300 */  1414, 1298, 1385, 1270, 1414, 1432, 1270, 1414, 1270, 1414,
+ /*   310 */  1432, 1355, 1355, 1355, 1411, 1432, 1355, 1367, 1355, 1411,
+ /*   320 */  1355, 1355, 1432, 1392, 1392, 1432, 1365, 1396, 1365, 1396,
+ /*   330 */  1365, 1396, 1365, 1396, 1270, 1372, 1429, 1502, 1390, 1372,
+ /*   340 */  1517, 1270, 1397, 1390, 1410, 1413, 1278, 1528, 1532, 1549,
+ /*   350 */  1549, 1562, 1562, 1562, 2009, 2009, 2009, 2009, 2009, 2009,
+ /*   360 */  2009, 2009, 2009, 2009, 2009, 2009, 2009, 2009, 2009, 2009,
+ /*   370 */   570,  345,  686,  748,   50,  740, 1064, 1107,  469,  537,
+ /*   380 */  1042, 1146, 1162, 1154, 1201, 1202, 1203, 1208, 1209, 1127,
+ /*   390 */  1069, 1196, 1157, 1147, 1226, 1228, 1245,  775,  868, 1246,
+ /*   400 */  1247, 1191, 1151, 1585, 1589, 1587, 1456, 1600, 1527, 1601,
+ /*   410 */  1595, 1596, 1492, 1484, 1506, 1603, 1495, 1608, 1496, 1614,
+ /*   420 */  1635, 1508, 1497, 1521, 1580, 1606, 1505, 1592, 1593, 1597,
+ /*   430 */  1598, 1530, 1547, 1619, 1524, 1654, 1651, 1636, 1553, 1510,
+ /*   440 */  1594, 1634, 1599, 1588, 1623, 1535, 1564, 1642, 1649, 1652,
+ /*   450 */  1552, 1560, 1653, 1609, 1655, 1656, 1657, 1659, 1612, 1658,
+ /*   460 */  1660, 1616, 1648, 1664, 1550, 1668, 1538, 1670, 1671, 1669,
+ /*   470 */  1673, 1675, 1676, 1678, 1680, 1679, 1574, 1683, 1690, 1610,
+ /*   480 */  1682, 1695, 1586, 1698, 1691, 1698, 1693, 1643, 1661, 1646,
+ /*   490 */  1686, 1710, 1711, 1714, 1716, 1703, 1715, 1698, 1727, 1728,
+ /*   500 */  1729, 1730, 1731, 1732, 1734, 1743, 1736, 1737, 1740, 1744,
+ /*   510 */  1738, 1746, 1739, 1645, 1640, 1644, 1647, 1650, 1749, 1751,
+ /*   520 */  1772,
 };
-#define YY_REDUCE_COUNT (366)
+#define YY_REDUCE_COUNT (369)
 #define YY_REDUCE_MIN   (-237)
-#define YY_REDUCE_MAX   (1420)
+#define YY_REDUCE_MAX   (1424)
 static const short yy_reduce_ofst[] = {
  /*     0 */  -147,  171,  263,  -96,  358, -144, -149, -102,  124, -156,
  /*    10 */   -98,  305,  401,  -57,  209, -237,  245,  -94,  -79,  189,
  /*    20 */   375,  490,  493,  378,  303,  539,  542,  501,  503,  554,
  /*    30 */   415,  526,  546,  557,  587,  593,  595, -234, -234, -234,
@@ -145580,81 +146699,82 @@
  /*   150 */   364,   41,  513,  509,  509,  117,  500,  789,  796,  646,
  /*   160 */   192,  291,  644,  798,  120,  807,  543,  911,  920,  652,
  /*   170 */   924,  922,  232,  698,  801,  971,   39,  220,  731,  442,
  /*   180 */   902, -199,  979,  -43,  421,  896,  942,  605, -184, -126,
  /*   190 */   155,  172,  281,  304,  377,  538,  650,  690,  699,  723,
- /*   200 */   803,  853,  919, 1088, 1091, 1092,  777, 1106, 1108, 1111,
- /*   210 */  1112, 1115, 1116, 1117, 1120, 1121, 1122, 1123, 1124, 1077,
- /*   220 */  1079, 1095, 1126, 1127, 1128, 1129, 1056, 1130, 1131, 1132,
- /*   230 */  1075, 1135, 1137, 1096, 1152,  304, 1153, 1158, 1172, 1173,
- /*   240 */  1174, 1175, 1066, 1068, 1110, 1098, 1119, 1125, 1139, 1056,
- /*   250 */  1110, 1110, 1170, 1160, 1178, 1149, 1114, 1140, 1089, 1150,
- /*   260 */  1151, 1133, 1177, 1171, 1189, 1161, 1181, 1195, 1159, 1142,
- /*   270 */  1179, 1182, 1218, 1141, 1220, 1228, 1145, 1147, 1229, 1183,
- /*   280 */  1188, 1210, 1196, 1209, 1211, 1212, 1213, 1242, 1255, 1215,
- /*   290 */  1219, 1190, 1200, 1224, 1235, 1225, 1267, 1270, 1191, 1194,
- /*   300 */  1272, 1274, 1259, 1279, 1281, 1283, 1285, 1266, 1273, 1276,
- /*   310 */  1286, 1280, 1271, 1287, 1288, 1289, 1284, 1297, 1299, 1293,
- /*   320 */  1241, 1244, 1303, 1268, 1275, 1278, 1300, 1295, 1302, 1307,
- /*   330 */  1309, 1328, 1291, 1230, 1231, 1321, 1292, 1298, 1341, 1301,
- /*   340 */  1325, 1326, 1329, 1332, 1375, 1382, 1393, 1398, 1396, 1401,
- /*   350 */  1402, 1304, 1305, 1306, 1392, 1385, 1395, 1399, 1403, 1397,
- /*   360 */  1388, 1404, 1407, 1409, 1417, 1420, 1406,
+ /*   200 */   803,  839,  853,  919,  991, 1018, 1067, 1092,  951, 1111,
+ /*   210 */  1112, 1115, 1116, 1117, 1119, 1120, 1121, 1122, 1123, 1124,
+ /*   220 */  1125, 1012, 1096, 1097, 1128, 1129, 1130, 1131, 1070, 1135,
+ /*   230 */  1137, 1152, 1077, 1153, 1155, 1114, 1156,  304, 1158, 1172,
+ /*   240 */  1173, 1174, 1175, 1176, 1089, 1091, 1133, 1098, 1126, 1139,
+ /*   250 */  1140, 1070, 1133, 1133, 1170, 1163, 1186, 1103, 1168, 1138,
+ /*   260 */  1141, 1110, 1169, 1171, 1132, 1177, 1189, 1194, 1181, 1200,
+ /*   270 */  1204, 1166, 1145, 1178, 1187, 1232, 1142, 1231, 1233, 1149,
+ /*   280 */  1150, 1238, 1179, 1182, 1212, 1205, 1219, 1220, 1221, 1222,
+ /*   290 */  1258, 1266, 1223, 1224, 1206, 1211, 1237, 1239, 1230, 1269,
+ /*   300 */  1272, 1195, 1197, 1280, 1284, 1268, 1285, 1289, 1290, 1293,
+ /*   310 */  1274, 1286, 1287, 1288, 1282, 1294, 1292, 1297, 1300, 1296,
+ /*   320 */  1301, 1306, 1304, 1249, 1250, 1308, 1271, 1275, 1273, 1276,
+ /*   330 */  1279, 1281, 1283, 1302, 1334, 1307, 1243, 1267, 1318, 1322,
+ /*   340 */  1303, 1371, 1299, 1328, 1332, 1340, 1342, 1384, 1391, 1400,
+ /*   350 */  1403, 1407, 1408, 1409, 1311, 1312, 1310, 1405, 1402, 1412,
+ /*   360 */  1417, 1420, 1406, 1393, 1395, 1421, 1422, 1423, 1424, 1415,
 };
 static const YYACTIONTYPE yy_default[] = {
- /*     0 */  1486, 1486, 1486, 1335, 1118, 1224, 1118, 1118, 1118, 1335,
- /*    10 */  1335, 1335, 1118, 1254, 1254, 1386, 1149, 1118, 1118, 1118,
- /*    20 */  1118, 1118, 1118, 1118, 1334, 1118, 1118, 1118, 1118, 1118,
- /*    30 */  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1260, 1118,
- /*    40 */  1118, 1118, 1118, 1118, 1336, 1337, 1118, 1118, 1118, 1385,
- /*    50 */  1387, 1270, 1269, 1268, 1267, 1368, 1241, 1265, 1258, 1262,
- /*    60 */  1330, 1331, 1329, 1333, 1337, 1336, 1118, 1261, 1301, 1315,
- /*    70 */  1300, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
- /*    80 */  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
- /*    90 */  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
- /*   100 */  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
- /*   110 */  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1309, 1314, 1320,
- /*   120 */  1313, 1310, 1303, 1302, 1304, 1305, 1118, 1139, 1188, 1118,
- /*   130 */  1118, 1118, 1118, 1403, 1402, 1118, 1118, 1149, 1306, 1307,
- /*   140 */  1317, 1316, 1393, 1442, 1441, 1118, 1118, 1118, 1118, 1118,
- /*   150 */  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
- /*   160 */  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
- /*   170 */  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1149, 1145, 1295,
- /*   180 */  1294, 1412, 1145, 1248, 1118, 1398, 1224, 1215, 1118, 1118,
- /*   190 */  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1390,
- /*   200 */  1388, 1118, 1350, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
- /*   210 */  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
- /*   220 */  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
- /*   230 */  1220, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
- /*   240 */  1118, 1436, 1118, 1363, 1202, 1220, 1220, 1220, 1220, 1222,
- /*   250 */  1203, 1201, 1214, 1149, 1125, 1264, 1243, 1243, 1475, 1264,
- /*   260 */  1264, 1475, 1163, 1456, 1160, 1254, 1254, 1254, 1243, 1332,
- /*   270 */  1221, 1214, 1118, 1478, 1229, 1229, 1477, 1477, 1229, 1273,
- /*   280 */  1279, 1191, 1264, 1197, 1197, 1197, 1197, 1229, 1136, 1264,
- /*   290 */  1264, 1273, 1279, 1191, 1191, 1264, 1229, 1136, 1367, 1472,
- /*   300 */  1229, 1136, 1343, 1229, 1136, 1229, 1136, 1343, 1189, 1189,
- /*   310 */  1189, 1178, 1343, 1189, 1163, 1189, 1178, 1189, 1189, 1343,
- /*   320 */  1347, 1347, 1343, 1247, 1242, 1247, 1242, 1247, 1242, 1247,
- /*   330 */  1242, 1229, 1248, 1411, 1118, 1259, 1248, 1338, 1229, 1118,
- /*   340 */  1259, 1257, 1255, 1264, 1142, 1181, 1439, 1439, 1435, 1435,
- /*   350 */  1435, 1483, 1483, 1398, 1451, 1149, 1149, 1149, 1149, 1451,
- /*   360 */  1165, 1165, 1149, 1149, 1149, 1149, 1451, 1118, 1118, 1118,
- /*   370 */  1118, 1118, 1118, 1446, 1118, 1352, 1233, 1118, 1118, 1118,
- /*   380 */  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
- /*   390 */  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1284,
- /*   400 */  1118, 1121, 1395, 1118, 1118, 1394, 1118, 1118, 1118, 1118,
- /*   410 */  1118, 1118, 1234, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
- /*   420 */  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
- /*   430 */  1118, 1474, 1118, 1118, 1118, 1118, 1118, 1118, 1366, 1365,
- /*   440 */  1118, 1118, 1231, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
- /*   450 */  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
- /*   460 */  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
- /*   470 */  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
- /*   480 */  1256, 1118, 1410, 1118, 1118, 1118, 1118, 1118, 1118, 1118,
- /*   490 */  1424, 1249, 1118, 1118, 1465, 1118, 1118, 1118, 1118, 1118,
- /*   500 */  1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1460,
- /*   510 */  1205, 1286, 1118, 1285, 1289, 1118, 1130, 1118,
+ /*     0 */  1492, 1492, 1492, 1340, 1123, 1229, 1123, 1123, 1123, 1340,
+ /*    10 */  1340, 1340, 1123, 1259, 1259, 1391, 1154, 1123, 1123, 1123,
+ /*    20 */  1123, 1123, 1123, 1123, 1339, 1123, 1123, 1123, 1123, 1123,
+ /*    30 */  1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1265, 1123,
+ /*    40 */  1123, 1123, 1123, 1123, 1341, 1342, 1123, 1123, 1123, 1390,
+ /*    50 */  1392, 1275, 1274, 1273, 1272, 1373, 1246, 1270, 1263, 1267,
+ /*    60 */  1335, 1336, 1334, 1338, 1342, 1341, 1123, 1266, 1306, 1320,
+ /*    70 */  1305, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123,
+ /*    80 */  1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123,
+ /*    90 */  1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123,
+ /*   100 */  1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123,
+ /*   110 */  1123, 1123, 1123, 1123, 1123, 1123, 1123, 1314, 1319, 1325,
+ /*   120 */  1318, 1315, 1308, 1307, 1309, 1310, 1123, 1144, 1193, 1123,
+ /*   130 */  1123, 1123, 1123, 1409, 1408, 1123, 1123, 1154, 1311, 1312,
+ /*   140 */  1322, 1321, 1398, 1448, 1447, 1123, 1123, 1123, 1123, 1123,
+ /*   150 */  1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123,
+ /*   160 */  1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123,
+ /*   170 */  1123, 1123, 1123, 1123, 1123, 1123, 1123, 1154, 1150, 1300,
+ /*   180 */  1299, 1418, 1150, 1253, 1123, 1404, 1229, 1220, 1123, 1123,
+ /*   190 */  1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123,
+ /*   200 */  1123, 1395, 1393, 1123, 1355, 1123, 1123, 1123, 1123, 1123,
+ /*   210 */  1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123,
+ /*   220 */  1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123,
+ /*   230 */  1123, 1123, 1225, 1123, 1123, 1123, 1123, 1123, 1123, 1123,
+ /*   240 */  1123, 1123, 1123, 1442, 1123, 1368, 1207, 1225, 1225, 1225,
+ /*   250 */  1225, 1227, 1208, 1206, 1219, 1154, 1130, 1484, 1269, 1248,
+ /*   260 */  1248, 1481, 1269, 1269, 1481, 1168, 1462, 1165, 1259, 1259,
+ /*   270 */  1259, 1248, 1337, 1226, 1219, 1123, 1484, 1234, 1234, 1483,
+ /*   280 */  1483, 1234, 1278, 1284, 1196, 1269, 1202, 1202, 1202, 1202,
+ /*   290 */  1234, 1141, 1269, 1269, 1278, 1284, 1196, 1196, 1269, 1234,
+ /*   300 */  1141, 1372, 1478, 1234, 1141, 1348, 1234, 1141, 1234, 1141,
+ /*   310 */  1348, 1194, 1194, 1194, 1183, 1348, 1194, 1168, 1194, 1183,
+ /*   320 */  1194, 1194, 1348, 1352, 1352, 1348, 1252, 1247, 1252, 1247,
+ /*   330 */  1252, 1247, 1252, 1247, 1234, 1253, 1417, 1123, 1264, 1253,
+ /*   340 */  1343, 1234, 1123, 1264, 1262, 1260, 1269, 1147, 1186, 1445,
+ /*   350 */  1445, 1441, 1441, 1441, 1489, 1489, 1404, 1457, 1154, 1154,
+ /*   360 */  1154, 1154, 1457, 1170, 1170, 1154, 1154, 1154, 1154, 1457,
+ /*   370 */  1123, 1123, 1123, 1123, 1123, 1123, 1452, 1123, 1357, 1238,
+ /*   380 */  1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123,
+ /*   390 */  1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123,
+ /*   400 */  1123, 1123, 1289, 1123, 1126, 1401, 1123, 1123, 1399, 1123,
+ /*   410 */  1123, 1123, 1123, 1123, 1123, 1239, 1123, 1123, 1123, 1123,
+ /*   420 */  1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123,
+ /*   430 */  1123, 1123, 1123, 1123, 1480, 1123, 1123, 1123, 1123, 1123,
+ /*   440 */  1123, 1371, 1370, 1123, 1123, 1236, 1123, 1123, 1123, 1123,
+ /*   450 */  1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123,
+ /*   460 */  1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123,
+ /*   470 */  1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123,
+ /*   480 */  1123, 1123, 1123, 1261, 1123, 1416, 1123, 1123, 1123, 1123,
+ /*   490 */  1123, 1123, 1123, 1430, 1254, 1123, 1123, 1471, 1123, 1123,
+ /*   500 */  1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123,
+ /*   510 */  1123, 1123, 1466, 1210, 1291, 1123, 1290, 1294, 1123, 1135,
+ /*   520 */  1123,
 };
 /********** End of lemon-generated parsing tables *****************************/
 
 /* The next table maps tokens (terminal symbols) into fallback tokens.  
 ** If a construct like the following:
@@ -146406,102 +147526,103 @@
  /* 269 */ "cmd ::= ANALYZE",
  /* 270 */ "cmd ::= ANALYZE nm dbnm",
  /* 271 */ "cmd ::= ALTER TABLE fullname RENAME TO nm",
  /* 272 */ "cmd ::= ALTER TABLE add_column_fullname ADD kwcolumn_opt columnname carglist",
  /* 273 */ "add_column_fullname ::= fullname",
- /* 274 */ "cmd ::= create_vtab",
- /* 275 */ "cmd ::= create_vtab LP vtabarglist RP",
- /* 276 */ "create_vtab ::= createkw VIRTUAL TABLE ifnotexists nm dbnm USING nm",
- /* 277 */ "vtabarg ::=",
- /* 278 */ "vtabargtoken ::= ANY",
- /* 279 */ "vtabargtoken ::= lp anylist RP",
- /* 280 */ "lp ::= LP",
- /* 281 */ "with ::= WITH wqlist",
- /* 282 */ "with ::= WITH RECURSIVE wqlist",
- /* 283 */ "wqlist ::= nm eidlist_opt AS LP select RP",
- /* 284 */ "wqlist ::= wqlist COMMA nm eidlist_opt AS LP select RP",
- /* 285 */ "windowdefn_list ::= windowdefn",
- /* 286 */ "windowdefn_list ::= windowdefn_list COMMA windowdefn",
- /* 287 */ "windowdefn ::= nm AS window",
- /* 288 */ "window ::= LP part_opt orderby_opt frame_opt RP",
- /* 289 */ "part_opt ::= PARTITION BY nexprlist",
- /* 290 */ "part_opt ::=",
- /* 291 */ "frame_opt ::=",
- /* 292 */ "frame_opt ::= range_or_rows frame_bound_s",
- /* 293 */ "frame_opt ::= range_or_rows BETWEEN frame_bound_s AND frame_bound_e",
- /* 294 */ "range_or_rows ::= RANGE",
- /* 295 */ "range_or_rows ::= ROWS",
- /* 296 */ "frame_bound_s ::= frame_bound",
- /* 297 */ "frame_bound_s ::= UNBOUNDED PRECEDING",
- /* 298 */ "frame_bound_e ::= frame_bound",
- /* 299 */ "frame_bound_e ::= UNBOUNDED FOLLOWING",
- /* 300 */ "frame_bound ::= expr PRECEDING",
- /* 301 */ "frame_bound ::= CURRENT ROW",
- /* 302 */ "frame_bound ::= expr FOLLOWING",
- /* 303 */ "window_clause ::= WINDOW windowdefn_list",
- /* 304 */ "over_clause ::= filter_opt OVER window",
- /* 305 */ "over_clause ::= filter_opt OVER nm",
- /* 306 */ "filter_opt ::=",
- /* 307 */ "filter_opt ::= FILTER LP WHERE expr RP",
- /* 308 */ "input ::= cmdlist",
- /* 309 */ "cmdlist ::= cmdlist ecmd",
- /* 310 */ "cmdlist ::= ecmd",
- /* 311 */ "ecmd ::= SEMI",
- /* 312 */ "ecmd ::= cmdx SEMI",
- /* 313 */ "ecmd ::= explain cmdx",
- /* 314 */ "trans_opt ::=",
- /* 315 */ "trans_opt ::= TRANSACTION",
- /* 316 */ "trans_opt ::= TRANSACTION nm",
- /* 317 */ "savepoint_opt ::= SAVEPOINT",
- /* 318 */ "savepoint_opt ::=",
- /* 319 */ "cmd ::= create_table create_table_args",
- /* 320 */ "columnlist ::= columnlist COMMA columnname carglist",
- /* 321 */ "columnlist ::= columnname carglist",
- /* 322 */ "nm ::= ID|INDEXED",
- /* 323 */ "nm ::= STRING",
- /* 324 */ "nm ::= JOIN_KW",
- /* 325 */ "typetoken ::= typename",
- /* 326 */ "typename ::= ID|STRING",
- /* 327 */ "signed ::= plus_num",
- /* 328 */ "signed ::= minus_num",
- /* 329 */ "carglist ::= carglist ccons",
- /* 330 */ "carglist ::=",
- /* 331 */ "ccons ::= NULL onconf",
- /* 332 */ "conslist_opt ::= COMMA conslist",
- /* 333 */ "conslist ::= conslist tconscomma tcons",
- /* 334 */ "conslist ::= tcons",
- /* 335 */ "tconscomma ::=",
- /* 336 */ "defer_subclause_opt ::= defer_subclause",
- /* 337 */ "resolvetype ::= raisetype",
- /* 338 */ "selectnowith ::= oneselect",
- /* 339 */ "oneselect ::= values",
- /* 340 */ "sclp ::= selcollist COMMA",
- /* 341 */ "as ::= ID|STRING",
- /* 342 */ "expr ::= term",
- /* 343 */ "likeop ::= LIKE_KW|MATCH",
- /* 344 */ "exprlist ::= nexprlist",
- /* 345 */ "nmnum ::= plus_num",
- /* 346 */ "nmnum ::= nm",
- /* 347 */ "nmnum ::= ON",
- /* 348 */ "nmnum ::= DELETE",
- /* 349 */ "nmnum ::= DEFAULT",
- /* 350 */ "plus_num ::= INTEGER|FLOAT",
- /* 351 */ "foreach_clause ::=",
- /* 352 */ "foreach_clause ::= FOR EACH ROW",
- /* 353 */ "trnm ::= nm",
- /* 354 */ "tridxby ::=",
- /* 355 */ "database_kw_opt ::= DATABASE",
- /* 356 */ "database_kw_opt ::=",
- /* 357 */ "kwcolumn_opt ::=",
- /* 358 */ "kwcolumn_opt ::= COLUMNKW",
- /* 359 */ "vtabarglist ::= vtabarg",
- /* 360 */ "vtabarglist ::= vtabarglist COMMA vtabarg",
- /* 361 */ "vtabarg ::= vtabarg vtabargtoken",
- /* 362 */ "anylist ::=",
- /* 363 */ "anylist ::= anylist LP anylist RP",
- /* 364 */ "anylist ::= anylist ANY",
- /* 365 */ "with ::=",
+ /* 274 */ "cmd ::= ALTER TABLE fullname RENAME kwcolumn_opt nm TO nm",
+ /* 275 */ "cmd ::= create_vtab",
+ /* 276 */ "cmd ::= create_vtab LP vtabarglist RP",
+ /* 277 */ "create_vtab ::= createkw VIRTUAL TABLE ifnotexists nm dbnm USING nm",
+ /* 278 */ "vtabarg ::=",
+ /* 279 */ "vtabargtoken ::= ANY",
+ /* 280 */ "vtabargtoken ::= lp anylist RP",
+ /* 281 */ "lp ::= LP",
+ /* 282 */ "with ::= WITH wqlist",
+ /* 283 */ "with ::= WITH RECURSIVE wqlist",
+ /* 284 */ "wqlist ::= nm eidlist_opt AS LP select RP",
+ /* 285 */ "wqlist ::= wqlist COMMA nm eidlist_opt AS LP select RP",
+ /* 286 */ "windowdefn_list ::= windowdefn",
+ /* 287 */ "windowdefn_list ::= windowdefn_list COMMA windowdefn",
+ /* 288 */ "windowdefn ::= nm AS window",
+ /* 289 */ "window ::= LP part_opt orderby_opt frame_opt RP",
+ /* 290 */ "part_opt ::= PARTITION BY nexprlist",
+ /* 291 */ "part_opt ::=",
+ /* 292 */ "frame_opt ::=",
+ /* 293 */ "frame_opt ::= range_or_rows frame_bound_s",
+ /* 294 */ "frame_opt ::= range_or_rows BETWEEN frame_bound_s AND frame_bound_e",
+ /* 295 */ "range_or_rows ::= RANGE",
+ /* 296 */ "range_or_rows ::= ROWS",
+ /* 297 */ "frame_bound_s ::= frame_bound",
+ /* 298 */ "frame_bound_s ::= UNBOUNDED PRECEDING",
+ /* 299 */ "frame_bound_e ::= frame_bound",
+ /* 300 */ "frame_bound_e ::= UNBOUNDED FOLLOWING",
+ /* 301 */ "frame_bound ::= expr PRECEDING",
+ /* 302 */ "frame_bound ::= CURRENT ROW",
+ /* 303 */ "frame_bound ::= expr FOLLOWING",
+ /* 304 */ "window_clause ::= WINDOW windowdefn_list",
+ /* 305 */ "over_clause ::= filter_opt OVER window",
+ /* 306 */ "over_clause ::= filter_opt OVER nm",
+ /* 307 */ "filter_opt ::=",
+ /* 308 */ "filter_opt ::= FILTER LP WHERE expr RP",
+ /* 309 */ "input ::= cmdlist",
+ /* 310 */ "cmdlist ::= cmdlist ecmd",
+ /* 311 */ "cmdlist ::= ecmd",
+ /* 312 */ "ecmd ::= SEMI",
+ /* 313 */ "ecmd ::= cmdx SEMI",
+ /* 314 */ "ecmd ::= explain cmdx",
+ /* 315 */ "trans_opt ::=",
+ /* 316 */ "trans_opt ::= TRANSACTION",
+ /* 317 */ "trans_opt ::= TRANSACTION nm",
+ /* 318 */ "savepoint_opt ::= SAVEPOINT",
+ /* 319 */ "savepoint_opt ::=",
+ /* 320 */ "cmd ::= create_table create_table_args",
+ /* 321 */ "columnlist ::= columnlist COMMA columnname carglist",
+ /* 322 */ "columnlist ::= columnname carglist",
+ /* 323 */ "nm ::= ID|INDEXED",
+ /* 324 */ "nm ::= STRING",
+ /* 325 */ "nm ::= JOIN_KW",
+ /* 326 */ "typetoken ::= typename",
+ /* 327 */ "typename ::= ID|STRING",
+ /* 328 */ "signed ::= plus_num",
+ /* 329 */ "signed ::= minus_num",
+ /* 330 */ "carglist ::= carglist ccons",
+ /* 331 */ "carglist ::=",
+ /* 332 */ "ccons ::= NULL onconf",
+ /* 333 */ "conslist_opt ::= COMMA conslist",
+ /* 334 */ "conslist ::= conslist tconscomma tcons",
+ /* 335 */ "conslist ::= tcons",
+ /* 336 */ "tconscomma ::=",
+ /* 337 */ "defer_subclause_opt ::= defer_subclause",
+ /* 338 */ "resolvetype ::= raisetype",
+ /* 339 */ "selectnowith ::= oneselect",
+ /* 340 */ "oneselect ::= values",
+ /* 341 */ "sclp ::= selcollist COMMA",
+ /* 342 */ "as ::= ID|STRING",
+ /* 343 */ "expr ::= term",
+ /* 344 */ "likeop ::= LIKE_KW|MATCH",
+ /* 345 */ "exprlist ::= nexprlist",
+ /* 346 */ "nmnum ::= plus_num",
+ /* 347 */ "nmnum ::= nm",
+ /* 348 */ "nmnum ::= ON",
+ /* 349 */ "nmnum ::= DELETE",
+ /* 350 */ "nmnum ::= DEFAULT",
+ /* 351 */ "plus_num ::= INTEGER|FLOAT",
+ /* 352 */ "foreach_clause ::=",
+ /* 353 */ "foreach_clause ::= FOR EACH ROW",
+ /* 354 */ "trnm ::= nm",
+ /* 355 */ "tridxby ::=",
+ /* 356 */ "database_kw_opt ::= DATABASE",
+ /* 357 */ "database_kw_opt ::=",
+ /* 358 */ "kwcolumn_opt ::=",
+ /* 359 */ "kwcolumn_opt ::= COLUMNKW",
+ /* 360 */ "vtabarglist ::= vtabarg",
+ /* 361 */ "vtabarglist ::= vtabarglist COMMA vtabarg",
+ /* 362 */ "vtabarg ::= vtabarg vtabargtoken",
+ /* 363 */ "anylist ::=",
+ /* 364 */ "anylist ::= anylist LP anylist RP",
+ /* 365 */ "anylist ::= anylist ANY",
+ /* 366 */ "with ::=",
 };
 #endif /* NDEBUG */
 
 
 #if YYSTACKDEPTH<=0
@@ -147285,102 +148406,103 @@
   {  160,   -1 }, /* (269) cmd ::= ANALYZE */
   {  160,   -3 }, /* (270) cmd ::= ANALYZE nm dbnm */
   {  160,   -6 }, /* (271) cmd ::= ALTER TABLE fullname RENAME TO nm */
   {  160,   -7 }, /* (272) cmd ::= ALTER TABLE add_column_fullname ADD kwcolumn_opt columnname carglist */
   {  259,   -1 }, /* (273) add_column_fullname ::= fullname */
-  {  160,   -1 }, /* (274) cmd ::= create_vtab */
-  {  160,   -4 }, /* (275) cmd ::= create_vtab LP vtabarglist RP */
-  {  261,   -8 }, /* (276) create_vtab ::= createkw VIRTUAL TABLE ifnotexists nm dbnm USING nm */
-  {  263,    0 }, /* (277) vtabarg ::= */
-  {  264,   -1 }, /* (278) vtabargtoken ::= ANY */
-  {  264,   -3 }, /* (279) vtabargtoken ::= lp anylist RP */
-  {  265,   -1 }, /* (280) lp ::= LP */
-  {  232,   -2 }, /* (281) with ::= WITH wqlist */
-  {  232,   -3 }, /* (282) with ::= WITH RECURSIVE wqlist */
-  {  208,   -6 }, /* (283) wqlist ::= nm eidlist_opt AS LP select RP */
-  {  208,   -8 }, /* (284) wqlist ::= wqlist COMMA nm eidlist_opt AS LP select RP */
-  {  267,   -1 }, /* (285) windowdefn_list ::= windowdefn */
-  {  267,   -3 }, /* (286) windowdefn_list ::= windowdefn_list COMMA windowdefn */
-  {  268,   -3 }, /* (287) windowdefn ::= nm AS window */
-  {  269,   -5 }, /* (288) window ::= LP part_opt orderby_opt frame_opt RP */
-  {  271,   -3 }, /* (289) part_opt ::= PARTITION BY nexprlist */
-  {  271,    0 }, /* (290) part_opt ::= */
-  {  270,    0 }, /* (291) frame_opt ::= */
-  {  270,   -2 }, /* (292) frame_opt ::= range_or_rows frame_bound_s */
-  {  270,   -5 }, /* (293) frame_opt ::= range_or_rows BETWEEN frame_bound_s AND frame_bound_e */
-  {  273,   -1 }, /* (294) range_or_rows ::= RANGE */
-  {  273,   -1 }, /* (295) range_or_rows ::= ROWS */
-  {  275,   -1 }, /* (296) frame_bound_s ::= frame_bound */
-  {  275,   -2 }, /* (297) frame_bound_s ::= UNBOUNDED PRECEDING */
-  {  276,   -1 }, /* (298) frame_bound_e ::= frame_bound */
-  {  276,   -2 }, /* (299) frame_bound_e ::= UNBOUNDED FOLLOWING */
-  {  274,   -2 }, /* (300) frame_bound ::= expr PRECEDING */
-  {  274,   -2 }, /* (301) frame_bound ::= CURRENT ROW */
-  {  274,   -2 }, /* (302) frame_bound ::= expr FOLLOWING */
-  {  218,   -2 }, /* (303) window_clause ::= WINDOW windowdefn_list */
-  {  237,   -3 }, /* (304) over_clause ::= filter_opt OVER window */
-  {  237,   -3 }, /* (305) over_clause ::= filter_opt OVER nm */
-  {  272,    0 }, /* (306) filter_opt ::= */
-  {  272,   -5 }, /* (307) filter_opt ::= FILTER LP WHERE expr RP */
-  {  155,   -1 }, /* (308) input ::= cmdlist */
-  {  156,   -2 }, /* (309) cmdlist ::= cmdlist ecmd */
-  {  156,   -1 }, /* (310) cmdlist ::= ecmd */
-  {  157,   -1 }, /* (311) ecmd ::= SEMI */
-  {  157,   -2 }, /* (312) ecmd ::= cmdx SEMI */
-  {  157,   -2 }, /* (313) ecmd ::= explain cmdx */
-  {  162,    0 }, /* (314) trans_opt ::= */
-  {  162,   -1 }, /* (315) trans_opt ::= TRANSACTION */
-  {  162,   -2 }, /* (316) trans_opt ::= TRANSACTION nm */
-  {  164,   -1 }, /* (317) savepoint_opt ::= SAVEPOINT */
-  {  164,    0 }, /* (318) savepoint_opt ::= */
-  {  160,   -2 }, /* (319) cmd ::= create_table create_table_args */
-  {  171,   -4 }, /* (320) columnlist ::= columnlist COMMA columnname carglist */
-  {  171,   -2 }, /* (321) columnlist ::= columnname carglist */
-  {  163,   -1 }, /* (322) nm ::= ID|INDEXED */
-  {  163,   -1 }, /* (323) nm ::= STRING */
-  {  163,   -1 }, /* (324) nm ::= JOIN_KW */
-  {  177,   -1 }, /* (325) typetoken ::= typename */
-  {  178,   -1 }, /* (326) typename ::= ID|STRING */
-  {  179,   -1 }, /* (327) signed ::= plus_num */
-  {  179,   -1 }, /* (328) signed ::= minus_num */
-  {  176,   -2 }, /* (329) carglist ::= carglist ccons */
-  {  176,    0 }, /* (330) carglist ::= */
-  {  183,   -2 }, /* (331) ccons ::= NULL onconf */
-  {  172,   -2 }, /* (332) conslist_opt ::= COMMA conslist */
-  {  195,   -3 }, /* (333) conslist ::= conslist tconscomma tcons */
-  {  195,   -1 }, /* (334) conslist ::= tcons */
-  {  196,    0 }, /* (335) tconscomma ::= */
-  {  200,   -1 }, /* (336) defer_subclause_opt ::= defer_subclause */
-  {  202,   -1 }, /* (337) resolvetype ::= raisetype */
-  {  206,   -1 }, /* (338) selectnowith ::= oneselect */
-  {  207,   -1 }, /* (339) oneselect ::= values */
-  {  221,   -2 }, /* (340) sclp ::= selcollist COMMA */
-  {  222,   -1 }, /* (341) as ::= ID|STRING */
-  {  185,   -1 }, /* (342) expr ::= term */
-  {  238,   -1 }, /* (343) likeop ::= LIKE_KW|MATCH */
-  {  229,   -1 }, /* (344) exprlist ::= nexprlist */
-  {  247,   -1 }, /* (345) nmnum ::= plus_num */
-  {  247,   -1 }, /* (346) nmnum ::= nm */
-  {  247,   -1 }, /* (347) nmnum ::= ON */
-  {  247,   -1 }, /* (348) nmnum ::= DELETE */
-  {  247,   -1 }, /* (349) nmnum ::= DEFAULT */
-  {  180,   -1 }, /* (350) plus_num ::= INTEGER|FLOAT */
-  {  252,    0 }, /* (351) foreach_clause ::= */
-  {  252,   -3 }, /* (352) foreach_clause ::= FOR EACH ROW */
-  {  255,   -1 }, /* (353) trnm ::= nm */
-  {  256,    0 }, /* (354) tridxby ::= */
-  {  257,   -1 }, /* (355) database_kw_opt ::= DATABASE */
-  {  257,    0 }, /* (356) database_kw_opt ::= */
-  {  260,    0 }, /* (357) kwcolumn_opt ::= */
-  {  260,   -1 }, /* (358) kwcolumn_opt ::= COLUMNKW */
-  {  262,   -1 }, /* (359) vtabarglist ::= vtabarg */
-  {  262,   -3 }, /* (360) vtabarglist ::= vtabarglist COMMA vtabarg */
-  {  263,   -2 }, /* (361) vtabarg ::= vtabarg vtabargtoken */
-  {  266,    0 }, /* (362) anylist ::= */
-  {  266,   -4 }, /* (363) anylist ::= anylist LP anylist RP */
-  {  266,   -2 }, /* (364) anylist ::= anylist ANY */
-  {  232,    0 }, /* (365) with ::= */
+  {  160,   -8 }, /* (274) cmd ::= ALTER TABLE fullname RENAME kwcolumn_opt nm TO nm */
+  {  160,   -1 }, /* (275) cmd ::= create_vtab */
+  {  160,   -4 }, /* (276) cmd ::= create_vtab LP vtabarglist RP */
+  {  261,   -8 }, /* (277) create_vtab ::= createkw VIRTUAL TABLE ifnotexists nm dbnm USING nm */
+  {  263,    0 }, /* (278) vtabarg ::= */
+  {  264,   -1 }, /* (279) vtabargtoken ::= ANY */
+  {  264,   -3 }, /* (280) vtabargtoken ::= lp anylist RP */
+  {  265,   -1 }, /* (281) lp ::= LP */
+  {  232,   -2 }, /* (282) with ::= WITH wqlist */
+  {  232,   -3 }, /* (283) with ::= WITH RECURSIVE wqlist */
+  {  208,   -6 }, /* (284) wqlist ::= nm eidlist_opt AS LP select RP */
+  {  208,   -8 }, /* (285) wqlist ::= wqlist COMMA nm eidlist_opt AS LP select RP */
+  {  267,   -1 }, /* (286) windowdefn_list ::= windowdefn */
+  {  267,   -3 }, /* (287) windowdefn_list ::= windowdefn_list COMMA windowdefn */
+  {  268,   -3 }, /* (288) windowdefn ::= nm AS window */
+  {  269,   -5 }, /* (289) window ::= LP part_opt orderby_opt frame_opt RP */
+  {  271,   -3 }, /* (290) part_opt ::= PARTITION BY nexprlist */
+  {  271,    0 }, /* (291) part_opt ::= */
+  {  270,    0 }, /* (292) frame_opt ::= */
+  {  270,   -2 }, /* (293) frame_opt ::= range_or_rows frame_bound_s */
+  {  270,   -5 }, /* (294) frame_opt ::= range_or_rows BETWEEN frame_bound_s AND frame_bound_e */
+  {  273,   -1 }, /* (295) range_or_rows ::= RANGE */
+  {  273,   -1 }, /* (296) range_or_rows ::= ROWS */
+  {  275,   -1 }, /* (297) frame_bound_s ::= frame_bound */
+  {  275,   -2 }, /* (298) frame_bound_s ::= UNBOUNDED PRECEDING */
+  {  276,   -1 }, /* (299) frame_bound_e ::= frame_bound */
+  {  276,   -2 }, /* (300) frame_bound_e ::= UNBOUNDED FOLLOWING */
+  {  274,   -2 }, /* (301) frame_bound ::= expr PRECEDING */
+  {  274,   -2 }, /* (302) frame_bound ::= CURRENT ROW */
+  {  274,   -2 }, /* (303) frame_bound ::= expr FOLLOWING */
+  {  218,   -2 }, /* (304) window_clause ::= WINDOW windowdefn_list */
+  {  237,   -3 }, /* (305) over_clause ::= filter_opt OVER window */
+  {  237,   -3 }, /* (306) over_clause ::= filter_opt OVER nm */
+  {  272,    0 }, /* (307) filter_opt ::= */
+  {  272,   -5 }, /* (308) filter_opt ::= FILTER LP WHERE expr RP */
+  {  155,   -1 }, /* (309) input ::= cmdlist */
+  {  156,   -2 }, /* (310) cmdlist ::= cmdlist ecmd */
+  {  156,   -1 }, /* (311) cmdlist ::= ecmd */
+  {  157,   -1 }, /* (312) ecmd ::= SEMI */
+  {  157,   -2 }, /* (313) ecmd ::= cmdx SEMI */
+  {  157,   -2 }, /* (314) ecmd ::= explain cmdx */
+  {  162,    0 }, /* (315) trans_opt ::= */
+  {  162,   -1 }, /* (316) trans_opt ::= TRANSACTION */
+  {  162,   -2 }, /* (317) trans_opt ::= TRANSACTION nm */
+  {  164,   -1 }, /* (318) savepoint_opt ::= SAVEPOINT */
+  {  164,    0 }, /* (319) savepoint_opt ::= */
+  {  160,   -2 }, /* (320) cmd ::= create_table create_table_args */
+  {  171,   -4 }, /* (321) columnlist ::= columnlist COMMA columnname carglist */
+  {  171,   -2 }, /* (322) columnlist ::= columnname carglist */
+  {  163,   -1 }, /* (323) nm ::= ID|INDEXED */
+  {  163,   -1 }, /* (324) nm ::= STRING */
+  {  163,   -1 }, /* (325) nm ::= JOIN_KW */
+  {  177,   -1 }, /* (326) typetoken ::= typename */
+  {  178,   -1 }, /* (327) typename ::= ID|STRING */
+  {  179,   -1 }, /* (328) signed ::= plus_num */
+  {  179,   -1 }, /* (329) signed ::= minus_num */
+  {  176,   -2 }, /* (330) carglist ::= carglist ccons */
+  {  176,    0 }, /* (331) carglist ::= */
+  {  183,   -2 }, /* (332) ccons ::= NULL onconf */
+  {  172,   -2 }, /* (333) conslist_opt ::= COMMA conslist */
+  {  195,   -3 }, /* (334) conslist ::= conslist tconscomma tcons */
+  {  195,   -1 }, /* (335) conslist ::= tcons */
+  {  196,    0 }, /* (336) tconscomma ::= */
+  {  200,   -1 }, /* (337) defer_subclause_opt ::= defer_subclause */
+  {  202,   -1 }, /* (338) resolvetype ::= raisetype */
+  {  206,   -1 }, /* (339) selectnowith ::= oneselect */
+  {  207,   -1 }, /* (340) oneselect ::= values */
+  {  221,   -2 }, /* (341) sclp ::= selcollist COMMA */
+  {  222,   -1 }, /* (342) as ::= ID|STRING */
+  {  185,   -1 }, /* (343) expr ::= term */
+  {  238,   -1 }, /* (344) likeop ::= LIKE_KW|MATCH */
+  {  229,   -1 }, /* (345) exprlist ::= nexprlist */
+  {  247,   -1 }, /* (346) nmnum ::= plus_num */
+  {  247,   -1 }, /* (347) nmnum ::= nm */
+  {  247,   -1 }, /* (348) nmnum ::= ON */
+  {  247,   -1 }, /* (349) nmnum ::= DELETE */
+  {  247,   -1 }, /* (350) nmnum ::= DEFAULT */
+  {  180,   -1 }, /* (351) plus_num ::= INTEGER|FLOAT */
+  {  252,    0 }, /* (352) foreach_clause ::= */
+  {  252,   -3 }, /* (353) foreach_clause ::= FOR EACH ROW */
+  {  255,   -1 }, /* (354) trnm ::= nm */
+  {  256,    0 }, /* (355) tridxby ::= */
+  {  257,   -1 }, /* (356) database_kw_opt ::= DATABASE */
+  {  257,    0 }, /* (357) database_kw_opt ::= */
+  {  260,    0 }, /* (358) kwcolumn_opt ::= */
+  {  260,   -1 }, /* (359) kwcolumn_opt ::= COLUMNKW */
+  {  262,   -1 }, /* (360) vtabarglist ::= vtabarg */
+  {  262,   -3 }, /* (361) vtabarglist ::= vtabarglist COMMA vtabarg */
+  {  263,   -2 }, /* (362) vtabarg ::= vtabarg vtabargtoken */
+  {  266,    0 }, /* (363) anylist ::= */
+  {  266,   -4 }, /* (364) anylist ::= anylist LP anylist RP */
+  {  266,   -2 }, /* (365) anylist ::= anylist ANY */
+  {  232,    0 }, /* (366) with ::= */
 };
 
 static void yy_accept(yyParser*);  /* Forward Declaration */
 
 /*
@@ -147602,11 +148724,11 @@
   Expr *p = tokenExpr(pParse, TK_STRING, yymsp[0].minor.yy0);
   if( p ){
     sqlite3ExprIdToTrueFalse(p);
     testcase( p->op==TK_TRUEFALSE && sqlite3ExprTruthValue(p) );
   }
-  sqlite3AddDefaultValue(pParse,p,yymsp[0].minor.yy0.z,yymsp[0].minor.yy0.z+yymsp[0].minor.yy0.n);
+    sqlite3AddDefaultValue(pParse,p,yymsp[0].minor.yy0.z,yymsp[0].minor.yy0.z+yymsp[0].minor.yy0.n);
 }
         break;
       case 35: /* ccons ::= NOT NULL onconf */
 {sqlite3AddNotNull(pParse, yymsp[0].minor.yy70);}
         break;
@@ -147935,15 +149057,27 @@
       case 108: /* dbnm ::= */
       case 122: /* indexed_opt ::= */ yytestcase(yyruleno==122);
 {yymsp[1].minor.yy0.z=0; yymsp[1].minor.yy0.n=0;}
         break;
       case 110: /* fullname ::= nm */
-      case 112: /* xfullname ::= nm */ yytestcase(yyruleno==112);
-{yymsp[0].minor.yy135 = sqlite3SrcListAppend(pParse->db,0,&yymsp[0].minor.yy0,0); /*A-overwrites-X*/}
+{
+  yylhsminor.yy135 = sqlite3SrcListAppend(pParse->db,0,&yymsp[0].minor.yy0,0);
+  if( IN_RENAME_OBJECT && yylhsminor.yy135 ) sqlite3RenameTokenMap(pParse, yylhsminor.yy135->a[0].zName, &yymsp[0].minor.yy0);
+}
+  yymsp[0].minor.yy135 = yylhsminor.yy135;
         break;
       case 111: /* fullname ::= nm DOT nm */
-      case 113: /* xfullname ::= nm DOT nm */ yytestcase(yyruleno==113);
+{
+  yylhsminor.yy135 = sqlite3SrcListAppend(pParse->db,0,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy0);
+  if( IN_RENAME_OBJECT && yylhsminor.yy135 ) sqlite3RenameTokenMap(pParse, yylhsminor.yy135->a[0].zName, &yymsp[0].minor.yy0);
+}
+  yymsp[-2].minor.yy135 = yylhsminor.yy135;
+        break;
+      case 112: /* xfullname ::= nm */
+{yymsp[0].minor.yy135 = sqlite3SrcListAppend(pParse->db,0,&yymsp[0].minor.yy0,0); /*A-overwrites-X*/}
+        break;
+      case 113: /* xfullname ::= nm DOT nm */
 {yymsp[-2].minor.yy135 = sqlite3SrcListAppend(pParse->db,0,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy0); /*A-overwrites-X*/}
         break;
       case 114: /* xfullname ::= nm DOT nm AS nm */
 {
    yymsp[-4].minor.yy135 = sqlite3SrcListAppend(pParse->db,0,&yymsp[-4].minor.yy0,&yymsp[-2].minor.yy0); /*A-overwrites-X*/
@@ -148089,14 +149223,14 @@
         break;
       case 159: /* idlist_opt ::= LP idlist RP */
 {yymsp[-2].minor.yy48 = yymsp[-1].minor.yy48;}
         break;
       case 160: /* idlist ::= idlist COMMA nm */
-{yymsp[-2].minor.yy48 = sqlite3IdListAppend(pParse->db,yymsp[-2].minor.yy48,&yymsp[0].minor.yy0);}
+{yymsp[-2].minor.yy48 = sqlite3IdListAppend(pParse,yymsp[-2].minor.yy48,&yymsp[0].minor.yy0);}
         break;
       case 161: /* idlist ::= nm */
-{yymsp[0].minor.yy48 = sqlite3IdListAppend(pParse->db,0,&yymsp[0].minor.yy0); /*A-overwrites-Y*/}
+{yymsp[0].minor.yy48 = sqlite3IdListAppend(pParse,0,&yymsp[0].minor.yy0); /*A-overwrites-Y*/}
         break;
       case 162: /* expr ::= LP expr RP */
 {yymsp[-2].minor.yy18 = yymsp[-1].minor.yy18;}
         break;
       case 163: /* expr ::= ID|INDEXED */
@@ -148105,10 +149239,14 @@
         break;
       case 165: /* expr ::= nm DOT nm */
 {
   Expr *temp1 = sqlite3ExprAlloc(pParse->db, TK_ID, &yymsp[-2].minor.yy0, 1);
   Expr *temp2 = sqlite3ExprAlloc(pParse->db, TK_ID, &yymsp[0].minor.yy0, 1);
+  if( IN_RENAME_OBJECT ){
+    sqlite3RenameTokenMap(pParse, (void*)temp2, &yymsp[0].minor.yy0);
+    sqlite3RenameTokenMap(pParse, (void*)temp1, &yymsp[-2].minor.yy0);
+  }
   yylhsminor.yy18 = sqlite3PExpr(pParse, TK_DOT, temp1, temp2);
 }
   yymsp[-2].minor.yy18 = yylhsminor.yy18;
         break;
       case 166: /* expr ::= nm DOT nm DOT nm */
@@ -148115,10 +149253,14 @@
 {
   Expr *temp1 = sqlite3ExprAlloc(pParse->db, TK_ID, &yymsp[-4].minor.yy0, 1);
   Expr *temp2 = sqlite3ExprAlloc(pParse->db, TK_ID, &yymsp[-2].minor.yy0, 1);
   Expr *temp3 = sqlite3ExprAlloc(pParse->db, TK_ID, &yymsp[0].minor.yy0, 1);
   Expr *temp4 = sqlite3PExpr(pParse, TK_DOT, temp2, temp3);
+  if( IN_RENAME_OBJECT ){
+    sqlite3RenameTokenMap(pParse, (void*)temp3, &yymsp[0].minor.yy0);
+    sqlite3RenameTokenMap(pParse, (void*)temp2, &yymsp[-2].minor.yy0);
+  }
   yylhsminor.yy18 = sqlite3PExpr(pParse, TK_DOT, temp1, temp4);
 }
   yymsp[-4].minor.yy18 = yylhsminor.yy18;
         break;
       case 167: /* term ::= NULL|FLOAT|BLOB */
@@ -148412,10 +149554,13 @@
       case 219: /* cmd ::= createkw uniqueflag INDEX ifnotexists nm dbnm ON nm LP sortlist RP where_opt */
 {
   sqlite3CreateIndex(pParse, &yymsp[-7].minor.yy0, &yymsp[-6].minor.yy0, 
                      sqlite3SrcListAppend(pParse->db,0,&yymsp[-4].minor.yy0,0), yymsp[-2].minor.yy420, yymsp[-10].minor.yy70,
                       &yymsp[-11].minor.yy0, yymsp[0].minor.yy18, SQLITE_SO_ASC, yymsp[-8].minor.yy70, SQLITE_IDXTYPE_APPDEF);
+  if( IN_RENAME_OBJECT && pParse->pNewIndex ){
+    sqlite3RenameTokenMap(pParse, pParse->pNewIndex->zName, &yymsp[-4].minor.yy0);
+  }
 }
         break;
       case 220: /* uniqueflag ::= UNIQUE */
       case 260: /* raisetype ::= ABORT */ yytestcase(yyruleno==260);
 {yymsp[0].minor.yy70 = OE_Abort;}
@@ -148487,11 +149632,11 @@
       case 245: /* trigger_event ::= UPDATE OF idlist */
 {yymsp[-2].minor.yy34.a = TK_UPDATE; yymsp[-2].minor.yy34.b = yymsp[0].minor.yy48;}
         break;
       case 246: /* when_clause ::= */
       case 265: /* key_opt ::= */ yytestcase(yyruleno==265);
-      case 306: /* filter_opt ::= */ yytestcase(yyruleno==306);
+      case 307: /* filter_opt ::= */ yytestcase(yyruleno==307);
 { yymsp[1].minor.yy18 = 0; }
         break;
       case 247: /* when_clause ::= WHEN expr */
       case 266: /* key_opt ::= KEY expr */ yytestcase(yyruleno==266);
 { yymsp[-1].minor.yy18 = yymsp[0].minor.yy18; }
@@ -148530,21 +149675,21 @@
         "the NOT INDEXED clause is not allowed on UPDATE or DELETE statements "
         "within triggers");
 }
         break;
       case 253: /* trigger_cmd ::= UPDATE orconf trnm tridxby SET setlist where_opt scanpt */
-{yylhsminor.yy207 = sqlite3TriggerUpdateStep(pParse->db, &yymsp[-5].minor.yy0, yymsp[-2].minor.yy420, yymsp[-1].minor.yy18, yymsp[-6].minor.yy70, yymsp[-7].minor.yy0.z, yymsp[0].minor.yy392);}
+{yylhsminor.yy207 = sqlite3TriggerUpdateStep(pParse, &yymsp[-5].minor.yy0, yymsp[-2].minor.yy420, yymsp[-1].minor.yy18, yymsp[-6].minor.yy70, yymsp[-7].minor.yy0.z, yymsp[0].minor.yy392);}
   yymsp[-7].minor.yy207 = yylhsminor.yy207;
         break;
       case 254: /* trigger_cmd ::= scanpt insert_cmd INTO trnm idlist_opt select upsert scanpt */
 {
-   yylhsminor.yy207 = sqlite3TriggerInsertStep(pParse->db,&yymsp[-4].minor.yy0,yymsp[-3].minor.yy48,yymsp[-2].minor.yy489,yymsp[-6].minor.yy70,yymsp[-1].minor.yy340,yymsp[-7].minor.yy392,yymsp[0].minor.yy392);/*yylhsminor.yy207-overwrites-yymsp[-6].minor.yy70*/
+   yylhsminor.yy207 = sqlite3TriggerInsertStep(pParse,&yymsp[-4].minor.yy0,yymsp[-3].minor.yy48,yymsp[-2].minor.yy489,yymsp[-6].minor.yy70,yymsp[-1].minor.yy340,yymsp[-7].minor.yy392,yymsp[0].minor.yy392);/*yylhsminor.yy207-overwrites-yymsp[-6].minor.yy70*/
 }
   yymsp[-7].minor.yy207 = yylhsminor.yy207;
         break;
       case 255: /* trigger_cmd ::= DELETE FROM trnm tridxby where_opt scanpt */
-{yylhsminor.yy207 = sqlite3TriggerDeleteStep(pParse->db, &yymsp[-3].minor.yy0, yymsp[-1].minor.yy18, yymsp[-5].minor.yy0.z, yymsp[0].minor.yy392);}
+{yylhsminor.yy207 = sqlite3TriggerDeleteStep(pParse, &yymsp[-3].minor.yy0, yymsp[-1].minor.yy18, yymsp[-5].minor.yy0.z, yymsp[0].minor.yy392);}
   yymsp[-5].minor.yy207 = yylhsminor.yy207;
         break;
       case 256: /* trigger_cmd ::= scanpt select scanpt */
 {yylhsminor.yy207 = sqlite3TriggerSelectStep(pParse->db, yymsp[-1].minor.yy489, yymsp[-2].minor.yy392, yymsp[0].minor.yy392); /*yylhsminor.yy207-overwrites-yymsp[-1].minor.yy489*/}
   yymsp[-2].minor.yy207 = yylhsminor.yy207;
@@ -148613,134 +149758,139 @@
 {
   disableLookaside(pParse);
   sqlite3AlterBeginAddColumn(pParse, yymsp[0].minor.yy135);
 }
         break;
-      case 274: /* cmd ::= create_vtab */
+      case 274: /* cmd ::= ALTER TABLE fullname RENAME kwcolumn_opt nm TO nm */
+{
+  sqlite3AlterRenameColumn(pParse, yymsp[-5].minor.yy135, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);
+}
+        break;
+      case 275: /* cmd ::= create_vtab */
 {sqlite3VtabFinishParse(pParse,0);}
         break;
-      case 275: /* cmd ::= create_vtab LP vtabarglist RP */
+      case 276: /* cmd ::= create_vtab LP vtabarglist RP */
 {sqlite3VtabFinishParse(pParse,&yymsp[0].minor.yy0);}
         break;
-      case 276: /* create_vtab ::= createkw VIRTUAL TABLE ifnotexists nm dbnm USING nm */
+      case 277: /* create_vtab ::= createkw VIRTUAL TABLE ifnotexists nm dbnm USING nm */
 {
     sqlite3VtabBeginParse(pParse, &yymsp[-3].minor.yy0, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, yymsp[-4].minor.yy70);
 }
         break;
-      case 277: /* vtabarg ::= */
+      case 278: /* vtabarg ::= */
 {sqlite3VtabArgInit(pParse);}
         break;
-      case 278: /* vtabargtoken ::= ANY */
-      case 279: /* vtabargtoken ::= lp anylist RP */ yytestcase(yyruleno==279);
-      case 280: /* lp ::= LP */ yytestcase(yyruleno==280);
+      case 279: /* vtabargtoken ::= ANY */
+      case 280: /* vtabargtoken ::= lp anylist RP */ yytestcase(yyruleno==280);
+      case 281: /* lp ::= LP */ yytestcase(yyruleno==281);
 {sqlite3VtabArgExtend(pParse,&yymsp[0].minor.yy0);}
         break;
-      case 281: /* with ::= WITH wqlist */
-      case 282: /* with ::= WITH RECURSIVE wqlist */ yytestcase(yyruleno==282);
+      case 282: /* with ::= WITH wqlist */
+      case 283: /* with ::= WITH RECURSIVE wqlist */ yytestcase(yyruleno==283);
 { sqlite3WithPush(pParse, yymsp[0].minor.yy449, 1); }
         break;
-      case 283: /* wqlist ::= nm eidlist_opt AS LP select RP */
+      case 284: /* wqlist ::= nm eidlist_opt AS LP select RP */
 {
   yymsp[-5].minor.yy449 = sqlite3WithAdd(pParse, 0, &yymsp[-5].minor.yy0, yymsp[-4].minor.yy420, yymsp[-1].minor.yy489); /*A-overwrites-X*/
 }
         break;
-      case 284: /* wqlist ::= wqlist COMMA nm eidlist_opt AS LP select RP */
+      case 285: /* wqlist ::= wqlist COMMA nm eidlist_opt AS LP select RP */
 {
   yymsp[-7].minor.yy449 = sqlite3WithAdd(pParse, yymsp[-7].minor.yy449, &yymsp[-5].minor.yy0, yymsp[-4].minor.yy420, yymsp[-1].minor.yy489);
 }
         break;
-      case 285: /* windowdefn_list ::= windowdefn */
+      case 286: /* windowdefn_list ::= windowdefn */
 { yylhsminor.yy327 = yymsp[0].minor.yy327; }
   yymsp[0].minor.yy327 = yylhsminor.yy327;
         break;
-      case 286: /* windowdefn_list ::= windowdefn_list COMMA windowdefn */
+      case 287: /* windowdefn_list ::= windowdefn_list COMMA windowdefn */
 {
   assert( yymsp[0].minor.yy327!=0 );
   yymsp[0].minor.yy327->pNextWin = yymsp[-2].minor.yy327;
   yylhsminor.yy327 = yymsp[0].minor.yy327;
 }
   yymsp[-2].minor.yy327 = yylhsminor.yy327;
         break;
-      case 287: /* windowdefn ::= nm AS window */
+      case 288: /* windowdefn ::= nm AS window */
 {
   if( ALWAYS(yymsp[0].minor.yy327) ){
     yymsp[0].minor.yy327->zName = sqlite3DbStrNDup(pParse->db, yymsp[-2].minor.yy0.z, yymsp[-2].minor.yy0.n);
   }
   yylhsminor.yy327 = yymsp[0].minor.yy327;
 }
   yymsp[-2].minor.yy327 = yylhsminor.yy327;
         break;
-      case 288: /* window ::= LP part_opt orderby_opt frame_opt RP */
+      case 289: /* window ::= LP part_opt orderby_opt frame_opt RP */
 {
   yymsp[-4].minor.yy327 = yymsp[-1].minor.yy327;
   if( ALWAYS(yymsp[-4].minor.yy327) ){
     yymsp[-4].minor.yy327->pPartition = yymsp[-3].minor.yy420;
     yymsp[-4].minor.yy327->pOrderBy = yymsp[-2].minor.yy420;
   }
 }
         break;
-      case 289: /* part_opt ::= PARTITION BY nexprlist */
+      case 290: /* part_opt ::= PARTITION BY nexprlist */
 { yymsp[-2].minor.yy420 = yymsp[0].minor.yy420; }
         break;
-      case 290: /* part_opt ::= */
+      case 291: /* part_opt ::= */
 { yymsp[1].minor.yy420 = 0; }
         break;
-      case 291: /* frame_opt ::= */
+      case 292: /* frame_opt ::= */
 { 
   yymsp[1].minor.yy327 = sqlite3WindowAlloc(pParse, TK_RANGE, TK_UNBOUNDED, 0, TK_CURRENT, 0);
 }
         break;
-      case 292: /* frame_opt ::= range_or_rows frame_bound_s */
+      case 293: /* frame_opt ::= range_or_rows frame_bound_s */
 { 
   yylhsminor.yy327 = sqlite3WindowAlloc(pParse, yymsp[-1].minor.yy70, yymsp[0].minor.yy119.eType, yymsp[0].minor.yy119.pExpr, TK_CURRENT, 0);
 }
   yymsp[-1].minor.yy327 = yylhsminor.yy327;
         break;
-      case 293: /* frame_opt ::= range_or_rows BETWEEN frame_bound_s AND frame_bound_e */
+      case 294: /* frame_opt ::= range_or_rows BETWEEN frame_bound_s AND frame_bound_e */
 { 
   yylhsminor.yy327 = sqlite3WindowAlloc(pParse, yymsp[-4].minor.yy70, yymsp[-2].minor.yy119.eType, yymsp[-2].minor.yy119.pExpr, yymsp[0].minor.yy119.eType, yymsp[0].minor.yy119.pExpr);
 }
   yymsp[-4].minor.yy327 = yylhsminor.yy327;
         break;
-      case 294: /* range_or_rows ::= RANGE */
+      case 295: /* range_or_rows ::= RANGE */
 { yymsp[0].minor.yy70 = TK_RANGE; }
         break;
-      case 295: /* range_or_rows ::= ROWS */
+      case 296: /* range_or_rows ::= ROWS */
 { yymsp[0].minor.yy70 = TK_ROWS;  }
         break;
-      case 296: /* frame_bound_s ::= frame_bound */
-      case 298: /* frame_bound_e ::= frame_bound */ yytestcase(yyruleno==298);
+      case 297: /* frame_bound_s ::= frame_bound */
+      case 299: /* frame_bound_e ::= frame_bound */ yytestcase(yyruleno==299);
 { yylhsminor.yy119 = yymsp[0].minor.yy119; }
   yymsp[0].minor.yy119 = yylhsminor.yy119;
         break;
-      case 297: /* frame_bound_s ::= UNBOUNDED PRECEDING */
-      case 299: /* frame_bound_e ::= UNBOUNDED FOLLOWING */ yytestcase(yyruleno==299);
+      case 298: /* frame_bound_s ::= UNBOUNDED PRECEDING */
+      case 300: /* frame_bound_e ::= UNBOUNDED FOLLOWING */ yytestcase(yyruleno==300);
 {yymsp[-1].minor.yy119.eType = TK_UNBOUNDED; yymsp[-1].minor.yy119.pExpr = 0;}
         break;
-      case 300: /* frame_bound ::= expr PRECEDING */
+      case 301: /* frame_bound ::= expr PRECEDING */
 { yylhsminor.yy119.eType = TK_PRECEDING; yylhsminor.yy119.pExpr = yymsp[-1].minor.yy18; }
   yymsp[-1].minor.yy119 = yylhsminor.yy119;
         break;
-      case 301: /* frame_bound ::= CURRENT ROW */
+      case 302: /* frame_bound ::= CURRENT ROW */
 { yymsp[-1].minor.yy119.eType = TK_CURRENT  ; yymsp[-1].minor.yy119.pExpr = 0; }
         break;
-      case 302: /* frame_bound ::= expr FOLLOWING */
+      case 303: /* frame_bound ::= expr FOLLOWING */
 { yylhsminor.yy119.eType = TK_FOLLOWING; yylhsminor.yy119.pExpr = yymsp[-1].minor.yy18; }
   yymsp[-1].minor.yy119 = yylhsminor.yy119;
         break;
-      case 303: /* window_clause ::= WINDOW windowdefn_list */
+      case 304: /* window_clause ::= WINDOW windowdefn_list */
 { yymsp[-1].minor.yy327 = yymsp[0].minor.yy327; }
         break;
-      case 304: /* over_clause ::= filter_opt OVER window */
+      case 305: /* over_clause ::= filter_opt OVER window */
 {
   yylhsminor.yy327 = yymsp[0].minor.yy327;
   assert( yylhsminor.yy327!=0 );
   yylhsminor.yy327->pFilter = yymsp[-2].minor.yy18;
 }
   yymsp[-2].minor.yy327 = yylhsminor.yy327;
         break;
-      case 305: /* over_clause ::= filter_opt OVER nm */
+      case 306: /* over_clause ::= filter_opt OVER nm */
 {
   yylhsminor.yy327 = (Window*)sqlite3DbMallocZero(pParse->db, sizeof(Window));
   if( yylhsminor.yy327 ){
     yylhsminor.yy327->zName = sqlite3DbStrNDup(pParse->db, yymsp[0].minor.yy0.z, yymsp[0].minor.yy0.n);
     yylhsminor.yy327->pFilter = yymsp[-2].minor.yy18;
@@ -148748,72 +149898,72 @@
     sqlite3ExprDelete(pParse->db, yymsp[-2].minor.yy18);
   }
 }
   yymsp[-2].minor.yy327 = yylhsminor.yy327;
         break;
-      case 307: /* filter_opt ::= FILTER LP WHERE expr RP */
+      case 308: /* filter_opt ::= FILTER LP WHERE expr RP */
 { yymsp[-4].minor.yy18 = yymsp[-1].minor.yy18; }
         break;
       default:
-      /* (308) input ::= cmdlist */ yytestcase(yyruleno==308);
-      /* (309) cmdlist ::= cmdlist ecmd */ yytestcase(yyruleno==309);
-      /* (310) cmdlist ::= ecmd (OPTIMIZED OUT) */ assert(yyruleno!=310);
-      /* (311) ecmd ::= SEMI */ yytestcase(yyruleno==311);
-      /* (312) ecmd ::= cmdx SEMI */ yytestcase(yyruleno==312);
-      /* (313) ecmd ::= explain cmdx */ yytestcase(yyruleno==313);
-      /* (314) trans_opt ::= */ yytestcase(yyruleno==314);
-      /* (315) trans_opt ::= TRANSACTION */ yytestcase(yyruleno==315);
-      /* (316) trans_opt ::= TRANSACTION nm */ yytestcase(yyruleno==316);
-      /* (317) savepoint_opt ::= SAVEPOINT */ yytestcase(yyruleno==317);
-      /* (318) savepoint_opt ::= */ yytestcase(yyruleno==318);
-      /* (319) cmd ::= create_table create_table_args */ yytestcase(yyruleno==319);
-      /* (320) columnlist ::= columnlist COMMA columnname carglist */ yytestcase(yyruleno==320);
-      /* (321) columnlist ::= columnname carglist */ yytestcase(yyruleno==321);
-      /* (322) nm ::= ID|INDEXED */ yytestcase(yyruleno==322);
-      /* (323) nm ::= STRING */ yytestcase(yyruleno==323);
-      /* (324) nm ::= JOIN_KW */ yytestcase(yyruleno==324);
-      /* (325) typetoken ::= typename */ yytestcase(yyruleno==325);
-      /* (326) typename ::= ID|STRING */ yytestcase(yyruleno==326);
-      /* (327) signed ::= plus_num (OPTIMIZED OUT) */ assert(yyruleno!=327);
-      /* (328) signed ::= minus_num (OPTIMIZED OUT) */ assert(yyruleno!=328);
-      /* (329) carglist ::= carglist ccons */ yytestcase(yyruleno==329);
-      /* (330) carglist ::= */ yytestcase(yyruleno==330);
-      /* (331) ccons ::= NULL onconf */ yytestcase(yyruleno==331);
-      /* (332) conslist_opt ::= COMMA conslist */ yytestcase(yyruleno==332);
-      /* (333) conslist ::= conslist tconscomma tcons */ yytestcase(yyruleno==333);
-      /* (334) conslist ::= tcons (OPTIMIZED OUT) */ assert(yyruleno!=334);
-      /* (335) tconscomma ::= */ yytestcase(yyruleno==335);
-      /* (336) defer_subclause_opt ::= defer_subclause (OPTIMIZED OUT) */ assert(yyruleno!=336);
-      /* (337) resolvetype ::= raisetype (OPTIMIZED OUT) */ assert(yyruleno!=337);
-      /* (338) selectnowith ::= oneselect (OPTIMIZED OUT) */ assert(yyruleno!=338);
-      /* (339) oneselect ::= values */ yytestcase(yyruleno==339);
-      /* (340) sclp ::= selcollist COMMA */ yytestcase(yyruleno==340);
-      /* (341) as ::= ID|STRING */ yytestcase(yyruleno==341);
-      /* (342) expr ::= term (OPTIMIZED OUT) */ assert(yyruleno!=342);
-      /* (343) likeop ::= LIKE_KW|MATCH */ yytestcase(yyruleno==343);
-      /* (344) exprlist ::= nexprlist */ yytestcase(yyruleno==344);
-      /* (345) nmnum ::= plus_num (OPTIMIZED OUT) */ assert(yyruleno!=345);
-      /* (346) nmnum ::= nm (OPTIMIZED OUT) */ assert(yyruleno!=346);
-      /* (347) nmnum ::= ON */ yytestcase(yyruleno==347);
-      /* (348) nmnum ::= DELETE */ yytestcase(yyruleno==348);
-      /* (349) nmnum ::= DEFAULT */ yytestcase(yyruleno==349);
-      /* (350) plus_num ::= INTEGER|FLOAT */ yytestcase(yyruleno==350);
-      /* (351) foreach_clause ::= */ yytestcase(yyruleno==351);
-      /* (352) foreach_clause ::= FOR EACH ROW */ yytestcase(yyruleno==352);
-      /* (353) trnm ::= nm */ yytestcase(yyruleno==353);
-      /* (354) tridxby ::= */ yytestcase(yyruleno==354);
-      /* (355) database_kw_opt ::= DATABASE */ yytestcase(yyruleno==355);
-      /* (356) database_kw_opt ::= */ yytestcase(yyruleno==356);
-      /* (357) kwcolumn_opt ::= */ yytestcase(yyruleno==357);
-      /* (358) kwcolumn_opt ::= COLUMNKW */ yytestcase(yyruleno==358);
-      /* (359) vtabarglist ::= vtabarg */ yytestcase(yyruleno==359);
-      /* (360) vtabarglist ::= vtabarglist COMMA vtabarg */ yytestcase(yyruleno==360);
-      /* (361) vtabarg ::= vtabarg vtabargtoken */ yytestcase(yyruleno==361);
-      /* (362) anylist ::= */ yytestcase(yyruleno==362);
-      /* (363) anylist ::= anylist LP anylist RP */ yytestcase(yyruleno==363);
-      /* (364) anylist ::= anylist ANY */ yytestcase(yyruleno==364);
-      /* (365) with ::= */ yytestcase(yyruleno==365);
+      /* (309) input ::= cmdlist */ yytestcase(yyruleno==309);
+      /* (310) cmdlist ::= cmdlist ecmd */ yytestcase(yyruleno==310);
+      /* (311) cmdlist ::= ecmd (OPTIMIZED OUT) */ assert(yyruleno!=311);
+      /* (312) ecmd ::= SEMI */ yytestcase(yyruleno==312);
+      /* (313) ecmd ::= cmdx SEMI */ yytestcase(yyruleno==313);
+      /* (314) ecmd ::= explain cmdx */ yytestcase(yyruleno==314);
+      /* (315) trans_opt ::= */ yytestcase(yyruleno==315);
+      /* (316) trans_opt ::= TRANSACTION */ yytestcase(yyruleno==316);
+      /* (317) trans_opt ::= TRANSACTION nm */ yytestcase(yyruleno==317);
+      /* (318) savepoint_opt ::= SAVEPOINT */ yytestcase(yyruleno==318);
+      /* (319) savepoint_opt ::= */ yytestcase(yyruleno==319);
+      /* (320) cmd ::= create_table create_table_args */ yytestcase(yyruleno==320);
+      /* (321) columnlist ::= columnlist COMMA columnname carglist */ yytestcase(yyruleno==321);
+      /* (322) columnlist ::= columnname carglist */ yytestcase(yyruleno==322);
+      /* (323) nm ::= ID|INDEXED */ yytestcase(yyruleno==323);
+      /* (324) nm ::= STRING */ yytestcase(yyruleno==324);
+      /* (325) nm ::= JOIN_KW */ yytestcase(yyruleno==325);
+      /* (326) typetoken ::= typename */ yytestcase(yyruleno==326);
+      /* (327) typename ::= ID|STRING */ yytestcase(yyruleno==327);
+      /* (328) signed ::= plus_num (OPTIMIZED OUT) */ assert(yyruleno!=328);
+      /* (329) signed ::= minus_num (OPTIMIZED OUT) */ assert(yyruleno!=329);
+      /* (330) carglist ::= carglist ccons */ yytestcase(yyruleno==330);
+      /* (331) carglist ::= */ yytestcase(yyruleno==331);
+      /* (332) ccons ::= NULL onconf */ yytestcase(yyruleno==332);
+      /* (333) conslist_opt ::= COMMA conslist */ yytestcase(yyruleno==333);
+      /* (334) conslist ::= conslist tconscomma tcons */ yytestcase(yyruleno==334);
+      /* (335) conslist ::= tcons (OPTIMIZED OUT) */ assert(yyruleno!=335);
+      /* (336) tconscomma ::= */ yytestcase(yyruleno==336);
+      /* (337) defer_subclause_opt ::= defer_subclause (OPTIMIZED OUT) */ assert(yyruleno!=337);
+      /* (338) resolvetype ::= raisetype (OPTIMIZED OUT) */ assert(yyruleno!=338);
+      /* (339) selectnowith ::= oneselect (OPTIMIZED OUT) */ assert(yyruleno!=339);
+      /* (340) oneselect ::= values */ yytestcase(yyruleno==340);
+      /* (341) sclp ::= selcollist COMMA */ yytestcase(yyruleno==341);
+      /* (342) as ::= ID|STRING */ yytestcase(yyruleno==342);
+      /* (343) expr ::= term (OPTIMIZED OUT) */ assert(yyruleno!=343);
+      /* (344) likeop ::= LIKE_KW|MATCH */ yytestcase(yyruleno==344);
+      /* (345) exprlist ::= nexprlist */ yytestcase(yyruleno==345);
+      /* (346) nmnum ::= plus_num (OPTIMIZED OUT) */ assert(yyruleno!=346);
+      /* (347) nmnum ::= nm (OPTIMIZED OUT) */ assert(yyruleno!=347);
+      /* (348) nmnum ::= ON */ yytestcase(yyruleno==348);
+      /* (349) nmnum ::= DELETE */ yytestcase(yyruleno==349);
+      /* (350) nmnum ::= DEFAULT */ yytestcase(yyruleno==350);
+      /* (351) plus_num ::= INTEGER|FLOAT */ yytestcase(yyruleno==351);
+      /* (352) foreach_clause ::= */ yytestcase(yyruleno==352);
+      /* (353) foreach_clause ::= FOR EACH ROW */ yytestcase(yyruleno==353);
+      /* (354) trnm ::= nm */ yytestcase(yyruleno==354);
+      /* (355) tridxby ::= */ yytestcase(yyruleno==355);
+      /* (356) database_kw_opt ::= DATABASE */ yytestcase(yyruleno==356);
+      /* (357) database_kw_opt ::= */ yytestcase(yyruleno==357);
+      /* (358) kwcolumn_opt ::= */ yytestcase(yyruleno==358);
+      /* (359) kwcolumn_opt ::= COLUMNKW */ yytestcase(yyruleno==359);
+      /* (360) vtabarglist ::= vtabarg */ yytestcase(yyruleno==360);
+      /* (361) vtabarglist ::= vtabarglist COMMA vtabarg */ yytestcase(yyruleno==361);
+      /* (362) vtabarg ::= vtabarg vtabargtoken */ yytestcase(yyruleno==362);
+      /* (363) anylist ::= */ yytestcase(yyruleno==363);
+      /* (364) anylist ::= anylist LP anylist RP */ yytestcase(yyruleno==364);
+      /* (365) anylist ::= anylist ANY */ yytestcase(yyruleno==365);
+      /* (366) with ::= */ yytestcase(yyruleno==366);
         break;
 /********** End reduce actions ************************************************/
   };
   assert( yyruleno<sizeof(yyRuleInfo)/sizeof(yyRuleInfo[0]) );
   yygoto = yyRuleInfo[yyruleno].lhs;
@@ -149632,14 +150782,12 @@
     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0,  /* Fx */
 };
 #define IdChar(C)  (((c=C)>=0x42 && sqlite3IsEbcdicIdChar[c-0x40]))
 #endif
 
-/* Make the IdChar function accessible from ctime.c */
-#ifndef SQLITE_OMIT_COMPILEOPTION_DIAGS
+/* Make the IdChar function accessible from ctime.c and alter.c */
 SQLITE_PRIVATE int sqlite3IsIdChar(u8 c){ return IdChar(c); }
-#endif
 
 #ifndef SQLITE_OMIT_WINDOWFUNC
 /*
 ** Return the id of the next token in string (*pz). Before returning, set
 ** (*pz) to point to the byte following the parsed token.
@@ -150138,20 +151286,22 @@
 #endif
 #ifndef SQLITE_OMIT_VIRTUALTABLE
   sqlite3_free(pParse->apVtabLock);
 #endif
 
-  if( !IN_DECLARE_VTAB ){
+  if( !IN_SPECIAL_PARSE ){
     /* If the pParse->declareVtab flag is set, do not delete any table 
     ** structure built up in pParse->pNewTable. The calling code (see vtab.c)
     ** will take responsibility for freeing the Table structure.
     */
     sqlite3DeleteTable(db, pParse->pNewTable);
   }
+  if( !IN_RENAME_OBJECT ){
+    sqlite3DeleteTrigger(db, pParse->pNewTrigger);
+  }
 
   if( pParse->pWithToFree ) sqlite3WithDelete(db, pParse->pWithToFree);
-  sqlite3DeleteTrigger(db, pParse->pNewTrigger);
   sqlite3DbFree(db, pParse->pVList);
   while( pParse->pAinc ){
     AutoincInfo *p = pParse->pAinc;
     pParse->pAinc = p->pNext;
     sqlite3DbFreeNN(db, p);
@@ -151884,10 +153034,11 @@
   int i, origRc = rc;
   for(i=0; i<2 && zName==0; i++, rc &= 0xff){
     switch( rc ){
       case SQLITE_OK:                 zName = "SQLITE_OK";                break;
       case SQLITE_ERROR:              zName = "SQLITE_ERROR";             break;
+      case SQLITE_ERROR_SNAPSHOT:     zName = "SQLITE_ERROR_SNAPSHOT";    break;
       case SQLITE_INTERNAL:           zName = "SQLITE_INTERNAL";          break;
       case SQLITE_PERM:               zName = "SQLITE_PERM";              break;
       case SQLITE_ABORT:              zName = "SQLITE_ABORT";             break;
       case SQLITE_ABORT_ROLLBACK:     zName = "SQLITE_ABORT_ROLLBACK";    break;
       case SQLITE_BUSY:               zName = "SQLITE_BUSY";              break;
@@ -159940,11 +161091,11 @@
 */
 static int fts3SavepointMethod(sqlite3_vtab *pVtab, int iSavepoint){
   int rc = SQLITE_OK;
   UNUSED_PARAMETER(iSavepoint);
   assert( ((Fts3Table *)pVtab)->inTransaction );
-  assert( ((Fts3Table *)pVtab)->mxSavepoint < iSavepoint );
+  assert( ((Fts3Table *)pVtab)->mxSavepoint <= iSavepoint );
   TESTONLY( ((Fts3Table *)pVtab)->mxSavepoint = iSavepoint );
   if( ((Fts3Table *)pVtab)->bIgnoreSavepoint==0 ){
     rc = fts3SyncMethod(pVtab);
   }
   return rc;
@@ -174363,10 +175514,2530 @@
 }
 #endif /* defined(SQLITE_ENABLE_FTS3) || defined(SQLITE_ENABLE_FTS4) */
 #endif /* !defined(SQLITE_DISABLE_FTS3_UNICODE) */
 
 /************** End of fts3_unicode2.c ***************************************/
+/************** Begin file json1.c *******************************************/
+/*
+** 2015-08-12
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+******************************************************************************
+**
+** This SQLite extension implements JSON functions.  The interface is
+** modeled after MySQL JSON functions:
+**
+**     https://dev.mysql.com/doc/refman/5.7/en/json.html
+**
+** For the time being, all JSON is stored as pure text.  (We might add
+** a JSONB type in the future which stores a binary encoding of JSON in
+** a BLOB, but there is no support for JSONB in the current implementation.
+** This implementation parses JSON text at 250 MB/s, so it is hard to see
+** how JSONB might improve on that.)
+*/
+#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_JSON1)
+#if !defined(SQLITEINT_H)
+/* #include "sqlite3ext.h" */
+#endif
+SQLITE_EXTENSION_INIT1
+/* #include <assert.h> */
+/* #include <string.h> */
+/* #include <stdlib.h> */
+/* #include <stdarg.h> */
+
+/* Mark a function parameter as unused, to suppress nuisance compiler
+** warnings. */
+#ifndef UNUSED_PARAM
+# define UNUSED_PARAM(X)  (void)(X)
+#endif
+
+#ifndef LARGEST_INT64
+# define LARGEST_INT64  (0xffffffff|(((sqlite3_int64)0x7fffffff)<<32))
+# define SMALLEST_INT64 (((sqlite3_int64)-1) - LARGEST_INT64)
+#endif
+
+/*
+** Versions of isspace(), isalnum() and isdigit() to which it is safe
+** to pass signed char values.
+*/
+#ifdef sqlite3Isdigit
+   /* Use the SQLite core versions if this routine is part of the
+   ** SQLite amalgamation */
+#  define safe_isdigit(x)  sqlite3Isdigit(x)
+#  define safe_isalnum(x)  sqlite3Isalnum(x)
+#  define safe_isxdigit(x) sqlite3Isxdigit(x)
+#else
+   /* Use the standard library for separate compilation */
+#include <ctype.h>  /* amalgamator: keep */
+#  define safe_isdigit(x)  isdigit((unsigned char)(x))
+#  define safe_isalnum(x)  isalnum((unsigned char)(x))
+#  define safe_isxdigit(x) isxdigit((unsigned char)(x))
+#endif
+
+/*
+** Growing our own isspace() routine this way is twice as fast as
+** the library isspace() function, resulting in a 7% overall performance
+** increase for the parser.  (Ubuntu14.10 gcc 4.8.4 x64 with -Os).
+*/
+static const char jsonIsSpace[] = {
+  0, 0, 0, 0, 0, 0, 0, 0,     0, 1, 1, 0, 0, 1, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+  1, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+};
+#define safe_isspace(x) (jsonIsSpace[(unsigned char)x])
+
+#ifndef SQLITE_AMALGAMATION
+  /* Unsigned integer types.  These are already defined in the sqliteInt.h,
+  ** but the definitions need to be repeated for separate compilation. */
+  typedef sqlite3_uint64 u64;
+  typedef unsigned int u32;
+  typedef unsigned short int u16;
+  typedef unsigned char u8;
+#endif
+
+/* Objects */
+typedef struct JsonString JsonString;
+typedef struct JsonNode JsonNode;
+typedef struct JsonParse JsonParse;
+
+/* An instance of this object represents a JSON string
+** under construction.  Really, this is a generic string accumulator
+** that can be and is used to create strings other than JSON.
+*/
+struct JsonString {
+  sqlite3_context *pCtx;   /* Function context - put error messages here */
+  char *zBuf;              /* Append JSON content here */
+  u64 nAlloc;              /* Bytes of storage available in zBuf[] */
+  u64 nUsed;               /* Bytes of zBuf[] currently used */
+  u8 bStatic;              /* True if zBuf is static space */
+  u8 bErr;                 /* True if an error has been encountered */
+  char zSpace[100];        /* Initial static space */
+};
+
+/* JSON type values
+*/
+#define JSON_NULL     0
+#define JSON_TRUE     1
+#define JSON_FALSE    2
+#define JSON_INT      3
+#define JSON_REAL     4
+#define JSON_STRING   5
+#define JSON_ARRAY    6
+#define JSON_OBJECT   7
+
+/* The "subtype" set for JSON values */
+#define JSON_SUBTYPE  74    /* Ascii for "J" */
+
+/*
+** Names of the various JSON types:
+*/
+static const char * const jsonType[] = {
+  "null", "true", "false", "integer", "real", "text", "array", "object"
+};
+
+/* Bit values for the JsonNode.jnFlag field
+*/
+#define JNODE_RAW     0x01         /* Content is raw, not JSON encoded */
+#define JNODE_ESCAPE  0x02         /* Content is text with \ escapes */
+#define JNODE_REMOVE  0x04         /* Do not output */
+#define JNODE_REPLACE 0x08         /* Replace with JsonNode.u.iReplace */
+#define JNODE_PATCH   0x10         /* Patch with JsonNode.u.pPatch */
+#define JNODE_APPEND  0x20         /* More ARRAY/OBJECT entries at u.iAppend */
+#define JNODE_LABEL   0x40         /* Is a label of an object */
+
+
+/* A single node of parsed JSON
+*/
+struct JsonNode {
+  u8 eType;              /* One of the JSON_ type values */
+  u8 jnFlags;            /* JNODE flags */
+  u32 n;                 /* Bytes of content, or number of sub-nodes */
+  union {
+    const char *zJContent; /* Content for INT, REAL, and STRING */
+    u32 iAppend;           /* More terms for ARRAY and OBJECT */
+    u32 iKey;              /* Key for ARRAY objects in json_tree() */
+    u32 iReplace;          /* Replacement content for JNODE_REPLACE */
+    JsonNode *pPatch;      /* Node chain of patch for JNODE_PATCH */
+  } u;
+};
+
+/* A completely parsed JSON string
+*/
+struct JsonParse {
+  u32 nNode;         /* Number of slots of aNode[] used */
+  u32 nAlloc;        /* Number of slots of aNode[] allocated */
+  JsonNode *aNode;   /* Array of nodes containing the parse */
+  const char *zJson; /* Original JSON string */
+  u32 *aUp;          /* Index of parent of each node */
+  u8 oom;            /* Set to true if out of memory */
+  u8 nErr;           /* Number of errors seen */
+  u16 iDepth;        /* Nesting depth */
+  int nJson;         /* Length of the zJson string in bytes */
+  u32 iHold;         /* Replace cache line with the lowest iHold value */
+};
+
+/*
+** Maximum nesting depth of JSON for this implementation.
+**
+** This limit is needed to avoid a stack overflow in the recursive
+** descent parser.  A depth of 2000 is far deeper than any sane JSON
+** should go.
+*/
+#define JSON_MAX_DEPTH  2000
+
+/**************************************************************************
+** Utility routines for dealing with JsonString objects
+**************************************************************************/
+
+/* Set the JsonString object to an empty string
+*/
+static void jsonZero(JsonString *p){
+  p->zBuf = p->zSpace;
+  p->nAlloc = sizeof(p->zSpace);
+  p->nUsed = 0;
+  p->bStatic = 1;
+}
+
+/* Initialize the JsonString object
+*/
+static void jsonInit(JsonString *p, sqlite3_context *pCtx){
+  p->pCtx = pCtx;
+  p->bErr = 0;
+  jsonZero(p);
+}
+
+
+/* Free all allocated memory and reset the JsonString object back to its
+** initial state.
+*/
+static void jsonReset(JsonString *p){
+  if( !p->bStatic ) sqlite3_free(p->zBuf);
+  jsonZero(p);
+}
+
+
+/* Report an out-of-memory (OOM) condition 
+*/
+static void jsonOom(JsonString *p){
+  p->bErr = 1;
+  sqlite3_result_error_nomem(p->pCtx);
+  jsonReset(p);
+}
+
+/* Enlarge pJson->zBuf so that it can hold at least N more bytes.
+** Return zero on success.  Return non-zero on an OOM error
+*/
+static int jsonGrow(JsonString *p, u32 N){
+  u64 nTotal = N<p->nAlloc ? p->nAlloc*2 : p->nAlloc+N+10;
+  char *zNew;
+  if( p->bStatic ){
+    if( p->bErr ) return 1;
+    zNew = sqlite3_malloc64(nTotal);
+    if( zNew==0 ){
+      jsonOom(p);
+      return SQLITE_NOMEM;
+    }
+    memcpy(zNew, p->zBuf, (size_t)p->nUsed);
+    p->zBuf = zNew;
+    p->bStatic = 0;
+  }else{
+    zNew = sqlite3_realloc64(p->zBuf, nTotal);
+    if( zNew==0 ){
+      jsonOom(p);
+      return SQLITE_NOMEM;
+    }
+    p->zBuf = zNew;
+  }
+  p->nAlloc = nTotal;
+  return SQLITE_OK;
+}
+
+/* Append N bytes from zIn onto the end of the JsonString string.
+*/
+static void jsonAppendRaw(JsonString *p, const char *zIn, u32 N){
+  if( (N+p->nUsed >= p->nAlloc) && jsonGrow(p,N)!=0 ) return;
+  memcpy(p->zBuf+p->nUsed, zIn, N);
+  p->nUsed += N;
+}
+
+/* Append formatted text (not to exceed N bytes) to the JsonString.
+*/
+static void jsonPrintf(int N, JsonString *p, const char *zFormat, ...){
+  va_list ap;
+  if( (p->nUsed + N >= p->nAlloc) && jsonGrow(p, N) ) return;
+  va_start(ap, zFormat);
+  sqlite3_vsnprintf(N, p->zBuf+p->nUsed, zFormat, ap);
+  va_end(ap);
+  p->nUsed += (int)strlen(p->zBuf+p->nUsed);
+}
+
+/* Append a single character
+*/
+static void jsonAppendChar(JsonString *p, char c){
+  if( p->nUsed>=p->nAlloc && jsonGrow(p,1)!=0 ) return;
+  p->zBuf[p->nUsed++] = c;
+}
+
+/* Append a comma separator to the output buffer, if the previous
+** character is not '[' or '{'.
+*/
+static void jsonAppendSeparator(JsonString *p){
+  char c;
+  if( p->nUsed==0 ) return;
+  c = p->zBuf[p->nUsed-1];
+  if( c!='[' && c!='{' ) jsonAppendChar(p, ',');
+}
+
+/* Append the N-byte string in zIn to the end of the JsonString string
+** under construction.  Enclose the string in "..." and escape
+** any double-quotes or backslash characters contained within the
+** string.
+*/
+static void jsonAppendString(JsonString *p, const char *zIn, u32 N){
+  u32 i;
+  if( (N+p->nUsed+2 >= p->nAlloc) && jsonGrow(p,N+2)!=0 ) return;
+  p->zBuf[p->nUsed++] = '"';
+  for(i=0; i<N; i++){
+    unsigned char c = ((unsigned const char*)zIn)[i];
+    if( c=='"' || c=='\\' ){
+      json_simple_escape:
+      if( (p->nUsed+N+3-i > p->nAlloc) && jsonGrow(p,N+3-i)!=0 ) return;
+      p->zBuf[p->nUsed++] = '\\';
+    }else if( c<=0x1f ){
+      static const char aSpecial[] = {
+         0, 0, 0, 0, 0, 0, 0, 0, 'b', 't', 'n', 0, 'f', 'r', 0, 0,
+         0, 0, 0, 0, 0, 0, 0, 0,   0,   0,   0, 0,   0,   0, 0, 0
+      };
+      assert( sizeof(aSpecial)==32 );
+      assert( aSpecial['\b']=='b' );
+      assert( aSpecial['\f']=='f' );
+      assert( aSpecial['\n']=='n' );
+      assert( aSpecial['\r']=='r' );
+      assert( aSpecial['\t']=='t' );
+      if( aSpecial[c] ){
+        c = aSpecial[c];
+        goto json_simple_escape;
+      }
+      if( (p->nUsed+N+7+i > p->nAlloc) && jsonGrow(p,N+7-i)!=0 ) return;
+      p->zBuf[p->nUsed++] = '\\';
+      p->zBuf[p->nUsed++] = 'u';
+      p->zBuf[p->nUsed++] = '0';
+      p->zBuf[p->nUsed++] = '0';
+      p->zBuf[p->nUsed++] = '0' + (c>>4);
+      c = "0123456789abcdef"[c&0xf];
+    }
+    p->zBuf[p->nUsed++] = c;
+  }
+  p->zBuf[p->nUsed++] = '"';
+  assert( p->nUsed<p->nAlloc );
+}
+
+/*
+** Append a function parameter value to the JSON string under 
+** construction.
+*/
+static void jsonAppendValue(
+  JsonString *p,                 /* Append to this JSON string */
+  sqlite3_value *pValue          /* Value to append */
+){
+  switch( sqlite3_value_type(pValue) ){
+    case SQLITE_NULL: {
+      jsonAppendRaw(p, "null", 4);
+      break;
+    }
+    case SQLITE_INTEGER:
+    case SQLITE_FLOAT: {
+      const char *z = (const char*)sqlite3_value_text(pValue);
+      u32 n = (u32)sqlite3_value_bytes(pValue);
+      jsonAppendRaw(p, z, n);
+      break;
+    }
+    case SQLITE_TEXT: {
+      const char *z = (const char*)sqlite3_value_text(pValue);
+      u32 n = (u32)sqlite3_value_bytes(pValue);
+      if( sqlite3_value_subtype(pValue)==JSON_SUBTYPE ){
+        jsonAppendRaw(p, z, n);
+      }else{
+        jsonAppendString(p, z, n);
+      }
+      break;
+    }
+    default: {
+      if( p->bErr==0 ){
+        sqlite3_result_error(p->pCtx, "JSON cannot hold BLOB values", -1);
+        p->bErr = 2;
+        jsonReset(p);
+      }
+      break;
+    }
+  }
+}
+
+
+/* Make the JSON in p the result of the SQL function.
+*/
+static void jsonResult(JsonString *p){
+  if( p->bErr==0 ){
+    sqlite3_result_text64(p->pCtx, p->zBuf, p->nUsed, 
+                          p->bStatic ? SQLITE_TRANSIENT : sqlite3_free,
+                          SQLITE_UTF8);
+    jsonZero(p);
+  }
+  assert( p->bStatic );
+}
+
+/**************************************************************************
+** Utility routines for dealing with JsonNode and JsonParse objects
+**************************************************************************/
+
+/*
+** Return the number of consecutive JsonNode slots need to represent
+** the parsed JSON at pNode.  The minimum answer is 1.  For ARRAY and
+** OBJECT types, the number might be larger.
+**
+** Appended elements are not counted.  The value returned is the number
+** by which the JsonNode counter should increment in order to go to the
+** next peer value.
+*/
+static u32 jsonNodeSize(JsonNode *pNode){
+  return pNode->eType>=JSON_ARRAY ? pNode->n+1 : 1;
+}
+
+/*
+** Reclaim all memory allocated by a JsonParse object.  But do not
+** delete the JsonParse object itself.
+*/
+static void jsonParseReset(JsonParse *pParse){
+  sqlite3_free(pParse->aNode);
+  pParse->aNode = 0;
+  pParse->nNode = 0;
+  pParse->nAlloc = 0;
+  sqlite3_free(pParse->aUp);
+  pParse->aUp = 0;
+}
+
+/*
+** Free a JsonParse object that was obtained from sqlite3_malloc().
+*/
+static void jsonParseFree(JsonParse *pParse){
+  jsonParseReset(pParse);
+  sqlite3_free(pParse);
+}
+
+/*
+** Convert the JsonNode pNode into a pure JSON string and
+** append to pOut.  Subsubstructure is also included.  Return
+** the number of JsonNode objects that are encoded.
+*/
+static void jsonRenderNode(
+  JsonNode *pNode,               /* The node to render */
+  JsonString *pOut,              /* Write JSON here */
+  sqlite3_value **aReplace       /* Replacement values */
+){
+  if( pNode->jnFlags & (JNODE_REPLACE|JNODE_PATCH) ){
+    if( pNode->jnFlags & JNODE_REPLACE ){
+      jsonAppendValue(pOut, aReplace[pNode->u.iReplace]);
+      return;
+    }
+    pNode = pNode->u.pPatch;
+  }
+  switch( pNode->eType ){
+    default: {
+      assert( pNode->eType==JSON_NULL );
+      jsonAppendRaw(pOut, "null", 4);
+      break;
+    }
+    case JSON_TRUE: {
+      jsonAppendRaw(pOut, "true", 4);
+      break;
+    }
+    case JSON_FALSE: {
+      jsonAppendRaw(pOut, "false", 5);
+      break;
+    }
+    case JSON_STRING: {
+      if( pNode->jnFlags & JNODE_RAW ){
+        jsonAppendString(pOut, pNode->u.zJContent, pNode->n);
+        break;
+      }
+      /* Fall through into the next case */
+    }
+    case JSON_REAL:
+    case JSON_INT: {
+      jsonAppendRaw(pOut, pNode->u.zJContent, pNode->n);
+      break;
+    }
+    case JSON_ARRAY: {
+      u32 j = 1;
+      jsonAppendChar(pOut, '[');
+      for(;;){
+        while( j<=pNode->n ){
+          if( (pNode[j].jnFlags & JNODE_REMOVE)==0 ){
+            jsonAppendSeparator(pOut);
+            jsonRenderNode(&pNode[j], pOut, aReplace);
+          }
+          j += jsonNodeSize(&pNode[j]);
+        }
+        if( (pNode->jnFlags & JNODE_APPEND)==0 ) break;
+        pNode = &pNode[pNode->u.iAppend];
+        j = 1;
+      }
+      jsonAppendChar(pOut, ']');
+      break;
+    }
+    case JSON_OBJECT: {
+      u32 j = 1;
+      jsonAppendChar(pOut, '{');
+      for(;;){
+        while( j<=pNode->n ){
+          if( (pNode[j+1].jnFlags & JNODE_REMOVE)==0 ){
+            jsonAppendSeparator(pOut);
+            jsonRenderNode(&pNode[j], pOut, aReplace);
+            jsonAppendChar(pOut, ':');
+            jsonRenderNode(&pNode[j+1], pOut, aReplace);
+          }
+          j += 1 + jsonNodeSize(&pNode[j+1]);
+        }
+        if( (pNode->jnFlags & JNODE_APPEND)==0 ) break;
+        pNode = &pNode[pNode->u.iAppend];
+        j = 1;
+      }
+      jsonAppendChar(pOut, '}');
+      break;
+    }
+  }
+}
+
+/*
+** Return a JsonNode and all its descendents as a JSON string.
+*/
+static void jsonReturnJson(
+  JsonNode *pNode,            /* Node to return */
+  sqlite3_context *pCtx,      /* Return value for this function */
+  sqlite3_value **aReplace    /* Array of replacement values */
+){
+  JsonString s;
+  jsonInit(&s, pCtx);
+  jsonRenderNode(pNode, &s, aReplace);
+  jsonResult(&s);
+  sqlite3_result_subtype(pCtx, JSON_SUBTYPE);
+}
+
+/*
+** Make the JsonNode the return value of the function.
+*/
+static void jsonReturn(
+  JsonNode *pNode,            /* Node to return */
+  sqlite3_context *pCtx,      /* Return value for this function */
+  sqlite3_value **aReplace    /* Array of replacement values */
+){
+  switch( pNode->eType ){
+    default: {
+      assert( pNode->eType==JSON_NULL );
+      sqlite3_result_null(pCtx);
+      break;
+    }
+    case JSON_TRUE: {
+      sqlite3_result_int(pCtx, 1);
+      break;
+    }
+    case JSON_FALSE: {
+      sqlite3_result_int(pCtx, 0);
+      break;
+    }
+    case JSON_INT: {
+      sqlite3_int64 i = 0;
+      const char *z = pNode->u.zJContent;
+      if( z[0]=='-' ){ z++; }
+      while( z[0]>='0' && z[0]<='9' ){
+        unsigned v = *(z++) - '0';
+        if( i>=LARGEST_INT64/10 ){
+          if( i>LARGEST_INT64/10 ) goto int_as_real;
+          if( z[0]>='0' && z[0]<='9' ) goto int_as_real;
+          if( v==9 ) goto int_as_real;
+          if( v==8 ){
+            if( pNode->u.zJContent[0]=='-' ){
+              sqlite3_result_int64(pCtx, SMALLEST_INT64);
+              goto int_done;
+            }else{
+              goto int_as_real;
+            }
+          }
+        }
+        i = i*10 + v;
+      }
+      if( pNode->u.zJContent[0]=='-' ){ i = -i; }
+      sqlite3_result_int64(pCtx, i);
+      int_done:
+      break;
+      int_as_real: /* fall through to real */;
+    }
+    case JSON_REAL: {
+      double r;
+#ifdef SQLITE_AMALGAMATION
+      const char *z = pNode->u.zJContent;
+      sqlite3AtoF(z, &r, sqlite3Strlen30(z), SQLITE_UTF8);
+#else
+      r = strtod(pNode->u.zJContent, 0);
+#endif
+      sqlite3_result_double(pCtx, r);
+      break;
+    }
+    case JSON_STRING: {
+#if 0 /* Never happens because JNODE_RAW is only set by json_set(),
+      ** json_insert() and json_replace() and those routines do not
+      ** call jsonReturn() */
+      if( pNode->jnFlags & JNODE_RAW ){
+        sqlite3_result_text(pCtx, pNode->u.zJContent, pNode->n,
+                            SQLITE_TRANSIENT);
+      }else 
+#endif
+      assert( (pNode->jnFlags & JNODE_RAW)==0 );
+      if( (pNode->jnFlags & JNODE_ESCAPE)==0 ){
+        /* JSON formatted without any backslash-escapes */
+        sqlite3_result_text(pCtx, pNode->u.zJContent+1, pNode->n-2,
+                            SQLITE_TRANSIENT);
+      }else{
+        /* Translate JSON formatted string into raw text */
+        u32 i;
+        u32 n = pNode->n;
+        const char *z = pNode->u.zJContent;
+        char *zOut;
+        u32 j;
+        zOut = sqlite3_malloc( n+1 );
+        if( zOut==0 ){
+          sqlite3_result_error_nomem(pCtx);
+          break;
+        }
+        for(i=1, j=0; i<n-1; i++){
+          char c = z[i];
+          if( c!='\\' ){
+            zOut[j++] = c;
+          }else{
+            c = z[++i];
+            if( c=='u' ){
+              u32 v = 0, k;
+              for(k=0; k<4; i++, k++){
+                assert( i<n-2 );
+                c = z[i+1];
+                assert( safe_isxdigit(c) );
+                if( c<='9' ) v = v*16 + c - '0';
+                else if( c<='F' ) v = v*16 + c - 'A' + 10;
+                else v = v*16 + c - 'a' + 10;
+              }
+              if( v==0 ) break;
+              if( v<=0x7f ){
+                zOut[j++] = (char)v;
+              }else if( v<=0x7ff ){
+                zOut[j++] = (char)(0xc0 | (v>>6));
+                zOut[j++] = 0x80 | (v&0x3f);
+              }else{
+                zOut[j++] = (char)(0xe0 | (v>>12));
+                zOut[j++] = 0x80 | ((v>>6)&0x3f);
+                zOut[j++] = 0x80 | (v&0x3f);
+              }
+            }else{
+              if( c=='b' ){
+                c = '\b';
+              }else if( c=='f' ){
+                c = '\f';
+              }else if( c=='n' ){
+                c = '\n';
+              }else if( c=='r' ){
+                c = '\r';
+              }else if( c=='t' ){
+                c = '\t';
+              }
+              zOut[j++] = c;
+            }
+          }
+        }
+        zOut[j] = 0;
+        sqlite3_result_text(pCtx, zOut, j, sqlite3_free);
+      }
+      break;
+    }
+    case JSON_ARRAY:
+    case JSON_OBJECT: {
+      jsonReturnJson(pNode, pCtx, aReplace);
+      break;
+    }
+  }
+}
+
+/* Forward reference */
+static int jsonParseAddNode(JsonParse*,u32,u32,const char*);
+
+/*
+** A macro to hint to the compiler that a function should not be
+** inlined.
+*/
+#if defined(__GNUC__)
+#  define JSON_NOINLINE  __attribute__((noinline))
+#elif defined(_MSC_VER) && _MSC_VER>=1310
+#  define JSON_NOINLINE  __declspec(noinline)
+#else
+#  define JSON_NOINLINE
+#endif
+
+
+static JSON_NOINLINE int jsonParseAddNodeExpand(
+  JsonParse *pParse,        /* Append the node to this object */
+  u32 eType,                /* Node type */
+  u32 n,                    /* Content size or sub-node count */
+  const char *zContent      /* Content */
+){
+  u32 nNew;
+  JsonNode *pNew;
+  assert( pParse->nNode>=pParse->nAlloc );
+  if( pParse->oom ) return -1;
+  nNew = pParse->nAlloc*2 + 10;
+  pNew = sqlite3_realloc(pParse->aNode, sizeof(JsonNode)*nNew);
+  if( pNew==0 ){
+    pParse->oom = 1;
+    return -1;
+  }
+  pParse->nAlloc = nNew;
+  pParse->aNode = pNew;
+  assert( pParse->nNode<pParse->nAlloc );
+  return jsonParseAddNode(pParse, eType, n, zContent);
+}
+
+/*
+** Create a new JsonNode instance based on the arguments and append that
+** instance to the JsonParse.  Return the index in pParse->aNode[] of the
+** new node, or -1 if a memory allocation fails.
+*/
+static int jsonParseAddNode(
+  JsonParse *pParse,        /* Append the node to this object */
+  u32 eType,                /* Node type */
+  u32 n,                    /* Content size or sub-node count */
+  const char *zContent      /* Content */
+){
+  JsonNode *p;
+  if( pParse->nNode>=pParse->nAlloc ){
+    return jsonParseAddNodeExpand(pParse, eType, n, zContent);
+  }
+  p = &pParse->aNode[pParse->nNode];
+  p->eType = (u8)eType;
+  p->jnFlags = 0;
+  p->n = n;
+  p->u.zJContent = zContent;
+  return pParse->nNode++;
+}
+
+/*
+** Return true if z[] begins with 4 (or more) hexadecimal digits
+*/
+static int jsonIs4Hex(const char *z){
+  int i;
+  for(i=0; i<4; i++) if( !safe_isxdigit(z[i]) ) return 0;
+  return 1;
+}
+
+/*
+** Parse a single JSON value which begins at pParse->zJson[i].  Return the
+** index of the first character past the end of the value parsed.
+**
+** Return negative for a syntax error.  Special cases:  return -2 if the
+** first non-whitespace character is '}' and return -3 if the first
+** non-whitespace character is ']'.
+*/
+static int jsonParseValue(JsonParse *pParse, u32 i){
+  char c;
+  u32 j;
+  int iThis;
+  int x;
+  JsonNode *pNode;
+  const char *z = pParse->zJson;
+  while( safe_isspace(z[i]) ){ i++; }
+  if( (c = z[i])=='{' ){
+    /* Parse object */
+    iThis = jsonParseAddNode(pParse, JSON_OBJECT, 0, 0);
+    if( iThis<0 ) return -1;
+    for(j=i+1;;j++){
+      while( safe_isspace(z[j]) ){ j++; }
+      if( ++pParse->iDepth > JSON_MAX_DEPTH ) return -1;
+      x = jsonParseValue(pParse, j);
+      if( x<0 ){
+        pParse->iDepth--;
+        if( x==(-2) && pParse->nNode==(u32)iThis+1 ) return j+1;
+        return -1;
+      }
+      if( pParse->oom ) return -1;
+      pNode = &pParse->aNode[pParse->nNode-1];
+      if( pNode->eType!=JSON_STRING ) return -1;
+      pNode->jnFlags |= JNODE_LABEL;
+      j = x;
+      while( safe_isspace(z[j]) ){ j++; }
+      if( z[j]!=':' ) return -1;
+      j++;
+      x = jsonParseValue(pParse, j);
+      pParse->iDepth--;
+      if( x<0 ) return -1;
+      j = x;
+      while( safe_isspace(z[j]) ){ j++; }
+      c = z[j];
+      if( c==',' ) continue;
+      if( c!='}' ) return -1;
+      break;
+    }
+    pParse->aNode[iThis].n = pParse->nNode - (u32)iThis - 1;
+    return j+1;
+  }else if( c=='[' ){
+    /* Parse array */
+    iThis = jsonParseAddNode(pParse, JSON_ARRAY, 0, 0);
+    if( iThis<0 ) return -1;
+    for(j=i+1;;j++){
+      while( safe_isspace(z[j]) ){ j++; }
+      if( ++pParse->iDepth > JSON_MAX_DEPTH ) return -1;
+      x = jsonParseValue(pParse, j);
+      pParse->iDepth--;
+      if( x<0 ){
+        if( x==(-3) && pParse->nNode==(u32)iThis+1 ) return j+1;
+        return -1;
+      }
+      j = x;
+      while( safe_isspace(z[j]) ){ j++; }
+      c = z[j];
+      if( c==',' ) continue;
+      if( c!=']' ) return -1;
+      break;
+    }
+    pParse->aNode[iThis].n = pParse->nNode - (u32)iThis - 1;
+    return j+1;
+  }else if( c=='"' ){
+    /* Parse string */
+    u8 jnFlags = 0;
+    j = i+1;
+    for(;;){
+      c = z[j];
+      if( (c & ~0x1f)==0 ){
+        /* Control characters are not allowed in strings */
+        return -1;
+      }
+      if( c=='\\' ){
+        c = z[++j];
+        if( c=='"' || c=='\\' || c=='/' || c=='b' || c=='f'
+           || c=='n' || c=='r' || c=='t'
+           || (c=='u' && jsonIs4Hex(z+j+1)) ){
+          jnFlags = JNODE_ESCAPE;
+        }else{
+          return -1;
+        }
+      }else if( c=='"' ){
+        break;
+      }
+      j++;
+    }
+    jsonParseAddNode(pParse, JSON_STRING, j+1-i, &z[i]);
+    if( !pParse->oom ) pParse->aNode[pParse->nNode-1].jnFlags = jnFlags;
+    return j+1;
+  }else if( c=='n'
+         && strncmp(z+i,"null",4)==0
+         && !safe_isalnum(z[i+4]) ){
+    jsonParseAddNode(pParse, JSON_NULL, 0, 0);
+    return i+4;
+  }else if( c=='t'
+         && strncmp(z+i,"true",4)==0
+         && !safe_isalnum(z[i+4]) ){
+    jsonParseAddNode(pParse, JSON_TRUE, 0, 0);
+    return i+4;
+  }else if( c=='f'
+         && strncmp(z+i,"false",5)==0
+         && !safe_isalnum(z[i+5]) ){
+    jsonParseAddNode(pParse, JSON_FALSE, 0, 0);
+    return i+5;
+  }else if( c=='-' || (c>='0' && c<='9') ){
+    /* Parse number */
+    u8 seenDP = 0;
+    u8 seenE = 0;
+    assert( '-' < '0' );
+    if( c<='0' ){
+      j = c=='-' ? i+1 : i;
+      if( z[j]=='0' && z[j+1]>='0' && z[j+1]<='9' ) return -1;
+    }
+    j = i+1;
+    for(;; j++){
+      c = z[j];
+      if( c>='0' && c<='9' ) continue;
+      if( c=='.' ){
+        if( z[j-1]=='-' ) return -1;
+        if( seenDP ) return -1;
+        seenDP = 1;
+        continue;
+      }
+      if( c=='e' || c=='E' ){
+        if( z[j-1]<'0' ) return -1;
+        if( seenE ) return -1;
+        seenDP = seenE = 1;
+        c = z[j+1];
+        if( c=='+' || c=='-' ){
+          j++;
+          c = z[j+1];
+        }
+        if( c<'0' || c>'9' ) return -1;
+        continue;
+      }
+      break;
+    }
+    if( z[j-1]<'0' ) return -1;
+    jsonParseAddNode(pParse, seenDP ? JSON_REAL : JSON_INT,
+                        j - i, &z[i]);
+    return j;
+  }else if( c=='}' ){
+    return -2;  /* End of {...} */
+  }else if( c==']' ){
+    return -3;  /* End of [...] */
+  }else if( c==0 ){
+    return 0;   /* End of file */
+  }else{
+    return -1;  /* Syntax error */
+  }
+}
+
+/*
+** Parse a complete JSON string.  Return 0 on success or non-zero if there
+** are any errors.  If an error occurs, free all memory associated with
+** pParse.
+**
+** pParse is uninitialized when this routine is called.
+*/
+static int jsonParse(
+  JsonParse *pParse,           /* Initialize and fill this JsonParse object */
+  sqlite3_context *pCtx,       /* Report errors here */
+  const char *zJson            /* Input JSON text to be parsed */
+){
+  int i;
+  memset(pParse, 0, sizeof(*pParse));
+  if( zJson==0 ) return 1;
+  pParse->zJson = zJson;
+  i = jsonParseValue(pParse, 0);
+  if( pParse->oom ) i = -1;
+  if( i>0 ){
+    assert( pParse->iDepth==0 );
+    while( safe_isspace(zJson[i]) ) i++;
+    if( zJson[i] ) i = -1;
+  }
+  if( i<=0 ){
+    if( pCtx!=0 ){
+      if( pParse->oom ){
+        sqlite3_result_error_nomem(pCtx);
+      }else{
+        sqlite3_result_error(pCtx, "malformed JSON", -1);
+      }
+    }
+    jsonParseReset(pParse);
+    return 1;
+  }
+  return 0;
+}
+
+/* Mark node i of pParse as being a child of iParent.  Call recursively
+** to fill in all the descendants of node i.
+*/
+static void jsonParseFillInParentage(JsonParse *pParse, u32 i, u32 iParent){
+  JsonNode *pNode = &pParse->aNode[i];
+  u32 j;
+  pParse->aUp[i] = iParent;
+  switch( pNode->eType ){
+    case JSON_ARRAY: {
+      for(j=1; j<=pNode->n; j += jsonNodeSize(pNode+j)){
+        jsonParseFillInParentage(pParse, i+j, i);
+      }
+      break;
+    }
+    case JSON_OBJECT: {
+      for(j=1; j<=pNode->n; j += jsonNodeSize(pNode+j+1)+1){
+        pParse->aUp[i+j] = i;
+        jsonParseFillInParentage(pParse, i+j+1, i);
+      }
+      break;
+    }
+    default: {
+      break;
+    }
+  }
+}
+
+/*
+** Compute the parentage of all nodes in a completed parse.
+*/
+static int jsonParseFindParents(JsonParse *pParse){
+  u32 *aUp;
+  assert( pParse->aUp==0 );
+  aUp = pParse->aUp = sqlite3_malloc( sizeof(u32)*pParse->nNode );
+  if( aUp==0 ){
+    pParse->oom = 1;
+    return SQLITE_NOMEM;
+  }
+  jsonParseFillInParentage(pParse, 0, 0);
+  return SQLITE_OK;
+}
+
+/*
+** Magic number used for the JSON parse cache in sqlite3_get_auxdata()
+*/
+#define JSON_CACHE_ID  (-429938)  /* First cache entry */
+#define JSON_CACHE_SZ  4          /* Max number of cache entries */
+
+/*
+** Obtain a complete parse of the JSON found in the first argument
+** of the argv array.  Use the sqlite3_get_auxdata() cache for this
+** parse if it is available.  If the cache is not available or if it
+** is no longer valid, parse the JSON again and return the new parse,
+** and also register the new parse so that it will be available for
+** future sqlite3_get_auxdata() calls.
+*/
+static JsonParse *jsonParseCached(
+  sqlite3_context *pCtx,
+  sqlite3_value **argv,
+  sqlite3_context *pErrCtx
+){
+  const char *zJson = (const char*)sqlite3_value_text(argv[0]);
+  int nJson = sqlite3_value_bytes(argv[0]);
+  JsonParse *p;
+  JsonParse *pMatch = 0;
+  int iKey;
+  int iMinKey = 0;
+  u32 iMinHold = 0xffffffff;
+  u32 iMaxHold = 0;
+  if( zJson==0 ) return 0;
+  for(iKey=0; iKey<JSON_CACHE_SZ; iKey++){
+    p = (JsonParse*)sqlite3_get_auxdata(pCtx, JSON_CACHE_ID+iKey);
+    if( p==0 ){
+      iMinKey = iKey;
+      break;
+    }
+    if( pMatch==0
+     && p->nJson==nJson
+     && memcmp(p->zJson,zJson,nJson)==0
+    ){
+      p->nErr = 0;
+      pMatch = p;
+    }else if( p->iHold<iMinHold ){
+      iMinHold = p->iHold;
+      iMinKey = iKey;
+    }
+    if( p->iHold>iMaxHold ){
+      iMaxHold = p->iHold;
+    }
+  }
+  if( pMatch ){
+    pMatch->nErr = 0;
+    pMatch->iHold = iMaxHold+1;
+    return pMatch;
+  }
+  p = sqlite3_malloc( sizeof(*p) + nJson + 1 );
+  if( p==0 ){
+    sqlite3_result_error_nomem(pCtx);
+    return 0;
+  }
+  memset(p, 0, sizeof(*p));
+  p->zJson = (char*)&p[1];
+  memcpy((char*)p->zJson, zJson, nJson+1);
+  if( jsonParse(p, pErrCtx, p->zJson) ){
+    sqlite3_free(p);
+    return 0;
+  }
+  p->nJson = nJson;
+  p->iHold = iMaxHold+1;
+  sqlite3_set_auxdata(pCtx, JSON_CACHE_ID+iMinKey, p,
+                      (void(*)(void*))jsonParseFree);
+  return (JsonParse*)sqlite3_get_auxdata(pCtx, JSON_CACHE_ID+iMinKey);
+}
+
+/*
+** Compare the OBJECT label at pNode against zKey,nKey.  Return true on
+** a match.
+*/
+static int jsonLabelCompare(JsonNode *pNode, const char *zKey, u32 nKey){
+  if( pNode->jnFlags & JNODE_RAW ){
+    if( pNode->n!=nKey ) return 0;
+    return strncmp(pNode->u.zJContent, zKey, nKey)==0;
+  }else{
+    if( pNode->n!=nKey+2 ) return 0;
+    return strncmp(pNode->u.zJContent+1, zKey, nKey)==0;
+  }
+}
+
+/* forward declaration */
+static JsonNode *jsonLookupAppend(JsonParse*,const char*,int*,const char**);
+
+/*
+** Search along zPath to find the node specified.  Return a pointer
+** to that node, or NULL if zPath is malformed or if there is no such
+** node.
+**
+** If pApnd!=0, then try to append new nodes to complete zPath if it is
+** possible to do so and if no existing node corresponds to zPath.  If
+** new nodes are appended *pApnd is set to 1.
+*/
+static JsonNode *jsonLookupStep(
+  JsonParse *pParse,      /* The JSON to search */
+  u32 iRoot,              /* Begin the search at this node */
+  const char *zPath,      /* The path to search */
+  int *pApnd,             /* Append nodes to complete path if not NULL */
+  const char **pzErr      /* Make *pzErr point to any syntax error in zPath */
+){
+  u32 i, j, nKey;
+  const char *zKey;
+  JsonNode *pRoot = &pParse->aNode[iRoot];
+  if( zPath[0]==0 ) return pRoot;
+  if( zPath[0]=='.' ){
+    if( pRoot->eType!=JSON_OBJECT ) return 0;
+    zPath++;
+    if( zPath[0]=='"' ){
+      zKey = zPath + 1;
+      for(i=1; zPath[i] && zPath[i]!='"'; i++){}
+      nKey = i-1;
+      if( zPath[i] ){
+        i++;
+      }else{
+        *pzErr = zPath;
+        return 0;
+      }
+    }else{
+      zKey = zPath;
+      for(i=0; zPath[i] && zPath[i]!='.' && zPath[i]!='['; i++){}
+      nKey = i;
+    }
+    if( nKey==0 ){
+      *pzErr = zPath;
+      return 0;
+    }
+    j = 1;
+    for(;;){
+      while( j<=pRoot->n ){
+        if( jsonLabelCompare(pRoot+j, zKey, nKey) ){
+          return jsonLookupStep(pParse, iRoot+j+1, &zPath[i], pApnd, pzErr);
+        }
+        j++;
+        j += jsonNodeSize(&pRoot[j]);
+      }
+      if( (pRoot->jnFlags & JNODE_APPEND)==0 ) break;
+      iRoot += pRoot->u.iAppend;
+      pRoot = &pParse->aNode[iRoot];
+      j = 1;
+    }
+    if( pApnd ){
+      u32 iStart, iLabel;
+      JsonNode *pNode;
+      iStart = jsonParseAddNode(pParse, JSON_OBJECT, 2, 0);
+      iLabel = jsonParseAddNode(pParse, JSON_STRING, i, zPath);
+      zPath += i;
+      pNode = jsonLookupAppend(pParse, zPath, pApnd, pzErr);
+      if( pParse->oom ) return 0;
+      if( pNode ){
+        pRoot = &pParse->aNode[iRoot];
+        pRoot->u.iAppend = iStart - iRoot;
+        pRoot->jnFlags |= JNODE_APPEND;
+        pParse->aNode[iLabel].jnFlags |= JNODE_RAW;
+      }
+      return pNode;
+    }
+  }else if( zPath[0]=='[' && safe_isdigit(zPath[1]) ){
+    if( pRoot->eType!=JSON_ARRAY ) return 0;
+    i = 0;
+    j = 1;
+    while( safe_isdigit(zPath[j]) ){
+      i = i*10 + zPath[j] - '0';
+      j++;
+    }
+    if( zPath[j]!=']' ){
+      *pzErr = zPath;
+      return 0;
+    }
+    zPath += j + 1;
+    j = 1;
+    for(;;){
+      while( j<=pRoot->n && (i>0 || (pRoot[j].jnFlags & JNODE_REMOVE)!=0) ){
+        if( (pRoot[j].jnFlags & JNODE_REMOVE)==0 ) i--;
+        j += jsonNodeSize(&pRoot[j]);
+      }
+      if( (pRoot->jnFlags & JNODE_APPEND)==0 ) break;
+      iRoot += pRoot->u.iAppend;
+      pRoot = &pParse->aNode[iRoot];
+      j = 1;
+    }
+    if( j<=pRoot->n ){
+      return jsonLookupStep(pParse, iRoot+j, zPath, pApnd, pzErr);
+    }
+    if( i==0 && pApnd ){
+      u32 iStart;
+      JsonNode *pNode;
+      iStart = jsonParseAddNode(pParse, JSON_ARRAY, 1, 0);
+      pNode = jsonLookupAppend(pParse, zPath, pApnd, pzErr);
+      if( pParse->oom ) return 0;
+      if( pNode ){
+        pRoot = &pParse->aNode[iRoot];
+        pRoot->u.iAppend = iStart - iRoot;
+        pRoot->jnFlags |= JNODE_APPEND;
+      }
+      return pNode;
+    }
+  }else{
+    *pzErr = zPath;
+  }
+  return 0;
+}
+
+/*
+** Append content to pParse that will complete zPath.  Return a pointer
+** to the inserted node, or return NULL if the append fails.
+*/
+static JsonNode *jsonLookupAppend(
+  JsonParse *pParse,     /* Append content to the JSON parse */
+  const char *zPath,     /* Description of content to append */
+  int *pApnd,            /* Set this flag to 1 */
+  const char **pzErr     /* Make this point to any syntax error */
+){
+  *pApnd = 1;
+  if( zPath[0]==0 ){
+    jsonParseAddNode(pParse, JSON_NULL, 0, 0);
+    return pParse->oom ? 0 : &pParse->aNode[pParse->nNode-1];
+  }
+  if( zPath[0]=='.' ){
+    jsonParseAddNode(pParse, JSON_OBJECT, 0, 0);
+  }else if( strncmp(zPath,"[0]",3)==0 ){
+    jsonParseAddNode(pParse, JSON_ARRAY, 0, 0);
+  }else{
+    return 0;
+  }
+  if( pParse->oom ) return 0;
+  return jsonLookupStep(pParse, pParse->nNode-1, zPath, pApnd, pzErr);
+}
+
+/*
+** Return the text of a syntax error message on a JSON path.  Space is
+** obtained from sqlite3_malloc().
+*/
+static char *jsonPathSyntaxError(const char *zErr){
+  return sqlite3_mprintf("JSON path error near '%q'", zErr);
+}
+
+/*
+** Do a node lookup using zPath.  Return a pointer to the node on success.
+** Return NULL if not found or if there is an error.
+**
+** On an error, write an error message into pCtx and increment the
+** pParse->nErr counter.
+**
+** If pApnd!=NULL then try to append missing nodes and set *pApnd = 1 if
+** nodes are appended.
+*/
+static JsonNode *jsonLookup(
+  JsonParse *pParse,      /* The JSON to search */
+  const char *zPath,      /* The path to search */
+  int *pApnd,             /* Append nodes to complete path if not NULL */
+  sqlite3_context *pCtx   /* Report errors here, if not NULL */
+){
+  const char *zErr = 0;
+  JsonNode *pNode = 0;
+  char *zMsg;
+
+  if( zPath==0 ) return 0;
+  if( zPath[0]!='$' ){
+    zErr = zPath;
+    goto lookup_err;
+  }
+  zPath++;
+  pNode = jsonLookupStep(pParse, 0, zPath, pApnd, &zErr);
+  if( zErr==0 ) return pNode;
+
+lookup_err:
+  pParse->nErr++;
+  assert( zErr!=0 && pCtx!=0 );
+  zMsg = jsonPathSyntaxError(zErr);
+  if( zMsg ){
+    sqlite3_result_error(pCtx, zMsg, -1);
+    sqlite3_free(zMsg);
+  }else{
+    sqlite3_result_error_nomem(pCtx);
+  }
+  return 0;
+}
+
+
+/*
+** Report the wrong number of arguments for json_insert(), json_replace()
+** or json_set().
+*/
+static void jsonWrongNumArgs(
+  sqlite3_context *pCtx,
+  const char *zFuncName
+){
+  char *zMsg = sqlite3_mprintf("json_%s() needs an odd number of arguments",
+                               zFuncName);
+  sqlite3_result_error(pCtx, zMsg, -1);
+  sqlite3_free(zMsg);     
+}
+
+/*
+** Mark all NULL entries in the Object passed in as JNODE_REMOVE.
+*/
+static void jsonRemoveAllNulls(JsonNode *pNode){
+  int i, n;
+  assert( pNode->eType==JSON_OBJECT );
+  n = pNode->n;
+  for(i=2; i<=n; i += jsonNodeSize(&pNode[i])+1){
+    switch( pNode[i].eType ){
+      case JSON_NULL:
+        pNode[i].jnFlags |= JNODE_REMOVE;
+        break;
+      case JSON_OBJECT:
+        jsonRemoveAllNulls(&pNode[i]);
+        break;
+    }
+  }
+}
+
+
+/****************************************************************************
+** SQL functions used for testing and debugging
+****************************************************************************/
+
+#ifdef SQLITE_DEBUG
+/*
+** The json_parse(JSON) function returns a string which describes
+** a parse of the JSON provided.  Or it returns NULL if JSON is not
+** well-formed.
+*/
+static void jsonParseFunc(
+  sqlite3_context *ctx,
+  int argc,
+  sqlite3_value **argv
+){
+  JsonString s;       /* Output string - not real JSON */
+  JsonParse x;        /* The parse */
+  u32 i;
+
+  assert( argc==1 );
+  if( jsonParse(&x, ctx, (const char*)sqlite3_value_text(argv[0])) ) return;
+  jsonParseFindParents(&x);
+  jsonInit(&s, ctx);
+  for(i=0; i<x.nNode; i++){
+    const char *zType;
+    if( x.aNode[i].jnFlags & JNODE_LABEL ){
+      assert( x.aNode[i].eType==JSON_STRING );
+      zType = "label";
+    }else{
+      zType = jsonType[x.aNode[i].eType];
+    }
+    jsonPrintf(100, &s,"node %3u: %7s n=%-4d up=%-4d",
+               i, zType, x.aNode[i].n, x.aUp[i]);
+    if( x.aNode[i].u.zJContent!=0 ){
+      jsonAppendRaw(&s, " ", 1);
+      jsonAppendRaw(&s, x.aNode[i].u.zJContent, x.aNode[i].n);
+    }
+    jsonAppendRaw(&s, "\n", 1);
+  }
+  jsonParseReset(&x);
+  jsonResult(&s);
+}
+
+/*
+** The json_test1(JSON) function return true (1) if the input is JSON
+** text generated by another json function.  It returns (0) if the input
+** is not known to be JSON.
+*/
+static void jsonTest1Func(
+  sqlite3_context *ctx,
+  int argc,
+  sqlite3_value **argv
+){
+  UNUSED_PARAM(argc);
+  sqlite3_result_int(ctx, sqlite3_value_subtype(argv[0])==JSON_SUBTYPE);
+}
+#endif /* SQLITE_DEBUG */
+
+/****************************************************************************
+** Scalar SQL function implementations
+****************************************************************************/
+
+/*
+** Implementation of the json_QUOTE(VALUE) function.  Return a JSON value
+** corresponding to the SQL value input.  Mostly this means putting 
+** double-quotes around strings and returning the unquoted string "null"
+** when given a NULL input.
+*/
+static void jsonQuoteFunc(
+  sqlite3_context *ctx,
+  int argc,
+  sqlite3_value **argv
+){
+  JsonString jx;
+  UNUSED_PARAM(argc);
+
+  jsonInit(&jx, ctx);
+  jsonAppendValue(&jx, argv[0]);
+  jsonResult(&jx);
+  sqlite3_result_subtype(ctx, JSON_SUBTYPE);
+}
+
+/*
+** Implementation of the json_array(VALUE,...) function.  Return a JSON
+** array that contains all values given in arguments.  Or if any argument
+** is a BLOB, throw an error.
+*/
+static void jsonArrayFunc(
+  sqlite3_context *ctx,
+  int argc,
+  sqlite3_value **argv
+){
+  int i;
+  JsonString jx;
+
+  jsonInit(&jx, ctx);
+  jsonAppendChar(&jx, '[');
+  for(i=0; i<argc; i++){
+    jsonAppendSeparator(&jx);
+    jsonAppendValue(&jx, argv[i]);
+  }
+  jsonAppendChar(&jx, ']');
+  jsonResult(&jx);
+  sqlite3_result_subtype(ctx, JSON_SUBTYPE);
+}
+
+
+/*
+** json_array_length(JSON)
+** json_array_length(JSON, PATH)
+**
+** Return the number of elements in the top-level JSON array.  
+** Return 0 if the input is not a well-formed JSON array.
+*/
+static void jsonArrayLengthFunc(
+  sqlite3_context *ctx,
+  int argc,
+  sqlite3_value **argv
+){
+  JsonParse *p;          /* The parse */
+  sqlite3_int64 n = 0;
+  u32 i;
+  JsonNode *pNode;
+
+  p = jsonParseCached(ctx, argv, ctx);
+  if( p==0 ) return;
+  assert( p->nNode );
+  if( argc==2 ){
+    const char *zPath = (const char*)sqlite3_value_text(argv[1]);
+    pNode = jsonLookup(p, zPath, 0, ctx);
+  }else{
+    pNode = p->aNode;
+  }
+  if( pNode==0 ){
+    return;
+  }
+  if( pNode->eType==JSON_ARRAY ){
+    assert( (pNode->jnFlags & JNODE_APPEND)==0 );
+    for(i=1; i<=pNode->n; n++){
+      i += jsonNodeSize(&pNode[i]);
+    }
+  }
+  sqlite3_result_int64(ctx, n);
+}
+
+/*
+** json_extract(JSON, PATH, ...)
+**
+** Return the element described by PATH.  Return NULL if there is no
+** PATH element.  If there are multiple PATHs, then return a JSON array
+** with the result from each path.  Throw an error if the JSON or any PATH
+** is malformed.
+*/
+static void jsonExtractFunc(
+  sqlite3_context *ctx,
+  int argc,
+  sqlite3_value **argv
+){
+  JsonParse *p;          /* The parse */
+  JsonNode *pNode;
+  const char *zPath;
+  JsonString jx;
+  int i;
+
+  if( argc<2 ) return;
+  p = jsonParseCached(ctx, argv, ctx);
+  if( p==0 ) return;
+  jsonInit(&jx, ctx);
+  jsonAppendChar(&jx, '[');
+  for(i=1; i<argc; i++){
+    zPath = (const char*)sqlite3_value_text(argv[i]);
+    pNode = jsonLookup(p, zPath, 0, ctx);
+    if( p->nErr ) break;
+    if( argc>2 ){
+      jsonAppendSeparator(&jx);
+      if( pNode ){
+        jsonRenderNode(pNode, &jx, 0);
+      }else{
+        jsonAppendRaw(&jx, "null", 4);
+      }
+    }else if( pNode ){
+      jsonReturn(pNode, ctx, 0);
+    }
+  }
+  if( argc>2 && i==argc ){
+    jsonAppendChar(&jx, ']');
+    jsonResult(&jx);
+    sqlite3_result_subtype(ctx, JSON_SUBTYPE);
+  }
+  jsonReset(&jx);
+}
+
+/* This is the RFC 7396 MergePatch algorithm.
+*/
+static JsonNode *jsonMergePatch(
+  JsonParse *pParse,   /* The JSON parser that contains the TARGET */
+  u32 iTarget,         /* Node of the TARGET in pParse */
+  JsonNode *pPatch     /* The PATCH */
+){
+  u32 i, j;
+  u32 iRoot;
+  JsonNode *pTarget;
+  if( pPatch->eType!=JSON_OBJECT ){
+    return pPatch;
+  }
+  assert( iTarget>=0 && iTarget<pParse->nNode );
+  pTarget = &pParse->aNode[iTarget];
+  assert( (pPatch->jnFlags & JNODE_APPEND)==0 );
+  if( pTarget->eType!=JSON_OBJECT ){
+    jsonRemoveAllNulls(pPatch);
+    return pPatch;
+  }
+  iRoot = iTarget;
+  for(i=1; i<pPatch->n; i += jsonNodeSize(&pPatch[i+1])+1){
+    u32 nKey;
+    const char *zKey;
+    assert( pPatch[i].eType==JSON_STRING );
+    assert( pPatch[i].jnFlags & JNODE_LABEL );
+    nKey = pPatch[i].n;
+    zKey = pPatch[i].u.zJContent;
+    assert( (pPatch[i].jnFlags & JNODE_RAW)==0 );
+    for(j=1; j<pTarget->n; j += jsonNodeSize(&pTarget[j+1])+1 ){
+      assert( pTarget[j].eType==JSON_STRING );
+      assert( pTarget[j].jnFlags & JNODE_LABEL );
+      assert( (pPatch[i].jnFlags & JNODE_RAW)==0 );
+      if( pTarget[j].n==nKey && strncmp(pTarget[j].u.zJContent,zKey,nKey)==0 ){
+        if( pTarget[j+1].jnFlags & (JNODE_REMOVE|JNODE_PATCH) ) break;
+        if( pPatch[i+1].eType==JSON_NULL ){
+          pTarget[j+1].jnFlags |= JNODE_REMOVE;
+        }else{
+          JsonNode *pNew = jsonMergePatch(pParse, iTarget+j+1, &pPatch[i+1]);
+          if( pNew==0 ) return 0;
+          pTarget = &pParse->aNode[iTarget];
+          if( pNew!=&pTarget[j+1] ){
+            pTarget[j+1].u.pPatch = pNew;
+            pTarget[j+1].jnFlags |= JNODE_PATCH;
+          }
+        }
+        break;
+      }
+    }
+    if( j>=pTarget->n && pPatch[i+1].eType!=JSON_NULL ){
+      int iStart, iPatch;
+      iStart = jsonParseAddNode(pParse, JSON_OBJECT, 2, 0);
+      jsonParseAddNode(pParse, JSON_STRING, nKey, zKey);
+      iPatch = jsonParseAddNode(pParse, JSON_TRUE, 0, 0);
+      if( pParse->oom ) return 0;
+      jsonRemoveAllNulls(pPatch);
+      pTarget = &pParse->aNode[iTarget];
+      pParse->aNode[iRoot].jnFlags |= JNODE_APPEND;
+      pParse->aNode[iRoot].u.iAppend = iStart - iRoot;
+      iRoot = iStart;
+      pParse->aNode[iPatch].jnFlags |= JNODE_PATCH;
+      pParse->aNode[iPatch].u.pPatch = &pPatch[i+1];
+    }
+  }
+  return pTarget;
+}
+
+/*
+** Implementation of the json_mergepatch(JSON1,JSON2) function.  Return a JSON
+** object that is the result of running the RFC 7396 MergePatch() algorithm
+** on the two arguments.
+*/
+static void jsonPatchFunc(
+  sqlite3_context *ctx,
+  int argc,
+  sqlite3_value **argv
+){
+  JsonParse x;     /* The JSON that is being patched */
+  JsonParse y;     /* The patch */
+  JsonNode *pResult;   /* The result of the merge */
+
+  UNUSED_PARAM(argc);
+  if( jsonParse(&x, ctx, (const char*)sqlite3_value_text(argv[0])) ) return;
+  if( jsonParse(&y, ctx, (const char*)sqlite3_value_text(argv[1])) ){
+    jsonParseReset(&x);
+    return;
+  }
+  pResult = jsonMergePatch(&x, 0, y.aNode);
+  assert( pResult!=0 || x.oom );
+  if( pResult ){
+    jsonReturnJson(pResult, ctx, 0);
+  }else{
+    sqlite3_result_error_nomem(ctx);
+  }
+  jsonParseReset(&x);
+  jsonParseReset(&y);
+}
+
+
+/*
+** Implementation of the json_object(NAME,VALUE,...) function.  Return a JSON
+** object that contains all name/value given in arguments.  Or if any name
+** is not a string or if any value is a BLOB, throw an error.
+*/
+static void jsonObjectFunc(
+  sqlite3_context *ctx,
+  int argc,
+  sqlite3_value **argv
+){
+  int i;
+  JsonString jx;
+  const char *z;
+  u32 n;
+
+  if( argc&1 ){
+    sqlite3_result_error(ctx, "json_object() requires an even number "
+                                  "of arguments", -1);
+    return;
+  }
+  jsonInit(&jx, ctx);
+  jsonAppendChar(&jx, '{');
+  for(i=0; i<argc; i+=2){
+    if( sqlite3_value_type(argv[i])!=SQLITE_TEXT ){
+      sqlite3_result_error(ctx, "json_object() labels must be TEXT", -1);
+      jsonReset(&jx);
+      return;
+    }
+    jsonAppendSeparator(&jx);
+    z = (const char*)sqlite3_value_text(argv[i]);
+    n = (u32)sqlite3_value_bytes(argv[i]);
+    jsonAppendString(&jx, z, n);
+    jsonAppendChar(&jx, ':');
+    jsonAppendValue(&jx, argv[i+1]);
+  }
+  jsonAppendChar(&jx, '}');
+  jsonResult(&jx);
+  sqlite3_result_subtype(ctx, JSON_SUBTYPE);
+}
+
+
+/*
+** json_remove(JSON, PATH, ...)
+**
+** Remove the named elements from JSON and return the result.  malformed
+** JSON or PATH arguments result in an error.
+*/
+static void jsonRemoveFunc(
+  sqlite3_context *ctx,
+  int argc,
+  sqlite3_value **argv
+){
+  JsonParse x;          /* The parse */
+  JsonNode *pNode;
+  const char *zPath;
+  u32 i;
+
+  if( argc<1 ) return;
+  if( jsonParse(&x, ctx, (const char*)sqlite3_value_text(argv[0])) ) return;
+  assert( x.nNode );
+  for(i=1; i<(u32)argc; i++){
+    zPath = (const char*)sqlite3_value_text(argv[i]);
+    if( zPath==0 ) goto remove_done;
+    pNode = jsonLookup(&x, zPath, 0, ctx);
+    if( x.nErr ) goto remove_done;
+    if( pNode ) pNode->jnFlags |= JNODE_REMOVE;
+  }
+  if( (x.aNode[0].jnFlags & JNODE_REMOVE)==0 ){
+    jsonReturnJson(x.aNode, ctx, 0);
+  }
+remove_done:
+  jsonParseReset(&x);
+}
+
+/*
+** json_replace(JSON, PATH, VALUE, ...)
+**
+** Replace the value at PATH with VALUE.  If PATH does not already exist,
+** this routine is a no-op.  If JSON or PATH is malformed, throw an error.
+*/
+static void jsonReplaceFunc(
+  sqlite3_context *ctx,
+  int argc,
+  sqlite3_value **argv
+){
+  JsonParse x;          /* The parse */
+  JsonNode *pNode;
+  const char *zPath;
+  u32 i;
+
+  if( argc<1 ) return;
+  if( (argc&1)==0 ) {
+    jsonWrongNumArgs(ctx, "replace");
+    return;
+  }
+  if( jsonParse(&x, ctx, (const char*)sqlite3_value_text(argv[0])) ) return;
+  assert( x.nNode );
+  for(i=1; i<(u32)argc; i+=2){
+    zPath = (const char*)sqlite3_value_text(argv[i]);
+    pNode = jsonLookup(&x, zPath, 0, ctx);
+    if( x.nErr ) goto replace_err;
+    if( pNode ){
+      pNode->jnFlags |= (u8)JNODE_REPLACE;
+      pNode->u.iReplace = i + 1;
+    }
+  }
+  if( x.aNode[0].jnFlags & JNODE_REPLACE ){
+    sqlite3_result_value(ctx, argv[x.aNode[0].u.iReplace]);
+  }else{
+    jsonReturnJson(x.aNode, ctx, argv);
+  }
+replace_err:
+  jsonParseReset(&x);
+}
+
+/*
+** json_set(JSON, PATH, VALUE, ...)
+**
+** Set the value at PATH to VALUE.  Create the PATH if it does not already
+** exist.  Overwrite existing values that do exist.
+** If JSON or PATH is malformed, throw an error.
+**
+** json_insert(JSON, PATH, VALUE, ...)
+**
+** Create PATH and initialize it to VALUE.  If PATH already exists, this
+** routine is a no-op.  If JSON or PATH is malformed, throw an error.
+*/
+static void jsonSetFunc(
+  sqlite3_context *ctx,
+  int argc,
+  sqlite3_value **argv
+){
+  JsonParse x;          /* The parse */
+  JsonNode *pNode;
+  const char *zPath;
+  u32 i;
+  int bApnd;
+  int bIsSet = *(int*)sqlite3_user_data(ctx);
+
+  if( argc<1 ) return;
+  if( (argc&1)==0 ) {
+    jsonWrongNumArgs(ctx, bIsSet ? "set" : "insert");
+    return;
+  }
+  if( jsonParse(&x, ctx, (const char*)sqlite3_value_text(argv[0])) ) return;
+  assert( x.nNode );
+  for(i=1; i<(u32)argc; i+=2){
+    zPath = (const char*)sqlite3_value_text(argv[i]);
+    bApnd = 0;
+    pNode = jsonLookup(&x, zPath, &bApnd, ctx);
+    if( x.oom ){
+      sqlite3_result_error_nomem(ctx);
+      goto jsonSetDone;
+    }else if( x.nErr ){
+      goto jsonSetDone;
+    }else if( pNode && (bApnd || bIsSet) ){
+      pNode->jnFlags |= (u8)JNODE_REPLACE;
+      pNode->u.iReplace = i + 1;
+    }
+  }
+  if( x.aNode[0].jnFlags & JNODE_REPLACE ){
+    sqlite3_result_value(ctx, argv[x.aNode[0].u.iReplace]);
+  }else{
+    jsonReturnJson(x.aNode, ctx, argv);
+  }
+jsonSetDone:
+  jsonParseReset(&x);
+}
+
+/*
+** json_type(JSON)
+** json_type(JSON, PATH)
+**
+** Return the top-level "type" of a JSON string.  Throw an error if
+** either the JSON or PATH inputs are not well-formed.
+*/
+static void jsonTypeFunc(
+  sqlite3_context *ctx,
+  int argc,
+  sqlite3_value **argv
+){
+  JsonParse *p;          /* The parse */
+  const char *zPath;
+  JsonNode *pNode;
+
+  p = jsonParseCached(ctx, argv, ctx);
+  if( p==0 ) return;
+  if( argc==2 ){
+    zPath = (const char*)sqlite3_value_text(argv[1]);
+    pNode = jsonLookup(p, zPath, 0, ctx);
+  }else{
+    pNode = p->aNode;
+  }
+  if( pNode ){
+    sqlite3_result_text(ctx, jsonType[pNode->eType], -1, SQLITE_STATIC);
+  }
+}
+
+/*
+** json_valid(JSON)
+**
+** Return 1 if JSON is a well-formed JSON string according to RFC-7159.
+** Return 0 otherwise.
+*/
+static void jsonValidFunc(
+  sqlite3_context *ctx,
+  int argc,
+  sqlite3_value **argv
+){
+  JsonParse *p;          /* The parse */
+  UNUSED_PARAM(argc);
+  p = jsonParseCached(ctx, argv, 0);
+  sqlite3_result_int(ctx, p!=0);
+}
+
+
+/****************************************************************************
+** Aggregate SQL function implementations
+****************************************************************************/
+/*
+** json_group_array(VALUE)
+**
+** Return a JSON array composed of all values in the aggregate.
+*/
+static void jsonArrayStep(
+  sqlite3_context *ctx,
+  int argc,
+  sqlite3_value **argv
+){
+  JsonString *pStr;
+  UNUSED_PARAM(argc);
+  pStr = (JsonString*)sqlite3_aggregate_context(ctx, sizeof(*pStr));
+  if( pStr ){
+    if( pStr->zBuf==0 ){
+      jsonInit(pStr, ctx);
+      jsonAppendChar(pStr, '[');
+    }else{
+      jsonAppendChar(pStr, ',');
+      pStr->pCtx = ctx;
+    }
+    jsonAppendValue(pStr, argv[0]);
+  }
+}
+static void jsonArrayCompute(sqlite3_context *ctx, int isFinal){
+  JsonString *pStr;
+  pStr = (JsonString*)sqlite3_aggregate_context(ctx, 0);
+  if( pStr ){
+    pStr->pCtx = ctx;
+    jsonAppendChar(pStr, ']');
+    if( pStr->bErr ){
+      if( pStr->bErr==1 ) sqlite3_result_error_nomem(ctx);
+      assert( pStr->bStatic );
+    }else if( isFinal ){
+      sqlite3_result_text(ctx, pStr->zBuf, pStr->nUsed,
+                          pStr->bStatic ? SQLITE_TRANSIENT : sqlite3_free);
+      pStr->bStatic = 1;
+    }else{
+      sqlite3_result_text(ctx, pStr->zBuf, pStr->nUsed, SQLITE_TRANSIENT);
+      pStr->nUsed--;
+    }
+  }else{
+    sqlite3_result_text(ctx, "[]", 2, SQLITE_STATIC);
+  }
+  sqlite3_result_subtype(ctx, JSON_SUBTYPE);
+}
+static void jsonArrayValue(sqlite3_context *ctx){
+  jsonArrayCompute(ctx, 0);
+}
+static void jsonArrayFinal(sqlite3_context *ctx){
+  jsonArrayCompute(ctx, 1);
+}
+
+#ifndef SQLITE_OMIT_WINDOWFUNC
+/*
+** This method works for both json_group_array() and json_group_object().
+** It works by removing the first element of the group by searching forward
+** to the first comma (",") that is not within a string and deleting all
+** text through that comma.
+*/
+static void jsonGroupInverse(
+  sqlite3_context *ctx,
+  int argc,
+  sqlite3_value **argv
+){
+  int i;
+  int inStr = 0;
+  char *z;
+  JsonString *pStr;
+  UNUSED_PARAM(argc);
+  UNUSED_PARAM(argv);
+  pStr = (JsonString*)sqlite3_aggregate_context(ctx, 0);
+#ifdef NEVER
+  /* pStr is always non-NULL since jsonArrayStep() or jsonObjectStep() will
+  ** always have been called to initalize it */
+  if( NEVER(!pStr) ) return;
+#endif
+  z = pStr->zBuf;
+  for(i=1; z[i]!=',' || inStr; i++){
+    assert( i<pStr->nUsed );
+    if( z[i]=='"' ){
+      inStr = !inStr;
+    }else if( z[i]=='\\' ){
+      i++;
+    }
+  }
+  pStr->nUsed -= i;      
+  memmove(&z[1], &z[i+1], pStr->nUsed-1);
+}
+#else
+# define jsonGroupInverse 0
+#endif
+
+
+/*
+** json_group_obj(NAME,VALUE)
+**
+** Return a JSON object composed of all names and values in the aggregate.
+*/
+static void jsonObjectStep(
+  sqlite3_context *ctx,
+  int argc,
+  sqlite3_value **argv
+){
+  JsonString *pStr;
+  const char *z;
+  u32 n;
+  UNUSED_PARAM(argc);
+  pStr = (JsonString*)sqlite3_aggregate_context(ctx, sizeof(*pStr));
+  if( pStr ){
+    if( pStr->zBuf==0 ){
+      jsonInit(pStr, ctx);
+      jsonAppendChar(pStr, '{');
+    }else{
+      jsonAppendChar(pStr, ',');
+      pStr->pCtx = ctx;
+    }
+    z = (const char*)sqlite3_value_text(argv[0]);
+    n = (u32)sqlite3_value_bytes(argv[0]);
+    jsonAppendString(pStr, z, n);
+    jsonAppendChar(pStr, ':');
+    jsonAppendValue(pStr, argv[1]);
+  }
+}
+static void jsonObjectCompute(sqlite3_context *ctx, int isFinal){
+  JsonString *pStr;
+  pStr = (JsonString*)sqlite3_aggregate_context(ctx, 0);
+  if( pStr ){
+    jsonAppendChar(pStr, '}');
+    if( pStr->bErr ){
+      if( pStr->bErr==1 ) sqlite3_result_error_nomem(ctx);
+      assert( pStr->bStatic );
+    }else if( isFinal ){
+      sqlite3_result_text(ctx, pStr->zBuf, pStr->nUsed,
+                          pStr->bStatic ? SQLITE_TRANSIENT : sqlite3_free);
+      pStr->bStatic = 1;
+    }else{
+      sqlite3_result_text(ctx, pStr->zBuf, pStr->nUsed, SQLITE_TRANSIENT);
+      pStr->nUsed--;
+    }
+  }else{
+    sqlite3_result_text(ctx, "{}", 2, SQLITE_STATIC);
+  }
+  sqlite3_result_subtype(ctx, JSON_SUBTYPE);
+}
+static void jsonObjectValue(sqlite3_context *ctx){
+  jsonObjectCompute(ctx, 0);
+}
+static void jsonObjectFinal(sqlite3_context *ctx){
+  jsonObjectCompute(ctx, 1);
+}
+
+
+
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+/****************************************************************************
+** The json_each virtual table
+****************************************************************************/
+typedef struct JsonEachCursor JsonEachCursor;
+struct JsonEachCursor {
+  sqlite3_vtab_cursor base;  /* Base class - must be first */
+  u32 iRowid;                /* The rowid */
+  u32 iBegin;                /* The first node of the scan */
+  u32 i;                     /* Index in sParse.aNode[] of current row */
+  u32 iEnd;                  /* EOF when i equals or exceeds this value */
+  u8 eType;                  /* Type of top-level element */
+  u8 bRecursive;             /* True for json_tree().  False for json_each() */
+  char *zJson;               /* Input JSON */
+  char *zRoot;               /* Path by which to filter zJson */
+  JsonParse sParse;          /* Parse of the input JSON */
+};
+
+/* Constructor for the json_each virtual table */
+static int jsonEachConnect(
+  sqlite3 *db,
+  void *pAux,
+  int argc, const char *const*argv,
+  sqlite3_vtab **ppVtab,
+  char **pzErr
+){
+  sqlite3_vtab *pNew;
+  int rc;
+
+/* Column numbers */
+#define JEACH_KEY     0
+#define JEACH_VALUE   1
+#define JEACH_TYPE    2
+#define JEACH_ATOM    3
+#define JEACH_ID      4
+#define JEACH_PARENT  5
+#define JEACH_FULLKEY 6
+#define JEACH_PATH    7
+#define JEACH_JSON    8
+#define JEACH_ROOT    9
+
+  UNUSED_PARAM(pzErr);
+  UNUSED_PARAM(argv);
+  UNUSED_PARAM(argc);
+  UNUSED_PARAM(pAux);
+  rc = sqlite3_declare_vtab(db, 
+     "CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,"
+                    "json HIDDEN,root HIDDEN)");
+  if( rc==SQLITE_OK ){
+    pNew = *ppVtab = sqlite3_malloc( sizeof(*pNew) );
+    if( pNew==0 ) return SQLITE_NOMEM;
+    memset(pNew, 0, sizeof(*pNew));
+  }
+  return rc;
+}
+
+/* destructor for json_each virtual table */
+static int jsonEachDisconnect(sqlite3_vtab *pVtab){
+  sqlite3_free(pVtab);
+  return SQLITE_OK;
+}
+
+/* constructor for a JsonEachCursor object for json_each(). */
+static int jsonEachOpenEach(sqlite3_vtab *p, sqlite3_vtab_cursor **ppCursor){
+  JsonEachCursor *pCur;
+
+  UNUSED_PARAM(p);
+  pCur = sqlite3_malloc( sizeof(*pCur) );
+  if( pCur==0 ) return SQLITE_NOMEM;
+  memset(pCur, 0, sizeof(*pCur));
+  *ppCursor = &pCur->base;
+  return SQLITE_OK;
+}
+
+/* constructor for a JsonEachCursor object for json_tree(). */
+static int jsonEachOpenTree(sqlite3_vtab *p, sqlite3_vtab_cursor **ppCursor){
+  int rc = jsonEachOpenEach(p, ppCursor);
+  if( rc==SQLITE_OK ){
+    JsonEachCursor *pCur = (JsonEachCursor*)*ppCursor;
+    pCur->bRecursive = 1;
+  }
+  return rc;
+}
+
+/* Reset a JsonEachCursor back to its original state.  Free any memory
+** held. */
+static void jsonEachCursorReset(JsonEachCursor *p){
+  sqlite3_free(p->zJson);
+  sqlite3_free(p->zRoot);
+  jsonParseReset(&p->sParse);
+  p->iRowid = 0;
+  p->i = 0;
+  p->iEnd = 0;
+  p->eType = 0;
+  p->zJson = 0;
+  p->zRoot = 0;
+}
+
+/* Destructor for a jsonEachCursor object */
+static int jsonEachClose(sqlite3_vtab_cursor *cur){
+  JsonEachCursor *p = (JsonEachCursor*)cur;
+  jsonEachCursorReset(p);
+  sqlite3_free(cur);
+  return SQLITE_OK;
+}
+
+/* Return TRUE if the jsonEachCursor object has been advanced off the end
+** of the JSON object */
+static int jsonEachEof(sqlite3_vtab_cursor *cur){
+  JsonEachCursor *p = (JsonEachCursor*)cur;
+  return p->i >= p->iEnd;
+}
+
+/* Advance the cursor to the next element for json_tree() */
+static int jsonEachNext(sqlite3_vtab_cursor *cur){
+  JsonEachCursor *p = (JsonEachCursor*)cur;
+  if( p->bRecursive ){
+    if( p->sParse.aNode[p->i].jnFlags & JNODE_LABEL ) p->i++;
+    p->i++;
+    p->iRowid++;
+    if( p->i<p->iEnd ){
+      u32 iUp = p->sParse.aUp[p->i];
+      JsonNode *pUp = &p->sParse.aNode[iUp];
+      p->eType = pUp->eType;
+      if( pUp->eType==JSON_ARRAY ){
+        if( iUp==p->i-1 ){
+          pUp->u.iKey = 0;
+        }else{
+          pUp->u.iKey++;
+        }
+      }
+    }
+  }else{
+    switch( p->eType ){
+      case JSON_ARRAY: {
+        p->i += jsonNodeSize(&p->sParse.aNode[p->i]);
+        p->iRowid++;
+        break;
+      }
+      case JSON_OBJECT: {
+        p->i += 1 + jsonNodeSize(&p->sParse.aNode[p->i+1]);
+        p->iRowid++;
+        break;
+      }
+      default: {
+        p->i = p->iEnd;
+        break;
+      }
+    }
+  }
+  return SQLITE_OK;
+}
+
+/* Append the name of the path for element i to pStr
+*/
+static void jsonEachComputePath(
+  JsonEachCursor *p,       /* The cursor */
+  JsonString *pStr,        /* Write the path here */
+  u32 i                    /* Path to this element */
+){
+  JsonNode *pNode, *pUp;
+  u32 iUp;
+  if( i==0 ){
+    jsonAppendChar(pStr, '$');
+    return;
+  }
+  iUp = p->sParse.aUp[i];
+  jsonEachComputePath(p, pStr, iUp);
+  pNode = &p->sParse.aNode[i];
+  pUp = &p->sParse.aNode[iUp];
+  if( pUp->eType==JSON_ARRAY ){
+    jsonPrintf(30, pStr, "[%d]", pUp->u.iKey);
+  }else{
+    assert( pUp->eType==JSON_OBJECT );
+    if( (pNode->jnFlags & JNODE_LABEL)==0 ) pNode--;
+    assert( pNode->eType==JSON_STRING );
+    assert( pNode->jnFlags & JNODE_LABEL );
+    jsonPrintf(pNode->n+1, pStr, ".%.*s", pNode->n-2, pNode->u.zJContent+1);
+  }
+}
+
+/* Return the value of a column */
+static int jsonEachColumn(
+  sqlite3_vtab_cursor *cur,   /* The cursor */
+  sqlite3_context *ctx,       /* First argument to sqlite3_result_...() */
+  int i                       /* Which column to return */
+){
+  JsonEachCursor *p = (JsonEachCursor*)cur;
+  JsonNode *pThis = &p->sParse.aNode[p->i];
+  switch( i ){
+    case JEACH_KEY: {
+      if( p->i==0 ) break;
+      if( p->eType==JSON_OBJECT ){
+        jsonReturn(pThis, ctx, 0);
+      }else if( p->eType==JSON_ARRAY ){
+        u32 iKey;
+        if( p->bRecursive ){
+          if( p->iRowid==0 ) break;
+          iKey = p->sParse.aNode[p->sParse.aUp[p->i]].u.iKey;
+        }else{
+          iKey = p->iRowid;
+        }
+        sqlite3_result_int64(ctx, (sqlite3_int64)iKey);
+      }
+      break;
+    }
+    case JEACH_VALUE: {
+      if( pThis->jnFlags & JNODE_LABEL ) pThis++;
+      jsonReturn(pThis, ctx, 0);
+      break;
+    }
+    case JEACH_TYPE: {
+      if( pThis->jnFlags & JNODE_LABEL ) pThis++;
+      sqlite3_result_text(ctx, jsonType[pThis->eType], -1, SQLITE_STATIC);
+      break;
+    }
+    case JEACH_ATOM: {
+      if( pThis->jnFlags & JNODE_LABEL ) pThis++;
+      if( pThis->eType>=JSON_ARRAY ) break;
+      jsonReturn(pThis, ctx, 0);
+      break;
+    }
+    case JEACH_ID: {
+      sqlite3_result_int64(ctx, 
+         (sqlite3_int64)p->i + ((pThis->jnFlags & JNODE_LABEL)!=0));
+      break;
+    }
+    case JEACH_PARENT: {
+      if( p->i>p->iBegin && p->bRecursive ){
+        sqlite3_result_int64(ctx, (sqlite3_int64)p->sParse.aUp[p->i]);
+      }
+      break;
+    }
+    case JEACH_FULLKEY: {
+      JsonString x;
+      jsonInit(&x, ctx);
+      if( p->bRecursive ){
+        jsonEachComputePath(p, &x, p->i);
+      }else{
+        if( p->zRoot ){
+          jsonAppendRaw(&x, p->zRoot, (int)strlen(p->zRoot));
+        }else{
+          jsonAppendChar(&x, '$');
+        }
+        if( p->eType==JSON_ARRAY ){
+          jsonPrintf(30, &x, "[%d]", p->iRowid);
+        }else if( p->eType==JSON_OBJECT ){
+          jsonPrintf(pThis->n, &x, ".%.*s", pThis->n-2, pThis->u.zJContent+1);
+        }
+      }
+      jsonResult(&x);
+      break;
+    }
+    case JEACH_PATH: {
+      if( p->bRecursive ){
+        JsonString x;
+        jsonInit(&x, ctx);
+        jsonEachComputePath(p, &x, p->sParse.aUp[p->i]);
+        jsonResult(&x);
+        break;
+      }
+      /* For json_each() path and root are the same so fall through
+      ** into the root case */
+    }
+    default: {
+      const char *zRoot = p->zRoot;
+      if( zRoot==0 ) zRoot = "$";
+      sqlite3_result_text(ctx, zRoot, -1, SQLITE_STATIC);
+      break;
+    }
+    case JEACH_JSON: {
+      assert( i==JEACH_JSON );
+      sqlite3_result_text(ctx, p->sParse.zJson, -1, SQLITE_STATIC);
+      break;
+    }
+  }
+  return SQLITE_OK;
+}
+
+/* Return the current rowid value */
+static int jsonEachRowid(sqlite3_vtab_cursor *cur, sqlite_int64 *pRowid){
+  JsonEachCursor *p = (JsonEachCursor*)cur;
+  *pRowid = p->iRowid;
+  return SQLITE_OK;
+}
+
+/* The query strategy is to look for an equality constraint on the json
+** column.  Without such a constraint, the table cannot operate.  idxNum is
+** 1 if the constraint is found, 3 if the constraint and zRoot are found,
+** and 0 otherwise.
+*/
+static int jsonEachBestIndex(
+  sqlite3_vtab *tab,
+  sqlite3_index_info *pIdxInfo
+){
+  int i;
+  int jsonIdx = -1;
+  int rootIdx = -1;
+  const struct sqlite3_index_constraint *pConstraint;
+
+  UNUSED_PARAM(tab);
+  pConstraint = pIdxInfo->aConstraint;
+  for(i=0; i<pIdxInfo->nConstraint; i++, pConstraint++){
+    if( pConstraint->usable==0 ) continue;
+    if( pConstraint->op!=SQLITE_INDEX_CONSTRAINT_EQ ) continue;
+    switch( pConstraint->iColumn ){
+      case JEACH_JSON:   jsonIdx = i;    break;
+      case JEACH_ROOT:   rootIdx = i;    break;
+      default:           /* no-op */     break;
+    }
+  }
+  if( jsonIdx<0 ){
+    pIdxInfo->idxNum = 0;
+    pIdxInfo->estimatedCost = 1e99;
+  }else{
+    pIdxInfo->estimatedCost = 1.0;
+    pIdxInfo->aConstraintUsage[jsonIdx].argvIndex = 1;
+    pIdxInfo->aConstraintUsage[jsonIdx].omit = 1;
+    if( rootIdx<0 ){
+      pIdxInfo->idxNum = 1;
+    }else{
+      pIdxInfo->aConstraintUsage[rootIdx].argvIndex = 2;
+      pIdxInfo->aConstraintUsage[rootIdx].omit = 1;
+      pIdxInfo->idxNum = 3;
+    }
+  }
+  return SQLITE_OK;
+}
+
+/* Start a search on a new JSON string */
+static int jsonEachFilter(
+  sqlite3_vtab_cursor *cur,
+  int idxNum, const char *idxStr,
+  int argc, sqlite3_value **argv
+){
+  JsonEachCursor *p = (JsonEachCursor*)cur;
+  const char *z;
+  const char *zRoot = 0;
+  sqlite3_int64 n;
+
+  UNUSED_PARAM(idxStr);
+  UNUSED_PARAM(argc);
+  jsonEachCursorReset(p);
+  if( idxNum==0 ) return SQLITE_OK;
+  z = (const char*)sqlite3_value_text(argv[0]);
+  if( z==0 ) return SQLITE_OK;
+  n = sqlite3_value_bytes(argv[0]);
+  p->zJson = sqlite3_malloc64( n+1 );
+  if( p->zJson==0 ) return SQLITE_NOMEM;
+  memcpy(p->zJson, z, (size_t)n+1);
+  if( jsonParse(&p->sParse, 0, p->zJson) ){
+    int rc = SQLITE_NOMEM;
+    if( p->sParse.oom==0 ){
+      sqlite3_free(cur->pVtab->zErrMsg);
+      cur->pVtab->zErrMsg = sqlite3_mprintf("malformed JSON");
+      if( cur->pVtab->zErrMsg ) rc = SQLITE_ERROR;
+    }
+    jsonEachCursorReset(p);
+    return rc;
+  }else if( p->bRecursive && jsonParseFindParents(&p->sParse) ){
+    jsonEachCursorReset(p);
+    return SQLITE_NOMEM;
+  }else{
+    JsonNode *pNode = 0;
+    if( idxNum==3 ){
+      const char *zErr = 0;
+      zRoot = (const char*)sqlite3_value_text(argv[1]);
+      if( zRoot==0 ) return SQLITE_OK;
+      n = sqlite3_value_bytes(argv[1]);
+      p->zRoot = sqlite3_malloc64( n+1 );
+      if( p->zRoot==0 ) return SQLITE_NOMEM;
+      memcpy(p->zRoot, zRoot, (size_t)n+1);
+      if( zRoot[0]!='$' ){
+        zErr = zRoot;
+      }else{
+        pNode = jsonLookupStep(&p->sParse, 0, p->zRoot+1, 0, &zErr);
+      }
+      if( zErr ){
+        sqlite3_free(cur->pVtab->zErrMsg);
+        cur->pVtab->zErrMsg = jsonPathSyntaxError(zErr);
+        jsonEachCursorReset(p);
+        return cur->pVtab->zErrMsg ? SQLITE_ERROR : SQLITE_NOMEM;
+      }else if( pNode==0 ){
+        return SQLITE_OK;
+      }
+    }else{
+      pNode = p->sParse.aNode;
+    }
+    p->iBegin = p->i = (int)(pNode - p->sParse.aNode);
+    p->eType = pNode->eType;
+    if( p->eType>=JSON_ARRAY ){
+      pNode->u.iKey = 0;
+      p->iEnd = p->i + pNode->n + 1;
+      if( p->bRecursive ){
+        p->eType = p->sParse.aNode[p->sParse.aUp[p->i]].eType;
+        if( p->i>0 && (p->sParse.aNode[p->i-1].jnFlags & JNODE_LABEL)!=0 ){
+          p->i--;
+        }
+      }else{
+        p->i++;
+      }
+    }else{
+      p->iEnd = p->i+1;
+    }
+  }
+  return SQLITE_OK;
+}
+
+/* The methods of the json_each virtual table */
+static sqlite3_module jsonEachModule = {
+  0,                         /* iVersion */
+  0,                         /* xCreate */
+  jsonEachConnect,           /* xConnect */
+  jsonEachBestIndex,         /* xBestIndex */
+  jsonEachDisconnect,        /* xDisconnect */
+  0,                         /* xDestroy */
+  jsonEachOpenEach,          /* xOpen - open a cursor */
+  jsonEachClose,             /* xClose - close a cursor */
+  jsonEachFilter,            /* xFilter - configure scan constraints */
+  jsonEachNext,              /* xNext - advance a cursor */
+  jsonEachEof,               /* xEof - check for end of scan */
+  jsonEachColumn,            /* xColumn - read data */
+  jsonEachRowid,             /* xRowid - read data */
+  0,                         /* xUpdate */
+  0,                         /* xBegin */
+  0,                         /* xSync */
+  0,                         /* xCommit */
+  0,                         /* xRollback */
+  0,                         /* xFindMethod */
+  0,                         /* xRename */
+  0,                         /* xSavepoint */
+  0,                         /* xRelease */
+  0                          /* xRollbackTo */
+};
+
+/* The methods of the json_tree virtual table. */
+static sqlite3_module jsonTreeModule = {
+  0,                         /* iVersion */
+  0,                         /* xCreate */
+  jsonEachConnect,           /* xConnect */
+  jsonEachBestIndex,         /* xBestIndex */
+  jsonEachDisconnect,        /* xDisconnect */
+  0,                         /* xDestroy */
+  jsonEachOpenTree,          /* xOpen - open a cursor */
+  jsonEachClose,             /* xClose - close a cursor */
+  jsonEachFilter,            /* xFilter - configure scan constraints */
+  jsonEachNext,              /* xNext - advance a cursor */
+  jsonEachEof,               /* xEof - check for end of scan */
+  jsonEachColumn,            /* xColumn - read data */
+  jsonEachRowid,             /* xRowid - read data */
+  0,                         /* xUpdate */
+  0,                         /* xBegin */
+  0,                         /* xSync */
+  0,                         /* xCommit */
+  0,                         /* xRollback */
+  0,                         /* xFindMethod */
+  0,                         /* xRename */
+  0,                         /* xSavepoint */
+  0,                         /* xRelease */
+  0                          /* xRollbackTo */
+};
+#endif /* SQLITE_OMIT_VIRTUALTABLE */
+
+/****************************************************************************
+** The following routines are the only publically visible identifiers in this
+** file.  Call the following routines in order to register the various SQL
+** functions and the virtual table implemented by this file.
+****************************************************************************/
+
+SQLITE_PRIVATE int sqlite3Json1Init(sqlite3 *db){
+  int rc = SQLITE_OK;
+  unsigned int i;
+  static const struct {
+     const char *zName;
+     int nArg;
+     int flag;
+     void (*xFunc)(sqlite3_context*,int,sqlite3_value**);
+  } aFunc[] = {
+    { "json",                 1, 0,   jsonRemoveFunc        },
+    { "json_array",          -1, 0,   jsonArrayFunc         },
+    { "json_array_length",    1, 0,   jsonArrayLengthFunc   },
+    { "json_array_length",    2, 0,   jsonArrayLengthFunc   },
+    { "json_extract",        -1, 0,   jsonExtractFunc       },
+    { "json_insert",         -1, 0,   jsonSetFunc           },
+    { "json_object",         -1, 0,   jsonObjectFunc        },
+    { "json_patch",           2, 0,   jsonPatchFunc         },
+    { "json_quote",           1, 0,   jsonQuoteFunc         },
+    { "json_remove",         -1, 0,   jsonRemoveFunc        },
+    { "json_replace",        -1, 0,   jsonReplaceFunc       },
+    { "json_set",            -1, 1,   jsonSetFunc           },
+    { "json_type",            1, 0,   jsonTypeFunc          },
+    { "json_type",            2, 0,   jsonTypeFunc          },
+    { "json_valid",           1, 0,   jsonValidFunc         },
+
+#if SQLITE_DEBUG
+    /* DEBUG and TESTING functions */
+    { "json_parse",           1, 0,   jsonParseFunc         },
+    { "json_test1",           1, 0,   jsonTest1Func         },
+#endif
+  };
+  static const struct {
+     const char *zName;
+     int nArg;
+     void (*xStep)(sqlite3_context*,int,sqlite3_value**);
+     void (*xFinal)(sqlite3_context*);
+     void (*xValue)(sqlite3_context*);
+  } aAgg[] = {
+    { "json_group_array",     1,
+      jsonArrayStep,   jsonArrayFinal,  jsonArrayValue  },
+    { "json_group_object",    2,
+      jsonObjectStep,  jsonObjectFinal, jsonObjectValue },
+  };
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+  static const struct {
+     const char *zName;
+     sqlite3_module *pModule;
+  } aMod[] = {
+    { "json_each",            &jsonEachModule               },
+    { "json_tree",            &jsonTreeModule               },
+  };
+#endif
+  for(i=0; i<sizeof(aFunc)/sizeof(aFunc[0]) && rc==SQLITE_OK; i++){
+    rc = sqlite3_create_function(db, aFunc[i].zName, aFunc[i].nArg,
+                                 SQLITE_UTF8 | SQLITE_DETERMINISTIC, 
+                                 (void*)&aFunc[i].flag,
+                                 aFunc[i].xFunc, 0, 0);
+  }
+#ifndef SQLITE_OMIT_WINDOWFUNC
+  for(i=0; i<sizeof(aAgg)/sizeof(aAgg[0]) && rc==SQLITE_OK; i++){
+    rc = sqlite3_create_window_function(db, aAgg[i].zName, aAgg[i].nArg,
+                                 SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
+                                 aAgg[i].xStep, aAgg[i].xFinal,
+                                 aAgg[i].xValue, jsonGroupInverse, 0);
+  }
+#endif
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+  for(i=0; i<sizeof(aMod)/sizeof(aMod[0]) && rc==SQLITE_OK; i++){
+    rc = sqlite3_create_module(db, aMod[i].zName, aMod[i].pModule, 0);
+  }
+#endif
+  return rc;
+}
+
+
+#ifndef SQLITE_CORE
+#ifdef _WIN32
+__declspec(dllexport)
+#endif
+SQLITE_API int sqlite3_json_init(
+  sqlite3 *db, 
+  char **pzErrMsg, 
+  const sqlite3_api_routines *pApi
+){
+  SQLITE_EXTENSION_INIT2(pApi);
+  (void)pzErrMsg;  /* Unused parameter */
+  return sqlite3Json1Init(db);
+}
+#endif
+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_JSON1) */
+
+/************** End of json1.c ***********************************************/
 /************** Begin file rtree.c *******************************************/
 /*
 ** 2001 September 15
 **
 ** The author disclaims copyright to this source code.  In place of
@@ -174493,10 +178164,11 @@
   u8 nDim2;                   /* Twice the number of dimensions */
   u8 eCoordType;              /* RTREE_COORD_REAL32 or RTREE_COORD_INT32 */
   u8 nBytesPerCell;           /* Bytes consumed per cell */
   u8 inWrTrans;               /* True if inside write transaction */
   u8 nAux;                    /* # of auxiliary columns in %_rowid */
+  u8 nAuxNotNull;             /* Number of initial not-null aux columns */
   int iDepth;                 /* Current depth of the r-tree structure */
   char *zDb;                  /* Name of database containing r-tree table */
   char *zName;                /* Name of r-tree table */ 
   u32 nBusy;                  /* Current number of users of this structure */
   i64 nRowEst;                /* Estimated number of rows in this table */
@@ -177259,11 +180931,11 @@
 }
 
 /*
 ** Select a currently unused rowid for a new r-tree record.
 */
-static int newRowid(Rtree *pRtree, i64 *piRowid){
+static int rtreeNewRowid(Rtree *pRtree, i64 *piRowid){
   int rc;
   sqlite3_bind_null(pRtree->pWriteRowid, 1);
   sqlite3_bind_null(pRtree->pWriteRowid, 2);
   sqlite3_step(pRtree->pWriteRowid);
   rc = sqlite3_reset(pRtree->pWriteRowid);
@@ -177546,11 +181218,11 @@
     /* Insert the new record into the r-tree */
     RtreeNode *pLeaf = 0;
 
     /* Figure out the rowid of the new row. */
     if( bHaveRowid==0 ){
-      rc = newRowid(pRtree, &cell.iRowid);
+      rc = rtreeNewRowid(pRtree, &cell.iRowid);
     }
     *pRowid = cell.iRowid;
 
     if( rc==SQLITE_OK ){
       rc = ChooseLeaf(pRtree, &cell, 0, &pLeaf);
@@ -177819,11 +181491,15 @@
       int ii;
       char *zSql;
       sqlite3_str_appendf(p, "UPDATE \"%w\".\"%w_rowid\"SET ", zDb, zPrefix);
       for(ii=0; ii<pRtree->nAux; ii++){
         if( ii ) sqlite3_str_append(p, ",", 1);
-        sqlite3_str_appendf(p,"a%d=?%d",ii,ii+2);
+        if( ii<pRtree->nAuxNotNull ){
+          sqlite3_str_appendf(p,"a%d=coalesce(?%d,a%d)",ii,ii+2,ii);
+        }else{
+          sqlite3_str_appendf(p,"a%d=?%d",ii,ii+2);
+        }
       }
       sqlite3_str_appendf(p, " WHERE rowid=?1");
       zSql = sqlite3_str_finish(p);
       if( zSql==0 ){
         rc = SQLITE_NOMEM;
@@ -178588,10 +182264,1677 @@
     }
     sqlite3_free(zReport);
   }
 }
 
+/* Conditionally include the geopoly code */
+#ifdef SQLITE_ENABLE_GEOPOLY
+/************** Include geopoly.c in the middle of rtree.c *******************/
+/************** Begin file geopoly.c *****************************************/
+/*
+** 2018-05-25
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+******************************************************************************
+**
+** This file implements an alternative R-Tree virtual table that
+** uses polygons to express the boundaries of 2-dimensional objects.
+**
+** This file is #include-ed onto the end of "rtree.c" so that it has
+** access to all of the R-Tree internals.
+*/
+/* #include <stdlib.h> */
+
+/* Enable -DGEOPOLY_ENABLE_DEBUG for debugging facilities */
+#ifdef GEOPOLY_ENABLE_DEBUG
+  static int geo_debug = 0;
+# define GEODEBUG(X) if(geo_debug)printf X
+#else
+# define GEODEBUG(X)
+#endif
+
+#ifndef JSON_NULL   /* The following stuff repeats things found in json1 */
+/*
+** Versions of isspace(), isalnum() and isdigit() to which it is safe
+** to pass signed char values.
+*/
+#ifdef sqlite3Isdigit
+   /* Use the SQLite core versions if this routine is part of the
+   ** SQLite amalgamation */
+#  define safe_isdigit(x)  sqlite3Isdigit(x)
+#  define safe_isalnum(x)  sqlite3Isalnum(x)
+#  define safe_isxdigit(x) sqlite3Isxdigit(x)
+#else
+   /* Use the standard library for separate compilation */
+#include <ctype.h>  /* amalgamator: keep */
+#  define safe_isdigit(x)  isdigit((unsigned char)(x))
+#  define safe_isalnum(x)  isalnum((unsigned char)(x))
+#  define safe_isxdigit(x) isxdigit((unsigned char)(x))
+#endif
+
+/*
+** Growing our own isspace() routine this way is twice as fast as
+** the library isspace() function.
+*/
+static const char geopolyIsSpace[] = {
+  0, 0, 0, 0, 0, 0, 0, 0,     0, 1, 1, 0, 0, 1, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+  1, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
+};
+#define safe_isspace(x) (geopolyIsSpace[(unsigned char)x])
+#endif /* JSON NULL - back to original code */
+
+/* Compiler and version */
+#ifndef GCC_VERSION
+#if defined(__GNUC__) && !defined(SQLITE_DISABLE_INTRINSIC)
+# define GCC_VERSION (__GNUC__*1000000+__GNUC_MINOR__*1000+__GNUC_PATCHLEVEL__)
+#else
+# define GCC_VERSION 0
+#endif
+#endif
+#ifndef MSVC_VERSION
+#if defined(_MSC_VER) && !defined(SQLITE_DISABLE_INTRINSIC)
+# define MSVC_VERSION _MSC_VER
+#else
+# define MSVC_VERSION 0
+#endif
+#endif
+
+/* Datatype for coordinates
+*/
+typedef float GeoCoord;
+
+/*
+** Internal representation of a polygon.
+**
+** The polygon consists of a sequence of vertexes.  There is a line
+** segment between each pair of vertexes, and one final segment from
+** the last vertex back to the first.  (This differs from the GeoJSON
+** standard in which the final vertex is a repeat of the first.)
+**
+** The polygon follows the right-hand rule.  The area to the right of
+** each segment is "outside" and the area to the left is "inside".
+**
+** The on-disk representation consists of a 4-byte header followed by
+** the values.  The 4-byte header is:
+**
+**      encoding    (1 byte)   0=big-endian, 1=little-endian
+**      nvertex     (3 bytes)  Number of vertexes as a big-endian integer
+*/
+typedef struct GeoPoly GeoPoly;
+struct GeoPoly {
+  int nVertex;          /* Number of vertexes */
+  unsigned char hdr[4]; /* Header for on-disk representation */
+  GeoCoord a[2];    /* 2*nVertex values. X (longitude) first, then Y */
+};
+
+/*
+** State of a parse of a GeoJSON input.
+*/
+typedef struct GeoParse GeoParse;
+struct GeoParse {
+  const unsigned char *z;   /* Unparsed input */
+  int nVertex;              /* Number of vertexes in a[] */
+  int nAlloc;               /* Space allocated to a[] */
+  int nErr;                 /* Number of errors encountered */
+  GeoCoord *a;          /* Array of vertexes.  From sqlite3_malloc64() */
+};
+
+/* Do a 4-byte byte swap */
+static void geopolySwab32(unsigned char *a){
+  unsigned char t = a[0];
+  a[0] = a[3];
+  a[3] = t;
+  t = a[1];
+  a[1] = a[2];
+  a[2] = t;
+}
+
+/* Skip whitespace.  Return the next non-whitespace character. */
+static char geopolySkipSpace(GeoParse *p){
+  while( p->z[0] && safe_isspace(p->z[0]) ) p->z++;
+  return p->z[0];
+}
+
+/* Parse out a number.  Write the value into *pVal if pVal!=0.
+** return non-zero on success and zero if the next token is not a number.
+*/
+static int geopolyParseNumber(GeoParse *p, GeoCoord *pVal){
+  char c = geopolySkipSpace(p);
+  const unsigned char *z = p->z;
+  int j = 0;
+  int seenDP = 0;
+  int seenE = 0;
+  if( c=='-' ){
+    j = 1;
+    c = z[j];
+  }
+  if( c=='0' && z[j+1]>='0' && z[j+1]<='9' ) return 0;
+  for(;; j++){
+    c = z[j];
+    if( c>='0' && c<='9' ) continue;
+    if( c=='.' ){
+      if( z[j-1]=='-' ) return 0;
+      if( seenDP ) return 0;
+      seenDP = 1;
+      continue;
+    }
+    if( c=='e' || c=='E' ){
+      if( z[j-1]<'0' ) return 0;
+      if( seenE ) return -1;
+      seenDP = seenE = 1;
+      c = z[j+1];
+      if( c=='+' || c=='-' ){
+        j++;
+        c = z[j+1];
+      }
+      if( c<'0' || c>'9' ) return 0;
+      continue;
+    }
+    break;
+  }
+  if( z[j-1]<'0' ) return 0;
+  if( pVal ) *pVal = atof((const char*)p->z);
+  p->z += j;
+  return 1;
+}
+
+/*
+** If the input is a well-formed JSON array of coordinates with at least
+** four coordinates and where each coordinate is itself a two-value array,
+** then convert the JSON into a GeoPoly object and return a pointer to
+** that object.
+**
+** If any error occurs, return NULL.
+*/
+static GeoPoly *geopolyParseJson(const unsigned char *z, int *pRc){
+  GeoParse s;
+  int rc = SQLITE_OK;
+  memset(&s, 0, sizeof(s));
+  s.z = z;
+  if( geopolySkipSpace(&s)=='[' ){
+    s.z++;
+    while( geopolySkipSpace(&s)=='[' ){
+      int ii = 0;
+      char c;
+      s.z++;
+      if( s.nVertex>=s.nAlloc ){
+        GeoCoord *aNew;
+        s.nAlloc = s.nAlloc*2 + 16;
+        aNew = sqlite3_realloc64(s.a, s.nAlloc*sizeof(GeoCoord)*2 );
+        if( aNew==0 ){
+          rc = SQLITE_NOMEM;
+          s.nErr++;
+          break;
+        }
+        s.a = aNew;
+      }
+      while( geopolyParseNumber(&s, ii<=1 ? &s.a[s.nVertex*2+ii] : 0) ){
+        ii++;
+        if( ii==2 ) s.nVertex++;
+        c = geopolySkipSpace(&s);
+        s.z++;
+        if( c==',' ) continue;
+        if( c==']' && ii>=2 ) break;
+        s.nErr++;
+        rc = SQLITE_ERROR;
+        goto parse_json_err;
+      }
+      if( geopolySkipSpace(&s)==',' ){
+        s.z++;
+        continue;
+      }
+      break;
+    }
+    if( geopolySkipSpace(&s)==']'
+     && s.nVertex>=4
+     && s.a[0]==s.a[s.nVertex*2-2]
+     && s.a[1]==s.a[s.nVertex*2-1]
+     && (s.z++, geopolySkipSpace(&s)==0)
+    ){
+      int nByte;
+      GeoPoly *pOut;
+      int x = 1;
+      s.nVertex--;  /* Remove the redundant vertex at the end */
+      nByte = sizeof(GeoPoly) * s.nVertex*2*sizeof(GeoCoord);
+      pOut = sqlite3_malloc64( nByte );
+      x = 1;
+      if( pOut==0 ) goto parse_json_err;
+      pOut->nVertex = s.nVertex;
+      memcpy(pOut->a, s.a, s.nVertex*2*sizeof(GeoCoord));
+      pOut->hdr[0] = *(unsigned char*)&x;
+      pOut->hdr[1] = (s.nVertex>>16)&0xff;
+      pOut->hdr[2] = (s.nVertex>>8)&0xff;
+      pOut->hdr[3] = s.nVertex&0xff;
+      sqlite3_free(s.a);
+      if( pRc ) *pRc = SQLITE_OK;
+      return pOut;
+    }else{
+      s.nErr++;
+      rc = SQLITE_ERROR;
+    }
+  }
+parse_json_err:
+  if( pRc ) *pRc = rc;
+  sqlite3_free(s.a);
+  return 0;
+}
+
+/*
+** Given a function parameter, try to interpret it as a polygon, either
+** in the binary format or JSON text.  Compute a GeoPoly object and
+** return a pointer to that object.  Or if the input is not a well-formed
+** polygon, put an error message in sqlite3_context and return NULL.
+*/
+static GeoPoly *geopolyFuncParam(
+  sqlite3_context *pCtx,      /* Context for error messages */
+  sqlite3_value *pVal,        /* The value to decode */
+  int *pRc                    /* Write error here */
+){
+  GeoPoly *p = 0;
+  int nByte;
+  if( sqlite3_value_type(pVal)==SQLITE_BLOB
+   && (nByte = sqlite3_value_bytes(pVal))>=(4+6*sizeof(GeoCoord))
+  ){
+    const unsigned char *a = sqlite3_value_blob(pVal);
+    int nVertex;
+    nVertex = (a[1]<<16) + (a[2]<<8) + a[3];
+    if( (a[0]==0 || a[0]==1)
+     && (nVertex*2*sizeof(GeoCoord) + 4)==(unsigned int)nByte
+    ){
+      p = sqlite3_malloc64( sizeof(*p) + (nVertex-1)*2*sizeof(GeoCoord) );
+      if( p==0 ){
+        if( pRc ) *pRc = SQLITE_NOMEM;
+        if( pCtx ) sqlite3_result_error_nomem(pCtx);
+      }else{
+        int x = 1;
+        p->nVertex = nVertex;
+        memcpy(p->hdr, a, nByte);
+        if( a[0] != *(unsigned char*)&x ){
+          int ii;
+          for(ii=0; ii<nVertex*2; ii++){
+            geopolySwab32((unsigned char*)&p->a[ii]);
+          }
+          p->hdr[0] ^= 1;
+        }
+      }
+    }
+    if( pRc ) *pRc = SQLITE_OK;
+    return p;
+  }else if( sqlite3_value_type(pVal)==SQLITE_TEXT ){
+    const unsigned char *zJson = sqlite3_value_text(pVal);
+    if( zJson==0 ){
+      if( pRc ) *pRc = SQLITE_NOMEM;
+      return 0;
+    }
+    return geopolyParseJson(zJson, pRc);
+  }else{
+    if( pRc ) *pRc = SQLITE_ERROR;
+    return 0;
+  }
+}
+
+/*
+** Implementation of the geopoly_blob(X) function.
+**
+** If the input is a well-formed Geopoly BLOB or JSON string
+** then return the BLOB representation of the polygon.  Otherwise
+** return NULL.
+*/
+static void geopolyBlobFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  GeoPoly *p = geopolyFuncParam(context, argv[0], 0);
+  if( p ){
+    sqlite3_result_blob(context, p->hdr, 
+       4+8*p->nVertex, SQLITE_TRANSIENT);
+    sqlite3_free(p);
+  }
+}
+
+/*
+** SQL function:     geopoly_json(X)
+**
+** Interpret X as a polygon and render it as a JSON array
+** of coordinates.  Or, if X is not a valid polygon, return NULL.
+*/
+static void geopolyJsonFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  GeoPoly *p = geopolyFuncParam(context, argv[0], 0);
+  if( p ){
+    sqlite3 *db = sqlite3_context_db_handle(context);
+    sqlite3_str *x = sqlite3_str_new(db);
+    int i;
+    sqlite3_str_append(x, "[", 1);
+    for(i=0; i<p->nVertex; i++){
+      sqlite3_str_appendf(x, "[%!g,%!g],", p->a[i*2], p->a[i*2+1]);
+    }
+    sqlite3_str_appendf(x, "[%!g,%!g]]", p->a[0], p->a[1]);
+    sqlite3_result_text(context, sqlite3_str_finish(x), -1, sqlite3_free);
+    sqlite3_free(p);
+  }
+}
+
+/*
+** SQL function:     geopoly_svg(X, ....)
+**
+** Interpret X as a polygon and render it as a SVG <polyline>.
+** Additional arguments are added as attributes to the <polyline>.
+*/
+static void geopolySvgFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  GeoPoly *p = geopolyFuncParam(context, argv[0], 0);
+  if( p ){
+    sqlite3 *db = sqlite3_context_db_handle(context);
+    sqlite3_str *x = sqlite3_str_new(db);
+    int i;
+    char cSep = '\'';
+    sqlite3_str_appendf(x, "<polyline points=");
+    for(i=0; i<p->nVertex; i++){
+      sqlite3_str_appendf(x, "%c%g,%g", cSep, p->a[i*2], p->a[i*2+1]);
+      cSep = ' ';
+    }
+    sqlite3_str_appendf(x, " %g,%g'", p->a[0], p->a[1]);
+    for(i=1; i<argc; i++){
+      const char *z = (const char*)sqlite3_value_text(argv[i]);
+      if( z && z[0] ){
+        sqlite3_str_appendf(x, " %s", z);
+      }
+    }
+    sqlite3_str_appendf(x, "></polyline>");
+    sqlite3_result_text(context, sqlite3_str_finish(x), -1, sqlite3_free);
+    sqlite3_free(p);
+  }
+}
+
+/*
+** SQL Function:      geopoly_xform(poly, A, B, C, D, E, F)
+**
+** Transform and/or translate a polygon as follows:
+**
+**      x1 = A*x0 + B*y0 + E
+**      y1 = C*x0 + D*y0 + F
+**
+** For a translation:
+**
+**      geopoly_xform(poly, 1, 0, 0, 1, x-offset, y-offset)
+**
+** Rotate by R around the point (0,0):
+**
+**      geopoly_xform(poly, cos(R), sin(R), -sin(R), cos(R), 0, 0)
+*/
+static void geopolyXformFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  GeoPoly *p = geopolyFuncParam(context, argv[0], 0);
+  double A = sqlite3_value_double(argv[1]);
+  double B = sqlite3_value_double(argv[2]);
+  double C = sqlite3_value_double(argv[3]);
+  double D = sqlite3_value_double(argv[4]);
+  double E = sqlite3_value_double(argv[5]);
+  double F = sqlite3_value_double(argv[6]);
+  GeoCoord x1, y1, x0, y0;
+  int ii;
+  if( p ){
+    for(ii=0; ii<p->nVertex; ii++){
+      x0 = p->a[ii*2];
+      y0 = p->a[ii*2+1];
+      x1 = A*x0 + B*y0 + E;
+      y1 = C*x0 + D*y0 + F;
+      p->a[ii*2] = x1;
+      p->a[ii*2+1] = y1;
+    }
+    sqlite3_result_blob(context, p->hdr, 
+       4+8*p->nVertex, SQLITE_TRANSIENT);
+    sqlite3_free(p);
+  }
+}
+
+/*
+** Implementation of the geopoly_area(X) function.
+**
+** If the input is a well-formed Geopoly BLOB then return the area
+** enclosed by the polygon.  If the polygon circulates clockwise instead
+** of counterclockwise (as it should) then return the negative of the
+** enclosed area.  Otherwise return NULL.
+*/
+static void geopolyAreaFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  GeoPoly *p = geopolyFuncParam(context, argv[0], 0);
+  if( p ){
+    double rArea = 0.0;
+    int ii;
+    for(ii=0; ii<p->nVertex-1; ii++){
+      rArea += (p->a[ii*2] - p->a[ii*2+2])           /* (x0 - x1) */
+                * (p->a[ii*2+1] + p->a[ii*2+3])      /* (y0 + y1) */
+                * 0.5;
+    }
+    rArea += (p->a[ii*2] - p->a[0])                  /* (xN - x0) */
+             * (p->a[ii*2+1] + p->a[1])              /* (yN + y0) */
+             * 0.5;
+    sqlite3_result_double(context, rArea);
+    sqlite3_free(p);
+  }            
+}
+
+/*
+** If pPoly is a polygon, compute its bounding box. Then:
+**
+**    (1) if aCoord!=0 store the bounding box in aCoord, returning NULL
+**    (2) otherwise, compute a GeoPoly for the bounding box and return the
+**        new GeoPoly
+**
+** If pPoly is NULL but aCoord is not NULL, then compute a new GeoPoly from
+** the bounding box in aCoord and return a pointer to that GeoPoly.
+*/
+static GeoPoly *geopolyBBox(
+  sqlite3_context *context,   /* For recording the error */
+  sqlite3_value *pPoly,       /* The polygon */
+  RtreeCoord *aCoord,         /* Results here */
+  int *pRc                    /* Error code here */
+){
+  GeoPoly *pOut = 0;
+  GeoPoly *p;
+  float mnX, mxX, mnY, mxY;
+  if( pPoly==0 && aCoord!=0 ){
+    p = 0;
+    mnX = aCoord[0].f;
+    mxX = aCoord[1].f;
+    mnY = aCoord[2].f;
+    mxY = aCoord[3].f;
+    goto geopolyBboxFill;
+  }else{
+    p = geopolyFuncParam(context, pPoly, pRc);
+  }
+  if( p ){
+    int ii;
+    mnX = mxX = p->a[0];
+    mnY = mxY = p->a[1];
+    for(ii=1; ii<p->nVertex; ii++){
+      double r = p->a[ii*2];
+      if( r<mnX ) mnX = r;
+      else if( r>mxX ) mxX = r;
+      r = p->a[ii*2+1];
+      if( r<mnY ) mnY = r;
+      else if( r>mxY ) mxY = r;
+    }
+    if( pRc ) *pRc = SQLITE_OK;
+    if( aCoord==0 ){
+      geopolyBboxFill:
+      pOut = sqlite3_realloc(p, sizeof(GeoPoly)+sizeof(GeoCoord)*6);
+      if( pOut==0 ){
+        sqlite3_free(p);
+        if( context ) sqlite3_result_error_nomem(context);
+        if( pRc ) *pRc = SQLITE_NOMEM;
+        return 0;
+      }
+      pOut->nVertex = 4;
+      ii = 1;
+      pOut->hdr[0] = *(unsigned char*)&ii;
+      pOut->hdr[1] = 0;
+      pOut->hdr[2] = 0;
+      pOut->hdr[3] = 4;
+      pOut->a[0] = mnX;
+      pOut->a[1] = mnY;
+      pOut->a[2] = mxX;
+      pOut->a[3] = mnY;
+      pOut->a[4] = mxX;
+      pOut->a[5] = mxY;
+      pOut->a[6] = mnX;
+      pOut->a[7] = mxY;
+    }else{
+      sqlite3_free(p);
+      aCoord[0].f = mnX;
+      aCoord[1].f = mxX;
+      aCoord[2].f = mnY;
+      aCoord[3].f = mxY;
+    }
+  }
+  return pOut;
+}
+
+/*
+** Implementation of the geopoly_bbox(X) SQL function.
+*/
+static void geopolyBBoxFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  GeoPoly *p = geopolyBBox(context, argv[0], 0, 0);
+  if( p ){
+    sqlite3_result_blob(context, p->hdr, 
+       4+8*p->nVertex, SQLITE_TRANSIENT);
+    sqlite3_free(p);
+  }
+}
+
+/*
+** State vector for the geopoly_group_bbox() aggregate function.
+*/
+typedef struct GeoBBox GeoBBox;
+struct GeoBBox {
+  int isInit;
+  RtreeCoord a[4];
+};
+
+
+/*
+** Implementation of the geopoly_group_bbox(X) aggregate SQL function.
+*/
+static void geopolyBBoxStep(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  RtreeCoord a[4];
+  int rc = SQLITE_OK;
+  (void)geopolyBBox(context, argv[0], a, &rc);
+  if( rc==SQLITE_OK ){
+    GeoBBox *pBBox;
+    pBBox = (GeoBBox*)sqlite3_aggregate_context(context, sizeof(*pBBox));
+    if( pBBox==0 ) return;
+    if( pBBox->isInit==0 ){
+      pBBox->isInit = 1;
+      memcpy(pBBox->a, a, sizeof(RtreeCoord)*4);
+    }else{
+      if( a[0].f < pBBox->a[0].f ) pBBox->a[0] = a[0];
+      if( a[1].f > pBBox->a[1].f ) pBBox->a[1] = a[1];
+      if( a[2].f < pBBox->a[2].f ) pBBox->a[2] = a[2];
+      if( a[3].f > pBBox->a[3].f ) pBBox->a[3] = a[3];
+    }
+  }
+}
+static void geopolyBBoxFinal(
+  sqlite3_context *context
+){
+  GeoPoly *p;
+  GeoBBox *pBBox;
+  pBBox = (GeoBBox*)sqlite3_aggregate_context(context, 0);
+  if( pBBox==0 ) return;
+  p = geopolyBBox(context, 0, pBBox->a, 0);
+  if( p ){
+    sqlite3_result_blob(context, p->hdr, 
+       4+8*p->nVertex, SQLITE_TRANSIENT);
+    sqlite3_free(p);
+  }
+}
+
+
+/*
+** Determine if point (x0,y0) is beneath line segment (x1,y1)->(x2,y2).
+** Returns:
+**
+**    +2  x0,y0 is on the line segement
+**
+**    +1  x0,y0 is beneath line segment
+**
+**    0   x0,y0 is not on or beneath the line segment or the line segment
+**        is vertical and x0,y0 is not on the line segment
+**
+** The left-most coordinate min(x1,x2) is not considered to be part of
+** the line segment for the purposes of this analysis.
+*/
+static int pointBeneathLine(
+  double x0, double y0,
+  double x1, double y1,
+  double x2, double y2
+){
+  double y;
+  if( x0==x1 && y0==y1 ) return 2;
+  if( x1<x2 ){
+    if( x0<=x1 || x0>x2 ) return 0;
+  }else if( x1>x2 ){
+    if( x0<=x2 || x0>x1 ) return 0;
+  }else{
+    /* Vertical line segment */
+    if( x0!=x1 ) return 0;
+    if( y0<y1 && y0<y2 ) return 0;
+    if( y0>y1 && y0>y2 ) return 0;
+    return 2;
+  }
+  y = y1 + (y2-y1)*(x0-x1)/(x2-x1);
+  if( y0==y ) return 2;
+  if( y0<y ) return 1;
+  return 0;
+}
+
+/*
+** SQL function:    geopoly_contains_point(P,X,Y)
+**
+** Return +2 if point X,Y is within polygon P.
+** Return +1 if point X,Y is on the polygon boundary.
+** Return 0 if point X,Y is outside the polygon
+*/
+static void geopolyContainsPointFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  GeoPoly *p1 = geopolyFuncParam(context, argv[0], 0);
+  double x0 = sqlite3_value_double(argv[1]);
+  double y0 = sqlite3_value_double(argv[2]);
+  int v = 0;
+  int cnt = 0;
+  int ii;
+  if( p1==0 ) return;
+  for(ii=0; ii<p1->nVertex-1; ii++){
+    v = pointBeneathLine(x0,y0,p1->a[ii*2],p1->a[ii*2+1],
+                               p1->a[ii*2+2],p1->a[ii*2+3]);
+    if( v==2 ) break;
+    cnt += v;
+  }
+  if( v!=2 ){
+    v = pointBeneathLine(x0,y0,p1->a[ii*2],p1->a[ii*2+1],
+                               p1->a[0],p1->a[1]);
+  }
+  if( v==2 ){
+    sqlite3_result_int(context, 1);
+  }else if( ((v+cnt)&1)==0 ){
+    sqlite3_result_int(context, 0);
+  }else{
+    sqlite3_result_int(context, 2);
+  }
+  sqlite3_free(p1);
+}
+
+/* Forward declaration */
+static int geopolyOverlap(GeoPoly *p1, GeoPoly *p2);
+
+/*
+** SQL function:    geopoly_within(P1,P2)
+**
+** Return +2 if P1 and P2 are the same polygon
+** Return +1 if P2 is contained within P1
+** Return 0 if any part of P2 is on the outside of P1
+**
+*/
+static void geopolyWithinFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  GeoPoly *p1 = geopolyFuncParam(context, argv[0], 0);
+  GeoPoly *p2 = geopolyFuncParam(context, argv[1], 0);
+  if( p1 && p2 ){
+    int x = geopolyOverlap(p1, p2);
+    if( x<0 ){
+      sqlite3_result_error_nomem(context);
+    }else{
+      sqlite3_result_int(context, x==2 ? 1 : x==4 ? 2 : 0);
+    }
+  }
+  sqlite3_free(p1);
+  sqlite3_free(p2);
+}
+
+/* Objects used by the overlap algorihm. */
+typedef struct GeoEvent GeoEvent;
+typedef struct GeoSegment GeoSegment;
+typedef struct GeoOverlap GeoOverlap;
+struct GeoEvent {
+  double x;              /* X coordinate at which event occurs */
+  int eType;             /* 0 for ADD, 1 for REMOVE */
+  GeoSegment *pSeg;      /* The segment to be added or removed */
+  GeoEvent *pNext;       /* Next event in the sorted list */
+};
+struct GeoSegment {
+  double C, B;           /* y = C*x + B */
+  double y;              /* Current y value */
+  float y0;              /* Initial y value */
+  unsigned char side;    /* 1 for p1, 2 for p2 */
+  unsigned int idx;      /* Which segment within the side */
+  GeoSegment *pNext;     /* Next segment in a list sorted by y */
+};
+struct GeoOverlap {
+  GeoEvent *aEvent;          /* Array of all events */
+  GeoSegment *aSegment;      /* Array of all segments */
+  int nEvent;                /* Number of events */
+  int nSegment;              /* Number of segments */
+};
+
+/*
+** Add a single segment and its associated events.
+*/
+static void geopolyAddOneSegment(
+  GeoOverlap *p,
+  GeoCoord x0,
+  GeoCoord y0,
+  GeoCoord x1,
+  GeoCoord y1,
+  unsigned char side,
+  unsigned int idx
+){
+  GeoSegment *pSeg;
+  GeoEvent *pEvent;
+  if( x0==x1 ) return;  /* Ignore vertical segments */
+  if( x0>x1 ){
+    GeoCoord t = x0;
+    x0 = x1;
+    x1 = t;
+    t = y0;
+    y0 = y1;
+    y1 = t;
+  }
+  pSeg = p->aSegment + p->nSegment;
+  p->nSegment++;
+  pSeg->C = (y1-y0)/(x1-x0);
+  pSeg->B = y1 - x1*pSeg->C;
+  pSeg->y0 = y0;
+  pSeg->side = side;
+  pSeg->idx = idx;
+  pEvent = p->aEvent + p->nEvent;
+  p->nEvent++;
+  pEvent->x = x0;
+  pEvent->eType = 0;
+  pEvent->pSeg = pSeg;
+  pEvent = p->aEvent + p->nEvent;
+  p->nEvent++;
+  pEvent->x = x1;
+  pEvent->eType = 1;
+  pEvent->pSeg = pSeg;
+}
+  
+
+
+/*
+** Insert all segments and events for polygon pPoly.
+*/
+static void geopolyAddSegments(
+  GeoOverlap *p,          /* Add segments to this Overlap object */
+  GeoPoly *pPoly,         /* Take all segments from this polygon */
+  unsigned char side      /* The side of pPoly */
+){
+  unsigned int i;
+  GeoCoord *x;
+  for(i=0; i<(unsigned)pPoly->nVertex-1; i++){
+    x = pPoly->a + (i*2);
+    geopolyAddOneSegment(p, x[0], x[1], x[2], x[3], side, i);
+  }
+  x = pPoly->a + (i*2);
+  geopolyAddOneSegment(p, x[0], x[1], pPoly->a[0], pPoly->a[1], side, i);
+}
+
+/*
+** Merge two lists of sorted events by X coordinate
+*/
+static GeoEvent *geopolyEventMerge(GeoEvent *pLeft, GeoEvent *pRight){
+  GeoEvent head, *pLast;
+  head.pNext = 0;
+  pLast = &head;
+  while( pRight && pLeft ){
+    if( pRight->x <= pLeft->x ){
+      pLast->pNext = pRight;
+      pLast = pRight;
+      pRight = pRight->pNext;
+    }else{
+      pLast->pNext = pLeft;
+      pLast = pLeft;
+      pLeft = pLeft->pNext;
+    }
+  }
+  pLast->pNext = pRight ? pRight : pLeft;
+  return head.pNext;  
+}
+
+/*
+** Sort an array of nEvent event objects into a list.
+*/
+static GeoEvent *geopolySortEventsByX(GeoEvent *aEvent, int nEvent){
+  int mx = 0;
+  int i, j;
+  GeoEvent *p;
+  GeoEvent *a[50];
+  for(i=0; i<nEvent; i++){
+    p = &aEvent[i];
+    p->pNext = 0;
+    for(j=0; j<mx && a[j]; j++){
+      p = geopolyEventMerge(a[j], p);
+      a[j] = 0;
+    }
+    a[j] = p;
+    if( j>=mx ) mx = j+1;
+  }
+  p = 0;
+  for(i=0; i<mx; i++){
+    p = geopolyEventMerge(a[i], p);
+  }
+  return p;
+}
+
+/*
+** Merge two lists of sorted segments by Y, and then by C.
+*/
+static GeoSegment *geopolySegmentMerge(GeoSegment *pLeft, GeoSegment *pRight){
+  GeoSegment head, *pLast;
+  head.pNext = 0;
+  pLast = &head;
+  while( pRight && pLeft ){
+    double r = pRight->y - pLeft->y;
+    if( r==0.0 ) r = pRight->C - pLeft->C;
+    if( r<0.0 ){
+      pLast->pNext = pRight;
+      pLast = pRight;
+      pRight = pRight->pNext;
+    }else{
+      pLast->pNext = pLeft;
+      pLast = pLeft;
+      pLeft = pLeft->pNext;
+    }
+  }
+  pLast->pNext = pRight ? pRight : pLeft;
+  return head.pNext;  
+}
+
+/*
+** Sort a list of GeoSegments in order of increasing Y and in the event of
+** a tie, increasing C (slope).
+*/
+static GeoSegment *geopolySortSegmentsByYAndC(GeoSegment *pList){
+  int mx = 0;
+  int i;
+  GeoSegment *p;
+  GeoSegment *a[50];
+  while( pList ){
+    p = pList;
+    pList = pList->pNext;
+    p->pNext = 0;
+    for(i=0; i<mx && a[i]; i++){
+      p = geopolySegmentMerge(a[i], p);
+      a[i] = 0;
+    }
+    a[i] = p;
+    if( i>=mx ) mx = i+1;
+  }
+  p = 0;
+  for(i=0; i<mx; i++){
+    p = geopolySegmentMerge(a[i], p);
+  }
+  return p;
+}
+
+/*
+** Determine the overlap between two polygons
+*/
+static int geopolyOverlap(GeoPoly *p1, GeoPoly *p2){
+  int nVertex = p1->nVertex + p2->nVertex + 2;
+  GeoOverlap *p;
+  int nByte;
+  GeoEvent *pThisEvent;
+  double rX;
+  int rc = 0;
+  int needSort = 0;
+  GeoSegment *pActive = 0;
+  GeoSegment *pSeg;
+  unsigned char aOverlap[4];
+
+  nByte = sizeof(GeoEvent)*nVertex*2 
+           + sizeof(GeoSegment)*nVertex 
+           + sizeof(GeoOverlap);
+  p = sqlite3_malloc( nByte );
+  if( p==0 ) return -1;
+  p->aEvent = (GeoEvent*)&p[1];
+  p->aSegment = (GeoSegment*)&p->aEvent[nVertex*2];
+  p->nEvent = p->nSegment = 0;
+  geopolyAddSegments(p, p1, 1);
+  geopolyAddSegments(p, p2, 2);
+  pThisEvent = geopolySortEventsByX(p->aEvent, p->nEvent);
+  rX = pThisEvent->x==0.0 ? -1.0 : 0.0;
+  memset(aOverlap, 0, sizeof(aOverlap));
+  while( pThisEvent ){
+    if( pThisEvent->x!=rX ){
+      GeoSegment *pPrev = 0;
+      int iMask = 0;
+      GEODEBUG(("Distinct X: %g\n", pThisEvent->x));
+      rX = pThisEvent->x;
+      if( needSort ){
+        GEODEBUG(("SORT\n"));
+        pActive = geopolySortSegmentsByYAndC(pActive);
+        needSort = 0;
+      }
+      for(pSeg=pActive; pSeg; pSeg=pSeg->pNext){
+        if( pPrev ){
+          if( pPrev->y!=pSeg->y ){
+            GEODEBUG(("MASK: %d\n", iMask));
+            aOverlap[iMask] = 1;
+          }
+        }
+        iMask ^= pSeg->side;
+        pPrev = pSeg;
+      }
+      pPrev = 0;
+      for(pSeg=pActive; pSeg; pSeg=pSeg->pNext){
+        double y = pSeg->C*rX + pSeg->B;
+        GEODEBUG(("Segment %d.%d %g->%g\n", pSeg->side, pSeg->idx, pSeg->y, y));
+        pSeg->y = y;
+        if( pPrev ){
+          if( pPrev->y>pSeg->y && pPrev->side!=pSeg->side ){
+            rc = 1;
+            GEODEBUG(("Crossing: %d.%d and %d.%d\n",
+                    pPrev->side, pPrev->idx,
+                    pSeg->side, pSeg->idx));
+            goto geopolyOverlapDone;
+          }else if( pPrev->y!=pSeg->y ){
+            GEODEBUG(("MASK: %d\n", iMask));
+            aOverlap[iMask] = 1;
+          }
+        }
+        iMask ^= pSeg->side;
+        pPrev = pSeg;
+      }
+    }
+    GEODEBUG(("%s %d.%d C=%g B=%g\n",
+      pThisEvent->eType ? "RM " : "ADD",
+      pThisEvent->pSeg->side, pThisEvent->pSeg->idx,
+      pThisEvent->pSeg->C,
+      pThisEvent->pSeg->B));
+    if( pThisEvent->eType==0 ){
+      /* Add a segment */
+      pSeg = pThisEvent->pSeg;
+      pSeg->y = pSeg->y0;
+      pSeg->pNext = pActive;
+      pActive = pSeg;
+      needSort = 1;
+    }else{
+      /* Remove a segment */
+      if( pActive==pThisEvent->pSeg ){
+        pActive = pActive->pNext;
+      }else{
+        for(pSeg=pActive; pSeg; pSeg=pSeg->pNext){
+          if( pSeg->pNext==pThisEvent->pSeg ){
+            pSeg->pNext = pSeg->pNext->pNext;
+            break;
+          }
+        }
+      }
+    }
+    pThisEvent = pThisEvent->pNext;
+  }
+  if( aOverlap[3]==0 ){
+    rc = 0;
+  }else if( aOverlap[1]!=0 && aOverlap[2]==0 ){
+    rc = 3;
+  }else if( aOverlap[1]==0 && aOverlap[2]!=0 ){
+    rc = 2;
+  }else if( aOverlap[1]==0 && aOverlap[2]==0 ){
+    rc = 4;
+  }else{
+    rc = 1;
+  }
+
+geopolyOverlapDone:
+  sqlite3_free(p);
+  return rc;
+}
+
+/*
+** SQL function:    geopoly_overlap(P1,P2)
+**
+** Determine whether or not P1 and P2 overlap. Return value:
+**
+**   0     The two polygons are disjoint
+**   1     They overlap
+**   2     P1 is completely contained within P2
+**   3     P2 is completely contained within P1
+**   4     P1 and P2 are the same polygon
+**   NULL  Either P1 or P2 or both are not valid polygons
+*/
+static void geopolyOverlapFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  GeoPoly *p1 = geopolyFuncParam(context, argv[0], 0);
+  GeoPoly *p2 = geopolyFuncParam(context, argv[1], 0);
+  if( p1 && p2 ){
+    int x = geopolyOverlap(p1, p2);
+    if( x<0 ){
+      sqlite3_result_error_nomem(context);
+    }else{
+      sqlite3_result_int(context, x);
+    }
+  }
+  sqlite3_free(p1);
+  sqlite3_free(p2);
+}
+
+/*
+** Enable or disable debugging output
+*/
+static void geopolyDebugFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+#ifdef GEOPOLY_ENABLE_DEBUG
+  geo_debug = sqlite3_value_int(argv[0]);
+#endif
+}
+
+/* 
+** This function is the implementation of both the xConnect and xCreate
+** methods of the geopoly virtual table.
+**
+**   argv[0]   -> module name
+**   argv[1]   -> database name
+**   argv[2]   -> table name
+**   argv[...] -> column names...
+*/
+static int geopolyInit(
+  sqlite3 *db,                        /* Database connection */
+  void *pAux,                         /* One of the RTREE_COORD_* constants */
+  int argc, const char *const*argv,   /* Parameters to CREATE TABLE statement */
+  sqlite3_vtab **ppVtab,              /* OUT: New virtual table */
+  char **pzErr,                       /* OUT: Error message, if any */
+  int isCreate                        /* True for xCreate, false for xConnect */
+){
+  int rc = SQLITE_OK;
+  Rtree *pRtree;
+  int nDb;              /* Length of string argv[1] */
+  int nName;            /* Length of string argv[2] */
+  sqlite3_str *pSql;
+  char *zSql;
+  int ii;
+
+  sqlite3_vtab_config(db, SQLITE_VTAB_CONSTRAINT_SUPPORT, 1);
+
+  /* Allocate the sqlite3_vtab structure */
+  nDb = (int)strlen(argv[1]);
+  nName = (int)strlen(argv[2]);
+  pRtree = (Rtree *)sqlite3_malloc(sizeof(Rtree)+nDb+nName+2);
+  if( !pRtree ){
+    return SQLITE_NOMEM;
+  }
+  memset(pRtree, 0, sizeof(Rtree)+nDb+nName+2);
+  pRtree->nBusy = 1;
+  pRtree->base.pModule = &rtreeModule;
+  pRtree->zDb = (char *)&pRtree[1];
+  pRtree->zName = &pRtree->zDb[nDb+1];
+  pRtree->eCoordType = RTREE_COORD_REAL32;
+  pRtree->nDim = 2;
+  pRtree->nDim2 = 4;
+  memcpy(pRtree->zDb, argv[1], nDb);
+  memcpy(pRtree->zName, argv[2], nName);
+
+
+  /* Create/Connect to the underlying relational database schema. If
+  ** that is successful, call sqlite3_declare_vtab() to configure
+  ** the r-tree table schema.
+  */
+  pSql = sqlite3_str_new(db);
+  sqlite3_str_appendf(pSql, "CREATE TABLE x(_shape");
+  pRtree->nAux = 1;         /* Add one for _shape */
+  pRtree->nAuxNotNull = 1;  /* The _shape column is always not-null */
+  for(ii=3; ii<argc; ii++){
+    pRtree->nAux++;
+    sqlite3_str_appendf(pSql, ",%s", argv[ii]);
+  }
+  sqlite3_str_appendf(pSql, ");");
+  zSql = sqlite3_str_finish(pSql);
+  if( !zSql ){
+    rc = SQLITE_NOMEM;
+  }else if( SQLITE_OK!=(rc = sqlite3_declare_vtab(db, zSql)) ){
+    *pzErr = sqlite3_mprintf("%s", sqlite3_errmsg(db));
+  }
+  sqlite3_free(zSql);
+  if( rc ) goto geopolyInit_fail;
+  pRtree->nBytesPerCell = 8 + pRtree->nDim2*4;
+
+  /* Figure out the node size to use. */
+  rc = getNodeSize(db, pRtree, isCreate, pzErr);
+  if( rc ) goto geopolyInit_fail;
+  rc = rtreeSqlInit(pRtree, db, argv[1], argv[2], isCreate);
+  if( rc ){
+    *pzErr = sqlite3_mprintf("%s", sqlite3_errmsg(db));
+    goto geopolyInit_fail;
+  }
+
+  *ppVtab = (sqlite3_vtab *)pRtree;
+  return SQLITE_OK;
+
+geopolyInit_fail:
+  if( rc==SQLITE_OK ) rc = SQLITE_ERROR;
+  assert( *ppVtab==0 );
+  assert( pRtree->nBusy==1 );
+  rtreeRelease(pRtree);
+  return rc;
+}
+
+
+/* 
+** GEOPOLY virtual table module xCreate method.
+*/
+static int geopolyCreate(
+  sqlite3 *db,
+  void *pAux,
+  int argc, const char *const*argv,
+  sqlite3_vtab **ppVtab,
+  char **pzErr
+){
+  return geopolyInit(db, pAux, argc, argv, ppVtab, pzErr, 1);
+}
+
+/* 
+** GEOPOLY virtual table module xConnect method.
+*/
+static int geopolyConnect(
+  sqlite3 *db,
+  void *pAux,
+  int argc, const char *const*argv,
+  sqlite3_vtab **ppVtab,
+  char **pzErr
+){
+  return geopolyInit(db, pAux, argc, argv, ppVtab, pzErr, 0);
+}
+
+
+/* 
+** GEOPOLY virtual table module xFilter method.
+**
+** Query plans:
+**
+**      1         rowid lookup
+**      2         search for objects overlapping the same bounding box
+**                that contains polygon argv[0]
+**      3         search for objects overlapping the same bounding box
+**                that contains polygon argv[0]
+**      4         full table scan
+*/
+static int geopolyFilter(
+  sqlite3_vtab_cursor *pVtabCursor,     /* The cursor to initialize */
+  int idxNum,                           /* Query plan */
+  const char *idxStr,                   /* Not Used */
+  int argc, sqlite3_value **argv        /* Parameters to the query plan */
+){
+  Rtree *pRtree = (Rtree *)pVtabCursor->pVtab;
+  RtreeCursor *pCsr = (RtreeCursor *)pVtabCursor;
+  RtreeNode *pRoot = 0;
+  int rc = SQLITE_OK;
+  int iCell = 0;
+  sqlite3_stmt *pStmt;
+
+  rtreeReference(pRtree);
+
+  /* Reset the cursor to the same state as rtreeOpen() leaves it in. */
+  freeCursorConstraints(pCsr);
+  sqlite3_free(pCsr->aPoint);
+  pStmt = pCsr->pReadAux;
+  memset(pCsr, 0, sizeof(RtreeCursor));
+  pCsr->base.pVtab = (sqlite3_vtab*)pRtree;
+  pCsr->pReadAux = pStmt;
+
+  pCsr->iStrategy = idxNum;
+  if( idxNum==1 ){
+    /* Special case - lookup by rowid. */
+    RtreeNode *pLeaf;        /* Leaf on which the required cell resides */
+    RtreeSearchPoint *p;     /* Search point for the leaf */
+    i64 iRowid = sqlite3_value_int64(argv[0]);
+    i64 iNode = 0;
+    rc = findLeafNode(pRtree, iRowid, &pLeaf, &iNode);
+    if( rc==SQLITE_OK && pLeaf!=0 ){
+      p = rtreeSearchPointNew(pCsr, RTREE_ZERO, 0);
+      assert( p!=0 );  /* Always returns pCsr->sPoint */
+      pCsr->aNode[0] = pLeaf;
+      p->id = iNode;
+      p->eWithin = PARTLY_WITHIN;
+      rc = nodeRowidIndex(pRtree, pLeaf, iRowid, &iCell);
+      p->iCell = (u8)iCell;
+      RTREE_QUEUE_TRACE(pCsr, "PUSH-F1:");
+    }else{
+      pCsr->atEOF = 1;
+    }
+  }else{
+    /* Normal case - r-tree scan. Set up the RtreeCursor.aConstraint array 
+    ** with the configured constraints. 
+    */
+    rc = nodeAcquire(pRtree, 1, 0, &pRoot);
+    if( rc==SQLITE_OK && idxNum<=3 ){
+      RtreeCoord bbox[4];
+      RtreeConstraint *p;
+      assert( argc==1 );
+      geopolyBBox(0, argv[0], bbox, &rc);
+      if( rc ){
+        goto geopoly_filter_end;
+      }
+      pCsr->aConstraint = p = sqlite3_malloc(sizeof(RtreeConstraint)*4);
+      pCsr->nConstraint = 4;
+      if( p==0 ){
+        rc = SQLITE_NOMEM;
+      }else{
+        memset(pCsr->aConstraint, 0, sizeof(RtreeConstraint)*4);
+        memset(pCsr->anQueue, 0, sizeof(u32)*(pRtree->iDepth + 1));
+        if( idxNum==2 ){
+          /* Overlap query */
+          p->op = 'B';
+          p->iCoord = 0;
+          p->u.rValue = bbox[1].f;
+          p++;
+          p->op = 'D';
+          p->iCoord = 1;
+          p->u.rValue = bbox[0].f;
+          p++;
+          p->op = 'B';
+          p->iCoord = 2;
+          p->u.rValue = bbox[3].f;
+          p++;
+          p->op = 'D';
+          p->iCoord = 3;
+          p->u.rValue = bbox[2].f;
+        }else{
+          /* Within query */
+          p->op = 'D';
+          p->iCoord = 0;
+          p->u.rValue = bbox[0].f;
+          p++;
+          p->op = 'B';
+          p->iCoord = 1;
+          p->u.rValue = bbox[1].f;
+          p++;
+          p->op = 'D';
+          p->iCoord = 2;
+          p->u.rValue = bbox[2].f;
+          p++;
+          p->op = 'B';
+          p->iCoord = 3;
+          p->u.rValue = bbox[3].f;
+        }
+      }
+    }
+    if( rc==SQLITE_OK ){
+      RtreeSearchPoint *pNew;
+      pNew = rtreeSearchPointNew(pCsr, RTREE_ZERO, (u8)(pRtree->iDepth+1));
+      if( pNew==0 ){
+        rc = SQLITE_NOMEM;
+        goto geopoly_filter_end;
+      }
+      pNew->id = 1;
+      pNew->iCell = 0;
+      pNew->eWithin = PARTLY_WITHIN;
+      assert( pCsr->bPoint==1 );
+      pCsr->aNode[0] = pRoot;
+      pRoot = 0;
+      RTREE_QUEUE_TRACE(pCsr, "PUSH-Fm:");
+      rc = rtreeStepToLeaf(pCsr);
+    }
+  }
+
+geopoly_filter_end:
+  nodeRelease(pRtree, pRoot);
+  rtreeRelease(pRtree);
+  return rc;
+}
+
+/*
+** Rtree virtual table module xBestIndex method. There are three
+** table scan strategies to choose from (in order from most to 
+** least desirable):
+**
+**   idxNum     idxStr        Strategy
+**   ------------------------------------------------
+**     1        "rowid"       Direct lookup by rowid.
+**     2        "rtree"       R-tree overlap query using geopoly_overlap()
+**     3        "rtree"       R-tree within query using geopoly_within()
+**     4        "fullscan"    full-table scan.
+**   ------------------------------------------------
+*/
+static int geopolyBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
+  int ii;
+  int iRowidTerm = -1;
+  int iFuncTerm = -1;
+  int idxNum = 0;
+
+  for(ii=0; ii<pIdxInfo->nConstraint; ii++){
+    struct sqlite3_index_constraint *p = &pIdxInfo->aConstraint[ii];
+    if( !p->usable ) continue;
+    if( p->iColumn<0 && p->op==SQLITE_INDEX_CONSTRAINT_EQ  ){
+      iRowidTerm = ii;
+      break;
+    }
+    if( p->iColumn==0 && p->op>=SQLITE_INDEX_CONSTRAINT_FUNCTION ){
+      /* p->op==SQLITE_INDEX_CONSTRAINT_FUNCTION for geopoly_overlap()
+      ** p->op==(SQLITE_INDEX_CONTRAINT_FUNCTION+1) for geopoly_within().
+      ** See geopolyFindFunction() */
+      iFuncTerm = ii;
+      idxNum = p->op - SQLITE_INDEX_CONSTRAINT_FUNCTION + 2;
+    }
+  }
+
+  if( iRowidTerm>=0 ){
+    pIdxInfo->idxNum = 1;
+    pIdxInfo->idxStr = "rowid";
+    pIdxInfo->aConstraintUsage[iRowidTerm].argvIndex = 1;
+    pIdxInfo->aConstraintUsage[iRowidTerm].omit = 1;
+    pIdxInfo->estimatedCost = 30.0;
+    pIdxInfo->estimatedRows = 1;
+    pIdxInfo->idxFlags = SQLITE_INDEX_SCAN_UNIQUE;
+    return SQLITE_OK;
+  }
+  if( iFuncTerm>=0 ){
+    pIdxInfo->idxNum = idxNum;
+    pIdxInfo->idxStr = "rtree";
+    pIdxInfo->aConstraintUsage[iFuncTerm].argvIndex = 1;
+    pIdxInfo->aConstraintUsage[iFuncTerm].omit = 0;
+    pIdxInfo->estimatedCost = 300.0;
+    pIdxInfo->estimatedRows = 10;
+    return SQLITE_OK;
+  }
+  pIdxInfo->idxNum = 4;
+  pIdxInfo->idxStr = "fullscan";
+  pIdxInfo->estimatedCost = 3000000.0;
+  pIdxInfo->estimatedRows = 100000;
+  return SQLITE_OK;
+}
+
+
+/* 
+** GEOPOLY virtual table module xColumn method.
+*/
+static int geopolyColumn(sqlite3_vtab_cursor *cur, sqlite3_context *ctx, int i){
+  Rtree *pRtree = (Rtree *)cur->pVtab;
+  RtreeCursor *pCsr = (RtreeCursor *)cur;
+  RtreeSearchPoint *p = rtreeSearchPointFirst(pCsr);
+  int rc = SQLITE_OK;
+  RtreeNode *pNode = rtreeNodeOfFirstSearchPoint(pCsr, &rc);
+
+  if( rc ) return rc;
+  if( p==0 ) return SQLITE_OK;
+  if( i==0 && sqlite3_vtab_nochange(ctx) ) return SQLITE_OK;
+  if( i<=pRtree->nAux ){
+    if( !pCsr->bAuxValid ){
+      if( pCsr->pReadAux==0 ){
+        rc = sqlite3_prepare_v3(pRtree->db, pRtree->zReadAuxSql, -1, 0,
+                                &pCsr->pReadAux, 0);
+        if( rc ) return rc;
+      }
+      sqlite3_bind_int64(pCsr->pReadAux, 1, 
+          nodeGetRowid(pRtree, pNode, p->iCell));
+      rc = sqlite3_step(pCsr->pReadAux);
+      if( rc==SQLITE_ROW ){
+        pCsr->bAuxValid = 1;
+      }else{
+        sqlite3_reset(pCsr->pReadAux);
+        if( rc==SQLITE_DONE ) rc = SQLITE_OK;
+        return rc;
+      }
+    }
+    sqlite3_result_value(ctx, sqlite3_column_value(pCsr->pReadAux, i+2));
+  }
+  return SQLITE_OK;
+}
+
+
+/*
+** The xUpdate method for GEOPOLY module virtual tables.
+**
+** For DELETE:
+**
+**     argv[0] = the rowid to be deleted
+**
+** For INSERT:
+**
+**     argv[0] = SQL NULL
+**     argv[1] = rowid to insert, or an SQL NULL to select automatically
+**     argv[2] = _shape column
+**     argv[3] = first application-defined column....
+**
+** For UPDATE:
+**
+**     argv[0] = rowid to modify.  Never NULL
+**     argv[1] = rowid after the change.  Never NULL
+**     argv[2] = new value for _shape
+**     argv[3] = new value for first application-defined column....
+*/
+static int geopolyUpdate(
+  sqlite3_vtab *pVtab, 
+  int nData, 
+  sqlite3_value **aData, 
+  sqlite_int64 *pRowid
+){
+  Rtree *pRtree = (Rtree *)pVtab;
+  int rc = SQLITE_OK;
+  RtreeCell cell;                 /* New cell to insert if nData>1 */
+  i64 oldRowid;                   /* The old rowid */
+  int oldRowidValid;              /* True if oldRowid is valid */
+  i64 newRowid;                   /* The new rowid */
+  int newRowidValid;              /* True if newRowid is valid */
+  int coordChange = 0;            /* Change in coordinates */
+
+  if( pRtree->nNodeRef ){
+    /* Unable to write to the btree while another cursor is reading from it,
+    ** since the write might do a rebalance which would disrupt the read
+    ** cursor. */
+    return SQLITE_LOCKED_VTAB;
+  }
+  rtreeReference(pRtree);
+  assert(nData>=1);
+
+  oldRowidValid = sqlite3_value_type(aData[0])!=SQLITE_NULL;;
+  oldRowid = oldRowidValid ? sqlite3_value_int64(aData[0]) : 0;
+  newRowidValid = nData>1 && sqlite3_value_type(aData[1])!=SQLITE_NULL;
+  newRowid = newRowidValid ? sqlite3_value_int64(aData[1]) : 0;
+  cell.iRowid = newRowid;
+
+  if( nData>1                                 /* not a DELETE */
+   && (!oldRowidValid                         /* INSERT */
+        || !sqlite3_value_nochange(aData[2])  /* UPDATE _shape */
+        || oldRowid!=newRowid)                /* Rowid change */
+  ){
+    geopolyBBox(0, aData[2], cell.aCoord, &rc);
+    if( rc ){
+      if( rc==SQLITE_ERROR ){
+        pVtab->zErrMsg =
+          sqlite3_mprintf("_shape does not contain a valid polygon");
+      }
+      goto geopoly_update_end;
+    }
+    coordChange = 1;
+
+    /* If a rowid value was supplied, check if it is already present in 
+    ** the table. If so, the constraint has failed. */
+    if( newRowidValid && (!oldRowidValid || oldRowid!=newRowid) ){
+      int steprc;
+      sqlite3_bind_int64(pRtree->pReadRowid, 1, cell.iRowid);
+      steprc = sqlite3_step(pRtree->pReadRowid);
+      rc = sqlite3_reset(pRtree->pReadRowid);
+      if( SQLITE_ROW==steprc ){
+        if( sqlite3_vtab_on_conflict(pRtree->db)==SQLITE_REPLACE ){
+          rc = rtreeDeleteRowid(pRtree, cell.iRowid);
+        }else{
+          rc = rtreeConstraintError(pRtree, 0);
+        }
+      }
+    }
+  }
+
+  /* If aData[0] is not an SQL NULL value, it is the rowid of a
+  ** record to delete from the r-tree table. The following block does
+  ** just that.
+  */
+  if( rc==SQLITE_OK && (nData==1 || (coordChange && oldRowidValid)) ){
+    rc = rtreeDeleteRowid(pRtree, oldRowid);
+  }
+
+  /* If the aData[] array contains more than one element, elements
+  ** (aData[2]..aData[argc-1]) contain a new record to insert into
+  ** the r-tree structure.
+  */
+  if( rc==SQLITE_OK && nData>1 && coordChange ){
+    /* Insert the new record into the r-tree */
+    RtreeNode *pLeaf = 0;
+    if( !newRowidValid ){
+      rc = rtreeNewRowid(pRtree, &cell.iRowid);
+    }
+    *pRowid = cell.iRowid;
+    if( rc==SQLITE_OK ){
+      rc = ChooseLeaf(pRtree, &cell, 0, &pLeaf);
+    }
+    if( rc==SQLITE_OK ){
+      int rc2;
+      pRtree->iReinsertHeight = -1;
+      rc = rtreeInsertCell(pRtree, pLeaf, &cell, 0);
+      rc2 = nodeRelease(pRtree, pLeaf);
+      if( rc==SQLITE_OK ){
+        rc = rc2;
+      }
+    }
+  }
+
+  /* Change the data */
+  if( rc==SQLITE_OK && nData>1 ){
+    sqlite3_stmt *pUp = pRtree->pWriteAux;
+    int jj;
+    int nChange = 0;
+    sqlite3_bind_int64(pUp, 1, cell.iRowid);
+    assert( pRtree->nAux>=1 );
+    if( sqlite3_value_nochange(aData[2]) ){
+      sqlite3_bind_null(pUp, 2);
+    }else{
+      sqlite3_bind_value(pUp, 2, aData[2]);
+      nChange = 1;
+    }
+    for(jj=1; jj<pRtree->nAux; jj++){
+      nChange++;
+      sqlite3_bind_value(pUp, jj+2, aData[jj+2]);
+    }
+    if( nChange ){
+      sqlite3_step(pUp);
+      rc = sqlite3_reset(pUp);
+    }
+  }
+
+geopoly_update_end:
+  rtreeRelease(pRtree);
+  return rc;
+}
+
+/*
+** Report that geopoly_overlap() is an overloaded function suitable
+** for use in xBestIndex.
+*/
+static int geopolyFindFunction(
+  sqlite3_vtab *pVtab,
+  int nArg,
+  const char *zName,
+  void (**pxFunc)(sqlite3_context*,int,sqlite3_value**),
+  void **ppArg
+){
+  if( sqlite3_stricmp(zName, "geopoly_overlap")==0 ){
+    *pxFunc = geopolyOverlapFunc;
+    *ppArg = 0;
+    return SQLITE_INDEX_CONSTRAINT_FUNCTION;
+  }
+  if( sqlite3_stricmp(zName, "geopoly_within")==0 ){
+    *pxFunc = geopolyWithinFunc;
+    *ppArg = 0;
+    return SQLITE_INDEX_CONSTRAINT_FUNCTION+1;
+  }
+  return 0;
+}
+
+
+static sqlite3_module geopolyModule = {
+  2,                          /* iVersion */
+  geopolyCreate,              /* xCreate - create a table */
+  geopolyConnect,             /* xConnect - connect to an existing table */
+  geopolyBestIndex,           /* xBestIndex - Determine search strategy */
+  rtreeDisconnect,            /* xDisconnect - Disconnect from a table */
+  rtreeDestroy,               /* xDestroy - Drop a table */
+  rtreeOpen,                  /* xOpen - open a cursor */
+  rtreeClose,                 /* xClose - close a cursor */
+  geopolyFilter,              /* xFilter - configure scan constraints */
+  rtreeNext,                  /* xNext - advance a cursor */
+  rtreeEof,                   /* xEof */
+  geopolyColumn,              /* xColumn - read data */
+  rtreeRowid,                 /* xRowid - read data */
+  geopolyUpdate,              /* xUpdate - write data */
+  rtreeBeginTransaction,      /* xBegin - begin transaction */
+  rtreeEndTransaction,        /* xSync - sync transaction */
+  rtreeEndTransaction,        /* xCommit - commit transaction */
+  rtreeEndTransaction,        /* xRollback - rollback transaction */
+  geopolyFindFunction,        /* xFindFunction - function overloading */
+  rtreeRename,                /* xRename - rename the table */
+  rtreeSavepoint,             /* xSavepoint */
+  0,                          /* xRelease */
+  0,                          /* xRollbackTo */
+};
+
+static int sqlite3_geopoly_init(sqlite3 *db){
+  int rc = SQLITE_OK;
+  static const struct {
+    void (*xFunc)(sqlite3_context*,int,sqlite3_value**);
+    int nArg;
+    const char *zName;
+  } aFunc[] = {
+     { geopolyAreaFunc,          1,    "geopoly_area"             },
+     { geopolyBlobFunc,          1,    "geopoly_blob"             },
+     { geopolyJsonFunc,          1,    "geopoly_json"             },
+     { geopolySvgFunc,          -1,    "geopoly_svg"              },
+     { geopolyWithinFunc,        2,    "geopoly_within"           },
+     { geopolyContainsPointFunc, 3,    "geopoly_contains_point"   },
+     { geopolyOverlapFunc,       2,    "geopoly_overlap"          },
+     { geopolyDebugFunc,         1,    "geopoly_debug"            },
+     { geopolyBBoxFunc,          1,    "geopoly_bbox"             },
+     { geopolyXformFunc,         7,    "geopoly_xform"            },
+  };
+  static const struct {
+    void (*xStep)(sqlite3_context*,int,sqlite3_value**);
+    void (*xFinal)(sqlite3_context*);
+    const char *zName;
+  } aAgg[] = {
+     { geopolyBBoxStep, geopolyBBoxFinal, "geopoly_group_bbox"    },
+  };
+  int i;
+  for(i=0; i<sizeof(aFunc)/sizeof(aFunc[0]) && rc==SQLITE_OK; i++){
+    rc = sqlite3_create_function(db, aFunc[i].zName, aFunc[i].nArg,
+                                 SQLITE_UTF8, 0,
+                                 aFunc[i].xFunc, 0, 0);
+  }
+  for(i=0; i<sizeof(aAgg)/sizeof(aAgg[0]) && rc==SQLITE_OK; i++){
+    rc = sqlite3_create_function(db, aAgg[i].zName, 1, SQLITE_UTF8, 0,
+                                 0, aAgg[i].xStep, aAgg[i].xFinal);
+  }
+  if( rc==SQLITE_OK ){
+    rc = sqlite3_create_module_v2(db, "geopoly", &geopolyModule, 0, 0);
+  }
+  return rc;
+}
+
+/************** End of geopoly.c *********************************************/
+/************** Continuing where we left off in rtree.c **********************/
+#endif
 
 /*
 ** Register the r-tree module with database handle db. This creates the
 ** virtual table module "rtree" and the debugging/analysis scalar 
 ** function "rtreenode".
@@ -178617,10 +183960,15 @@
   }
   if( rc==SQLITE_OK ){
     void *c = (void *)RTREE_COORD_INT32;
     rc = sqlite3_create_module_v2(db, "rtree_i32", &rtreeModule, c, 0);
   }
+#ifdef SQLITE_ENABLE_GEOPOLY
+  if( rc==SQLITE_OK ){
+    rc = sqlite3_geopoly_init(db);
+  }
+#endif
 
   return rc;
 }
 
 /*
@@ -191579,2506 +196927,10 @@
 }
 
 #endif /* SQLITE_ENABLE_SESSION && SQLITE_ENABLE_PREUPDATE_HOOK */
 
 /************** End of sqlite3session.c **************************************/
-/************** Begin file json1.c *******************************************/
-/*
-** 2015-08-12
-**
-** The author disclaims copyright to this source code.  In place of
-** a legal notice, here is a blessing:
-**
-**    May you do good and not evil.
-**    May you find forgiveness for yourself and forgive others.
-**    May you share freely, never taking more than you give.
-**
-******************************************************************************
-**
-** This SQLite extension implements JSON functions.  The interface is
-** modeled after MySQL JSON functions:
-**
-**     https://dev.mysql.com/doc/refman/5.7/en/json.html
-**
-** For the time being, all JSON is stored as pure text.  (We might add
-** a JSONB type in the future which stores a binary encoding of JSON in
-** a BLOB, but there is no support for JSONB in the current implementation.
-** This implementation parses JSON text at 250 MB/s, so it is hard to see
-** how JSONB might improve on that.)
-*/
-#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_JSON1)
-#if !defined(SQLITEINT_H)
-/* #include "sqlite3ext.h" */
-#endif
-SQLITE_EXTENSION_INIT1
-/* #include <assert.h> */
-/* #include <string.h> */
-/* #include <stdlib.h> */
-/* #include <stdarg.h> */
-
-/* Mark a function parameter as unused, to suppress nuisance compiler
-** warnings. */
-#ifndef UNUSED_PARAM
-# define UNUSED_PARAM(X)  (void)(X)
-#endif
-
-#ifndef LARGEST_INT64
-# define LARGEST_INT64  (0xffffffff|(((sqlite3_int64)0x7fffffff)<<32))
-# define SMALLEST_INT64 (((sqlite3_int64)-1) - LARGEST_INT64)
-#endif
-
-/*
-** Versions of isspace(), isalnum() and isdigit() to which it is safe
-** to pass signed char values.
-*/
-#ifdef sqlite3Isdigit
-   /* Use the SQLite core versions if this routine is part of the
-   ** SQLite amalgamation */
-#  define safe_isdigit(x)  sqlite3Isdigit(x)
-#  define safe_isalnum(x)  sqlite3Isalnum(x)
-#  define safe_isxdigit(x) sqlite3Isxdigit(x)
-#else
-   /* Use the standard library for separate compilation */
-#include <ctype.h>  /* amalgamator: keep */
-#  define safe_isdigit(x)  isdigit((unsigned char)(x))
-#  define safe_isalnum(x)  isalnum((unsigned char)(x))
-#  define safe_isxdigit(x) isxdigit((unsigned char)(x))
-#endif
-
-/*
-** Growing our own isspace() routine this way is twice as fast as
-** the library isspace() function, resulting in a 7% overall performance
-** increase for the parser.  (Ubuntu14.10 gcc 4.8.4 x64 with -Os).
-*/
-static const char jsonIsSpace[] = {
-  0, 0, 0, 0, 0, 0, 0, 0,     0, 1, 1, 0, 0, 1, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
-  1, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
-};
-#define safe_isspace(x) (jsonIsSpace[(unsigned char)x])
-
-#ifndef SQLITE_AMALGAMATION
-  /* Unsigned integer types.  These are already defined in the sqliteInt.h,
-  ** but the definitions need to be repeated for separate compilation. */
-  typedef sqlite3_uint64 u64;
-  typedef unsigned int u32;
-  typedef unsigned short int u16;
-  typedef unsigned char u8;
-#endif
-
-/* Objects */
-typedef struct JsonString JsonString;
-typedef struct JsonNode JsonNode;
-typedef struct JsonParse JsonParse;
-
-/* An instance of this object represents a JSON string
-** under construction.  Really, this is a generic string accumulator
-** that can be and is used to create strings other than JSON.
-*/
-struct JsonString {
-  sqlite3_context *pCtx;   /* Function context - put error messages here */
-  char *zBuf;              /* Append JSON content here */
-  u64 nAlloc;              /* Bytes of storage available in zBuf[] */
-  u64 nUsed;               /* Bytes of zBuf[] currently used */
-  u8 bStatic;              /* True if zBuf is static space */
-  u8 bErr;                 /* True if an error has been encountered */
-  char zSpace[100];        /* Initial static space */
-};
-
-/* JSON type values
-*/
-#define JSON_NULL     0
-#define JSON_TRUE     1
-#define JSON_FALSE    2
-#define JSON_INT      3
-#define JSON_REAL     4
-#define JSON_STRING   5
-#define JSON_ARRAY    6
-#define JSON_OBJECT   7
-
-/* The "subtype" set for JSON values */
-#define JSON_SUBTYPE  74    /* Ascii for "J" */
-
-/*
-** Names of the various JSON types:
-*/
-static const char * const jsonType[] = {
-  "null", "true", "false", "integer", "real", "text", "array", "object"
-};
-
-/* Bit values for the JsonNode.jnFlag field
-*/
-#define JNODE_RAW     0x01         /* Content is raw, not JSON encoded */
-#define JNODE_ESCAPE  0x02         /* Content is text with \ escapes */
-#define JNODE_REMOVE  0x04         /* Do not output */
-#define JNODE_REPLACE 0x08         /* Replace with JsonNode.u.iReplace */
-#define JNODE_PATCH   0x10         /* Patch with JsonNode.u.pPatch */
-#define JNODE_APPEND  0x20         /* More ARRAY/OBJECT entries at u.iAppend */
-#define JNODE_LABEL   0x40         /* Is a label of an object */
-
-
-/* A single node of parsed JSON
-*/
-struct JsonNode {
-  u8 eType;              /* One of the JSON_ type values */
-  u8 jnFlags;            /* JNODE flags */
-  u32 n;                 /* Bytes of content, or number of sub-nodes */
-  union {
-    const char *zJContent; /* Content for INT, REAL, and STRING */
-    u32 iAppend;           /* More terms for ARRAY and OBJECT */
-    u32 iKey;              /* Key for ARRAY objects in json_tree() */
-    u32 iReplace;          /* Replacement content for JNODE_REPLACE */
-    JsonNode *pPatch;      /* Node chain of patch for JNODE_PATCH */
-  } u;
-};
-
-/* A completely parsed JSON string
-*/
-struct JsonParse {
-  u32 nNode;         /* Number of slots of aNode[] used */
-  u32 nAlloc;        /* Number of slots of aNode[] allocated */
-  JsonNode *aNode;   /* Array of nodes containing the parse */
-  const char *zJson; /* Original JSON string */
-  u32 *aUp;          /* Index of parent of each node */
-  u8 oom;            /* Set to true if out of memory */
-  u8 nErr;           /* Number of errors seen */
-  u16 iDepth;        /* Nesting depth */
-  int nJson;         /* Length of the zJson string in bytes */
-};
-
-/*
-** Maximum nesting depth of JSON for this implementation.
-**
-** This limit is needed to avoid a stack overflow in the recursive
-** descent parser.  A depth of 2000 is far deeper than any sane JSON
-** should go.
-*/
-#define JSON_MAX_DEPTH  2000
-
-/**************************************************************************
-** Utility routines for dealing with JsonString objects
-**************************************************************************/
-
-/* Set the JsonString object to an empty string
-*/
-static void jsonZero(JsonString *p){
-  p->zBuf = p->zSpace;
-  p->nAlloc = sizeof(p->zSpace);
-  p->nUsed = 0;
-  p->bStatic = 1;
-}
-
-/* Initialize the JsonString object
-*/
-static void jsonInit(JsonString *p, sqlite3_context *pCtx){
-  p->pCtx = pCtx;
-  p->bErr = 0;
-  jsonZero(p);
-}
-
-
-/* Free all allocated memory and reset the JsonString object back to its
-** initial state.
-*/
-static void jsonReset(JsonString *p){
-  if( !p->bStatic ) sqlite3_free(p->zBuf);
-  jsonZero(p);
-}
-
-
-/* Report an out-of-memory (OOM) condition 
-*/
-static void jsonOom(JsonString *p){
-  p->bErr = 1;
-  sqlite3_result_error_nomem(p->pCtx);
-  jsonReset(p);
-}
-
-/* Enlarge pJson->zBuf so that it can hold at least N more bytes.
-** Return zero on success.  Return non-zero on an OOM error
-*/
-static int jsonGrow(JsonString *p, u32 N){
-  u64 nTotal = N<p->nAlloc ? p->nAlloc*2 : p->nAlloc+N+10;
-  char *zNew;
-  if( p->bStatic ){
-    if( p->bErr ) return 1;
-    zNew = sqlite3_malloc64(nTotal);
-    if( zNew==0 ){
-      jsonOom(p);
-      return SQLITE_NOMEM;
-    }
-    memcpy(zNew, p->zBuf, (size_t)p->nUsed);
-    p->zBuf = zNew;
-    p->bStatic = 0;
-  }else{
-    zNew = sqlite3_realloc64(p->zBuf, nTotal);
-    if( zNew==0 ){
-      jsonOom(p);
-      return SQLITE_NOMEM;
-    }
-    p->zBuf = zNew;
-  }
-  p->nAlloc = nTotal;
-  return SQLITE_OK;
-}
-
-/* Append N bytes from zIn onto the end of the JsonString string.
-*/
-static void jsonAppendRaw(JsonString *p, const char *zIn, u32 N){
-  if( (N+p->nUsed >= p->nAlloc) && jsonGrow(p,N)!=0 ) return;
-  memcpy(p->zBuf+p->nUsed, zIn, N);
-  p->nUsed += N;
-}
-
-/* Append formatted text (not to exceed N bytes) to the JsonString.
-*/
-static void jsonPrintf(int N, JsonString *p, const char *zFormat, ...){
-  va_list ap;
-  if( (p->nUsed + N >= p->nAlloc) && jsonGrow(p, N) ) return;
-  va_start(ap, zFormat);
-  sqlite3_vsnprintf(N, p->zBuf+p->nUsed, zFormat, ap);
-  va_end(ap);
-  p->nUsed += (int)strlen(p->zBuf+p->nUsed);
-}
-
-/* Append a single character
-*/
-static void jsonAppendChar(JsonString *p, char c){
-  if( p->nUsed>=p->nAlloc && jsonGrow(p,1)!=0 ) return;
-  p->zBuf[p->nUsed++] = c;
-}
-
-/* Append a comma separator to the output buffer, if the previous
-** character is not '[' or '{'.
-*/
-static void jsonAppendSeparator(JsonString *p){
-  char c;
-  if( p->nUsed==0 ) return;
-  c = p->zBuf[p->nUsed-1];
-  if( c!='[' && c!='{' ) jsonAppendChar(p, ',');
-}
-
-/* Append the N-byte string in zIn to the end of the JsonString string
-** under construction.  Enclose the string in "..." and escape
-** any double-quotes or backslash characters contained within the
-** string.
-*/
-static void jsonAppendString(JsonString *p, const char *zIn, u32 N){
-  u32 i;
-  if( (N+p->nUsed+2 >= p->nAlloc) && jsonGrow(p,N+2)!=0 ) return;
-  p->zBuf[p->nUsed++] = '"';
-  for(i=0; i<N; i++){
-    unsigned char c = ((unsigned const char*)zIn)[i];
-    if( c=='"' || c=='\\' ){
-      json_simple_escape:
-      if( (p->nUsed+N+3-i > p->nAlloc) && jsonGrow(p,N+3-i)!=0 ) return;
-      p->zBuf[p->nUsed++] = '\\';
-    }else if( c<=0x1f ){
-      static const char aSpecial[] = {
-         0, 0, 0, 0, 0, 0, 0, 0, 'b', 't', 'n', 0, 'f', 'r', 0, 0,
-         0, 0, 0, 0, 0, 0, 0, 0,   0,   0,   0, 0,   0,   0, 0, 0
-      };
-      assert( sizeof(aSpecial)==32 );
-      assert( aSpecial['\b']=='b' );
-      assert( aSpecial['\f']=='f' );
-      assert( aSpecial['\n']=='n' );
-      assert( aSpecial['\r']=='r' );
-      assert( aSpecial['\t']=='t' );
-      if( aSpecial[c] ){
-        c = aSpecial[c];
-        goto json_simple_escape;
-      }
-      if( (p->nUsed+N+7+i > p->nAlloc) && jsonGrow(p,N+7-i)!=0 ) return;
-      p->zBuf[p->nUsed++] = '\\';
-      p->zBuf[p->nUsed++] = 'u';
-      p->zBuf[p->nUsed++] = '0';
-      p->zBuf[p->nUsed++] = '0';
-      p->zBuf[p->nUsed++] = '0' + (c>>4);
-      c = "0123456789abcdef"[c&0xf];
-    }
-    p->zBuf[p->nUsed++] = c;
-  }
-  p->zBuf[p->nUsed++] = '"';
-  assert( p->nUsed<p->nAlloc );
-}
-
-/*
-** Append a function parameter value to the JSON string under 
-** construction.
-*/
-static void jsonAppendValue(
-  JsonString *p,                 /* Append to this JSON string */
-  sqlite3_value *pValue          /* Value to append */
-){
-  switch( sqlite3_value_type(pValue) ){
-    case SQLITE_NULL: {
-      jsonAppendRaw(p, "null", 4);
-      break;
-    }
-    case SQLITE_INTEGER:
-    case SQLITE_FLOAT: {
-      const char *z = (const char*)sqlite3_value_text(pValue);
-      u32 n = (u32)sqlite3_value_bytes(pValue);
-      jsonAppendRaw(p, z, n);
-      break;
-    }
-    case SQLITE_TEXT: {
-      const char *z = (const char*)sqlite3_value_text(pValue);
-      u32 n = (u32)sqlite3_value_bytes(pValue);
-      if( sqlite3_value_subtype(pValue)==JSON_SUBTYPE ){
-        jsonAppendRaw(p, z, n);
-      }else{
-        jsonAppendString(p, z, n);
-      }
-      break;
-    }
-    default: {
-      if( p->bErr==0 ){
-        sqlite3_result_error(p->pCtx, "JSON cannot hold BLOB values", -1);
-        p->bErr = 2;
-        jsonReset(p);
-      }
-      break;
-    }
-  }
-}
-
-
-/* Make the JSON in p the result of the SQL function.
-*/
-static void jsonResult(JsonString *p){
-  if( p->bErr==0 ){
-    sqlite3_result_text64(p->pCtx, p->zBuf, p->nUsed, 
-                          p->bStatic ? SQLITE_TRANSIENT : sqlite3_free,
-                          SQLITE_UTF8);
-    jsonZero(p);
-  }
-  assert( p->bStatic );
-}
-
-/**************************************************************************
-** Utility routines for dealing with JsonNode and JsonParse objects
-**************************************************************************/
-
-/*
-** Return the number of consecutive JsonNode slots need to represent
-** the parsed JSON at pNode.  The minimum answer is 1.  For ARRAY and
-** OBJECT types, the number might be larger.
-**
-** Appended elements are not counted.  The value returned is the number
-** by which the JsonNode counter should increment in order to go to the
-** next peer value.
-*/
-static u32 jsonNodeSize(JsonNode *pNode){
-  return pNode->eType>=JSON_ARRAY ? pNode->n+1 : 1;
-}
-
-/*
-** Reclaim all memory allocated by a JsonParse object.  But do not
-** delete the JsonParse object itself.
-*/
-static void jsonParseReset(JsonParse *pParse){
-  sqlite3_free(pParse->aNode);
-  pParse->aNode = 0;
-  pParse->nNode = 0;
-  pParse->nAlloc = 0;
-  sqlite3_free(pParse->aUp);
-  pParse->aUp = 0;
-}
-
-/*
-** Free a JsonParse object that was obtained from sqlite3_malloc().
-*/
-static void jsonParseFree(JsonParse *pParse){
-  jsonParseReset(pParse);
-  sqlite3_free(pParse);
-}
-
-/*
-** Convert the JsonNode pNode into a pure JSON string and
-** append to pOut.  Subsubstructure is also included.  Return
-** the number of JsonNode objects that are encoded.
-*/
-static void jsonRenderNode(
-  JsonNode *pNode,               /* The node to render */
-  JsonString *pOut,              /* Write JSON here */
-  sqlite3_value **aReplace       /* Replacement values */
-){
-  if( pNode->jnFlags & (JNODE_REPLACE|JNODE_PATCH) ){
-    if( pNode->jnFlags & JNODE_REPLACE ){
-      jsonAppendValue(pOut, aReplace[pNode->u.iReplace]);
-      return;
-    }
-    pNode = pNode->u.pPatch;
-  }
-  switch( pNode->eType ){
-    default: {
-      assert( pNode->eType==JSON_NULL );
-      jsonAppendRaw(pOut, "null", 4);
-      break;
-    }
-    case JSON_TRUE: {
-      jsonAppendRaw(pOut, "true", 4);
-      break;
-    }
-    case JSON_FALSE: {
-      jsonAppendRaw(pOut, "false", 5);
-      break;
-    }
-    case JSON_STRING: {
-      if( pNode->jnFlags & JNODE_RAW ){
-        jsonAppendString(pOut, pNode->u.zJContent, pNode->n);
-        break;
-      }
-      /* Fall through into the next case */
-    }
-    case JSON_REAL:
-    case JSON_INT: {
-      jsonAppendRaw(pOut, pNode->u.zJContent, pNode->n);
-      break;
-    }
-    case JSON_ARRAY: {
-      u32 j = 1;
-      jsonAppendChar(pOut, '[');
-      for(;;){
-        while( j<=pNode->n ){
-          if( (pNode[j].jnFlags & JNODE_REMOVE)==0 ){
-            jsonAppendSeparator(pOut);
-            jsonRenderNode(&pNode[j], pOut, aReplace);
-          }
-          j += jsonNodeSize(&pNode[j]);
-        }
-        if( (pNode->jnFlags & JNODE_APPEND)==0 ) break;
-        pNode = &pNode[pNode->u.iAppend];
-        j = 1;
-      }
-      jsonAppendChar(pOut, ']');
-      break;
-    }
-    case JSON_OBJECT: {
-      u32 j = 1;
-      jsonAppendChar(pOut, '{');
-      for(;;){
-        while( j<=pNode->n ){
-          if( (pNode[j+1].jnFlags & JNODE_REMOVE)==0 ){
-            jsonAppendSeparator(pOut);
-            jsonRenderNode(&pNode[j], pOut, aReplace);
-            jsonAppendChar(pOut, ':');
-            jsonRenderNode(&pNode[j+1], pOut, aReplace);
-          }
-          j += 1 + jsonNodeSize(&pNode[j+1]);
-        }
-        if( (pNode->jnFlags & JNODE_APPEND)==0 ) break;
-        pNode = &pNode[pNode->u.iAppend];
-        j = 1;
-      }
-      jsonAppendChar(pOut, '}');
-      break;
-    }
-  }
-}
-
-/*
-** Return a JsonNode and all its descendents as a JSON string.
-*/
-static void jsonReturnJson(
-  JsonNode *pNode,            /* Node to return */
-  sqlite3_context *pCtx,      /* Return value for this function */
-  sqlite3_value **aReplace    /* Array of replacement values */
-){
-  JsonString s;
-  jsonInit(&s, pCtx);
-  jsonRenderNode(pNode, &s, aReplace);
-  jsonResult(&s);
-  sqlite3_result_subtype(pCtx, JSON_SUBTYPE);
-}
-
-/*
-** Make the JsonNode the return value of the function.
-*/
-static void jsonReturn(
-  JsonNode *pNode,            /* Node to return */
-  sqlite3_context *pCtx,      /* Return value for this function */
-  sqlite3_value **aReplace    /* Array of replacement values */
-){
-  switch( pNode->eType ){
-    default: {
-      assert( pNode->eType==JSON_NULL );
-      sqlite3_result_null(pCtx);
-      break;
-    }
-    case JSON_TRUE: {
-      sqlite3_result_int(pCtx, 1);
-      break;
-    }
-    case JSON_FALSE: {
-      sqlite3_result_int(pCtx, 0);
-      break;
-    }
-    case JSON_INT: {
-      sqlite3_int64 i = 0;
-      const char *z = pNode->u.zJContent;
-      if( z[0]=='-' ){ z++; }
-      while( z[0]>='0' && z[0]<='9' ){
-        unsigned v = *(z++) - '0';
-        if( i>=LARGEST_INT64/10 ){
-          if( i>LARGEST_INT64/10 ) goto int_as_real;
-          if( z[0]>='0' && z[0]<='9' ) goto int_as_real;
-          if( v==9 ) goto int_as_real;
-          if( v==8 ){
-            if( pNode->u.zJContent[0]=='-' ){
-              sqlite3_result_int64(pCtx, SMALLEST_INT64);
-              goto int_done;
-            }else{
-              goto int_as_real;
-            }
-          }
-        }
-        i = i*10 + v;
-      }
-      if( pNode->u.zJContent[0]=='-' ){ i = -i; }
-      sqlite3_result_int64(pCtx, i);
-      int_done:
-      break;
-      int_as_real: /* fall through to real */;
-    }
-    case JSON_REAL: {
-      double r;
-#ifdef SQLITE_AMALGAMATION
-      const char *z = pNode->u.zJContent;
-      sqlite3AtoF(z, &r, sqlite3Strlen30(z), SQLITE_UTF8);
-#else
-      r = strtod(pNode->u.zJContent, 0);
-#endif
-      sqlite3_result_double(pCtx, r);
-      break;
-    }
-    case JSON_STRING: {
-#if 0 /* Never happens because JNODE_RAW is only set by json_set(),
-      ** json_insert() and json_replace() and those routines do not
-      ** call jsonReturn() */
-      if( pNode->jnFlags & JNODE_RAW ){
-        sqlite3_result_text(pCtx, pNode->u.zJContent, pNode->n,
-                            SQLITE_TRANSIENT);
-      }else 
-#endif
-      assert( (pNode->jnFlags & JNODE_RAW)==0 );
-      if( (pNode->jnFlags & JNODE_ESCAPE)==0 ){
-        /* JSON formatted without any backslash-escapes */
-        sqlite3_result_text(pCtx, pNode->u.zJContent+1, pNode->n-2,
-                            SQLITE_TRANSIENT);
-      }else{
-        /* Translate JSON formatted string into raw text */
-        u32 i;
-        u32 n = pNode->n;
-        const char *z = pNode->u.zJContent;
-        char *zOut;
-        u32 j;
-        zOut = sqlite3_malloc( n+1 );
-        if( zOut==0 ){
-          sqlite3_result_error_nomem(pCtx);
-          break;
-        }
-        for(i=1, j=0; i<n-1; i++){
-          char c = z[i];
-          if( c!='\\' ){
-            zOut[j++] = c;
-          }else{
-            c = z[++i];
-            if( c=='u' ){
-              u32 v = 0, k;
-              for(k=0; k<4; i++, k++){
-                assert( i<n-2 );
-                c = z[i+1];
-                assert( safe_isxdigit(c) );
-                if( c<='9' ) v = v*16 + c - '0';
-                else if( c<='F' ) v = v*16 + c - 'A' + 10;
-                else v = v*16 + c - 'a' + 10;
-              }
-              if( v==0 ) break;
-              if( v<=0x7f ){
-                zOut[j++] = (char)v;
-              }else if( v<=0x7ff ){
-                zOut[j++] = (char)(0xc0 | (v>>6));
-                zOut[j++] = 0x80 | (v&0x3f);
-              }else{
-                zOut[j++] = (char)(0xe0 | (v>>12));
-                zOut[j++] = 0x80 | ((v>>6)&0x3f);
-                zOut[j++] = 0x80 | (v&0x3f);
-              }
-            }else{
-              if( c=='b' ){
-                c = '\b';
-              }else if( c=='f' ){
-                c = '\f';
-              }else if( c=='n' ){
-                c = '\n';
-              }else if( c=='r' ){
-                c = '\r';
-              }else if( c=='t' ){
-                c = '\t';
-              }
-              zOut[j++] = c;
-            }
-          }
-        }
-        zOut[j] = 0;
-        sqlite3_result_text(pCtx, zOut, j, sqlite3_free);
-      }
-      break;
-    }
-    case JSON_ARRAY:
-    case JSON_OBJECT: {
-      jsonReturnJson(pNode, pCtx, aReplace);
-      break;
-    }
-  }
-}
-
-/* Forward reference */
-static int jsonParseAddNode(JsonParse*,u32,u32,const char*);
-
-/*
-** A macro to hint to the compiler that a function should not be
-** inlined.
-*/
-#if defined(__GNUC__)
-#  define JSON_NOINLINE  __attribute__((noinline))
-#elif defined(_MSC_VER) && _MSC_VER>=1310
-#  define JSON_NOINLINE  __declspec(noinline)
-#else
-#  define JSON_NOINLINE
-#endif
-
-
-static JSON_NOINLINE int jsonParseAddNodeExpand(
-  JsonParse *pParse,        /* Append the node to this object */
-  u32 eType,                /* Node type */
-  u32 n,                    /* Content size or sub-node count */
-  const char *zContent      /* Content */
-){
-  u32 nNew;
-  JsonNode *pNew;
-  assert( pParse->nNode>=pParse->nAlloc );
-  if( pParse->oom ) return -1;
-  nNew = pParse->nAlloc*2 + 10;
-  pNew = sqlite3_realloc(pParse->aNode, sizeof(JsonNode)*nNew);
-  if( pNew==0 ){
-    pParse->oom = 1;
-    return -1;
-  }
-  pParse->nAlloc = nNew;
-  pParse->aNode = pNew;
-  assert( pParse->nNode<pParse->nAlloc );
-  return jsonParseAddNode(pParse, eType, n, zContent);
-}
-
-/*
-** Create a new JsonNode instance based on the arguments and append that
-** instance to the JsonParse.  Return the index in pParse->aNode[] of the
-** new node, or -1 if a memory allocation fails.
-*/
-static int jsonParseAddNode(
-  JsonParse *pParse,        /* Append the node to this object */
-  u32 eType,                /* Node type */
-  u32 n,                    /* Content size or sub-node count */
-  const char *zContent      /* Content */
-){
-  JsonNode *p;
-  if( pParse->nNode>=pParse->nAlloc ){
-    return jsonParseAddNodeExpand(pParse, eType, n, zContent);
-  }
-  p = &pParse->aNode[pParse->nNode];
-  p->eType = (u8)eType;
-  p->jnFlags = 0;
-  p->n = n;
-  p->u.zJContent = zContent;
-  return pParse->nNode++;
-}
-
-/*
-** Return true if z[] begins with 4 (or more) hexadecimal digits
-*/
-static int jsonIs4Hex(const char *z){
-  int i;
-  for(i=0; i<4; i++) if( !safe_isxdigit(z[i]) ) return 0;
-  return 1;
-}
-
-/*
-** Parse a single JSON value which begins at pParse->zJson[i].  Return the
-** index of the first character past the end of the value parsed.
-**
-** Return negative for a syntax error.  Special cases:  return -2 if the
-** first non-whitespace character is '}' and return -3 if the first
-** non-whitespace character is ']'.
-*/
-static int jsonParseValue(JsonParse *pParse, u32 i){
-  char c;
-  u32 j;
-  int iThis;
-  int x;
-  JsonNode *pNode;
-  const char *z = pParse->zJson;
-  while( safe_isspace(z[i]) ){ i++; }
-  if( (c = z[i])=='{' ){
-    /* Parse object */
-    iThis = jsonParseAddNode(pParse, JSON_OBJECT, 0, 0);
-    if( iThis<0 ) return -1;
-    for(j=i+1;;j++){
-      while( safe_isspace(z[j]) ){ j++; }
-      if( ++pParse->iDepth > JSON_MAX_DEPTH ) return -1;
-      x = jsonParseValue(pParse, j);
-      if( x<0 ){
-        pParse->iDepth--;
-        if( x==(-2) && pParse->nNode==(u32)iThis+1 ) return j+1;
-        return -1;
-      }
-      if( pParse->oom ) return -1;
-      pNode = &pParse->aNode[pParse->nNode-1];
-      if( pNode->eType!=JSON_STRING ) return -1;
-      pNode->jnFlags |= JNODE_LABEL;
-      j = x;
-      while( safe_isspace(z[j]) ){ j++; }
-      if( z[j]!=':' ) return -1;
-      j++;
-      x = jsonParseValue(pParse, j);
-      pParse->iDepth--;
-      if( x<0 ) return -1;
-      j = x;
-      while( safe_isspace(z[j]) ){ j++; }
-      c = z[j];
-      if( c==',' ) continue;
-      if( c!='}' ) return -1;
-      break;
-    }
-    pParse->aNode[iThis].n = pParse->nNode - (u32)iThis - 1;
-    return j+1;
-  }else if( c=='[' ){
-    /* Parse array */
-    iThis = jsonParseAddNode(pParse, JSON_ARRAY, 0, 0);
-    if( iThis<0 ) return -1;
-    for(j=i+1;;j++){
-      while( safe_isspace(z[j]) ){ j++; }
-      if( ++pParse->iDepth > JSON_MAX_DEPTH ) return -1;
-      x = jsonParseValue(pParse, j);
-      pParse->iDepth--;
-      if( x<0 ){
-        if( x==(-3) && pParse->nNode==(u32)iThis+1 ) return j+1;
-        return -1;
-      }
-      j = x;
-      while( safe_isspace(z[j]) ){ j++; }
-      c = z[j];
-      if( c==',' ) continue;
-      if( c!=']' ) return -1;
-      break;
-    }
-    pParse->aNode[iThis].n = pParse->nNode - (u32)iThis - 1;
-    return j+1;
-  }else if( c=='"' ){
-    /* Parse string */
-    u8 jnFlags = 0;
-    j = i+1;
-    for(;;){
-      c = z[j];
-      if( (c & ~0x1f)==0 ){
-        /* Control characters are not allowed in strings */
-        return -1;
-      }
-      if( c=='\\' ){
-        c = z[++j];
-        if( c=='"' || c=='\\' || c=='/' || c=='b' || c=='f'
-           || c=='n' || c=='r' || c=='t'
-           || (c=='u' && jsonIs4Hex(z+j+1)) ){
-          jnFlags = JNODE_ESCAPE;
-        }else{
-          return -1;
-        }
-      }else if( c=='"' ){
-        break;
-      }
-      j++;
-    }
-    jsonParseAddNode(pParse, JSON_STRING, j+1-i, &z[i]);
-    if( !pParse->oom ) pParse->aNode[pParse->nNode-1].jnFlags = jnFlags;
-    return j+1;
-  }else if( c=='n'
-         && strncmp(z+i,"null",4)==0
-         && !safe_isalnum(z[i+4]) ){
-    jsonParseAddNode(pParse, JSON_NULL, 0, 0);
-    return i+4;
-  }else if( c=='t'
-         && strncmp(z+i,"true",4)==0
-         && !safe_isalnum(z[i+4]) ){
-    jsonParseAddNode(pParse, JSON_TRUE, 0, 0);
-    return i+4;
-  }else if( c=='f'
-         && strncmp(z+i,"false",5)==0
-         && !safe_isalnum(z[i+5]) ){
-    jsonParseAddNode(pParse, JSON_FALSE, 0, 0);
-    return i+5;
-  }else if( c=='-' || (c>='0' && c<='9') ){
-    /* Parse number */
-    u8 seenDP = 0;
-    u8 seenE = 0;
-    assert( '-' < '0' );
-    if( c<='0' ){
-      j = c=='-' ? i+1 : i;
-      if( z[j]=='0' && z[j+1]>='0' && z[j+1]<='9' ) return -1;
-    }
-    j = i+1;
-    for(;; j++){
-      c = z[j];
-      if( c>='0' && c<='9' ) continue;
-      if( c=='.' ){
-        if( z[j-1]=='-' ) return -1;
-        if( seenDP ) return -1;
-        seenDP = 1;
-        continue;
-      }
-      if( c=='e' || c=='E' ){
-        if( z[j-1]<'0' ) return -1;
-        if( seenE ) return -1;
-        seenDP = seenE = 1;
-        c = z[j+1];
-        if( c=='+' || c=='-' ){
-          j++;
-          c = z[j+1];
-        }
-        if( c<'0' || c>'9' ) return -1;
-        continue;
-      }
-      break;
-    }
-    if( z[j-1]<'0' ) return -1;
-    jsonParseAddNode(pParse, seenDP ? JSON_REAL : JSON_INT,
-                        j - i, &z[i]);
-    return j;
-  }else if( c=='}' ){
-    return -2;  /* End of {...} */
-  }else if( c==']' ){
-    return -3;  /* End of [...] */
-  }else if( c==0 ){
-    return 0;   /* End of file */
-  }else{
-    return -1;  /* Syntax error */
-  }
-}
-
-/*
-** Parse a complete JSON string.  Return 0 on success or non-zero if there
-** are any errors.  If an error occurs, free all memory associated with
-** pParse.
-**
-** pParse is uninitialized when this routine is called.
-*/
-static int jsonParse(
-  JsonParse *pParse,           /* Initialize and fill this JsonParse object */
-  sqlite3_context *pCtx,       /* Report errors here */
-  const char *zJson            /* Input JSON text to be parsed */
-){
-  int i;
-  memset(pParse, 0, sizeof(*pParse));
-  if( zJson==0 ) return 1;
-  pParse->zJson = zJson;
-  i = jsonParseValue(pParse, 0);
-  if( pParse->oom ) i = -1;
-  if( i>0 ){
-    assert( pParse->iDepth==0 );
-    while( safe_isspace(zJson[i]) ) i++;
-    if( zJson[i] ) i = -1;
-  }
-  if( i<=0 ){
-    if( pCtx!=0 ){
-      if( pParse->oom ){
-        sqlite3_result_error_nomem(pCtx);
-      }else{
-        sqlite3_result_error(pCtx, "malformed JSON", -1);
-      }
-    }
-    jsonParseReset(pParse);
-    return 1;
-  }
-  return 0;
-}
-
-/* Mark node i of pParse as being a child of iParent.  Call recursively
-** to fill in all the descendants of node i.
-*/
-static void jsonParseFillInParentage(JsonParse *pParse, u32 i, u32 iParent){
-  JsonNode *pNode = &pParse->aNode[i];
-  u32 j;
-  pParse->aUp[i] = iParent;
-  switch( pNode->eType ){
-    case JSON_ARRAY: {
-      for(j=1; j<=pNode->n; j += jsonNodeSize(pNode+j)){
-        jsonParseFillInParentage(pParse, i+j, i);
-      }
-      break;
-    }
-    case JSON_OBJECT: {
-      for(j=1; j<=pNode->n; j += jsonNodeSize(pNode+j+1)+1){
-        pParse->aUp[i+j] = i;
-        jsonParseFillInParentage(pParse, i+j+1, i);
-      }
-      break;
-    }
-    default: {
-      break;
-    }
-  }
-}
-
-/*
-** Compute the parentage of all nodes in a completed parse.
-*/
-static int jsonParseFindParents(JsonParse *pParse){
-  u32 *aUp;
-  assert( pParse->aUp==0 );
-  aUp = pParse->aUp = sqlite3_malloc( sizeof(u32)*pParse->nNode );
-  if( aUp==0 ){
-    pParse->oom = 1;
-    return SQLITE_NOMEM;
-  }
-  jsonParseFillInParentage(pParse, 0, 0);
-  return SQLITE_OK;
-}
-
-/*
-** Magic number used for the JSON parse cache in sqlite3_get_auxdata()
-*/
-#define JSON_CACHE_ID  (-429938)
-
-/*
-** Obtain a complete parse of the JSON found in the first argument
-** of the argv array.  Use the sqlite3_get_auxdata() cache for this
-** parse if it is available.  If the cache is not available or if it
-** is no longer valid, parse the JSON again and return the new parse,
-** and also register the new parse so that it will be available for
-** future sqlite3_get_auxdata() calls.
-*/
-static JsonParse *jsonParseCached(
-  sqlite3_context *pCtx,
-  sqlite3_value **argv
-){
-  const char *zJson = (const char*)sqlite3_value_text(argv[0]);
-  int nJson = sqlite3_value_bytes(argv[0]);
-  JsonParse *p;
-  if( zJson==0 ) return 0;
-  p = (JsonParse*)sqlite3_get_auxdata(pCtx, JSON_CACHE_ID);
-  if( p && p->nJson==nJson && memcmp(p->zJson,zJson,nJson)==0 ){
-    p->nErr = 0;
-    return p; /* The cached entry matches, so return it */
-  }
-  p = sqlite3_malloc( sizeof(*p) + nJson + 1 );
-  if( p==0 ){
-    sqlite3_result_error_nomem(pCtx);
-    return 0;
-  }
-  memset(p, 0, sizeof(*p));
-  p->zJson = (char*)&p[1];
-  memcpy((char*)p->zJson, zJson, nJson+1);
-  if( jsonParse(p, pCtx, p->zJson) ){
-    sqlite3_free(p);
-    return 0;
-  }
-  p->nJson = nJson;
-  sqlite3_set_auxdata(pCtx, JSON_CACHE_ID, p, (void(*)(void*))jsonParseFree);
-  return (JsonParse*)sqlite3_get_auxdata(pCtx, JSON_CACHE_ID);
-}
-
-/*
-** Compare the OBJECT label at pNode against zKey,nKey.  Return true on
-** a match.
-*/
-static int jsonLabelCompare(JsonNode *pNode, const char *zKey, u32 nKey){
-  if( pNode->jnFlags & JNODE_RAW ){
-    if( pNode->n!=nKey ) return 0;
-    return strncmp(pNode->u.zJContent, zKey, nKey)==0;
-  }else{
-    if( pNode->n!=nKey+2 ) return 0;
-    return strncmp(pNode->u.zJContent+1, zKey, nKey)==0;
-  }
-}
-
-/* forward declaration */
-static JsonNode *jsonLookupAppend(JsonParse*,const char*,int*,const char**);
-
-/*
-** Search along zPath to find the node specified.  Return a pointer
-** to that node, or NULL if zPath is malformed or if there is no such
-** node.
-**
-** If pApnd!=0, then try to append new nodes to complete zPath if it is
-** possible to do so and if no existing node corresponds to zPath.  If
-** new nodes are appended *pApnd is set to 1.
-*/
-static JsonNode *jsonLookupStep(
-  JsonParse *pParse,      /* The JSON to search */
-  u32 iRoot,              /* Begin the search at this node */
-  const char *zPath,      /* The path to search */
-  int *pApnd,             /* Append nodes to complete path if not NULL */
-  const char **pzErr      /* Make *pzErr point to any syntax error in zPath */
-){
-  u32 i, j, nKey;
-  const char *zKey;
-  JsonNode *pRoot = &pParse->aNode[iRoot];
-  if( zPath[0]==0 ) return pRoot;
-  if( zPath[0]=='.' ){
-    if( pRoot->eType!=JSON_OBJECT ) return 0;
-    zPath++;
-    if( zPath[0]=='"' ){
-      zKey = zPath + 1;
-      for(i=1; zPath[i] && zPath[i]!='"'; i++){}
-      nKey = i-1;
-      if( zPath[i] ){
-        i++;
-      }else{
-        *pzErr = zPath;
-        return 0;
-      }
-    }else{
-      zKey = zPath;
-      for(i=0; zPath[i] && zPath[i]!='.' && zPath[i]!='['; i++){}
-      nKey = i;
-    }
-    if( nKey==0 ){
-      *pzErr = zPath;
-      return 0;
-    }
-    j = 1;
-    for(;;){
-      while( j<=pRoot->n ){
-        if( jsonLabelCompare(pRoot+j, zKey, nKey) ){
-          return jsonLookupStep(pParse, iRoot+j+1, &zPath[i], pApnd, pzErr);
-        }
-        j++;
-        j += jsonNodeSize(&pRoot[j]);
-      }
-      if( (pRoot->jnFlags & JNODE_APPEND)==0 ) break;
-      iRoot += pRoot->u.iAppend;
-      pRoot = &pParse->aNode[iRoot];
-      j = 1;
-    }
-    if( pApnd ){
-      u32 iStart, iLabel;
-      JsonNode *pNode;
-      iStart = jsonParseAddNode(pParse, JSON_OBJECT, 2, 0);
-      iLabel = jsonParseAddNode(pParse, JSON_STRING, i, zPath);
-      zPath += i;
-      pNode = jsonLookupAppend(pParse, zPath, pApnd, pzErr);
-      if( pParse->oom ) return 0;
-      if( pNode ){
-        pRoot = &pParse->aNode[iRoot];
-        pRoot->u.iAppend = iStart - iRoot;
-        pRoot->jnFlags |= JNODE_APPEND;
-        pParse->aNode[iLabel].jnFlags |= JNODE_RAW;
-      }
-      return pNode;
-    }
-  }else if( zPath[0]=='[' && safe_isdigit(zPath[1]) ){
-    if( pRoot->eType!=JSON_ARRAY ) return 0;
-    i = 0;
-    j = 1;
-    while( safe_isdigit(zPath[j]) ){
-      i = i*10 + zPath[j] - '0';
-      j++;
-    }
-    if( zPath[j]!=']' ){
-      *pzErr = zPath;
-      return 0;
-    }
-    zPath += j + 1;
-    j = 1;
-    for(;;){
-      while( j<=pRoot->n && (i>0 || (pRoot[j].jnFlags & JNODE_REMOVE)!=0) ){
-        if( (pRoot[j].jnFlags & JNODE_REMOVE)==0 ) i--;
-        j += jsonNodeSize(&pRoot[j]);
-      }
-      if( (pRoot->jnFlags & JNODE_APPEND)==0 ) break;
-      iRoot += pRoot->u.iAppend;
-      pRoot = &pParse->aNode[iRoot];
-      j = 1;
-    }
-    if( j<=pRoot->n ){
-      return jsonLookupStep(pParse, iRoot+j, zPath, pApnd, pzErr);
-    }
-    if( i==0 && pApnd ){
-      u32 iStart;
-      JsonNode *pNode;
-      iStart = jsonParseAddNode(pParse, JSON_ARRAY, 1, 0);
-      pNode = jsonLookupAppend(pParse, zPath, pApnd, pzErr);
-      if( pParse->oom ) return 0;
-      if( pNode ){
-        pRoot = &pParse->aNode[iRoot];
-        pRoot->u.iAppend = iStart - iRoot;
-        pRoot->jnFlags |= JNODE_APPEND;
-      }
-      return pNode;
-    }
-  }else{
-    *pzErr = zPath;
-  }
-  return 0;
-}
-
-/*
-** Append content to pParse that will complete zPath.  Return a pointer
-** to the inserted node, or return NULL if the append fails.
-*/
-static JsonNode *jsonLookupAppend(
-  JsonParse *pParse,     /* Append content to the JSON parse */
-  const char *zPath,     /* Description of content to append */
-  int *pApnd,            /* Set this flag to 1 */
-  const char **pzErr     /* Make this point to any syntax error */
-){
-  *pApnd = 1;
-  if( zPath[0]==0 ){
-    jsonParseAddNode(pParse, JSON_NULL, 0, 0);
-    return pParse->oom ? 0 : &pParse->aNode[pParse->nNode-1];
-  }
-  if( zPath[0]=='.' ){
-    jsonParseAddNode(pParse, JSON_OBJECT, 0, 0);
-  }else if( strncmp(zPath,"[0]",3)==0 ){
-    jsonParseAddNode(pParse, JSON_ARRAY, 0, 0);
-  }else{
-    return 0;
-  }
-  if( pParse->oom ) return 0;
-  return jsonLookupStep(pParse, pParse->nNode-1, zPath, pApnd, pzErr);
-}
-
-/*
-** Return the text of a syntax error message on a JSON path.  Space is
-** obtained from sqlite3_malloc().
-*/
-static char *jsonPathSyntaxError(const char *zErr){
-  return sqlite3_mprintf("JSON path error near '%q'", zErr);
-}
-
-/*
-** Do a node lookup using zPath.  Return a pointer to the node on success.
-** Return NULL if not found or if there is an error.
-**
-** On an error, write an error message into pCtx and increment the
-** pParse->nErr counter.
-**
-** If pApnd!=NULL then try to append missing nodes and set *pApnd = 1 if
-** nodes are appended.
-*/
-static JsonNode *jsonLookup(
-  JsonParse *pParse,      /* The JSON to search */
-  const char *zPath,      /* The path to search */
-  int *pApnd,             /* Append nodes to complete path if not NULL */
-  sqlite3_context *pCtx   /* Report errors here, if not NULL */
-){
-  const char *zErr = 0;
-  JsonNode *pNode = 0;
-  char *zMsg;
-
-  if( zPath==0 ) return 0;
-  if( zPath[0]!='$' ){
-    zErr = zPath;
-    goto lookup_err;
-  }
-  zPath++;
-  pNode = jsonLookupStep(pParse, 0, zPath, pApnd, &zErr);
-  if( zErr==0 ) return pNode;
-
-lookup_err:
-  pParse->nErr++;
-  assert( zErr!=0 && pCtx!=0 );
-  zMsg = jsonPathSyntaxError(zErr);
-  if( zMsg ){
-    sqlite3_result_error(pCtx, zMsg, -1);
-    sqlite3_free(zMsg);
-  }else{
-    sqlite3_result_error_nomem(pCtx);
-  }
-  return 0;
-}
-
-
-/*
-** Report the wrong number of arguments for json_insert(), json_replace()
-** or json_set().
-*/
-static void jsonWrongNumArgs(
-  sqlite3_context *pCtx,
-  const char *zFuncName
-){
-  char *zMsg = sqlite3_mprintf("json_%s() needs an odd number of arguments",
-                               zFuncName);
-  sqlite3_result_error(pCtx, zMsg, -1);
-  sqlite3_free(zMsg);     
-}
-
-/*
-** Mark all NULL entries in the Object passed in as JNODE_REMOVE.
-*/
-static void jsonRemoveAllNulls(JsonNode *pNode){
-  int i, n;
-  assert( pNode->eType==JSON_OBJECT );
-  n = pNode->n;
-  for(i=2; i<=n; i += jsonNodeSize(&pNode[i])+1){
-    switch( pNode[i].eType ){
-      case JSON_NULL:
-        pNode[i].jnFlags |= JNODE_REMOVE;
-        break;
-      case JSON_OBJECT:
-        jsonRemoveAllNulls(&pNode[i]);
-        break;
-    }
-  }
-}
-
-
-/****************************************************************************
-** SQL functions used for testing and debugging
-****************************************************************************/
-
-#ifdef SQLITE_DEBUG
-/*
-** The json_parse(JSON) function returns a string which describes
-** a parse of the JSON provided.  Or it returns NULL if JSON is not
-** well-formed.
-*/
-static void jsonParseFunc(
-  sqlite3_context *ctx,
-  int argc,
-  sqlite3_value **argv
-){
-  JsonString s;       /* Output string - not real JSON */
-  JsonParse x;        /* The parse */
-  u32 i;
-
-  assert( argc==1 );
-  if( jsonParse(&x, ctx, (const char*)sqlite3_value_text(argv[0])) ) return;
-  jsonParseFindParents(&x);
-  jsonInit(&s, ctx);
-  for(i=0; i<x.nNode; i++){
-    const char *zType;
-    if( x.aNode[i].jnFlags & JNODE_LABEL ){
-      assert( x.aNode[i].eType==JSON_STRING );
-      zType = "label";
-    }else{
-      zType = jsonType[x.aNode[i].eType];
-    }
-    jsonPrintf(100, &s,"node %3u: %7s n=%-4d up=%-4d",
-               i, zType, x.aNode[i].n, x.aUp[i]);
-    if( x.aNode[i].u.zJContent!=0 ){
-      jsonAppendRaw(&s, " ", 1);
-      jsonAppendRaw(&s, x.aNode[i].u.zJContent, x.aNode[i].n);
-    }
-    jsonAppendRaw(&s, "\n", 1);
-  }
-  jsonParseReset(&x);
-  jsonResult(&s);
-}
-
-/*
-** The json_test1(JSON) function return true (1) if the input is JSON
-** text generated by another json function.  It returns (0) if the input
-** is not known to be JSON.
-*/
-static void jsonTest1Func(
-  sqlite3_context *ctx,
-  int argc,
-  sqlite3_value **argv
-){
-  UNUSED_PARAM(argc);
-  sqlite3_result_int(ctx, sqlite3_value_subtype(argv[0])==JSON_SUBTYPE);
-}
-#endif /* SQLITE_DEBUG */
-
-/****************************************************************************
-** Scalar SQL function implementations
-****************************************************************************/
-
-/*
-** Implementation of the json_QUOTE(VALUE) function.  Return a JSON value
-** corresponding to the SQL value input.  Mostly this means putting 
-** double-quotes around strings and returning the unquoted string "null"
-** when given a NULL input.
-*/
-static void jsonQuoteFunc(
-  sqlite3_context *ctx,
-  int argc,
-  sqlite3_value **argv
-){
-  JsonString jx;
-  UNUSED_PARAM(argc);
-
-  jsonInit(&jx, ctx);
-  jsonAppendValue(&jx, argv[0]);
-  jsonResult(&jx);
-  sqlite3_result_subtype(ctx, JSON_SUBTYPE);
-}
-
-/*
-** Implementation of the json_array(VALUE,...) function.  Return a JSON
-** array that contains all values given in arguments.  Or if any argument
-** is a BLOB, throw an error.
-*/
-static void jsonArrayFunc(
-  sqlite3_context *ctx,
-  int argc,
-  sqlite3_value **argv
-){
-  int i;
-  JsonString jx;
-
-  jsonInit(&jx, ctx);
-  jsonAppendChar(&jx, '[');
-  for(i=0; i<argc; i++){
-    jsonAppendSeparator(&jx);
-    jsonAppendValue(&jx, argv[i]);
-  }
-  jsonAppendChar(&jx, ']');
-  jsonResult(&jx);
-  sqlite3_result_subtype(ctx, JSON_SUBTYPE);
-}
-
-
-/*
-** json_array_length(JSON)
-** json_array_length(JSON, PATH)
-**
-** Return the number of elements in the top-level JSON array.  
-** Return 0 if the input is not a well-formed JSON array.
-*/
-static void jsonArrayLengthFunc(
-  sqlite3_context *ctx,
-  int argc,
-  sqlite3_value **argv
-){
-  JsonParse *p;          /* The parse */
-  sqlite3_int64 n = 0;
-  u32 i;
-  JsonNode *pNode;
-
-  p = jsonParseCached(ctx, argv);
-  if( p==0 ) return;
-  assert( p->nNode );
-  if( argc==2 ){
-    const char *zPath = (const char*)sqlite3_value_text(argv[1]);
-    pNode = jsonLookup(p, zPath, 0, ctx);
-  }else{
-    pNode = p->aNode;
-  }
-  if( pNode==0 ){
-    return;
-  }
-  if( pNode->eType==JSON_ARRAY ){
-    assert( (pNode->jnFlags & JNODE_APPEND)==0 );
-    for(i=1; i<=pNode->n; n++){
-      i += jsonNodeSize(&pNode[i]);
-    }
-  }
-  sqlite3_result_int64(ctx, n);
-}
-
-/*
-** json_extract(JSON, PATH, ...)
-**
-** Return the element described by PATH.  Return NULL if there is no
-** PATH element.  If there are multiple PATHs, then return a JSON array
-** with the result from each path.  Throw an error if the JSON or any PATH
-** is malformed.
-*/
-static void jsonExtractFunc(
-  sqlite3_context *ctx,
-  int argc,
-  sqlite3_value **argv
-){
-  JsonParse *p;          /* The parse */
-  JsonNode *pNode;
-  const char *zPath;
-  JsonString jx;
-  int i;
-
-  if( argc<2 ) return;
-  p = jsonParseCached(ctx, argv);
-  if( p==0 ) return;
-  jsonInit(&jx, ctx);
-  jsonAppendChar(&jx, '[');
-  for(i=1; i<argc; i++){
-    zPath = (const char*)sqlite3_value_text(argv[i]);
-    pNode = jsonLookup(p, zPath, 0, ctx);
-    if( p->nErr ) break;
-    if( argc>2 ){
-      jsonAppendSeparator(&jx);
-      if( pNode ){
-        jsonRenderNode(pNode, &jx, 0);
-      }else{
-        jsonAppendRaw(&jx, "null", 4);
-      }
-    }else if( pNode ){
-      jsonReturn(pNode, ctx, 0);
-    }
-  }
-  if( argc>2 && i==argc ){
-    jsonAppendChar(&jx, ']');
-    jsonResult(&jx);
-    sqlite3_result_subtype(ctx, JSON_SUBTYPE);
-  }
-  jsonReset(&jx);
-}
-
-/* This is the RFC 7396 MergePatch algorithm.
-*/
-static JsonNode *jsonMergePatch(
-  JsonParse *pParse,   /* The JSON parser that contains the TARGET */
-  u32 iTarget,         /* Node of the TARGET in pParse */
-  JsonNode *pPatch     /* The PATCH */
-){
-  u32 i, j;
-  u32 iRoot;
-  JsonNode *pTarget;
-  if( pPatch->eType!=JSON_OBJECT ){
-    return pPatch;
-  }
-  assert( iTarget>=0 && iTarget<pParse->nNode );
-  pTarget = &pParse->aNode[iTarget];
-  assert( (pPatch->jnFlags & JNODE_APPEND)==0 );
-  if( pTarget->eType!=JSON_OBJECT ){
-    jsonRemoveAllNulls(pPatch);
-    return pPatch;
-  }
-  iRoot = iTarget;
-  for(i=1; i<pPatch->n; i += jsonNodeSize(&pPatch[i+1])+1){
-    u32 nKey;
-    const char *zKey;
-    assert( pPatch[i].eType==JSON_STRING );
-    assert( pPatch[i].jnFlags & JNODE_LABEL );
-    nKey = pPatch[i].n;
-    zKey = pPatch[i].u.zJContent;
-    assert( (pPatch[i].jnFlags & JNODE_RAW)==0 );
-    for(j=1; j<pTarget->n; j += jsonNodeSize(&pTarget[j+1])+1 ){
-      assert( pTarget[j].eType==JSON_STRING );
-      assert( pTarget[j].jnFlags & JNODE_LABEL );
-      assert( (pPatch[i].jnFlags & JNODE_RAW)==0 );
-      if( pTarget[j].n==nKey && strncmp(pTarget[j].u.zJContent,zKey,nKey)==0 ){
-        if( pTarget[j+1].jnFlags & (JNODE_REMOVE|JNODE_PATCH) ) break;
-        if( pPatch[i+1].eType==JSON_NULL ){
-          pTarget[j+1].jnFlags |= JNODE_REMOVE;
-        }else{
-          JsonNode *pNew = jsonMergePatch(pParse, iTarget+j+1, &pPatch[i+1]);
-          if( pNew==0 ) return 0;
-          pTarget = &pParse->aNode[iTarget];
-          if( pNew!=&pTarget[j+1] ){
-            pTarget[j+1].u.pPatch = pNew;
-            pTarget[j+1].jnFlags |= JNODE_PATCH;
-          }
-        }
-        break;
-      }
-    }
-    if( j>=pTarget->n && pPatch[i+1].eType!=JSON_NULL ){
-      int iStart, iPatch;
-      iStart = jsonParseAddNode(pParse, JSON_OBJECT, 2, 0);
-      jsonParseAddNode(pParse, JSON_STRING, nKey, zKey);
-      iPatch = jsonParseAddNode(pParse, JSON_TRUE, 0, 0);
-      if( pParse->oom ) return 0;
-      jsonRemoveAllNulls(pPatch);
-      pTarget = &pParse->aNode[iTarget];
-      pParse->aNode[iRoot].jnFlags |= JNODE_APPEND;
-      pParse->aNode[iRoot].u.iAppend = iStart - iRoot;
-      iRoot = iStart;
-      pParse->aNode[iPatch].jnFlags |= JNODE_PATCH;
-      pParse->aNode[iPatch].u.pPatch = &pPatch[i+1];
-    }
-  }
-  return pTarget;
-}
-
-/*
-** Implementation of the json_mergepatch(JSON1,JSON2) function.  Return a JSON
-** object that is the result of running the RFC 7396 MergePatch() algorithm
-** on the two arguments.
-*/
-static void jsonPatchFunc(
-  sqlite3_context *ctx,
-  int argc,
-  sqlite3_value **argv
-){
-  JsonParse x;     /* The JSON that is being patched */
-  JsonParse y;     /* The patch */
-  JsonNode *pResult;   /* The result of the merge */
-
-  UNUSED_PARAM(argc);
-  if( jsonParse(&x, ctx, (const char*)sqlite3_value_text(argv[0])) ) return;
-  if( jsonParse(&y, ctx, (const char*)sqlite3_value_text(argv[1])) ){
-    jsonParseReset(&x);
-    return;
-  }
-  pResult = jsonMergePatch(&x, 0, y.aNode);
-  assert( pResult!=0 || x.oom );
-  if( pResult ){
-    jsonReturnJson(pResult, ctx, 0);
-  }else{
-    sqlite3_result_error_nomem(ctx);
-  }
-  jsonParseReset(&x);
-  jsonParseReset(&y);
-}
-
-
-/*
-** Implementation of the json_object(NAME,VALUE,...) function.  Return a JSON
-** object that contains all name/value given in arguments.  Or if any name
-** is not a string or if any value is a BLOB, throw an error.
-*/
-static void jsonObjectFunc(
-  sqlite3_context *ctx,
-  int argc,
-  sqlite3_value **argv
-){
-  int i;
-  JsonString jx;
-  const char *z;
-  u32 n;
-
-  if( argc&1 ){
-    sqlite3_result_error(ctx, "json_object() requires an even number "
-                                  "of arguments", -1);
-    return;
-  }
-  jsonInit(&jx, ctx);
-  jsonAppendChar(&jx, '{');
-  for(i=0; i<argc; i+=2){
-    if( sqlite3_value_type(argv[i])!=SQLITE_TEXT ){
-      sqlite3_result_error(ctx, "json_object() labels must be TEXT", -1);
-      jsonReset(&jx);
-      return;
-    }
-    jsonAppendSeparator(&jx);
-    z = (const char*)sqlite3_value_text(argv[i]);
-    n = (u32)sqlite3_value_bytes(argv[i]);
-    jsonAppendString(&jx, z, n);
-    jsonAppendChar(&jx, ':');
-    jsonAppendValue(&jx, argv[i+1]);
-  }
-  jsonAppendChar(&jx, '}');
-  jsonResult(&jx);
-  sqlite3_result_subtype(ctx, JSON_SUBTYPE);
-}
-
-
-/*
-** json_remove(JSON, PATH, ...)
-**
-** Remove the named elements from JSON and return the result.  malformed
-** JSON or PATH arguments result in an error.
-*/
-static void jsonRemoveFunc(
-  sqlite3_context *ctx,
-  int argc,
-  sqlite3_value **argv
-){
-  JsonParse x;          /* The parse */
-  JsonNode *pNode;
-  const char *zPath;
-  u32 i;
-
-  if( argc<1 ) return;
-  if( jsonParse(&x, ctx, (const char*)sqlite3_value_text(argv[0])) ) return;
-  assert( x.nNode );
-  for(i=1; i<(u32)argc; i++){
-    zPath = (const char*)sqlite3_value_text(argv[i]);
-    if( zPath==0 ) goto remove_done;
-    pNode = jsonLookup(&x, zPath, 0, ctx);
-    if( x.nErr ) goto remove_done;
-    if( pNode ) pNode->jnFlags |= JNODE_REMOVE;
-  }
-  if( (x.aNode[0].jnFlags & JNODE_REMOVE)==0 ){
-    jsonReturnJson(x.aNode, ctx, 0);
-  }
-remove_done:
-  jsonParseReset(&x);
-}
-
-/*
-** json_replace(JSON, PATH, VALUE, ...)
-**
-** Replace the value at PATH with VALUE.  If PATH does not already exist,
-** this routine is a no-op.  If JSON or PATH is malformed, throw an error.
-*/
-static void jsonReplaceFunc(
-  sqlite3_context *ctx,
-  int argc,
-  sqlite3_value **argv
-){
-  JsonParse x;          /* The parse */
-  JsonNode *pNode;
-  const char *zPath;
-  u32 i;
-
-  if( argc<1 ) return;
-  if( (argc&1)==0 ) {
-    jsonWrongNumArgs(ctx, "replace");
-    return;
-  }
-  if( jsonParse(&x, ctx, (const char*)sqlite3_value_text(argv[0])) ) return;
-  assert( x.nNode );
-  for(i=1; i<(u32)argc; i+=2){
-    zPath = (const char*)sqlite3_value_text(argv[i]);
-    pNode = jsonLookup(&x, zPath, 0, ctx);
-    if( x.nErr ) goto replace_err;
-    if( pNode ){
-      pNode->jnFlags |= (u8)JNODE_REPLACE;
-      pNode->u.iReplace = i + 1;
-    }
-  }
-  if( x.aNode[0].jnFlags & JNODE_REPLACE ){
-    sqlite3_result_value(ctx, argv[x.aNode[0].u.iReplace]);
-  }else{
-    jsonReturnJson(x.aNode, ctx, argv);
-  }
-replace_err:
-  jsonParseReset(&x);
-}
-
-/*
-** json_set(JSON, PATH, VALUE, ...)
-**
-** Set the value at PATH to VALUE.  Create the PATH if it does not already
-** exist.  Overwrite existing values that do exist.
-** If JSON or PATH is malformed, throw an error.
-**
-** json_insert(JSON, PATH, VALUE, ...)
-**
-** Create PATH and initialize it to VALUE.  If PATH already exists, this
-** routine is a no-op.  If JSON or PATH is malformed, throw an error.
-*/
-static void jsonSetFunc(
-  sqlite3_context *ctx,
-  int argc,
-  sqlite3_value **argv
-){
-  JsonParse x;          /* The parse */
-  JsonNode *pNode;
-  const char *zPath;
-  u32 i;
-  int bApnd;
-  int bIsSet = *(int*)sqlite3_user_data(ctx);
-
-  if( argc<1 ) return;
-  if( (argc&1)==0 ) {
-    jsonWrongNumArgs(ctx, bIsSet ? "set" : "insert");
-    return;
-  }
-  if( jsonParse(&x, ctx, (const char*)sqlite3_value_text(argv[0])) ) return;
-  assert( x.nNode );
-  for(i=1; i<(u32)argc; i+=2){
-    zPath = (const char*)sqlite3_value_text(argv[i]);
-    bApnd = 0;
-    pNode = jsonLookup(&x, zPath, &bApnd, ctx);
-    if( x.oom ){
-      sqlite3_result_error_nomem(ctx);
-      goto jsonSetDone;
-    }else if( x.nErr ){
-      goto jsonSetDone;
-    }else if( pNode && (bApnd || bIsSet) ){
-      pNode->jnFlags |= (u8)JNODE_REPLACE;
-      pNode->u.iReplace = i + 1;
-    }
-  }
-  if( x.aNode[0].jnFlags & JNODE_REPLACE ){
-    sqlite3_result_value(ctx, argv[x.aNode[0].u.iReplace]);
-  }else{
-    jsonReturnJson(x.aNode, ctx, argv);
-  }
-jsonSetDone:
-  jsonParseReset(&x);
-}
-
-/*
-** json_type(JSON)
-** json_type(JSON, PATH)
-**
-** Return the top-level "type" of a JSON string.  Throw an error if
-** either the JSON or PATH inputs are not well-formed.
-*/
-static void jsonTypeFunc(
-  sqlite3_context *ctx,
-  int argc,
-  sqlite3_value **argv
-){
-  JsonParse x;          /* The parse */
-  const char *zPath;
-  JsonNode *pNode;
-
-  if( jsonParse(&x, ctx, (const char*)sqlite3_value_text(argv[0])) ) return;
-  assert( x.nNode );
-  if( argc==2 ){
-    zPath = (const char*)sqlite3_value_text(argv[1]);
-    pNode = jsonLookup(&x, zPath, 0, ctx);
-  }else{
-    pNode = x.aNode;
-  }
-  if( pNode ){
-    sqlite3_result_text(ctx, jsonType[pNode->eType], -1, SQLITE_STATIC);
-  }
-  jsonParseReset(&x);
-}
-
-/*
-** json_valid(JSON)
-**
-** Return 1 if JSON is a well-formed JSON string according to RFC-7159.
-** Return 0 otherwise.
-*/
-static void jsonValidFunc(
-  sqlite3_context *ctx,
-  int argc,
-  sqlite3_value **argv
-){
-  JsonParse x;          /* The parse */
-  int rc = 0;
-
-  UNUSED_PARAM(argc);
-  if( jsonParse(&x, 0, (const char*)sqlite3_value_text(argv[0]))==0 ){
-    rc = 1;
-  }
-  jsonParseReset(&x);
-  sqlite3_result_int(ctx, rc);
-}
-
-
-/****************************************************************************
-** Aggregate SQL function implementations
-****************************************************************************/
-/*
-** json_group_array(VALUE)
-**
-** Return a JSON array composed of all values in the aggregate.
-*/
-static void jsonArrayStep(
-  sqlite3_context *ctx,
-  int argc,
-  sqlite3_value **argv
-){
-  JsonString *pStr;
-  UNUSED_PARAM(argc);
-  pStr = (JsonString*)sqlite3_aggregate_context(ctx, sizeof(*pStr));
-  if( pStr ){
-    if( pStr->zBuf==0 ){
-      jsonInit(pStr, ctx);
-      jsonAppendChar(pStr, '[');
-    }else{
-      jsonAppendChar(pStr, ',');
-      pStr->pCtx = ctx;
-    }
-    jsonAppendValue(pStr, argv[0]);
-  }
-}
-static void jsonArrayCompute(sqlite3_context *ctx, int isFinal){
-  JsonString *pStr;
-  pStr = (JsonString*)sqlite3_aggregate_context(ctx, 0);
-  if( pStr ){
-    pStr->pCtx = ctx;
-    jsonAppendChar(pStr, ']');
-    if( pStr->bErr ){
-      if( pStr->bErr==1 ) sqlite3_result_error_nomem(ctx);
-      assert( pStr->bStatic );
-    }else if( isFinal ){
-      sqlite3_result_text(ctx, pStr->zBuf, pStr->nUsed,
-                          pStr->bStatic ? SQLITE_TRANSIENT : sqlite3_free);
-      pStr->bStatic = 1;
-    }else{
-      sqlite3_result_text(ctx, pStr->zBuf, pStr->nUsed, SQLITE_TRANSIENT);
-      pStr->nUsed--;
-    }
-  }else{
-    sqlite3_result_text(ctx, "[]", 2, SQLITE_STATIC);
-  }
-  sqlite3_result_subtype(ctx, JSON_SUBTYPE);
-}
-static void jsonArrayValue(sqlite3_context *ctx){
-  jsonArrayCompute(ctx, 0);
-}
-static void jsonArrayFinal(sqlite3_context *ctx){
-  jsonArrayCompute(ctx, 1);
-}
-
-#ifndef SQLITE_OMIT_WINDOWFUNC
-/*
-** This method works for both json_group_array() and json_group_object().
-** It works by removing the first element of the group by searching forward
-** to the first comma (",") that is not within a string and deleting all
-** text through that comma.
-*/
-static void jsonGroupInverse(
-  sqlite3_context *ctx,
-  int argc,
-  sqlite3_value **argv
-){
-  int i;
-  int inStr = 0;
-  char *z;
-  JsonString *pStr;
-  UNUSED_PARAM(argc);
-  UNUSED_PARAM(argv);
-  pStr = (JsonString*)sqlite3_aggregate_context(ctx, 0);
-#ifdef NEVER
-  /* pStr is always non-NULL since jsonArrayStep() or jsonObjectStep() will
-  ** always have been called to initalize it */
-  if( NEVER(!pStr) ) return;
-#endif
-  z = pStr->zBuf;
-  for(i=1; z[i]!=',' || inStr; i++){
-    assert( i<pStr->nUsed );
-    if( z[i]=='"' ){
-      inStr = !inStr;
-    }else if( z[i]=='\\' ){
-      i++;
-    }
-  }
-  pStr->nUsed -= i;      
-  memmove(&z[1], &z[i+1], pStr->nUsed-1);
-}
-#else
-# define jsonGroupInverse 0
-#endif
-
-
-/*
-** json_group_obj(NAME,VALUE)
-**
-** Return a JSON object composed of all names and values in the aggregate.
-*/
-static void jsonObjectStep(
-  sqlite3_context *ctx,
-  int argc,
-  sqlite3_value **argv
-){
-  JsonString *pStr;
-  const char *z;
-  u32 n;
-  UNUSED_PARAM(argc);
-  pStr = (JsonString*)sqlite3_aggregate_context(ctx, sizeof(*pStr));
-  if( pStr ){
-    if( pStr->zBuf==0 ){
-      jsonInit(pStr, ctx);
-      jsonAppendChar(pStr, '{');
-    }else{
-      jsonAppendChar(pStr, ',');
-      pStr->pCtx = ctx;
-    }
-    z = (const char*)sqlite3_value_text(argv[0]);
-    n = (u32)sqlite3_value_bytes(argv[0]);
-    jsonAppendString(pStr, z, n);
-    jsonAppendChar(pStr, ':');
-    jsonAppendValue(pStr, argv[1]);
-  }
-}
-static void jsonObjectCompute(sqlite3_context *ctx, int isFinal){
-  JsonString *pStr;
-  pStr = (JsonString*)sqlite3_aggregate_context(ctx, 0);
-  if( pStr ){
-    jsonAppendChar(pStr, '}');
-    if( pStr->bErr ){
-      if( pStr->bErr==1 ) sqlite3_result_error_nomem(ctx);
-      assert( pStr->bStatic );
-    }else if( isFinal ){
-      sqlite3_result_text(ctx, pStr->zBuf, pStr->nUsed,
-                          pStr->bStatic ? SQLITE_TRANSIENT : sqlite3_free);
-      pStr->bStatic = 1;
-    }else{
-      sqlite3_result_text(ctx, pStr->zBuf, pStr->nUsed, SQLITE_TRANSIENT);
-      pStr->nUsed--;
-    }
-  }else{
-    sqlite3_result_text(ctx, "{}", 2, SQLITE_STATIC);
-  }
-  sqlite3_result_subtype(ctx, JSON_SUBTYPE);
-}
-static void jsonObjectValue(sqlite3_context *ctx){
-  jsonObjectCompute(ctx, 0);
-}
-static void jsonObjectFinal(sqlite3_context *ctx){
-  jsonObjectCompute(ctx, 1);
-}
-
-
-
-#ifndef SQLITE_OMIT_VIRTUALTABLE
-/****************************************************************************
-** The json_each virtual table
-****************************************************************************/
-typedef struct JsonEachCursor JsonEachCursor;
-struct JsonEachCursor {
-  sqlite3_vtab_cursor base;  /* Base class - must be first */
-  u32 iRowid;                /* The rowid */
-  u32 iBegin;                /* The first node of the scan */
-  u32 i;                     /* Index in sParse.aNode[] of current row */
-  u32 iEnd;                  /* EOF when i equals or exceeds this value */
-  u8 eType;                  /* Type of top-level element */
-  u8 bRecursive;             /* True for json_tree().  False for json_each() */
-  char *zJson;               /* Input JSON */
-  char *zRoot;               /* Path by which to filter zJson */
-  JsonParse sParse;          /* Parse of the input JSON */
-};
-
-/* Constructor for the json_each virtual table */
-static int jsonEachConnect(
-  sqlite3 *db,
-  void *pAux,
-  int argc, const char *const*argv,
-  sqlite3_vtab **ppVtab,
-  char **pzErr
-){
-  sqlite3_vtab *pNew;
-  int rc;
-
-/* Column numbers */
-#define JEACH_KEY     0
-#define JEACH_VALUE   1
-#define JEACH_TYPE    2
-#define JEACH_ATOM    3
-#define JEACH_ID      4
-#define JEACH_PARENT  5
-#define JEACH_FULLKEY 6
-#define JEACH_PATH    7
-#define JEACH_JSON    8
-#define JEACH_ROOT    9
-
-  UNUSED_PARAM(pzErr);
-  UNUSED_PARAM(argv);
-  UNUSED_PARAM(argc);
-  UNUSED_PARAM(pAux);
-  rc = sqlite3_declare_vtab(db, 
-     "CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,"
-                    "json HIDDEN,root HIDDEN)");
-  if( rc==SQLITE_OK ){
-    pNew = *ppVtab = sqlite3_malloc( sizeof(*pNew) );
-    if( pNew==0 ) return SQLITE_NOMEM;
-    memset(pNew, 0, sizeof(*pNew));
-  }
-  return rc;
-}
-
-/* destructor for json_each virtual table */
-static int jsonEachDisconnect(sqlite3_vtab *pVtab){
-  sqlite3_free(pVtab);
-  return SQLITE_OK;
-}
-
-/* constructor for a JsonEachCursor object for json_each(). */
-static int jsonEachOpenEach(sqlite3_vtab *p, sqlite3_vtab_cursor **ppCursor){
-  JsonEachCursor *pCur;
-
-  UNUSED_PARAM(p);
-  pCur = sqlite3_malloc( sizeof(*pCur) );
-  if( pCur==0 ) return SQLITE_NOMEM;
-  memset(pCur, 0, sizeof(*pCur));
-  *ppCursor = &pCur->base;
-  return SQLITE_OK;
-}
-
-/* constructor for a JsonEachCursor object for json_tree(). */
-static int jsonEachOpenTree(sqlite3_vtab *p, sqlite3_vtab_cursor **ppCursor){
-  int rc = jsonEachOpenEach(p, ppCursor);
-  if( rc==SQLITE_OK ){
-    JsonEachCursor *pCur = (JsonEachCursor*)*ppCursor;
-    pCur->bRecursive = 1;
-  }
-  return rc;
-}
-
-/* Reset a JsonEachCursor back to its original state.  Free any memory
-** held. */
-static void jsonEachCursorReset(JsonEachCursor *p){
-  sqlite3_free(p->zJson);
-  sqlite3_free(p->zRoot);
-  jsonParseReset(&p->sParse);
-  p->iRowid = 0;
-  p->i = 0;
-  p->iEnd = 0;
-  p->eType = 0;
-  p->zJson = 0;
-  p->zRoot = 0;
-}
-
-/* Destructor for a jsonEachCursor object */
-static int jsonEachClose(sqlite3_vtab_cursor *cur){
-  JsonEachCursor *p = (JsonEachCursor*)cur;
-  jsonEachCursorReset(p);
-  sqlite3_free(cur);
-  return SQLITE_OK;
-}
-
-/* Return TRUE if the jsonEachCursor object has been advanced off the end
-** of the JSON object */
-static int jsonEachEof(sqlite3_vtab_cursor *cur){
-  JsonEachCursor *p = (JsonEachCursor*)cur;
-  return p->i >= p->iEnd;
-}
-
-/* Advance the cursor to the next element for json_tree() */
-static int jsonEachNext(sqlite3_vtab_cursor *cur){
-  JsonEachCursor *p = (JsonEachCursor*)cur;
-  if( p->bRecursive ){
-    if( p->sParse.aNode[p->i].jnFlags & JNODE_LABEL ) p->i++;
-    p->i++;
-    p->iRowid++;
-    if( p->i<p->iEnd ){
-      u32 iUp = p->sParse.aUp[p->i];
-      JsonNode *pUp = &p->sParse.aNode[iUp];
-      p->eType = pUp->eType;
-      if( pUp->eType==JSON_ARRAY ){
-        if( iUp==p->i-1 ){
-          pUp->u.iKey = 0;
-        }else{
-          pUp->u.iKey++;
-        }
-      }
-    }
-  }else{
-    switch( p->eType ){
-      case JSON_ARRAY: {
-        p->i += jsonNodeSize(&p->sParse.aNode[p->i]);
-        p->iRowid++;
-        break;
-      }
-      case JSON_OBJECT: {
-        p->i += 1 + jsonNodeSize(&p->sParse.aNode[p->i+1]);
-        p->iRowid++;
-        break;
-      }
-      default: {
-        p->i = p->iEnd;
-        break;
-      }
-    }
-  }
-  return SQLITE_OK;
-}
-
-/* Append the name of the path for element i to pStr
-*/
-static void jsonEachComputePath(
-  JsonEachCursor *p,       /* The cursor */
-  JsonString *pStr,        /* Write the path here */
-  u32 i                    /* Path to this element */
-){
-  JsonNode *pNode, *pUp;
-  u32 iUp;
-  if( i==0 ){
-    jsonAppendChar(pStr, '$');
-    return;
-  }
-  iUp = p->sParse.aUp[i];
-  jsonEachComputePath(p, pStr, iUp);
-  pNode = &p->sParse.aNode[i];
-  pUp = &p->sParse.aNode[iUp];
-  if( pUp->eType==JSON_ARRAY ){
-    jsonPrintf(30, pStr, "[%d]", pUp->u.iKey);
-  }else{
-    assert( pUp->eType==JSON_OBJECT );
-    if( (pNode->jnFlags & JNODE_LABEL)==0 ) pNode--;
-    assert( pNode->eType==JSON_STRING );
-    assert( pNode->jnFlags & JNODE_LABEL );
-    jsonPrintf(pNode->n+1, pStr, ".%.*s", pNode->n-2, pNode->u.zJContent+1);
-  }
-}
-
-/* Return the value of a column */
-static int jsonEachColumn(
-  sqlite3_vtab_cursor *cur,   /* The cursor */
-  sqlite3_context *ctx,       /* First argument to sqlite3_result_...() */
-  int i                       /* Which column to return */
-){
-  JsonEachCursor *p = (JsonEachCursor*)cur;
-  JsonNode *pThis = &p->sParse.aNode[p->i];
-  switch( i ){
-    case JEACH_KEY: {
-      if( p->i==0 ) break;
-      if( p->eType==JSON_OBJECT ){
-        jsonReturn(pThis, ctx, 0);
-      }else if( p->eType==JSON_ARRAY ){
-        u32 iKey;
-        if( p->bRecursive ){
-          if( p->iRowid==0 ) break;
-          iKey = p->sParse.aNode[p->sParse.aUp[p->i]].u.iKey;
-        }else{
-          iKey = p->iRowid;
-        }
-        sqlite3_result_int64(ctx, (sqlite3_int64)iKey);
-      }
-      break;
-    }
-    case JEACH_VALUE: {
-      if( pThis->jnFlags & JNODE_LABEL ) pThis++;
-      jsonReturn(pThis, ctx, 0);
-      break;
-    }
-    case JEACH_TYPE: {
-      if( pThis->jnFlags & JNODE_LABEL ) pThis++;
-      sqlite3_result_text(ctx, jsonType[pThis->eType], -1, SQLITE_STATIC);
-      break;
-    }
-    case JEACH_ATOM: {
-      if( pThis->jnFlags & JNODE_LABEL ) pThis++;
-      if( pThis->eType>=JSON_ARRAY ) break;
-      jsonReturn(pThis, ctx, 0);
-      break;
-    }
-    case JEACH_ID: {
-      sqlite3_result_int64(ctx, 
-         (sqlite3_int64)p->i + ((pThis->jnFlags & JNODE_LABEL)!=0));
-      break;
-    }
-    case JEACH_PARENT: {
-      if( p->i>p->iBegin && p->bRecursive ){
-        sqlite3_result_int64(ctx, (sqlite3_int64)p->sParse.aUp[p->i]);
-      }
-      break;
-    }
-    case JEACH_FULLKEY: {
-      JsonString x;
-      jsonInit(&x, ctx);
-      if( p->bRecursive ){
-        jsonEachComputePath(p, &x, p->i);
-      }else{
-        if( p->zRoot ){
-          jsonAppendRaw(&x, p->zRoot, (int)strlen(p->zRoot));
-        }else{
-          jsonAppendChar(&x, '$');
-        }
-        if( p->eType==JSON_ARRAY ){
-          jsonPrintf(30, &x, "[%d]", p->iRowid);
-        }else if( p->eType==JSON_OBJECT ){
-          jsonPrintf(pThis->n, &x, ".%.*s", pThis->n-2, pThis->u.zJContent+1);
-        }
-      }
-      jsonResult(&x);
-      break;
-    }
-    case JEACH_PATH: {
-      if( p->bRecursive ){
-        JsonString x;
-        jsonInit(&x, ctx);
-        jsonEachComputePath(p, &x, p->sParse.aUp[p->i]);
-        jsonResult(&x);
-        break;
-      }
-      /* For json_each() path and root are the same so fall through
-      ** into the root case */
-    }
-    default: {
-      const char *zRoot = p->zRoot;
-      if( zRoot==0 ) zRoot = "$";
-      sqlite3_result_text(ctx, zRoot, -1, SQLITE_STATIC);
-      break;
-    }
-    case JEACH_JSON: {
-      assert( i==JEACH_JSON );
-      sqlite3_result_text(ctx, p->sParse.zJson, -1, SQLITE_STATIC);
-      break;
-    }
-  }
-  return SQLITE_OK;
-}
-
-/* Return the current rowid value */
-static int jsonEachRowid(sqlite3_vtab_cursor *cur, sqlite_int64 *pRowid){
-  JsonEachCursor *p = (JsonEachCursor*)cur;
-  *pRowid = p->iRowid;
-  return SQLITE_OK;
-}
-
-/* The query strategy is to look for an equality constraint on the json
-** column.  Without such a constraint, the table cannot operate.  idxNum is
-** 1 if the constraint is found, 3 if the constraint and zRoot are found,
-** and 0 otherwise.
-*/
-static int jsonEachBestIndex(
-  sqlite3_vtab *tab,
-  sqlite3_index_info *pIdxInfo
-){
-  int i;
-  int jsonIdx = -1;
-  int rootIdx = -1;
-  const struct sqlite3_index_constraint *pConstraint;
-
-  UNUSED_PARAM(tab);
-  pConstraint = pIdxInfo->aConstraint;
-  for(i=0; i<pIdxInfo->nConstraint; i++, pConstraint++){
-    if( pConstraint->usable==0 ) continue;
-    if( pConstraint->op!=SQLITE_INDEX_CONSTRAINT_EQ ) continue;
-    switch( pConstraint->iColumn ){
-      case JEACH_JSON:   jsonIdx = i;    break;
-      case JEACH_ROOT:   rootIdx = i;    break;
-      default:           /* no-op */     break;
-    }
-  }
-  if( jsonIdx<0 ){
-    pIdxInfo->idxNum = 0;
-    pIdxInfo->estimatedCost = 1e99;
-  }else{
-    pIdxInfo->estimatedCost = 1.0;
-    pIdxInfo->aConstraintUsage[jsonIdx].argvIndex = 1;
-    pIdxInfo->aConstraintUsage[jsonIdx].omit = 1;
-    if( rootIdx<0 ){
-      pIdxInfo->idxNum = 1;
-    }else{
-      pIdxInfo->aConstraintUsage[rootIdx].argvIndex = 2;
-      pIdxInfo->aConstraintUsage[rootIdx].omit = 1;
-      pIdxInfo->idxNum = 3;
-    }
-  }
-  return SQLITE_OK;
-}
-
-/* Start a search on a new JSON string */
-static int jsonEachFilter(
-  sqlite3_vtab_cursor *cur,
-  int idxNum, const char *idxStr,
-  int argc, sqlite3_value **argv
-){
-  JsonEachCursor *p = (JsonEachCursor*)cur;
-  const char *z;
-  const char *zRoot = 0;
-  sqlite3_int64 n;
-
-  UNUSED_PARAM(idxStr);
-  UNUSED_PARAM(argc);
-  jsonEachCursorReset(p);
-  if( idxNum==0 ) return SQLITE_OK;
-  z = (const char*)sqlite3_value_text(argv[0]);
-  if( z==0 ) return SQLITE_OK;
-  n = sqlite3_value_bytes(argv[0]);
-  p->zJson = sqlite3_malloc64( n+1 );
-  if( p->zJson==0 ) return SQLITE_NOMEM;
-  memcpy(p->zJson, z, (size_t)n+1);
-  if( jsonParse(&p->sParse, 0, p->zJson) ){
-    int rc = SQLITE_NOMEM;
-    if( p->sParse.oom==0 ){
-      sqlite3_free(cur->pVtab->zErrMsg);
-      cur->pVtab->zErrMsg = sqlite3_mprintf("malformed JSON");
-      if( cur->pVtab->zErrMsg ) rc = SQLITE_ERROR;
-    }
-    jsonEachCursorReset(p);
-    return rc;
-  }else if( p->bRecursive && jsonParseFindParents(&p->sParse) ){
-    jsonEachCursorReset(p);
-    return SQLITE_NOMEM;
-  }else{
-    JsonNode *pNode = 0;
-    if( idxNum==3 ){
-      const char *zErr = 0;
-      zRoot = (const char*)sqlite3_value_text(argv[1]);
-      if( zRoot==0 ) return SQLITE_OK;
-      n = sqlite3_value_bytes(argv[1]);
-      p->zRoot = sqlite3_malloc64( n+1 );
-      if( p->zRoot==0 ) return SQLITE_NOMEM;
-      memcpy(p->zRoot, zRoot, (size_t)n+1);
-      if( zRoot[0]!='$' ){
-        zErr = zRoot;
-      }else{
-        pNode = jsonLookupStep(&p->sParse, 0, p->zRoot+1, 0, &zErr);
-      }
-      if( zErr ){
-        sqlite3_free(cur->pVtab->zErrMsg);
-        cur->pVtab->zErrMsg = jsonPathSyntaxError(zErr);
-        jsonEachCursorReset(p);
-        return cur->pVtab->zErrMsg ? SQLITE_ERROR : SQLITE_NOMEM;
-      }else if( pNode==0 ){
-        return SQLITE_OK;
-      }
-    }else{
-      pNode = p->sParse.aNode;
-    }
-    p->iBegin = p->i = (int)(pNode - p->sParse.aNode);
-    p->eType = pNode->eType;
-    if( p->eType>=JSON_ARRAY ){
-      pNode->u.iKey = 0;
-      p->iEnd = p->i + pNode->n + 1;
-      if( p->bRecursive ){
-        p->eType = p->sParse.aNode[p->sParse.aUp[p->i]].eType;
-        if( p->i>0 && (p->sParse.aNode[p->i-1].jnFlags & JNODE_LABEL)!=0 ){
-          p->i--;
-        }
-      }else{
-        p->i++;
-      }
-    }else{
-      p->iEnd = p->i+1;
-    }
-  }
-  return SQLITE_OK;
-}
-
-/* The methods of the json_each virtual table */
-static sqlite3_module jsonEachModule = {
-  0,                         /* iVersion */
-  0,                         /* xCreate */
-  jsonEachConnect,           /* xConnect */
-  jsonEachBestIndex,         /* xBestIndex */
-  jsonEachDisconnect,        /* xDisconnect */
-  0,                         /* xDestroy */
-  jsonEachOpenEach,          /* xOpen - open a cursor */
-  jsonEachClose,             /* xClose - close a cursor */
-  jsonEachFilter,            /* xFilter - configure scan constraints */
-  jsonEachNext,              /* xNext - advance a cursor */
-  jsonEachEof,               /* xEof - check for end of scan */
-  jsonEachColumn,            /* xColumn - read data */
-  jsonEachRowid,             /* xRowid - read data */
-  0,                         /* xUpdate */
-  0,                         /* xBegin */
-  0,                         /* xSync */
-  0,                         /* xCommit */
-  0,                         /* xRollback */
-  0,                         /* xFindMethod */
-  0,                         /* xRename */
-  0,                         /* xSavepoint */
-  0,                         /* xRelease */
-  0                          /* xRollbackTo */
-};
-
-/* The methods of the json_tree virtual table. */
-static sqlite3_module jsonTreeModule = {
-  0,                         /* iVersion */
-  0,                         /* xCreate */
-  jsonEachConnect,           /* xConnect */
-  jsonEachBestIndex,         /* xBestIndex */
-  jsonEachDisconnect,        /* xDisconnect */
-  0,                         /* xDestroy */
-  jsonEachOpenTree,          /* xOpen - open a cursor */
-  jsonEachClose,             /* xClose - close a cursor */
-  jsonEachFilter,            /* xFilter - configure scan constraints */
-  jsonEachNext,              /* xNext - advance a cursor */
-  jsonEachEof,               /* xEof - check for end of scan */
-  jsonEachColumn,            /* xColumn - read data */
-  jsonEachRowid,             /* xRowid - read data */
-  0,                         /* xUpdate */
-  0,                         /* xBegin */
-  0,                         /* xSync */
-  0,                         /* xCommit */
-  0,                         /* xRollback */
-  0,                         /* xFindMethod */
-  0,                         /* xRename */
-  0,                         /* xSavepoint */
-  0,                         /* xRelease */
-  0                          /* xRollbackTo */
-};
-#endif /* SQLITE_OMIT_VIRTUALTABLE */
-
-/****************************************************************************
-** The following routines are the only publically visible identifiers in this
-** file.  Call the following routines in order to register the various SQL
-** functions and the virtual table implemented by this file.
-****************************************************************************/
-
-SQLITE_PRIVATE int sqlite3Json1Init(sqlite3 *db){
-  int rc = SQLITE_OK;
-  unsigned int i;
-  static const struct {
-     const char *zName;
-     int nArg;
-     int flag;
-     void (*xFunc)(sqlite3_context*,int,sqlite3_value**);
-  } aFunc[] = {
-    { "json",                 1, 0,   jsonRemoveFunc        },
-    { "json_array",          -1, 0,   jsonArrayFunc         },
-    { "json_array_length",    1, 0,   jsonArrayLengthFunc   },
-    { "json_array_length",    2, 0,   jsonArrayLengthFunc   },
-    { "json_extract",        -1, 0,   jsonExtractFunc       },
-    { "json_insert",         -1, 0,   jsonSetFunc           },
-    { "json_object",         -1, 0,   jsonObjectFunc        },
-    { "json_patch",           2, 0,   jsonPatchFunc         },
-    { "json_quote",           1, 0,   jsonQuoteFunc         },
-    { "json_remove",         -1, 0,   jsonRemoveFunc        },
-    { "json_replace",        -1, 0,   jsonReplaceFunc       },
-    { "json_set",            -1, 1,   jsonSetFunc           },
-    { "json_type",            1, 0,   jsonTypeFunc          },
-    { "json_type",            2, 0,   jsonTypeFunc          },
-    { "json_valid",           1, 0,   jsonValidFunc         },
-
-#if SQLITE_DEBUG
-    /* DEBUG and TESTING functions */
-    { "json_parse",           1, 0,   jsonParseFunc         },
-    { "json_test1",           1, 0,   jsonTest1Func         },
-#endif
-  };
-  static const struct {
-     const char *zName;
-     int nArg;
-     void (*xStep)(sqlite3_context*,int,sqlite3_value**);
-     void (*xFinal)(sqlite3_context*);
-     void (*xValue)(sqlite3_context*);
-  } aAgg[] = {
-    { "json_group_array",     1,
-      jsonArrayStep,   jsonArrayFinal,  jsonArrayValue  },
-    { "json_group_object",    2,
-      jsonObjectStep,  jsonObjectFinal, jsonObjectValue },
-  };
-#ifndef SQLITE_OMIT_VIRTUALTABLE
-  static const struct {
-     const char *zName;
-     sqlite3_module *pModule;
-  } aMod[] = {
-    { "json_each",            &jsonEachModule               },
-    { "json_tree",            &jsonTreeModule               },
-  };
-#endif
-  for(i=0; i<sizeof(aFunc)/sizeof(aFunc[0]) && rc==SQLITE_OK; i++){
-    rc = sqlite3_create_function(db, aFunc[i].zName, aFunc[i].nArg,
-                                 SQLITE_UTF8 | SQLITE_DETERMINISTIC, 
-                                 (void*)&aFunc[i].flag,
-                                 aFunc[i].xFunc, 0, 0);
-  }
-#ifndef SQLITE_OMIT_WINDOWFUNC
-  for(i=0; i<sizeof(aAgg)/sizeof(aAgg[0]) && rc==SQLITE_OK; i++){
-    rc = sqlite3_create_window_function(db, aAgg[i].zName, aAgg[i].nArg,
-                                 SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
-                                 aAgg[i].xStep, aAgg[i].xFinal,
-                                 aAgg[i].xValue, jsonGroupInverse, 0);
-  }
-#endif
-#ifndef SQLITE_OMIT_VIRTUALTABLE
-  for(i=0; i<sizeof(aMod)/sizeof(aMod[0]) && rc==SQLITE_OK; i++){
-    rc = sqlite3_create_module(db, aMod[i].zName, aMod[i].pModule, 0);
-  }
-#endif
-  return rc;
-}
-
-
-#ifndef SQLITE_CORE
-#ifdef _WIN32
-__declspec(dllexport)
-#endif
-SQLITE_API int sqlite3_json_init(
-  sqlite3 *db, 
-  char **pzErrMsg, 
-  const sqlite3_api_routines *pApi
-){
-  SQLITE_EXTENSION_INIT2(pApi);
-  (void)pzErrMsg;  /* Unused parameter */
-  return sqlite3Json1Init(db);
-}
-#endif
-#endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_JSON1) */
-
-/************** End of json1.c ***********************************************/
 /************** Begin file fts5.c ********************************************/
 
 
 #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS5) 
 
@@ -209173,11 +212025,11 @@
       break;
 
     case FTS5_SAVEPOINT:
       assert( p->ts.eState==1 );
       assert( iSavepoint>=0 );
-      assert( iSavepoint>p->ts.iSavepoint );
+      assert( iSavepoint>=p->ts.iSavepoint );
       p->ts.iSavepoint = iSavepoint;
       break;
       
     case FTS5_RELEASE:
       assert( p->ts.eState==1 );
@@ -210098,10 +212950,17 @@
     ** fts5CursorFirstSorted() above.  */
     assert( pRowidEq==0 && pRowidLe==0 && pRowidGe==0 && pRank==0 );
     assert( nVal==0 && pMatch==0 && bOrderByRank==0 && bDesc==0 );
     assert( pCsr->iLastRowid==LARGEST_INT64 );
     assert( pCsr->iFirstRowid==SMALLEST_INT64 );
+    if( pTab->pSortCsr->bDesc ){
+      pCsr->iLastRowid = pTab->pSortCsr->iFirstRowid;
+      pCsr->iFirstRowid = pTab->pSortCsr->iLastRowid;
+    }else{
+      pCsr->iLastRowid = pTab->pSortCsr->iLastRowid;
+      pCsr->iFirstRowid = pTab->pSortCsr->iFirstRowid;
+    }
     pCsr->ePlan = FTS5_PLAN_SOURCE;
     pCsr->pExpr = pTab->pSortCsr->pExpr;
     rc = fts5CursorFirst(pTab, pCsr, bDesc);
   }else if( pMatch ){
     const char *zExpr = (const char*)sqlite3_value_text(apVal[0]);
@@ -211528,11 +214387,11 @@
   int nArg,                       /* Number of args */
   sqlite3_value **apUnused        /* Function arguments */
 ){
   assert( nArg==0 );
   UNUSED_PARAM2(nArg, apUnused);
-  sqlite3_result_text(pCtx, "fts5: 2018-08-16 15:29:40 60045fbf52162f15f2e18a4e392e80fab19bdbce242728b5e62b0894eac49dfd", -1, SQLITE_TRANSIENT);
+  sqlite3_result_text(pCtx, "fts5: 2018-09-10 16:38:25 564fa75195c5179d0bc86431aaff06136fc65ec63aa9839cd1114b1fbfac928b", -1, SQLITE_TRANSIENT);
 }
 
 static int fts5Init(sqlite3 *db){
   static const sqlite3_module fts5Mod = {
     /* iVersion      */ 2,
@@ -216238,12 +219097,12 @@
 }
 #endif /* SQLITE_CORE */
 #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */
 
 /************** End of stmt.c ************************************************/
-#if __LINE__!=216243
+#if __LINE__!=219102
 #undef SQLITE_SOURCE_ID
-#define SQLITE_SOURCE_ID      "2018-08-16 16:24:24 456842924bb33c0af8af29402f06e5f25b6791f698a0d12a080258b20b0calt2"
+#define SQLITE_SOURCE_ID      "2018-09-10 19:34:06 74c381b573817d0212153278b5ee5d2238a27a727dcf7ee769365c47bb9falt2"
 #endif
 /* Return the source-id for this library */
 SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
 /************************** End of sqlite3.c ******************************/

Index: src/sqlite3.h
==================================================================
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -123,11 +123,11 @@
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
 ** [sqlite_version()] and [sqlite_source_id()].
 */
 #define SQLITE_VERSION        "3.25.0"
 #define SQLITE_VERSION_NUMBER 3025000
-#define SQLITE_SOURCE_ID      "2018-08-16 16:24:24 456842924bb33c0af8af29402f06e5f25b6791f698a0d12a080258b20b0cfb61"
+#define SQLITE_SOURCE_ID      "2018-09-10 19:34:06 74c381b573817d0212153278b5ee5d2238a27a727dcf7ee769365c47bb9fc40d"
 
 /*
 ** CAPI3REF: Run-Time Library Version Numbers
 ** KEYWORDS: sqlite3_version sqlite3_sourceid
 **
@@ -470,10 +470,11 @@
 ** the most recent error can be obtained using
 ** [sqlite3_extended_errcode()].
 */
 #define SQLITE_ERROR_MISSING_COLLSEQ   (SQLITE_ERROR | (1<<8))
 #define SQLITE_ERROR_RETRY             (SQLITE_ERROR | (2<<8))
+#define SQLITE_ERROR_SNAPSHOT          (SQLITE_ERROR | (3<<8))
 #define SQLITE_IOERR_READ              (SQLITE_IOERR | (1<<8))
 #define SQLITE_IOERR_SHORT_READ        (SQLITE_IOERR | (2<<8))
 #define SQLITE_IOERR_WRITE             (SQLITE_IOERR | (3<<8))
 #define SQLITE_IOERR_FSYNC             (SQLITE_IOERR | (4<<8))
 #define SQLITE_IOERR_DIR_FSYNC         (SQLITE_IOERR | (5<<8))
@@ -6438,10 +6439,11 @@
 #define SQLITE_INDEX_CONSTRAINT_NE        68
 #define SQLITE_INDEX_CONSTRAINT_ISNOT     69
 #define SQLITE_INDEX_CONSTRAINT_ISNOTNULL 70
 #define SQLITE_INDEX_CONSTRAINT_ISNULL    71
 #define SQLITE_INDEX_CONSTRAINT_IS        72
+#define SQLITE_INDEX_CONSTRAINT_FUNCTION 150
 
 /*
 ** CAPI3REF: Register A Virtual Table Implementation
 ** METHOD: sqlite3
 **
@@ -9050,15 +9052,15 @@
 ** SQLITE_ERROR is returned if either of these conditions is violated, or
 ** if schema S does not exist, or if the snapshot object is invalid.
 **
 ** ^A call to sqlite3_snapshot_open() will fail to open if the specified
 ** snapshot has been overwritten by a [checkpoint]. In this case 
-** SQLITE_BUSY_SNAPSHOT is returned.
+** SQLITE_ERROR_SNAPSHOT is returned.
 **
 ** If there is already a read transaction open when this function is 
 ** invoked, then the same read transaction remains open (on the same
-** database snapshot) if SQLITE_ERROR, SQLITE_BUSY or SQLITE_BUSY_SNAPSHOT
+** database snapshot) if SQLITE_ERROR, SQLITE_BUSY or SQLITE_ERROR_SNAPSHOT
 ** is returned. If another error code - for example SQLITE_PROTOCOL or an
 ** SQLITE_IOERR error code - is returned, then the final state of the
 ** read transaction is undefined. If SQLITE_OK is returned, then the 
 ** read transaction is now open on database snapshot P.
 **

Index: src/stat.c
==================================================================
--- src/stat.c
+++ src/stat.c
@@ -270,11 +270,11 @@
   }
   if( g.perm.Admin ){
     @ <tr><th>Backoffice:</th>
     @ <td>Last run: %z(backoffice_last_run())</td></tr>
   }
-  if( g.perm.Admin && email_enabled() ){
+  if( g.perm.Admin && alert_enabled() ){
     stats_for_email();
   }
 
   @ </table>
   style_footer();

Index: src/style.c
==================================================================
--- src/style.c
+++ src/style.c
@@ -86,10 +86,15 @@
 */
 static int needHrefJs = 0;   /* href.js */
 static int needSortJs = 0;   /* sorttable.js */
 static int needGraphJs = 0;  /* graph.js */
 
+/*
+** Extra JS added to the end of the file.
+*/
+static Blob blobOnLoad = BLOB_INITIALIZER;
+
 /*
 ** Generate and return a anchor tag like this:
 **
 **        <a href="URL">
 **  or    <a id="ID">
@@ -360,10 +365,24 @@
   char *zConfigName = mprintf("%s-image", zImageName);
   url_var(zVarPrefix, zConfigName, zImageName);
   free(zVarPrefix);
   free(zConfigName);
 }
+
+/*
+** Return a random nonce that is stored in static space.  For a particular
+** run, the same nonce is always returned.
+*/
+char *style_nonce(void){
+  static char zNonce[52];
+  if( zNonce[0]==0 ){
+    unsigned char zSeed[24];
+    sqlite3_randomness(24, zSeed);
+    encode16(zSeed,(unsigned char*)zNonce,24);
+  }
+  return zNonce;
+}
 
 /*
 ** Default HTML page header text through <body>.  If the repository-specific
 ** header template lacks a <body> tag, then all of the following is
 ** prepended.
@@ -371,20 +390,49 @@
 static char zDfltHeader[] = 
 @ <html>
 @ <head>
 @ <base href="$baseurl/$current_page" />
 @ <meta http-equiv="Content-Security-Policy" \
-@  content="default-src 'self' data: 'unsafe-inline'" />
+@  content="default-src 'self' data: ; \
+@  script-src 'self' 'nonce-$<nonce>' ;\
+@  style-src 'self' 'unsafe-inline'" />
 @ <meta name="viewport" content="width=device-width, initial-scale=1.0">
 @ <title>$<project_name>: $<title></title>
 @ <link rel="alternate" type="application/rss+xml" title="RSS Feed" \
 @  href="$home/timeline.rss" />
 @ <link rel="stylesheet" href="$stylesheet_url" type="text/css" \
 @  media="screen" />
 @ </head>
 @ <body>
 ;
+
+/*
+** Initialize all the default TH1 variables
+*/
+static void style_init_th1_vars(const char *zTitle){
+  Th_Store("nonce", style_nonce());
+  Th_Store("project_name", db_get("project-name","Unnamed Fossil Project"));
+  Th_Store("project_description", db_get("project-description",""));
+  if( zTitle ) Th_Store("title", zTitle);
+  Th_Store("baseurl", g.zBaseURL);
+  Th_Store("secureurl", login_wants_https_redirect()? g.zHttpsURL: g.zBaseURL);
+  Th_Store("home", g.zTop);
+  Th_Store("index_page", db_get("index-page","/home"));
+  if( local_zCurrentPage==0 ) style_set_current_page("%T", g.zPath);
+  Th_Store("current_page", local_zCurrentPage);
+  Th_Store("csrf_token", g.zCsrfToken);
+  Th_Store("release_version", RELEASE_VERSION);
+  Th_Store("manifest_version", MANIFEST_VERSION);
+  Th_Store("manifest_date", MANIFEST_DATE);
+  Th_Store("compiler_name", COMPILER_NAME);
+  url_var("stylesheet", "css", "style.css");
+  image_url_var("logo");
+  image_url_var("background");
+  if( !login_is_nobody() ){
+    Th_Store("login", g.zLogin);
+  }
+}
 
 /*
 ** Draw the header.
 */
 void style_header(const char *zTitleFormat, ...){
@@ -402,30 +450,11 @@
   @ <!DOCTYPE html>
 
   if( g.thTrace ) Th_Trace("BEGIN_HEADER<br />\n", -1);
 
   /* Generate the header up through the main menu */
-  Th_Store("project_name", db_get("project-name","Unnamed Fossil Project"));
-  Th_Store("project_description", db_get("project-description",""));
-  Th_Store("title", zTitle);
-  Th_Store("baseurl", g.zBaseURL);
-  Th_Store("secureurl", login_wants_https_redirect()? g.zHttpsURL: g.zBaseURL);
-  Th_Store("home", g.zTop);
-  Th_Store("index_page", db_get("index-page","/home"));
-  if( local_zCurrentPage==0 ) style_set_current_page("%T", g.zPath);
-  Th_Store("current_page", local_zCurrentPage);
-  Th_Store("csrf_token", g.zCsrfToken);
-  Th_Store("release_version", RELEASE_VERSION);
-  Th_Store("manifest_version", MANIFEST_VERSION);
-  Th_Store("manifest_date", MANIFEST_DATE);
-  Th_Store("compiler_name", COMPILER_NAME);
-  url_var("stylesheet", "css", "style.css");
-  image_url_var("logo");
-  image_url_var("background");
-  if( !login_is_nobody() ){
-    Th_Store("login", g.zLogin);
-  }
+  style_init_th1_vars(zTitle);
   if( sqlite3_strlike("%<body%", zHeader, 0)!=0 ){
     Th_Render(zDfltHeader);
   }
   if( g.thTrace ) Th_Trace("BEGIN_HEADER_SCRIPT<br />\n", -1);
   Th_Render(zHeader);
@@ -523,11 +552,11 @@
   int i;
   for(i=0; i<nJsToLoad; i++){
     if( fossil_strcmp(zName, azJsToLoad[i])==0 ) return;
   }
   if( nJsToLoad>=sizeof(azJsToLoad)/sizeof(azJsToLoad[0]) ){
-    fossil_panic("too man JS files");
+    fossil_panic("too many JS files");
   }
   azJsToLoad[nJsToLoad++] = zName;
 }
 
 /*
@@ -541,21 +570,40 @@
     /* Load up the page data */
     bMouseover = (!g.isHuman || db_get_boolean("auto-hyperlink-ishuman",0))
                  && db_get_boolean("auto-hyperlink-mouseover",0);
     @ <script id='href-data' type='application/json'>\
     @ {"delay":%d(nDelay),"mouseover":%d(bMouseover)}</script>
-    style_load_one_js_file("href.js");
+  }
+  @ <script nonce="%h(style_nonce())">
+  if( needHrefJs ){
+    cgi_append_content(builtin_text("href.js"),-1);
   }
   if( needSortJs ){
-    style_load_one_js_file("sorttable.js");
+    cgi_append_content(builtin_text("sorttable.js"),-1);
   }
   if( needGraphJs ){
-    style_load_one_js_file("graph.js");
+    cgi_append_content(builtin_text("graph.js"),-1);
   }
   for(i=0; i<nJsToLoad; i++){
-    style_load_one_js_file(azJsToLoad[i]);
+    cgi_append_content(builtin_text(azJsToLoad[i]),-1);
+  }
+  if( blob_size(&blobOnLoad)>0 ){
+    @ window.onload = function(){
+    cgi_append_content(blob_buffer(&blobOnLoad), blob_size(&blobOnLoad));
+    cgi_append_content("\n}\n", -1);
   }
+  @ </script>
+}
+
+/*
+** Extra JS to run after all content is loaded.
+*/
+void style_js_onload(const char *zFormat, ...){
+  va_list ap;
+  va_start(ap, zFormat);
+  blob_vappendf(&blobOnLoad, zFormat, ap);
+  va_end(ap);
 }
 
 /*
 ** Draw the footer at the bottom of the page.
 */
@@ -807,10 +855,29 @@
   zSelector = g.argv[3];
   found = containsSelector(blob_str(&css), zSelector);
   fossil_print("%s %s\n", zSelector, found ? "found" : "not found");
   blob_reset(&css);
 }
+
+/*
+** WEBPAGE: script.js
+**
+** Return the "Javascript" content for the current skin (if there is any)
+*/
+void page_script_js(void){
+  const char *zScript = skin_get("js");
+  if( P("test") ){
+    /* Render the script as plain-text for testing purposes, if the "test"
+    ** query parameter is present */
+    cgi_set_content_type("text/plain");
+  }else{
+    /* Default behavior is to return javascript */
+    cgi_set_content_type("application/javascript");
+  }
+  style_init_th1_vars(0);
+  Th_Render(zScript?zScript:"");
+}
 
 
 /*
 ** WEBPAGE: style.css
 **

Index: src/th_main.c
==================================================================
--- src/th_main.c
+++ src/th_main.c
@@ -1300,10 +1300,38 @@
   }else{
     Th_SetResult(interp, "repository unavailable", -1);
     return TH_ERROR;
   }
 }
+
+/*
+** TH1 command: styleScript
+**
+** Render the configured javascript for the selected skin
+*/
+static int styleScriptCmd(
+  Th_Interp *interp,
+  void *p,
+  int argc,
+  const char **argv,
+  int *argl
+){
+  if( argc!=1 ){
+    return Th_WrongNumArgs(interp, "styleScript");
+  }
+  if( Th_IsRepositoryOpen() ){
+    const char *zScript = skin_get("js");
+    if( zScript==0 ) zScript = "";
+    Th_Render(zScript);
+    Th_SetResult(interp, 0, 0);
+    return TH_OK;
+  }else{
+    Th_SetResult(interp, "repository unavailable", -1);
+    return TH_ERROR;
+  }
+}
+
 
 /*
 ** TH1 command: artifact ID ?FILENAME?
 **
 ** Attempts to locate the specified artifact and return its contents.  An
@@ -1984,12 +2012,13 @@
     {"render",        renderCmd,            0},
     {"repository",    repositoryCmd,        0},
     {"searchable",    searchableCmd,        0},
     {"setParameter",  setParameterCmd,      0},
     {"setting",       settingCmd,           0},
-    {"styleHeader",   styleHeaderCmd,       0},
     {"styleFooter",   styleFooterCmd,       0},
+    {"styleHeader",   styleHeaderCmd,       0},
+    {"styleScript",   styleScriptCmd,       0},
     {"tclReady",      tclReadyCmd,          0},
     {"trace",         traceCmd,             0},
     {"stime",         stimeCmd,             0},
     {"unversioned",   unversionedCmd,       0},
     {"utime",         utimeCmd,             0},

Index: test/commit-warning.test
==================================================================
--- test/commit-warning.test
+++ test/commit-warning.test
@@ -161,146 +161,146 @@
 #       be fragile as development progresses.
 #
 # Unless the real goal of this test is to document a collection
 # of source files that MUST NEVER BE TEXT.
 #
-run_in_checkout {
+test_block_in_checkout pre-commit-warnings-fossil-1 {
   fossil test-commit-warning --no-settings
-}
-
-test pre-commit-warnings-fossil-1 {[normalize_result] eq \
-    [subst -nocommands -novariables [string trim {
-1\tart/branching.odp\tbinary data
-1\tart/concept1.dia\tbinary data
-1\tart/concept2.dia\tbinary data
-1\tcompat/zlib/contrib/blast/test.pk\tbinary data
-1\tcompat/zlib/contrib/dotzlib/DotZLib.build\tCR/LF line endings
-1\tcompat/zlib/contrib/dotzlib/DotZLib.chm\tbinary data
-1\tcompat/zlib/contrib/dotzlib/DotZLib.sln\tCR/LF line endings
-1\tcompat/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs\tCR/LF line endings
-1\tcompat/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs\tinvalid UTF-8
-1\tcompat/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs\tinvalid UTF-8
-1\tcompat/zlib/contrib/dotzlib/DotZLib/CodecBase.cs\tinvalid UTF-8
-1\tcompat/zlib/contrib/dotzlib/DotZLib/Deflater.cs\tinvalid UTF-8
-1\tcompat/zlib/contrib/dotzlib/DotZLib/DotZLib.cs\tinvalid UTF-8
-1\tcompat/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj\tCR/LF line endings
-1\tcompat/zlib/contrib/dotzlib/DotZLib/GZipStream.cs\tinvalid UTF-8
-1\tcompat/zlib/contrib/dotzlib/DotZLib/Inflater.cs\tinvalid UTF-8
-1\tcompat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs\tCR/LF line endings
-1\tcompat/zlib/contrib/dotzlib/LICENSE_1_0.txt\tCR/LF line endings
-1\tcompat/zlib/contrib/dotzlib/readme.txt\tCR/LF line endings
-1\tcompat/zlib/contrib/gcc_gvmat64/gvmat64.S\tCR/LF line endings
-1\tcompat/zlib/contrib/masmx64/bld_ml64.bat\tCR/LF line endings
-1\tcompat/zlib/contrib/masmx64/gvmat64.asm\tCR/LF line endings
-1\tcompat/zlib/contrib/masmx64/inffas8664.c\tCR/LF line endings
-1\tcompat/zlib/contrib/masmx64/inffasx64.asm\tCR/LF line endings
-1\tcompat/zlib/contrib/masmx64/readme.txt\tCR/LF line endings
-1\tcompat/zlib/contrib/masmx86/bld_ml32.bat\tCR/LF line endings
-1\tcompat/zlib/contrib/masmx86/inffas32.asm\tCR/LF line endings
-1\tcompat/zlib/contrib/masmx86/match686.asm\tCR/LF line endings
-1\tcompat/zlib/contrib/masmx86/readme.txt\tCR/LF line endings
-1\tcompat/zlib/contrib/puff/zeros.raw\tbinary data
-1\tcompat/zlib/contrib/testzlib/testzlib.c\tCR/LF line endings
-1\tcompat/zlib/contrib/testzlib/testzlib.txt\tCR/LF line endings
-1\tcompat/zlib/contrib/vstudio/readme.txt\tCR/LF line endings
-1\tcompat/zlib/contrib/vstudio/vc10/miniunz.vcxproj\tCR/LF line endings
-1\tcompat/zlib/contrib/vstudio/vc10/miniunz.vcxproj.filters\tCR/LF line endings
-1\tcompat/zlib/contrib/vstudio/vc10/minizip.vcxproj\tCR/LF line endings
-1\tcompat/zlib/contrib/vstudio/vc10/minizip.vcxproj.filters\tCR/LF line endings
-1\tcompat/zlib/contrib/vstudio/vc10/testzlib.vcxproj\tCR/LF line endings
-1\tcompat/zlib/contrib/vstudio/vc10/testzlib.vcxproj.filters\tCR/LF line endings
-1\tcompat/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj\tCR/LF line endings
-1\tcompat/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj.filters\tCR/LF line endings
-1\tcompat/zlib/contrib/vstudio/vc10/zlib.rc\tCR/LF line endings
-1\tcompat/zlib/contrib/vstudio/vc10/zlibstat.vcxproj\tCR/LF line endings
-1\tcompat/zlib/contrib/vstudio/vc10/zlibstat.vcxproj.filters\tCR/LF line endings
-1\tcompat/zlib/contrib/vstudio/vc10/zlibvc.def\tCR/LF line endings
-1\tcompat/zlib/contrib/vstudio/vc10/zlibvc.sln\tCR/LF line endings
-1\tcompat/zlib/contrib/vstudio/vc10/zlibvc.vcxproj\tCR/LF line endings
-1\tcompat/zlib/contrib/vstudio/vc10/zlibvc.vcxproj.filters\tCR/LF line endings
-1\tcompat/zlib/contrib/vstudio/vc11/miniunz.vcxproj\tCR/LF line endings
-1\tcompat/zlib/contrib/vstudio/vc11/minizip.vcxproj\tCR/LF line endings
-1\tcompat/zlib/contrib/vstudio/vc11/testzlib.vcxproj\tCR/LF line endings
-1\tcompat/zlib/contrib/vstudio/vc11/testzlibdll.vcxproj\tCR/LF line endings
-1\tcompat/zlib/contrib/vstudio/vc11/zlib.rc\tCR/LF line endings
-1\tcompat/zlib/contrib/vstudio/vc11/zlibstat.vcxproj\tCR/LF line endings
-1\tcompat/zlib/contrib/vstudio/vc11/zlibvc.def\tCR/LF line endings
-1\tcompat/zlib/contrib/vstudio/vc11/zlibvc.sln\tCR/LF line endings
-1\tcompat/zlib/contrib/vstudio/vc11/zlibvc.vcxproj\tCR/LF line endings
-1\tcompat/zlib/contrib/vstudio/vc12/zlibvc.def\tCR/LF line endings
-1\tcompat/zlib/contrib/vstudio/vc14/zlibvc.def\tCR/LF line endings
-1\tcompat/zlib/contrib/vstudio/vc9/miniunz.vcproj\tCR/LF line endings
-1\tcompat/zlib/contrib/vstudio/vc9/minizip.vcproj\tCR/LF line endings
-1\tcompat/zlib/contrib/vstudio/vc9/testzlib.vcproj\tCR/LF line endings
-1\tcompat/zlib/contrib/vstudio/vc9/testzlibdll.vcproj\tCR/LF line endings
-1\tcompat/zlib/contrib/vstudio/vc9/zlib.rc\tCR/LF line endings
-1\tcompat/zlib/contrib/vstudio/vc9/zlibstat.vcproj\tCR/LF line endings
-1\tcompat/zlib/contrib/vstudio/vc9/zlibvc.def\tCR/LF line endings
-1\tcompat/zlib/contrib/vstudio/vc9/zlibvc.sln\tCR/LF line endings
-1\tcompat/zlib/contrib/vstudio/vc9/zlibvc.vcproj\tCR/LF line endings
-1\tcompat/zlib/win32/zlib.def\tCR/LF line endings
-1\tcompat/zlib/zlib.3.pdf\tbinary data
-1\tcompat/zlib/zlib.map\tCR/LF line endings
-1\tsetup/fossil.iss\tCR/LF line endings
-1\tskins/blitz/arrow_project.png\tbinary data
-1\tskins/blitz/dir.png\tbinary data
-1\tskins/blitz/file.png\tbinary data
-1\tskins/blitz/fossil_100.png\tbinary data
-1\tskins/blitz/fossil_80_reversed_darkcyan.png\tbinary data
-1\tskins/blitz/fossil_80_reversed_darkcyan_text.png\tbinary data
-1\tskins/blitz/rss_20.png\tbinary data
-1\tskins/bootstrap/css.txt\tlong lines
-1\ttest/th1-docs-input.txt\tCR/LF line endings
-1\ttest/th1-hooks-input.txt\tCR/LF line endings
-1\ttest/utf16be.txt\tUnicode
-1\ttest/utf16le.txt\tUnicode
-1\twin/buildmsvc.bat\tCR/LF line endings
-1\twin/fossil.ico\tbinary data
-1\twin/fossil.rc\tinvalid UTF-8
-1\twww/CollRev1.gif\tbinary data
-1\twww/CollRev2.gif\tbinary data
-1\twww/CollRev3.gif\tbinary data
-1\twww/CollRev4.gif\tbinary data
-1\twww/apple-touch-icon.png\tbinary data
-1\twww/background.jpg\tbinary data
-1\twww/branch01.gif\tbinary data
-1\twww/branch02.gif\tbinary data
-1\twww/branch03.gif\tbinary data
-1\twww/branch04.gif\tbinary data
-1\twww/branch05.gif\tbinary data
-1\twww/build-icons/linux.gif\tbinary data
-1\twww/build-icons/linux64.gif\tbinary data
-1\twww/build-icons/mac.gif\tbinary data
-1\twww/build-icons/openbsd.gif\tbinary data
-1\twww/build-icons/src.gif\tbinary data
-1\twww/build-icons/win32.gif\tbinary data
-1\twww/concept1.gif\tbinary data
-1\twww/concept2.gif\tbinary data
-1\twww/copyright-release.pdf\tbinary data
-1\twww/delta1.gif\tbinary data
-1\twww/delta2.gif\tbinary data
-1\twww/delta3.gif\tbinary data
-1\twww/delta4.gif\tbinary data
-1\twww/delta5.gif\tbinary data
-1\twww/delta6.gif\tbinary data
-1\twww/encode1.gif\tbinary data
-1\twww/encode10.gif\tbinary data
-1\twww/encode2.gif\tbinary data
-1\twww/encode3.gif\tbinary data
-1\twww/encode4.gif\tbinary data
-1\twww/encode5.gif\tbinary data
-1\twww/encode6.gif\tbinary data
-1\twww/encode7.gif\tbinary data
-1\twww/encode8.gif\tbinary data
-1\twww/encode9.gif\tbinary data
-1\twww/fossil.gif\tbinary data
-1\twww/fossil2.gif\tbinary data
-1\twww/fossil3.gif\tbinary data
-1\twww/fossil_logo_small.gif\tbinary data
-1\twww/fossil_logo_small2.gif\tbinary data
-1\twww/fossil_logo_small3.gif\tbinary data
-1\twww/xkcd-git.gif\tbinary data
-1}]]}
+} {
+  test pre-commit-warnings-fossil-1 {[normalize_result] eq \
+      [subst -nocommands -novariables [string trim {
+  1\tart/branching.odp\tbinary data
+  1\tart/concept1.dia\tbinary data
+  1\tart/concept2.dia\tbinary data
+  1\tcompat/zlib/contrib/blast/test.pk\tbinary data
+  1\tcompat/zlib/contrib/dotzlib/DotZLib.build\tCR/LF line endings
+  1\tcompat/zlib/contrib/dotzlib/DotZLib.chm\tbinary data
+  1\tcompat/zlib/contrib/dotzlib/DotZLib.sln\tCR/LF line endings
+  1\tcompat/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs\tCR/LF line endings
+  1\tcompat/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs\tinvalid UTF-8
+  1\tcompat/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs\tinvalid UTF-8
+  1\tcompat/zlib/contrib/dotzlib/DotZLib/CodecBase.cs\tinvalid UTF-8
+  1\tcompat/zlib/contrib/dotzlib/DotZLib/Deflater.cs\tinvalid UTF-8
+  1\tcompat/zlib/contrib/dotzlib/DotZLib/DotZLib.cs\tinvalid UTF-8
+  1\tcompat/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj\tCR/LF line endings
+  1\tcompat/zlib/contrib/dotzlib/DotZLib/GZipStream.cs\tinvalid UTF-8
+  1\tcompat/zlib/contrib/dotzlib/DotZLib/Inflater.cs\tinvalid UTF-8
+  1\tcompat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs\tCR/LF line endings
+  1\tcompat/zlib/contrib/dotzlib/LICENSE_1_0.txt\tCR/LF line endings
+  1\tcompat/zlib/contrib/dotzlib/readme.txt\tCR/LF line endings
+  1\tcompat/zlib/contrib/gcc_gvmat64/gvmat64.S\tCR/LF line endings
+  1\tcompat/zlib/contrib/masmx64/bld_ml64.bat\tCR/LF line endings
+  1\tcompat/zlib/contrib/masmx64/gvmat64.asm\tCR/LF line endings
+  1\tcompat/zlib/contrib/masmx64/inffas8664.c\tCR/LF line endings
+  1\tcompat/zlib/contrib/masmx64/inffasx64.asm\tCR/LF line endings
+  1\tcompat/zlib/contrib/masmx64/readme.txt\tCR/LF line endings
+  1\tcompat/zlib/contrib/masmx86/bld_ml32.bat\tCR/LF line endings
+  1\tcompat/zlib/contrib/masmx86/inffas32.asm\tCR/LF line endings
+  1\tcompat/zlib/contrib/masmx86/match686.asm\tCR/LF line endings
+  1\tcompat/zlib/contrib/masmx86/readme.txt\tCR/LF line endings
+  1\tcompat/zlib/contrib/puff/zeros.raw\tbinary data
+  1\tcompat/zlib/contrib/testzlib/testzlib.c\tCR/LF line endings
+  1\tcompat/zlib/contrib/testzlib/testzlib.txt\tCR/LF line endings
+  1\tcompat/zlib/contrib/vstudio/readme.txt\tCR/LF line endings
+  1\tcompat/zlib/contrib/vstudio/vc10/miniunz.vcxproj\tCR/LF line endings
+  1\tcompat/zlib/contrib/vstudio/vc10/miniunz.vcxproj.filters\tCR/LF line endings
+  1\tcompat/zlib/contrib/vstudio/vc10/minizip.vcxproj\tCR/LF line endings
+  1\tcompat/zlib/contrib/vstudio/vc10/minizip.vcxproj.filters\tCR/LF line endings
+  1\tcompat/zlib/contrib/vstudio/vc10/testzlib.vcxproj\tCR/LF line endings
+  1\tcompat/zlib/contrib/vstudio/vc10/testzlib.vcxproj.filters\tCR/LF line endings
+  1\tcompat/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj\tCR/LF line endings
+  1\tcompat/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj.filters\tCR/LF line endings
+  1\tcompat/zlib/contrib/vstudio/vc10/zlib.rc\tCR/LF line endings
+  1\tcompat/zlib/contrib/vstudio/vc10/zlibstat.vcxproj\tCR/LF line endings
+  1\tcompat/zlib/contrib/vstudio/vc10/zlibstat.vcxproj.filters\tCR/LF line endings
+  1\tcompat/zlib/contrib/vstudio/vc10/zlibvc.def\tCR/LF line endings
+  1\tcompat/zlib/contrib/vstudio/vc10/zlibvc.sln\tCR/LF line endings
+  1\tcompat/zlib/contrib/vstudio/vc10/zlibvc.vcxproj\tCR/LF line endings
+  1\tcompat/zlib/contrib/vstudio/vc10/zlibvc.vcxproj.filters\tCR/LF line endings
+  1\tcompat/zlib/contrib/vstudio/vc11/miniunz.vcxproj\tCR/LF line endings
+  1\tcompat/zlib/contrib/vstudio/vc11/minizip.vcxproj\tCR/LF line endings
+  1\tcompat/zlib/contrib/vstudio/vc11/testzlib.vcxproj\tCR/LF line endings
+  1\tcompat/zlib/contrib/vstudio/vc11/testzlibdll.vcxproj\tCR/LF line endings
+  1\tcompat/zlib/contrib/vstudio/vc11/zlib.rc\tCR/LF line endings
+  1\tcompat/zlib/contrib/vstudio/vc11/zlibstat.vcxproj\tCR/LF line endings
+  1\tcompat/zlib/contrib/vstudio/vc11/zlibvc.def\tCR/LF line endings
+  1\tcompat/zlib/contrib/vstudio/vc11/zlibvc.sln\tCR/LF line endings
+  1\tcompat/zlib/contrib/vstudio/vc11/zlibvc.vcxproj\tCR/LF line endings
+  1\tcompat/zlib/contrib/vstudio/vc12/zlibvc.def\tCR/LF line endings
+  1\tcompat/zlib/contrib/vstudio/vc14/zlibvc.def\tCR/LF line endings
+  1\tcompat/zlib/contrib/vstudio/vc9/miniunz.vcproj\tCR/LF line endings
+  1\tcompat/zlib/contrib/vstudio/vc9/minizip.vcproj\tCR/LF line endings
+  1\tcompat/zlib/contrib/vstudio/vc9/testzlib.vcproj\tCR/LF line endings
+  1\tcompat/zlib/contrib/vstudio/vc9/testzlibdll.vcproj\tCR/LF line endings
+  1\tcompat/zlib/contrib/vstudio/vc9/zlib.rc\tCR/LF line endings
+  1\tcompat/zlib/contrib/vstudio/vc9/zlibstat.vcproj\tCR/LF line endings
+  1\tcompat/zlib/contrib/vstudio/vc9/zlibvc.def\tCR/LF line endings
+  1\tcompat/zlib/contrib/vstudio/vc9/zlibvc.sln\tCR/LF line endings
+  1\tcompat/zlib/contrib/vstudio/vc9/zlibvc.vcproj\tCR/LF line endings
+  1\tcompat/zlib/win32/zlib.def\tCR/LF line endings
+  1\tcompat/zlib/zlib.3.pdf\tbinary data
+  1\tcompat/zlib/zlib.map\tCR/LF line endings
+  1\tsetup/fossil.iss\tCR/LF line endings
+  1\tskins/blitz/arrow_project.png\tbinary data
+  1\tskins/blitz/dir.png\tbinary data
+  1\tskins/blitz/file.png\tbinary data
+  1\tskins/blitz/fossil_100.png\tbinary data
+  1\tskins/blitz/fossil_80_reversed_darkcyan.png\tbinary data
+  1\tskins/blitz/fossil_80_reversed_darkcyan_text.png\tbinary data
+  1\tskins/blitz/rss_20.png\tbinary data
+  1\tskins/bootstrap/css.txt\tlong lines
+  1\ttest/th1-docs-input.txt\tCR/LF line endings
+  1\ttest/th1-hooks-input.txt\tCR/LF line endings
+  1\ttest/utf16be.txt\tUnicode
+  1\ttest/utf16le.txt\tUnicode
+  1\twin/buildmsvc.bat\tCR/LF line endings
+  1\twin/fossil.ico\tbinary data
+  1\twin/fossil.rc\tinvalid UTF-8
+  1\twww/CollRev1.gif\tbinary data
+  1\twww/CollRev2.gif\tbinary data
+  1\twww/CollRev3.gif\tbinary data
+  1\twww/CollRev4.gif\tbinary data
+  1\twww/apple-touch-icon.png\tbinary data
+  1\twww/background.jpg\tbinary data
+  1\twww/branch01.gif\tbinary data
+  1\twww/branch02.gif\tbinary data
+  1\twww/branch03.gif\tbinary data
+  1\twww/branch04.gif\tbinary data
+  1\twww/branch05.gif\tbinary data
+  1\twww/build-icons/linux.gif\tbinary data
+  1\twww/build-icons/linux64.gif\tbinary data
+  1\twww/build-icons/mac.gif\tbinary data
+  1\twww/build-icons/openbsd.gif\tbinary data
+  1\twww/build-icons/src.gif\tbinary data
+  1\twww/build-icons/win32.gif\tbinary data
+  1\twww/concept1.gif\tbinary data
+  1\twww/concept2.gif\tbinary data
+  1\twww/copyright-release.pdf\tbinary data
+  1\twww/delta1.gif\tbinary data
+  1\twww/delta2.gif\tbinary data
+  1\twww/delta3.gif\tbinary data
+  1\twww/delta4.gif\tbinary data
+  1\twww/delta5.gif\tbinary data
+  1\twww/delta6.gif\tbinary data
+  1\twww/encode1.gif\tbinary data
+  1\twww/encode10.gif\tbinary data
+  1\twww/encode2.gif\tbinary data
+  1\twww/encode3.gif\tbinary data
+  1\twww/encode4.gif\tbinary data
+  1\twww/encode5.gif\tbinary data
+  1\twww/encode6.gif\tbinary data
+  1\twww/encode7.gif\tbinary data
+  1\twww/encode8.gif\tbinary data
+  1\twww/encode9.gif\tbinary data
+  1\twww/fossil.gif\tbinary data
+  1\twww/fossil2.gif\tbinary data
+  1\twww/fossil3.gif\tbinary data
+  1\twww/fossil_logo_small.gif\tbinary data
+  1\twww/fossil_logo_small2.gif\tbinary data
+  1\twww/fossil_logo_small3.gif\tbinary data
+  1\twww/xkcd-git.gif\tbinary data
+  1}]]}
+}
 
 ###############################################################################
 
 test_cleanup

Index: test/tester.tcl
==================================================================
--- test/tester.tcl
+++ test/tester.tcl
@@ -20,20 +20,32 @@
 #     tclsh ../test/tester.tcl ../bld/fossil
 #
 # Where ../test/tester.tcl is the name of this file and ../bld/fossil
 # is the name of the executable to be tested.
 #
+
+# We use some things introduced in 8.6 such as lmap.  auto.def should
+# have found us a suitable Tcl installation.
+package require Tcl 8.6
 
 set testfiledir [file normalize [file dirname [info script]]]
 set testrundir [pwd]
 set testdir [file normalize [file dirname $argv0]]
 set fossilexe [file normalize [lindex $argv 0]]
+set is_windows [expr {$::tcl_platform(platform) eq "windows"}]
 
-if {$tcl_platform(platform) eq "windows" && \
-    [string length [file extension $fossilexe]] == 0} {
-  append fossilexe .exe
+if {$::is_windows} {
+  if {[string length [file extension $fossilexe]] == 0} {
+    append fossilexe .exe
+  }
+  set outside_fossil_repo [expr ![file exists "$::testfiledir\\..\\_FOSSIL_"]]
+} else {
+  set outside_fossil_repo [expr ![file exists "$::testfiledir/../.fslckout"]]
 }
+
+catch {exec $::fossilexe changes --changed} res
+set dirty_ckout [string length $res]
 
 set argv [lrange $argv 1 end]
 
 set i [lsearch $argv -keep]
 if {$i>=0} {
@@ -439,11 +451,11 @@
   if {![info exists ::tempKeepHome]} {delete_temporary_home}
 }
 
 proc delete_temporary_home {} {
   if {$::KEEP} {return}; # All cleanup disabled?
-  if {$::tcl_platform(platform) eq "windows"} {
+  if {$::is_windows} {
     robust_delete [file join $::tempHomePath _fossil]
   } else {
     robust_delete [file join $::tempHomePath .fossil]
   }
   robust_delete $::tempHomePath
@@ -512,26 +524,66 @@
   fossil test-th-eval --open-config "setting th1-hooks"
   if {[normalize_result] eq "1"} {return 1}
   return [info exists ::env(TH1_ENABLE_HOOKS)]
 }
 
-# This (rarely used) procedure is designed to run a test within the Fossil
-# source checkout (e.g. one that does NOT modify any state), while saving
-# and restoring the current directory (e.g. one used when running a test
-# file outside of the Fossil source checkout).  Please do NOT use this
-# procedure unless you are absolutely sure it does not modify the state of
-# the repository or source checkout in any way.
+# Run the given command script inside the Fossil source repo checkout.
+#
+# Callers of this function must ensure two things:
+#
+# 1. This test run is in fact being done from within a Fossil repo
+#    checkout directory.  If you are unsure, test $::outside_fossil_repo
+#    or call one of the test_* wrappers below which do that for you.
+#
+#    As a rule, you should not be calling this function directly!
+#
+# 2. This test run is being done from a repo checkout directory that
+#    doesn't have any uncommitted changes.  If it does, that affects the
+#    output of any test based on the output of "fossil status",
+#    "... diff", etc., which is likely to make the test appear to fail.
+#    If you must call this function directly, test $::dirty_ckout and
+#    skip the call if it's true.  The test_* wrappers do this for you.
 #
+# 3. The test does NOT modify the Fossil checkout tree in any way.
 proc run_in_checkout { script {dir ""} } {
   if {[string length $dir] == 0} {set dir $::testfiledir}
   set savedPwd [pwd]; cd $dir
   set code [catch {
     uplevel 1 $script
   } result]
   cd $savedPwd; unset savedPwd
   return -code $code $result
 }
+
+# Wrapper for the above function pair.  The tscript parameter is an
+# optional post-run test script.  Some callers choose instead to put
+# the tests inline with the rscript commands.
+#
+# Be sure to adhere to the requirements of run_in_checkout!
+proc test_block_in_checkout { name rscript {tscript ""} } {
+  if {$::outside_fossil_repo || $::dirty_ckout} {
+    set $::CODE 0
+    set $::RESULT ""
+  } else {
+    run_in_checkout $rscript
+    if {[string length $tscript] == 0} {
+      return ""
+    } else {
+      set code [catch {
+        uplevel 1 $tscript
+      } result]
+      return -code $code $result
+    }
+  }
+}
+
+# Single-test wrapper for the above.
+proc test_in_checkout { name rscript tscript } {
+  return test_block_in_checkout name rscript {
+    test $name $tscript
+  }
+}
 
 # Normalize file status lists (like those returned by 'fossil changes')
 # so they can be compared using simple string comparison
 #
 proc normalize_status_list {list} {
@@ -624,11 +676,11 @@
   }
 
   #
   # NOTE: On non-Windows systems, fallback to /tmp if it is usable.
   #
-  if {$::tcl_platform(platform) ne "windows"} {
+  if {!$::is_windows} {
     set value /tmp
 
     if {[file exists $value] && [file isdirectory $value]} {
       return $value
     }
@@ -796,21 +848,21 @@
   global fossilexe tempPath
   set command [list exec $fossilexe server --localhost]
   if {[string length $varName] > 0} {
     upvar 1 $varName stopArg
   }
-  if {$::tcl_platform(platform) eq "windows"} {
+  if {$::is_windows} {
     set stopArg [file join [getTemporaryPath] [appendArgs \
         [string trim [clock seconds] -] _ [getSeqNo] .stopper]]
     lappend command --stopper $stopArg
   }
   set outFileName [file join $tempPath [appendArgs \
       fossil_server_ [string trim [clock seconds] -] _ \
       [getSeqNo]]].out
   lappend command $repository >&$outFileName &
   set pid [eval $command]
-  if {$::tcl_platform(platform) ne "windows"} {
+  if {!$::is_windows} {
     set stopArg $pid
   }
   after 1000; # output might not be there yet
   set output [read_file $outFileName]
   if {![regexp {Listening.*TCP port (\d+)} $output dummy port]} {
@@ -823,11 +875,11 @@
 # This procedure stops a Fossil server instance that was previously started
 # by the [test_start_server] procedure.  The value of the "stop argument"
 # will vary by platform as will the exact method used to stop the server.
 # The fileName argument is the name of a temporary output file to delete.
 proc test_stop_server { stopArg pid fileName } {
-  if {$::tcl_platform(platform) eq "windows"} {
+  if {$::is_windows} {
     #
     # NOTE: On Windows, the "stop argument" must be the name of a file
     #       that does NOT already exist.
     #
     if {[string length $stopArg] > 0 && \
@@ -950,11 +1002,11 @@
   return [lindex [split [normalize_result] \n] end-2]
 }
 
 set tempPath [getTemporaryPath]
 
-if {$tcl_platform(platform) eq "windows"} {
+if {$is_windows} {
   set tempPath [string map [list \\ /] $tempPath]
 }
 
 if {[catch {
   set tempFile [file join $tempPath temporary.txt]

Index: test/th1-docs.test
==================================================================
--- test/th1-docs.test
+++ test/th1-docs.test
@@ -29,10 +29,18 @@
 
 if {[normalize_result] ne "1"} {
   puts "Fossil was not compiled with Tcl support."
   test_cleanup_then_return
 }
+
+if {$::outside_fossil_repo} {
+  puts "Skipping th1-docs-* tests: not in Fossil repo checkout."
+  test_cleanup_then_return
+} elseif ($::dirty_ckout) {
+  puts "Skipping th1-docs-* tests: uncommitted changes in Fossil checkout."
+  test_cleanup_then_return
+}
 
 ###############################################################################
 
 test_setup ""
 

Index: test/th1.test
==================================================================
--- test/th1.test
+++ test/th1.test
@@ -553,10 +553,19 @@
 
 fossil test-th-eval "lindex list -0x"
 test th1-expr-49 {$RESULT eq {TH_ERROR: expected integer, got: "-0x"}}
 
 ###############################################################################
+
+set skip_anycap 1
+if {$::outside_fossil_repo} {
+  puts "Skipping th1-anycap-*-1 perm tests: not in Fossil repo checkout."
+} elseif ($::dirty_ckout) {
+  puts "Skipping th1-anycap-*-1 perm tests: uncommitted changes in Fossil checkout."
+} else {
+  set skip_anycap 0
+}
 
 foreach perm [list a b c d e f g h i j k l m n o p q r s t u v w x y z] {
   if {$perm eq "u"} continue; # NOTE: Skip "reader" meta-permission.
   if {$perm eq "v"} continue; # NOTE: Skip "developer" meta-permission.
 
@@ -566,10 +575,12 @@
   fossil test-th-eval "hascap $perm"
   test th1-hascap-no-$perm-1 {$RESULT eq {0}}
 
   fossil test-th-eval "anoncap $perm"
   test th1-anoncap-no-$perm-1 {$RESULT eq {0}}
+
+  if {$skip_anycap} { continue }
 
   run_in_checkout {
     fossil test-th-eval --set-user-caps "anycap $perm"
     test th1-anycap-yes-$perm-1 {$RESULT eq {1}}
 
@@ -621,11 +632,11 @@
 fossil test-th-eval "anoncap o h"
 test th1-anoncap-no-multiple-2 {$RESULT eq {0}}
 
 ###############################################################################
 
-run_in_checkout {
+test_block_in_checkout "test-anoncap-*" {
   fossil test-th-eval --set-user-caps "anycap oh"
   test th1-anycap-yes-multiple-1 {$RESULT eq {1}}
 
   set ::env(TH1_TEST_USER_CAPS) o
   fossil test-th-eval --set-user-caps "anycap oh"
@@ -665,29 +676,25 @@
   unset ::env(TH1_TEST_ANON_CAPS)
 }
 
 ###############################################################################
 
-run_in_checkout {
+test_in_checkout th1-checkout-1 {
   # NOTE: The "1" here forces the checkout to be opened.
   fossil test-th-eval "checkout 1"
-}
-
-test th1-checkout-1 {[string length $RESULT] > 0}
+} {[string length $RESULT] > 0}
 
 ###############################################################################
 
-run_in_checkout {
+test_in_checkout th1-checkout-2 {
   if {$th1Hooks} {
     fossil test-th-eval "checkout"
   } else {
     # NOTE: No TH1 hooks, force checkout to be populated.
     fossil test-th-eval --open-config "checkout"
   }
-}
-
-test th1-checkout-2 {[string length $RESULT] > 0}
+} {[string length $RESULT] > 0}
 
 ###############################################################################
 
 set savedPwd [pwd]; cd /
 fossil test-th-eval "checkout 1"
@@ -762,15 +769,13 @@
 fossil test-th-eval "styleHeader {Page Title Here}"
 test th1-header-1 {$RESULT eq {TH_ERROR: repository unavailable}}
 
 ###############################################################################
 
-run_in_checkout {
+test_in_checkout th1-header-2 {
   fossil test-th-eval --open-config "styleHeader {Page Title Here}"
-}
-
-test th1-header-2 {[regexp -- {<title>Fossil: Page Title Here</title>} $RESULT]}
+} {[regexp -- {<title>Fossil: Page Title Here</title>} $RESULT]}
 
 ###############################################################################
 
 fossil test-th-eval "styleFooter"
 test th1-footer-1 {$RESULT eq {TH_ERROR: repository unavailable}}
@@ -848,15 +853,13 @@
 fossil test-th-eval "artifact tip"
 test th1-artifact-2 {$RESULT eq {TH_ERROR: repository unavailable}}
 
 ###############################################################################
 
-run_in_checkout {
+test_in_checkout th1-artifact-3 {
   fossil test-th-eval --open-config "artifact tip"
-}
-
-test th1-artifact-3 {[regexp -- {F test/th1\.test [0-9a-f]{40,64}} $RESULT]}
+} {[regexp -- {F test/th1\.test [0-9a-f]{40,64}} $RESULT]}
 
 ###############################################################################
 
 fossil test-th-eval "artifact 0000000000"
 test th1-artifact-4 {$RESULT eq {TH_ERROR: repository unavailable}}
@@ -871,15 +874,13 @@
 fossil test-th-eval "artifact tip test/th1.test"
 test th1-artifact-6 {$RESULT eq {TH_ERROR: repository unavailable}}
 
 ###############################################################################
 
-run_in_checkout {
+test_in_checkout th1-artifact-7 {
   fossil test-th-eval --open-config "artifact tip test/th1.test"
-}
-
-test th1-artifact-7 {[regexp -- {th1-artifact-7} $RESULT]}
+} {[regexp -- {th1-artifact-7} $RESULT]}
 
 ###############################################################################
 
 fossil test-th-eval "artifact 0000000000 test/th1.test"
 test th1-artifact-8 {$RESULT eq {TH_ERROR: repository unavailable}}
@@ -889,24 +890,22 @@
 fossil test-th-eval --open-config "artifact 0000000000 test/th1.test"
 test th1-artifact-9 {$RESULT eq {TH_ERROR: manifest not found}}
 
 ###############################################################################
 
-run_in_checkout {
+test_in_checkout th1-globalState-1 {
   if {$th1Hooks} {
     fossil test-th-eval "globalState checkout"
   } else {
     # NOTE: No TH1 hooks, force checkout to be populated.
     fossil test-th-eval --open-config "globalState checkout"
   }
-}
-
-test th1-globalState-1 {[string length $RESULT] > 0}
+} {[string length $RESULT] > 0}
 
 ###############################################################################
 
-run_in_checkout {
+test_block_in_checkout th1-globalState-2 {
   if {$th1Hooks} {
     fossil test-th-eval "globalState checkout"
     test th1-globalState-2 {$RESULT eq [fossil test-th-eval checkout]}
   } else {
     # NOTE: No TH1 hooks, force checkout to be populated.
@@ -942,24 +941,22 @@
 fossil test-th-eval --errorlog foserrors.log "globalState log"
 test th1-globalState-7 {$RESULT eq "foserrors.log"}
 
 ###############################################################################
 
-run_in_checkout {
+test_in_checkout th1-globalState-8 {
   if {$th1Hooks} {
     fossil test-th-eval "globalState repository"
   } else {
     # NOTE: No TH1 hooks, force repository to be populated.
     fossil test-th-eval --open-config "globalState repository"
   }
-}
-
-test th1-globalState-8 {[string length $RESULT] > 0}
+} {[string length $RESULT] > 0}
 
 ###############################################################################
 
-run_in_checkout {
+test_block_in_checkout th1-globalState-9 {
   if {$th1Hooks} {
     fossil test-th-eval "globalState repository"
     test th1-globalState-9 {$RESULT eq [fossil test-th-eval repository]}
   } else {
     # NOTE: No TH1 hooks, force repository to be populated.
@@ -1603,21 +1600,20 @@
 test th1-encode64-2 {$RESULT eq "dGVzdAA="}
 
 ###############################################################################
 
 #
-# TODO: Modify the result of this test if the source file (i.e.
-#       "ajax/cgi-bin/fossil-json.cgi.example") changes.
+# This test will fail if the Fossil source file named below changes.  Update
+# the expected result string below if that happens.
 #
-run_in_checkout {
+test_in_checkout th1-encode64-3 {
   fossil test-th-eval --open-config \
       {encode64 [artifact trunk ajax/cgi-bin/fossil-json.cgi.example]}
+} {
+  $RESULT eq "IyEvcGF0aC90by9mb3NzaWwvYmluYXJ5CnJlcG9zaXRvcnk6IC9wYXRoL3RvL3JlcG8uZnNsCg=="
 }
 
-test th1-encode64-3 {$RESULT eq \
-"IyEvcGF0aC90by9mb3NzaWwvYmluYXJ5CnJlcG9zaXRvcnk6IC9wYXRoL3RvL3JlcG8uZnNsCg=="}
-
 ###############################################################################
 
 fossil test-th-eval {array exists tcl_platform}
 test th1-platform-1 {$RESULT eq "1"}
 

Index: win/Makefile.dmc
==================================================================
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -28,13 +28,13 @@
 
 SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_GET_TABLE -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB
 
 SHELL_OPTIONS = -DNDEBUG=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_GET_TABLE -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
 
-SRC   = add_.c allrepo_.c attach_.c backoffice_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.c cache_.c capabilities_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c cookies_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c dispatch_.c doc_.c email_.c encode_.c etag_.c event_.c export_.c file_.c finfo_.c foci_.c forum_.c fshell_.c fusefs_.c glob_.c graph_.c gzip_.c hname_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c loadctrl_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c piechart_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c report_.c rss_.c schema_.c search_.c security_audit_.c setup_.c setupuser_.c sha1_.c sha1hard_.c sha3_.c shun_.c sitemap_.c skins_.c smtp_.c sqlcmd_.c stash_.c stat_.c statrep_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c unversioned_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c webmail_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c
+SRC   = add_.c alerts_.c allrepo_.c attach_.c backoffice_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.c cache_.c capabilities_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c cookies_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c dispatch_.c doc_.c encode_.c etag_.c event_.c export_.c file_.c finfo_.c foci_.c forum_.c fshell_.c fusefs_.c glob_.c graph_.c gzip_.c hname_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c loadctrl_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c piechart_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c report_.c rss_.c schema_.c search_.c security_audit_.c setup_.c setupuser_.c sha1_.c sha1hard_.c sha3_.c shun_.c sitemap_.c skins_.c smtp_.c sqlcmd_.c stash_.c stat_.c statrep_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c unversioned_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c webmail_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c
 
-OBJ   = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\backoffice$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\builtin$O $(OBJDIR)\bundle$O $(OBJDIR)\cache$O $(OBJDIR)\capabilities$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\cookies$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\dispatch$O $(OBJDIR)\doc$O $(OBJDIR)\email$O $(OBJDIR)\encode$O $(OBJDIR)\etag$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\foci$O $(OBJDIR)\forum$O $(OBJDIR)\fshell$O $(OBJDIR)\fusefs$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\hname$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_status$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\loadctrl$O $(OBJDIR)\login$O $(OBJDIR)\lookslike$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\piechart$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\publish$O $(OBJDIR)\purge$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\security_audit$O $(OBJDIR)\setup$O $(OBJDIR)\setupuser$O $(OBJDIR)\sha1$O $(OBJDIR)\sha1hard$O $(OBJDIR)\sha3$O $(OBJDIR)\shun$O $(OBJDIR)\sitemap$O $(OBJDIR)\skins$O $(OBJDIR)\smtp$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\statrep$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\unversioned$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\webmail$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winfile$O $(OBJDIR)\winhttp$O $(OBJDIR)\wysiwyg$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
+OBJ   = $(OBJDIR)\add$O $(OBJDIR)\alerts$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\backoffice$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\builtin$O $(OBJDIR)\bundle$O $(OBJDIR)\cache$O $(OBJDIR)\capabilities$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\cookies$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\dispatch$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\etag$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\foci$O $(OBJDIR)\forum$O $(OBJDIR)\fshell$O $(OBJDIR)\fusefs$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\hname$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_status$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\loadctrl$O $(OBJDIR)\login$O $(OBJDIR)\lookslike$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\piechart$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\publish$O $(OBJDIR)\purge$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\security_audit$O $(OBJDIR)\setup$O $(OBJDIR)\setupuser$O $(OBJDIR)\sha1$O $(OBJDIR)\sha1hard$O $(OBJDIR)\sha3$O $(OBJDIR)\shun$O $(OBJDIR)\sitemap$O $(OBJDIR)\skins$O $(OBJDIR)\smtp$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\statrep$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\unversioned$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\webmail$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winfile$O $(OBJDIR)\winhttp$O $(OBJDIR)\wysiwyg$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
 
 
 RC=$(DMDIR)\bin\rcc
 RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
 
@@ -49,11 +49,11 @@
 
 $(OBJDIR)\fossil.res:	$B\win\fossil.rc
 	$(RC) $(RCFLAGS) -o$@ $**
 
 $(OBJDIR)\link: $B\win\Makefile.dmc $(OBJDIR)\fossil.res
-	+echo add allrepo attach backoffice bag bisect blob branch browse builtin bundle cache capabilities captcha cgi checkin checkout clearsign clone comformat configure content cookies db delta deltacmd descendants diff diffcmd dispatch doc email encode etag event export file finfo foci forum fshell fusefs glob graph gzip hname http http_socket http_ssl http_transport import info json json_artifact json_branch json_config json_diff json_dir json_finfo json_login json_query json_report json_status json_tag json_timeline json_user json_wiki leaf loadctrl login lookslike main manifest markdown markdown_html md5 merge merge3 moderate name path piechart pivot popen pqueue printf publish purge rebuild regexp report rss schema search security_audit setup setupuser sha1 sha1hard sha3 shun sitemap skins smtp sqlcmd stash stat statrep style sync tag tar th_main timeline tkt tktsetup undo unicode unversioned update url user utf8 util verify vfile webmail wiki wikiformat winfile winhttp wysiwyg xfer xfersetup zip shell sqlite3 th th_lang > $@
+	+echo add alerts allrepo attach backoffice bag bisect blob branch browse builtin bundle cache capabilities captcha cgi checkin checkout clearsign clone comformat configure content cookies db delta deltacmd descendants diff diffcmd dispatch doc encode etag event export file finfo foci forum fshell fusefs glob graph gzip hname http http_socket http_ssl http_transport import info json json_artifact json_branch json_config json_diff json_dir json_finfo json_login json_query json_report json_status json_tag json_timeline json_user json_wiki leaf loadctrl login lookslike main manifest markdown markdown_html md5 merge merge3 moderate name path piechart pivot popen pqueue printf publish purge rebuild regexp report rss schema search security_audit setup setupuser sha1 sha1hard sha3 shun sitemap skins smtp sqlcmd stash stat statrep style sync tag tar th_main timeline tkt tktsetup undo unicode unversioned update url user utf8 util verify vfile webmail wiki wikiformat winfile winhttp wysiwyg xfer xfersetup zip shell sqlite3 th th_lang > $@
 	+echo fossil >> $@
 	+echo fossil >> $@
 	+echo $(LIBS) >> $@
 	+echo. >> $@
 	+echo fossil >> $@
@@ -134,10 +134,16 @@
 $(OBJDIR)\add$O : add_.c add.h
 	$(TCC) -o$@ -c add_.c
 
 add_.c : $(SRCDIR)\add.c
 	+translate$E $** > $@
+
+$(OBJDIR)\alerts$O : alerts_.c alerts.h
+	$(TCC) -o$@ -c alerts_.c
+
+alerts_.c : $(SRCDIR)\alerts.c
+	+translate$E $** > $@
 
 $(OBJDIR)\allrepo$O : allrepo_.c allrepo.h
 	$(TCC) -o$@ -c allrepo_.c
 
 allrepo_.c : $(SRCDIR)\allrepo.c
@@ -315,16 +321,10 @@
 	$(TCC) -o$@ -c doc_.c
 
 doc_.c : $(SRCDIR)\doc.c
 	+translate$E $** > $@
 
-$(OBJDIR)\email$O : email_.c email.h
-	$(TCC) -o$@ -c email_.c
-
-email_.c : $(SRCDIR)\email.c
-	+translate$E $** > $@
-
 $(OBJDIR)\encode$O : encode_.c encode.h
 	$(TCC) -o$@ -c encode_.c
 
 encode_.c : $(SRCDIR)\encode.c
 	+translate$E $** > $@
@@ -940,7 +940,7 @@
 
 zip_.c : $(SRCDIR)\zip.c
 	+translate$E $** > $@
 
 headers: makeheaders$E page_index.h builtin_data.h default_css.h VERSION.h
-	 +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h backoffice_.c:backoffice.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h builtin_.c:builtin.h bundle_.c:bundle.h cache_.c:cache.h capabilities_.c:capabilities.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h cookies_.c:cookies.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h dispatch_.c:dispatch.h doc_.c:doc.h email_.c:email.h encode_.c:encode.h etag_.c:etag.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h foci_.c:foci.h forum_.c:forum.h fshell_.c:fshell.h fusefs_.c:fusefs.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h hname_.c:hname.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_config_.c:json_config.h json_diff_.c:json_diff.h json_dir_.c:json_dir.h json_finfo_.c:json_finfo.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_status_.c:json_status.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h loadctrl_.c:loadctrl.h login_.c:login.h lookslike_.c:lookslike.h main_.c:main.h manifest_.c:manifest.h markdown_.c:markdown.h markdown_html_.c:markdown_html.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h moderate_.c:moderate.h name_.c:name.h path_.c:path.h piechart_.c:piechart.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h publish_.c:publish.h purge_.c:purge.h rebuild_.c:rebuild.h regexp_.c:regexp.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h security_audit_.c:security_audit.h setup_.c:setup.h setupuser_.c:setupuser.h sha1_.c:sha1.h sha1hard_.c:sha1hard.h sha3_.c:sha3.h shun_.c:shun.h sitemap_.c:sitemap.h skins_.c:skins.h smtp_.c:smtp.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h statrep_.c:statrep.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h unicode_.c:unicode.h unversioned_.c:unversioned.h update_.c:update.h url_.c:url.h user_.c:user.h utf8_.c:utf8.h util_.c:util.h verify_.c:verify.h vfile_.c:vfile.h webmail_.c:webmail.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winfile_.c:winfile.h winhttp_.c:winhttp.h wysiwyg_.c:wysiwyg.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
+	 +makeheaders$E add_.c:add.h alerts_.c:alerts.h allrepo_.c:allrepo.h attach_.c:attach.h backoffice_.c:backoffice.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h builtin_.c:builtin.h bundle_.c:bundle.h cache_.c:cache.h capabilities_.c:capabilities.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h cookies_.c:cookies.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h dispatch_.c:dispatch.h doc_.c:doc.h encode_.c:encode.h etag_.c:etag.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h foci_.c:foci.h forum_.c:forum.h fshell_.c:fshell.h fusefs_.c:fusefs.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h hname_.c:hname.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_config_.c:json_config.h json_diff_.c:json_diff.h json_dir_.c:json_dir.h json_finfo_.c:json_finfo.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_status_.c:json_status.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h loadctrl_.c:loadctrl.h login_.c:login.h lookslike_.c:lookslike.h main_.c:main.h manifest_.c:manifest.h markdown_.c:markdown.h markdown_html_.c:markdown_html.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h moderate_.c:moderate.h name_.c:name.h path_.c:path.h piechart_.c:piechart.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h publish_.c:publish.h purge_.c:purge.h rebuild_.c:rebuild.h regexp_.c:regexp.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h security_audit_.c:security_audit.h setup_.c:setup.h setupuser_.c:setupuser.h sha1_.c:sha1.h sha1hard_.c:sha1hard.h sha3_.c:sha3.h shun_.c:shun.h sitemap_.c:sitemap.h skins_.c:skins.h smtp_.c:smtp.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h statrep_.c:statrep.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h unicode_.c:unicode.h unversioned_.c:unversioned.h update_.c:update.h url_.c:url.h user_.c:user.h utf8_.c:utf8.h util_.c:util.h verify_.c:verify.h vfile_.c:vfile.h webmail_.c:webmail.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winfile_.c:winfile.h winhttp_.c:winhttp.h wysiwyg_.c:wysiwyg.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
 	@copy /Y nul: headers

Index: win/Makefile.mingw
==================================================================
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -160,11 +160,11 @@
 endif
 
 #### Disable creation of the OpenSSL shared libraries.  Also, disable support
 #    for SSLv3 (i.e. thereby forcing the use of TLS).
 #
-SSLCONFIG += no-ssl3 enable-capieng no-weak-ssl-ciphers no-shared
+SSLCONFIG += no-ssl3 no-weak-ssl-ciphers no-shared
 
 #### When using zlib, make sure that OpenSSL is configured to use the zlib
 #    that Fossil knows about (i.e. the one within the source tree).
 #
 ifndef FOSSIL_ENABLE_MINIZ
@@ -437,10 +437,11 @@
 XBCC = $(BCC) $(CFLAGS)
 XTCC = $(TCC) $(CFLAGS) -I. -I$(SRCDIR)
 
 SRC = \
   $(SRCDIR)/add.c \
+  $(SRCDIR)/alerts.c \
   $(SRCDIR)/allrepo.c \
   $(SRCDIR)/attach.c \
   $(SRCDIR)/backoffice.c \
   $(SRCDIR)/bag.c \
   $(SRCDIR)/bisect.c \
@@ -467,11 +468,10 @@
   $(SRCDIR)/descendants.c \
   $(SRCDIR)/diff.c \
   $(SRCDIR)/diffcmd.c \
   $(SRCDIR)/dispatch.c \
   $(SRCDIR)/doc.c \
-  $(SRCDIR)/email.c \
   $(SRCDIR)/encode.c \
   $(SRCDIR)/etag.c \
   $(SRCDIR)/event.c \
   $(SRCDIR)/export.c \
   $(SRCDIR)/file.c \
@@ -600,10 +600,11 @@
   $(SRCDIR)/../skins/bootstrap/header.txt \
   $(SRCDIR)/../skins/default/css.txt \
   $(SRCDIR)/../skins/default/details.txt \
   $(SRCDIR)/../skins/default/footer.txt \
   $(SRCDIR)/../skins/default/header.txt \
+  $(SRCDIR)/../skins/default/js.txt \
   $(SRCDIR)/../skins/eagle/css.txt \
   $(SRCDIR)/../skins/eagle/details.txt \
   $(SRCDIR)/../skins/eagle/footer.txt \
   $(SRCDIR)/../skins/eagle/header.txt \
   $(SRCDIR)/../skins/enhanced1/css.txt \
@@ -646,10 +647,11 @@
   $(SRCDIR)/useredit.js \
   $(SRCDIR)/wiki.wiki
 
 TRANS_SRC = \
   $(OBJDIR)/add_.c \
+  $(OBJDIR)/alerts_.c \
   $(OBJDIR)/allrepo_.c \
   $(OBJDIR)/attach_.c \
   $(OBJDIR)/backoffice_.c \
   $(OBJDIR)/bag_.c \
   $(OBJDIR)/bisect_.c \
@@ -676,11 +678,10 @@
   $(OBJDIR)/descendants_.c \
   $(OBJDIR)/diff_.c \
   $(OBJDIR)/diffcmd_.c \
   $(OBJDIR)/dispatch_.c \
   $(OBJDIR)/doc_.c \
-  $(OBJDIR)/email_.c \
   $(OBJDIR)/encode_.c \
   $(OBJDIR)/etag_.c \
   $(OBJDIR)/event_.c \
   $(OBJDIR)/export_.c \
   $(OBJDIR)/file_.c \
@@ -783,10 +784,11 @@
   $(OBJDIR)/xfersetup_.c \
   $(OBJDIR)/zip_.c
 
 OBJ = \
  $(OBJDIR)/add.o \
+ $(OBJDIR)/alerts.o \
  $(OBJDIR)/allrepo.o \
  $(OBJDIR)/attach.o \
  $(OBJDIR)/backoffice.o \
  $(OBJDIR)/bag.o \
  $(OBJDIR)/bisect.o \
@@ -813,11 +815,10 @@
  $(OBJDIR)/descendants.o \
  $(OBJDIR)/diff.o \
  $(OBJDIR)/diffcmd.o \
  $(OBJDIR)/dispatch.o \
  $(OBJDIR)/doc.o \
- $(OBJDIR)/email.o \
  $(OBJDIR)/encode.o \
  $(OBJDIR)/etag.o \
  $(OBJDIR)/event.o \
  $(OBJDIR)/export.o \
  $(OBJDIR)/file.o \
@@ -1139,10 +1140,11 @@
 $(OBJDIR)/builtin_data.h:	$(MKBUILTIN) $(EXTRA_FILES)
 	$(MKBUILTIN) --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
 
 $(OBJDIR)/headers:	$(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/default_css.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
 	$(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
+		$(OBJDIR)/alerts_.c:$(OBJDIR)/alerts.h \
 		$(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
 		$(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
 		$(OBJDIR)/backoffice_.c:$(OBJDIR)/backoffice.h \
 		$(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
 		$(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
@@ -1169,11 +1171,10 @@
 		$(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h \
 		$(OBJDIR)/diff_.c:$(OBJDIR)/diff.h \
 		$(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h \
 		$(OBJDIR)/dispatch_.c:$(OBJDIR)/dispatch.h \
 		$(OBJDIR)/doc_.c:$(OBJDIR)/doc.h \
-		$(OBJDIR)/email_.c:$(OBJDIR)/email.h \
 		$(OBJDIR)/encode_.c:$(OBJDIR)/encode.h \
 		$(OBJDIR)/etag_.c:$(OBJDIR)/etag.h \
 		$(OBJDIR)/event_.c:$(OBJDIR)/event.h \
 		$(OBJDIR)/export_.c:$(OBJDIR)/export.h \
 		$(OBJDIR)/file_.c:$(OBJDIR)/file.h \
@@ -1289,10 +1290,18 @@
 
 $(OBJDIR)/add.o:	$(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h
 	$(XTCC) -o $(OBJDIR)/add.o -c $(OBJDIR)/add_.c
 
 $(OBJDIR)/add.h:	$(OBJDIR)/headers
+
+$(OBJDIR)/alerts_.c:	$(SRCDIR)/alerts.c $(TRANSLATE)
+	$(TRANSLATE) $(SRCDIR)/alerts.c >$@
+
+$(OBJDIR)/alerts.o:	$(OBJDIR)/alerts_.c $(OBJDIR)/alerts.h $(SRCDIR)/config.h
+	$(XTCC) -o $(OBJDIR)/alerts.o -c $(OBJDIR)/alerts_.c
+
+$(OBJDIR)/alerts.h:	$(OBJDIR)/headers
 
 $(OBJDIR)/allrepo_.c:	$(SRCDIR)/allrepo.c $(TRANSLATE)
 	$(TRANSLATE) $(SRCDIR)/allrepo.c >$@
 
 $(OBJDIR)/allrepo.o:	$(OBJDIR)/allrepo_.c $(OBJDIR)/allrepo.h $(SRCDIR)/config.h
@@ -1530,18 +1539,10 @@
 $(OBJDIR)/doc.o:	$(OBJDIR)/doc_.c $(OBJDIR)/doc.h $(SRCDIR)/config.h
 	$(XTCC) -o $(OBJDIR)/doc.o -c $(OBJDIR)/doc_.c
 
 $(OBJDIR)/doc.h:	$(OBJDIR)/headers
 
-$(OBJDIR)/email_.c:	$(SRCDIR)/email.c $(TRANSLATE)
-	$(TRANSLATE) $(SRCDIR)/email.c >$@
-
-$(OBJDIR)/email.o:	$(OBJDIR)/email_.c $(OBJDIR)/email.h $(SRCDIR)/config.h
-	$(XTCC) -o $(OBJDIR)/email.o -c $(OBJDIR)/email_.c
-
-$(OBJDIR)/email.h:	$(OBJDIR)/headers
-
 $(OBJDIR)/encode_.c:	$(SRCDIR)/encode.c $(TRANSLATE)
 	$(TRANSLATE) $(SRCDIR)/encode.c >$@
 
 $(OBJDIR)/encode.o:	$(OBJDIR)/encode_.c $(OBJDIR)/encode.h $(SRCDIR)/config.h
 	$(XTCC) -o $(OBJDIR)/encode.o -c $(OBJDIR)/encode_.c

Index: win/Makefile.mingw.mistachkin
==================================================================
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -160,11 +160,11 @@
 endif
 
 #### Disable creation of the OpenSSL shared libraries.  Also, disable support
 #    for SSLv3 (i.e. thereby forcing the use of TLS).
 #
-SSLCONFIG += no-ssl3 enable-capieng no-weak-ssl-ciphers no-shared
+SSLCONFIG += no-ssl3 no-weak-ssl-ciphers no-shared
 
 #### When using zlib, make sure that OpenSSL is configured to use the zlib
 #    that Fossil knows about (i.e. the one within the source tree).
 #
 ifndef FOSSIL_ENABLE_MINIZ
@@ -437,10 +437,11 @@
 XBCC = $(BCC) $(CFLAGS)
 XTCC = $(TCC) $(CFLAGS) -I. -I$(SRCDIR)
 
 SRC = \
   $(SRCDIR)/add.c \
+  $(SRCDIR)/alerts.c \
   $(SRCDIR)/allrepo.c \
   $(SRCDIR)/attach.c \
   $(SRCDIR)/backoffice.c \
   $(SRCDIR)/bag.c \
   $(SRCDIR)/bisect.c \
@@ -467,11 +468,10 @@
   $(SRCDIR)/descendants.c \
   $(SRCDIR)/diff.c \
   $(SRCDIR)/diffcmd.c \
   $(SRCDIR)/dispatch.c \
   $(SRCDIR)/doc.c \
-  $(SRCDIR)/email.c \
   $(SRCDIR)/encode.c \
   $(SRCDIR)/etag.c \
   $(SRCDIR)/event.c \
   $(SRCDIR)/export.c \
   $(SRCDIR)/file.c \
@@ -532,10 +532,11 @@
   $(SRCDIR)/rss.c \
   $(SRCDIR)/schema.c \
   $(SRCDIR)/search.c \
   $(SRCDIR)/security_audit.c \
   $(SRCDIR)/setup.c \
+  $(SRCDIR)/setupuser.c \
   $(SRCDIR)/sha1.c \
   $(SRCDIR)/sha1hard.c \
   $(SRCDIR)/sha3.c \
   $(SRCDIR)/shun.c \
   $(SRCDIR)/sitemap.c \
@@ -599,10 +600,11 @@
   $(SRCDIR)/../skins/bootstrap/header.txt \
   $(SRCDIR)/../skins/default/css.txt \
   $(SRCDIR)/../skins/default/details.txt \
   $(SRCDIR)/../skins/default/footer.txt \
   $(SRCDIR)/../skins/default/header.txt \
+  $(SRCDIR)/../skins/default/js.txt \
   $(SRCDIR)/../skins/eagle/css.txt \
   $(SRCDIR)/../skins/eagle/details.txt \
   $(SRCDIR)/../skins/eagle/footer.txt \
   $(SRCDIR)/../skins/eagle/header.txt \
   $(SRCDIR)/../skins/enhanced1/css.txt \
@@ -645,10 +647,11 @@
   $(SRCDIR)/useredit.js \
   $(SRCDIR)/wiki.wiki
 
 TRANS_SRC = \
   $(OBJDIR)/add_.c \
+  $(OBJDIR)/alerts_.c \
   $(OBJDIR)/allrepo_.c \
   $(OBJDIR)/attach_.c \
   $(OBJDIR)/backoffice_.c \
   $(OBJDIR)/bag_.c \
   $(OBJDIR)/bisect_.c \
@@ -675,11 +678,10 @@
   $(OBJDIR)/descendants_.c \
   $(OBJDIR)/diff_.c \
   $(OBJDIR)/diffcmd_.c \
   $(OBJDIR)/dispatch_.c \
   $(OBJDIR)/doc_.c \
-  $(OBJDIR)/email_.c \
   $(OBJDIR)/encode_.c \
   $(OBJDIR)/etag_.c \
   $(OBJDIR)/event_.c \
   $(OBJDIR)/export_.c \
   $(OBJDIR)/file_.c \
@@ -740,10 +742,11 @@
   $(OBJDIR)/rss_.c \
   $(OBJDIR)/schema_.c \
   $(OBJDIR)/search_.c \
   $(OBJDIR)/security_audit_.c \
   $(OBJDIR)/setup_.c \
+  $(OBJDIR)/setupuser_.c \
   $(OBJDIR)/sha1_.c \
   $(OBJDIR)/sha1hard_.c \
   $(OBJDIR)/sha3_.c \
   $(OBJDIR)/shun_.c \
   $(OBJDIR)/sitemap_.c \
@@ -781,10 +784,11 @@
   $(OBJDIR)/xfersetup_.c \
   $(OBJDIR)/zip_.c
 
 OBJ = \
  $(OBJDIR)/add.o \
+ $(OBJDIR)/alerts.o \
  $(OBJDIR)/allrepo.o \
  $(OBJDIR)/attach.o \
  $(OBJDIR)/backoffice.o \
  $(OBJDIR)/bag.o \
  $(OBJDIR)/bisect.o \
@@ -811,11 +815,10 @@
  $(OBJDIR)/descendants.o \
  $(OBJDIR)/diff.o \
  $(OBJDIR)/diffcmd.o \
  $(OBJDIR)/dispatch.o \
  $(OBJDIR)/doc.o \
- $(OBJDIR)/email.o \
  $(OBJDIR)/encode.o \
  $(OBJDIR)/etag.o \
  $(OBJDIR)/event.o \
  $(OBJDIR)/export.o \
  $(OBJDIR)/file.o \
@@ -876,10 +879,11 @@
  $(OBJDIR)/rss.o \
  $(OBJDIR)/schema.o \
  $(OBJDIR)/search.o \
  $(OBJDIR)/security_audit.o \
  $(OBJDIR)/setup.o \
+ $(OBJDIR)/setupuser.o \
  $(OBJDIR)/sha1.o \
  $(OBJDIR)/sha1hard.o \
  $(OBJDIR)/sha3.o \
  $(OBJDIR)/shun.o \
  $(OBJDIR)/sitemap.o \
@@ -1136,10 +1140,11 @@
 $(OBJDIR)/builtin_data.h:	$(MKBUILTIN) $(EXTRA_FILES)
 	$(MKBUILTIN) --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
 
 $(OBJDIR)/headers:	$(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/default_css.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
 	$(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
+		$(OBJDIR)/alerts_.c:$(OBJDIR)/alerts.h \
 		$(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
 		$(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
 		$(OBJDIR)/backoffice_.c:$(OBJDIR)/backoffice.h \
 		$(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
 		$(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
@@ -1166,11 +1171,10 @@
 		$(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h \
 		$(OBJDIR)/diff_.c:$(OBJDIR)/diff.h \
 		$(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h \
 		$(OBJDIR)/dispatch_.c:$(OBJDIR)/dispatch.h \
 		$(OBJDIR)/doc_.c:$(OBJDIR)/doc.h \
-		$(OBJDIR)/email_.c:$(OBJDIR)/email.h \
 		$(OBJDIR)/encode_.c:$(OBJDIR)/encode.h \
 		$(OBJDIR)/etag_.c:$(OBJDIR)/etag.h \
 		$(OBJDIR)/event_.c:$(OBJDIR)/event.h \
 		$(OBJDIR)/export_.c:$(OBJDIR)/export.h \
 		$(OBJDIR)/file_.c:$(OBJDIR)/file.h \
@@ -1231,10 +1235,11 @@
 		$(OBJDIR)/rss_.c:$(OBJDIR)/rss.h \
 		$(OBJDIR)/schema_.c:$(OBJDIR)/schema.h \
 		$(OBJDIR)/search_.c:$(OBJDIR)/search.h \
 		$(OBJDIR)/security_audit_.c:$(OBJDIR)/security_audit.h \
 		$(OBJDIR)/setup_.c:$(OBJDIR)/setup.h \
+		$(OBJDIR)/setupuser_.c:$(OBJDIR)/setupuser.h \
 		$(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h \
 		$(OBJDIR)/sha1hard_.c:$(OBJDIR)/sha1hard.h \
 		$(OBJDIR)/sha3_.c:$(OBJDIR)/sha3.h \
 		$(OBJDIR)/shun_.c:$(OBJDIR)/shun.h \
 		$(OBJDIR)/sitemap_.c:$(OBJDIR)/sitemap.h \
@@ -1285,10 +1290,18 @@
 
 $(OBJDIR)/add.o:	$(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h
 	$(XTCC) -o $(OBJDIR)/add.o -c $(OBJDIR)/add_.c
 
 $(OBJDIR)/add.h:	$(OBJDIR)/headers
+
+$(OBJDIR)/alerts_.c:	$(SRCDIR)/alerts.c $(TRANSLATE)
+	$(TRANSLATE) $(SRCDIR)/alerts.c >$@
+
+$(OBJDIR)/alerts.o:	$(OBJDIR)/alerts_.c $(OBJDIR)/alerts.h $(SRCDIR)/config.h
+	$(XTCC) -o $(OBJDIR)/alerts.o -c $(OBJDIR)/alerts_.c
+
+$(OBJDIR)/alerts.h:	$(OBJDIR)/headers
 
 $(OBJDIR)/allrepo_.c:	$(SRCDIR)/allrepo.c $(TRANSLATE)
 	$(TRANSLATE) $(SRCDIR)/allrepo.c >$@
 
 $(OBJDIR)/allrepo.o:	$(OBJDIR)/allrepo_.c $(OBJDIR)/allrepo.h $(SRCDIR)/config.h
@@ -1526,18 +1539,10 @@
 $(OBJDIR)/doc.o:	$(OBJDIR)/doc_.c $(OBJDIR)/doc.h $(SRCDIR)/config.h
 	$(XTCC) -o $(OBJDIR)/doc.o -c $(OBJDIR)/doc_.c
 
 $(OBJDIR)/doc.h:	$(OBJDIR)/headers
 
-$(OBJDIR)/email_.c:	$(SRCDIR)/email.c $(TRANSLATE)
-	$(TRANSLATE) $(SRCDIR)/email.c >$@
-
-$(OBJDIR)/email.o:	$(OBJDIR)/email_.c $(OBJDIR)/email.h $(SRCDIR)/config.h
-	$(XTCC) -o $(OBJDIR)/email.o -c $(OBJDIR)/email_.c
-
-$(OBJDIR)/email.h:	$(OBJDIR)/headers
-
 $(OBJDIR)/encode_.c:	$(SRCDIR)/encode.c $(TRANSLATE)
 	$(TRANSLATE) $(SRCDIR)/encode.c >$@
 
 $(OBJDIR)/encode.o:	$(OBJDIR)/encode_.c $(OBJDIR)/encode.h $(SRCDIR)/config.h
 	$(XTCC) -o $(OBJDIR)/encode.o -c $(OBJDIR)/encode_.c
@@ -2045,10 +2050,18 @@
 
 $(OBJDIR)/setup.o:	$(OBJDIR)/setup_.c $(OBJDIR)/setup.h $(SRCDIR)/config.h
 	$(XTCC) -o $(OBJDIR)/setup.o -c $(OBJDIR)/setup_.c
 
 $(OBJDIR)/setup.h:	$(OBJDIR)/headers
+
+$(OBJDIR)/setupuser_.c:	$(SRCDIR)/setupuser.c $(TRANSLATE)
+	$(TRANSLATE) $(SRCDIR)/setupuser.c >$@
+
+$(OBJDIR)/setupuser.o:	$(OBJDIR)/setupuser_.c $(OBJDIR)/setupuser.h $(SRCDIR)/config.h
+	$(XTCC) -o $(OBJDIR)/setupuser.o -c $(OBJDIR)/setupuser_.c
+
+$(OBJDIR)/setupuser.h:	$(OBJDIR)/headers
 
 $(OBJDIR)/sha1_.c:	$(SRCDIR)/sha1.c $(TRANSLATE)
 	$(TRANSLATE) $(SRCDIR)/sha1.c >$@
 
 $(OBJDIR)/sha1.o:	$(OBJDIR)/sha1_.c $(OBJDIR)/sha1.h $(SRCDIR)/config.h

Index: win/Makefile.msc
==================================================================
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -110,11 +110,11 @@
 SSLLFLAGS = /nologo /opt:ref /debug
 SSLLIB    = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib
 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
 !message Using 'x64' platform for OpenSSL...
 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
-# SSLCONFIG = VC-WIN64A no-asm no-ssl3 enable-capieng no-weak-ssl-ciphers
+# SSLCONFIG = VC-WIN64A no-asm no-ssl3 no-weak-ssl-ciphers
 SSLCONFIG = VC-WIN64A no-asm
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
 SSLCONFIG = $(SSLCONFIG) shared
 !else
 SSLCONFIG = $(SSLCONFIG) no-shared
@@ -125,16 +125,16 @@
 !else
 SSLNMAKE  = ms\nt.mak all
 !endif
 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
 !if $(FOSSIL_DYNAMIC_BUILD)==0
-SSLCFLAGS = -DOPENSSL_NO_SSL3
+SSLCFLAGS = -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
 !endif
 !elseif "$(PLATFORM)"=="ia64"
 !message Using 'ia64' platform for OpenSSL...
 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
-# SSLCONFIG = VC-WIN64I no-asm no-ssl3 enable-capieng no-weak-ssl-ciphers
+# SSLCONFIG = VC-WIN64I no-asm no-ssl3 no-weak-ssl-ciphers
 SSLCONFIG = VC-WIN64I no-asm
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
 SSLCONFIG = $(SSLCONFIG) shared
 !else
 SSLCONFIG = $(SSLCONFIG) no-shared
@@ -145,16 +145,16 @@
 !else
 SSLNMAKE  = ms\nt.mak all
 !endif
 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
 !if $(FOSSIL_DYNAMIC_BUILD)==0
-SSLCFLAGS = -DOPENSSL_NO_SSL3
+SSLCFLAGS = -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
 !endif
 !else
 !message Assuming 'x86' platform for OpenSSL...
 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
-# SSLCONFIG = VC-WIN32 no-asm no-ssl3 enable-capieng no-weak-ssl-ciphers
+# SSLCONFIG = VC-WIN32 no-asm no-ssl3 no-weak-ssl-ciphers
 SSLCONFIG = VC-WIN32 no-asm
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
 SSLCONFIG = $(SSLCONFIG) shared
 !else
 SSLCONFIG = $(SSLCONFIG) no-shared
@@ -165,11 +165,11 @@
 !else
 SSLNMAKE  = ms\nt.mak all
 !endif
 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
 !if $(FOSSIL_DYNAMIC_BUILD)==0
-SSLCFLAGS = -DOPENSSL_NO_SSL3
+SSLCFLAGS = -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
 !endif
 !endif
 !endif
 
 !if $(FOSSIL_ENABLE_TCL)!=0
@@ -379,10 +379,11 @@
 MINIZ_OPTIONS = /DMINIZ_NO_STDIO \
                 /DMINIZ_NO_TIME \
                 /DMINIZ_NO_ARCHIVE_APIS
 
 SRC   = add_.c \
+        alerts_.c \
         allrepo_.c \
         attach_.c \
         backoffice_.c \
         bag_.c \
         bisect_.c \
@@ -409,11 +410,10 @@
         descendants_.c \
         diff_.c \
         diffcmd_.c \
         dispatch_.c \
         doc_.c \
-        email_.c \
         encode_.c \
         etag_.c \
         event_.c \
         export_.c \
         file_.c \
@@ -541,10 +541,11 @@
         $(SRCDIR)\..\skins\bootstrap\header.txt \
         $(SRCDIR)\..\skins\default\css.txt \
         $(SRCDIR)\..\skins\default\details.txt \
         $(SRCDIR)\..\skins\default\footer.txt \
         $(SRCDIR)\..\skins\default\header.txt \
+        $(SRCDIR)\..\skins\default\js.txt \
         $(SRCDIR)\..\skins\eagle\css.txt \
         $(SRCDIR)\..\skins\eagle\details.txt \
         $(SRCDIR)\..\skins\eagle\footer.txt \
         $(SRCDIR)\..\skins\eagle\header.txt \
         $(SRCDIR)\..\skins\enhanced1\css.txt \
@@ -586,10 +587,11 @@
         $(SRCDIR)\tree.js \
         $(SRCDIR)\useredit.js \
         $(SRCDIR)\wiki.wiki
 
 OBJ   = $(OX)\add$O \
+        $(OX)\alerts$O \
         $(OX)\allrepo$O \
         $(OX)\attach$O \
         $(OX)\backoffice$O \
         $(OX)\bag$O \
         $(OX)\bisect$O \
@@ -617,11 +619,10 @@
         $(OX)\descendants$O \
         $(OX)\diff$O \
         $(OX)\diffcmd$O \
         $(OX)\dispatch$O \
         $(OX)\doc$O \
-        $(OX)\email$O \
         $(OX)\encode$O \
         $(OX)\etag$O \
         $(OX)\event$O \
         $(OX)\export$O \
         $(OX)\file$O \
@@ -782,10 +783,11 @@
 	if exist $@.manifest \
 		$(MTC) -nologo -manifest $@.manifest -outputresource:$@;1
 
 $(OX)\linkopts: $B\win\Makefile.msc
 	echo $(OX)\add.obj > $@
+	echo $(OX)\alerts.obj >> $@
 	echo $(OX)\allrepo.obj >> $@
 	echo $(OX)\attach.obj >> $@
 	echo $(OX)\backoffice.obj >> $@
 	echo $(OX)\bag.obj >> $@
 	echo $(OX)\bisect.obj >> $@
@@ -813,11 +815,10 @@
 	echo $(OX)\descendants.obj >> $@
 	echo $(OX)\diff.obj >> $@
 	echo $(OX)\diffcmd.obj >> $@
 	echo $(OX)\dispatch.obj >> $@
 	echo $(OX)\doc.obj >> $@
-	echo $(OX)\email.obj >> $@
 	echo $(OX)\encode.obj >> $@
 	echo $(OX)\etag.obj >> $@
 	echo $(OX)\event.obj >> $@
 	echo $(OX)\export.obj >> $@
 	echo $(OX)\file.obj >> $@
@@ -1045,10 +1046,16 @@
 $(OX)\add$O : add_.c add.h
 	$(TCC) /Fo$@ -c add_.c
 
 add_.c : $(SRCDIR)\add.c
 	translate$E $** > $@
+
+$(OX)\alerts$O : alerts_.c alerts.h
+	$(TCC) /Fo$@ -c alerts_.c
+
+alerts_.c : $(SRCDIR)\alerts.c
+	translate$E $** > $@
 
 $(OX)\allrepo$O : allrepo_.c allrepo.h
 	$(TCC) /Fo$@ -c allrepo_.c
 
 allrepo_.c : $(SRCDIR)\allrepo.c
@@ -1226,16 +1233,10 @@
 	$(TCC) /Fo$@ -c doc_.c
 
 doc_.c : $(SRCDIR)\doc.c
 	translate$E $** > $@
 
-$(OX)\email$O : email_.c email.h
-	$(TCC) /Fo$@ -c email_.c
-
-email_.c : $(SRCDIR)\email.c
-	translate$E $** > $@
-
 $(OX)\encode$O : encode_.c encode.h
 	$(TCC) /Fo$@ -c encode_.c
 
 encode_.c : $(SRCDIR)\encode.c
 	translate$E $** > $@
@@ -1855,10 +1856,11 @@
 fossil.res : $B\win\fossil.rc
 	$(RCC)  /fo $@ $**
 
 headers: makeheaders$E page_index.h builtin_data.h default_css.h VERSION.h
 	makeheaders$E add_.c:add.h \
+			alerts_.c:alerts.h \
 			allrepo_.c:allrepo.h \
 			attach_.c:attach.h \
 			backoffice_.c:backoffice.h \
 			bag_.c:bag.h \
 			bisect_.c:bisect.h \
@@ -1885,11 +1887,10 @@
 			descendants_.c:descendants.h \
 			diff_.c:diff.h \
 			diffcmd_.c:diffcmd.h \
 			dispatch_.c:dispatch.h \
 			doc_.c:doc.h \
-			email_.c:email.h \
 			encode_.c:encode.h \
 			etag_.c:etag.h \
 			event_.c:event.h \
 			export_.c:export.h \
 			file_.c:file.h \

Index: www/aboutdownload.wiki
==================================================================
--- www/aboutdownload.wiki
+++ www/aboutdownload.wiki
@@ -6,18 +6,19 @@
 The [/uv/download.html|Download] page for the Fossil self-hosting
 repository is implemented using [./unvers.wiki|unversioned files].
 The "download.html" screen itself, and the various build products
 are all stored as unversioned content.  The download.html page
 uses AJAX to retrieve the [/help?cmd=/juvlist|/juvlist] webpage
-for a list of all unversioned files.  Javascript within the
-download.html page then figures out which unversioned files are
+for a list of all unversioned files.  Javascript in the
+[/uv/download.js?mimetype=text/plain|download.js] file (which is
+sourced by "download.html") then figures out which unversioned files are
 build products and paints appropriate icons on the displayed
 download page.
 
 When a new version is generated, the developers use the
 [/help?cmd=uv|fossil uv edit] command to make minor changes
-to the "[/uv/download.html?mimetype=text/plain|download.html]"
+to the "[/uv/download.js?mimetype=text/plain|download.js]"
 file so that it knows about the
 new version number.  Then the developers run
 the [/help?cmd=uv|fossil uv add] command for each
 build product.  Finally, the
 [/help?cmd=uv|fossil uv sync] command is run to push all
@@ -25,31 +26,36 @@
 [./selfhost.wiki|three self-hosting repositories] for Fossil
 are updated automatically.
 
 <h2>2.0 Details</h2>
 
-The current text of the "download.html" file can be seen
-[/uv/download.html?mimetype=text/plain|here].  (Mouse-over that
-hyperlink to see how the "mimetype=text/plain" query parameter
-is added in order to display the file as plain text instead of
-the usual HTML.)  The default mimetype for "download.html" is
-text/html.  But because the entire page is enclosed within
+The current text of the "download.html" and "download.js" files can
+be seen at:
+
+   *   [/uv/download.html?mimetype=text/plain]
+   *   [/uv/download.js?mimetype=text/plain]
+
+Notice how the hyperlinks above use the "mimetype=text/plain"
+query parameter in order to display the file as plain text
+instead of the usual HTML or Javascript.
 
+The default mimetype for "download.html" is
+text/html.  But because the entire page is enclosed within
 
     <b>&lt;div class='fossil-doc' data-title='Download Page'&gt;...&lt;/div&gt;</b>
 
 Fossil knows to add its standard header and footer information to the
 document, making it look just like any other page.  See
 "[./embeddeddoc.wiki|embedded documentation]" for further details on
-how this works.
+how &lt;div class='fossil-doc'&gt; this works.
 
 With each new release, the "releases" variable in the javascript on
-the [/uv/download.html?mimetype=text/plain|download.html] page is
-edited (using "[/help?cmd=uv|fossil uv edit download.html]") to add
+the [/uv/download.js?mimetype=text/plain|download.js] page is
+edited (using "[/help?cmd=uv|fossil uv edit download.js]") to add
 details of the release.
 
-When the javascript on the "download.html" page runs, it requests
+When the javascript in the "download.js" file runs, it requests
 a listing of all unversioned content using the /juvlist URL.
 ([/juvlist|sample /juvlist output]).  The content of the download page is
 constructed by matching unversioned files against regular expressions
 in the "releases" variable.
 
@@ -62,11 +68,11 @@
 [/help?cmd=uv|fossil uv sync] to push the new build product to the
 [./selfhost.wiki|various servers].  This process is repeated for
 each build product.
 
 When older builds are retired from the download page, the
-[/uv/download.html?mimetype=text/plain|download.html] page is again
+[/uv/download.js?mimetype=text/plain|download.js] page is again
 edited to remove the corresponding entry from the "release" variable
 and the edit is synced using
 [/help?cmd=uv|fossil uv sync].  This causes the build products to
 disappear from the download page immediately.  But those build products
 are still taking up space in the unversioned content table of the

Index: www/changes.wiki
==================================================================
--- www/changes.wiki
+++ www/changes.wiki
@@ -1,17 +1,20 @@
 <title>Change Log</title>
 
 <a name='v2_7'></a>
 <h2>Changes for Version 2.7 (2018-??-??)</h2>
 
-  *  Add support for [./alerts.md|email alerts].
-  *  Add support for forums.
-  *  Added new user capabilities letters needed to support alerts and forum.
+  *  Add the [./alerts.md|email alerts] feature for commits, ticket
+     changes, wiki changes, forum posts, and announcements.
+  *  Add the discussion forum feature.
+  *  Add new user capabilities letters needed to support alerts and forum.
      Formerly, user capabilities were letters from &#91;a-z&#93;, but with the
      enhancements, the supply of lower case letters was exhausted.
      User capabilities are now letters in &#91;a-zA-Z0-9&#93;.
-  *  Added the [./backoffice.md|backoffice].
+  *  The default skin is now responsive, providing better layout on
+     small screens, including mobile devices.
+  *  Add the [./backoffice.md|backoffice].
   *  Update internal Unicode character tables, used in regular expression
      handling, from version 10.0 to 11.0.
   *  Improvements to the "Security Audit" administration page
 
 <a name='v2_6'></a>

Index: www/forum.wiki
==================================================================
--- www/forum.wiki
+++ www/forum.wiki
@@ -173,21 +173,22 @@
 the WriteTrusted capability (4) to users in the <tt>developer</tt>
 category. If you did not give the Read Forum capability (2) to
 <tt>anonymous</tt> above, you should give <tt>developer</tt> that
 capability here if you choose to give it capability 3 or 4.
 
-You must give at least one user or user category the Email Alerts
-capability (7), else the only people able to sign themselves up for
-email notifications are those with the Setup or Admin capability. Those
-users could sign others up via Admin &rarr; Notification, but you
-probably want to give this capability to one of the user categories.
-Give it to <tt>nobody</tt> if you want anyone to sign up without any
-restrictions.  Give it to <tt>anonymous</tt> if you want the user to
-solve a simple CAPTCHA before signing up. Give it to <tt>reader</tt> or
-<tt>developer</tt> if you want only users with Fossil logins to have
-this ability. (That's assuming you give one or both of these
-capabilities to every user on your Fossil repository.)
+If you want to use the email notification feature, by default only those
+users in the Setup and Admin user categories can make use of it. Grant
+the Email Alerts capability (7) to give others access to this feature.
+Alternately, you can handle notification signups outside of Fossil, with
+a Setup or Admin users manually signing users up via Admin &rarr;
+Notification. You'll want to grant this capability to the
+<tt>nobody</tt> user category if you want anyone to sign up without any
+restrictions.  Give it to <tt>anonymous</tt> instead if you want the
+user to solve a simple CAPTCHA before signing up. Or, give it to
+<tt>reader</tt> or <tt>developer</tt> if you want only users with Fossil
+logins to have this ability. (That's assuming you give one or both of
+these capabilities to every user on your Fossil repository.)
 
 By following this advice, you should not need to tediously add
 capabilities to individual accounts except in atypical cases, such as
 to grant the Moderate Forum capability (5) to an uncommonly
 highly-trusted user.
@@ -197,22 +198,38 @@
 
 If you create a new Fossil repository with version 2.7 or newer, its
 default skin is already set up correctly for typical forum
 configurations.
 
-Those upgrading existing repositories will need to edit the Header part
-of their existing Fossil skin in Admin &rarr; Skins, adding something
-like this to create the navbar link:
+If you have an existing repository, you have two choices if you want its
+skin to be upgraded to support forums:
+
+<ol>
+  <li>Go into Admin &rarr; Skins and switch from your current skin to
+  one of the stock skins.  If you were on a stock skin, just switch away
+  from your current one to the actual stock skin, since they will be
+  different after the upgrade.</li>
+
+  <li>If you have local customization that you do not want to throw
+  away, you can use the diff feature of Fossil's skin editor to show how
+  the skins differ.</li>
+</ol>
+
+The remainder of this section summarizes the differences you're expected
+to see when taking option #2.
+
+The first thing is that you'll need to add something like the following
+to the Header part of the skin to create the navbar link:
 
 <verbatim>
-  if {[anycap 23456] || [anoncap 2] || [anoncap 3]} {
+  if {[anycap 234567] || [anoncap 2] || [anoncap 3]} {
     menulink /forum Forum
   }
 </verbatim>
 
 These rules say that any logged-in user with any forum-related
-capability (2-6 inclusive, as of this writing) or an anonymous user with
+capability (2-7 inclusive, as of this writing) or an anonymous user with
 read or write capability on the forum (2, 3) will see the "Forum" navbar
 link, which just takes you to <tt>/forum</tt>.
 
 The exact code you need here varies depending on which skin you're
 using. Follow the style you see for the other navbar links.
@@ -240,10 +257,35 @@
     background-color: rgba(255, 255, 255, 0.05);
   }
 </verbatim>
 
 That overlays the background with 5% white to lighten it slightly.
+
+Another new forum-related CSS style you might want to reflect into your
+existing skin is:
+
+<verbatim>
+  div.forumPosts a:visited {
+    color: #6A7F94;
+  }
+</verbatim>
+
+This changes the clicked-hyperlink color for the forum post links on the
+main <tt>/forum</tt> page only, which allows your browser's history
+mechanism to show which threads a user has read and which not. The link
+color will change back to the normal link color — indicating "unread" —
+when a reply is added to an existing thread because that changes where
+the link from the <tt>/forum</tt> page points, taking you to the newest
+post in the thread.
+
+The color given above is suitable for the stock skin.
+
+Beware that when changing this example, there are some
+[https://hacks.mozilla.org/2010/03/privacy-related-changes-coming-to-css-vistited/
+| stringent restrictions] in modern browsers to prevent snoopy web sites
+from brute-forcing your browsing history. (See the link for the method,
+which explains the restrictions.)
 
 
 <h3 id="search">Enable Forum Search</h3>
 
 One of the underlying assumptions of the forum feature is that you will

Index: www/th1.md
==================================================================
--- www/th1.md
+++ www/th1.md
@@ -33,14 +33,14 @@
 seem inefficient, but it is faster than people imagine, and numeric
 computations do not come up very often for the kinds of work that TH1 does,
 so it has never been a factor.)
 
 A TH1 script consist of a sequence of commands.
-Each command is terminated by the first (unescaped) newline or ";" character.
+Each command is terminated by the first *unescaped* newline or ";" character.
 The text of the command (excluding the newline or semicolon terminator)
 is broken into space-separated tokens.  The first token is the command
-name and subsequent tokens are the arguments.  In this since, TH1 syntax
+name and subsequent tokens are the arguments.  In this sense, TH1 syntax
 is similar to the familiar command-line shell syntax.
 
 A token is any sequence of characters other than whitespace and semicolons.
 Or, all text without double-quotes is a single token even if it includes
 whitespace and semicolons.  Or, all text without nested {...} pairs is a
@@ -48,36 +48,68 @@
 
 The nested {...} form of tokens is important because it allows TH1 commands
 to have an appearance similar to C/C++.  It is important to remember, though,
 that a TH1 script is really just a list of text commands, not a context-free
 language with a grammar like C/C++.  This can be confusing to long-time
-C/C++ programmers because TH1 does look a lot like C/C++.  But the semantics
+C/C++ programmers because TH1 does look a lot like C/C++, but the semantics
 of TH1 are closer to FORTH or Lisp than they are to C.
 
-Consider the "if" command in TH1.
+Consider the `if` command in TH1.
 
         if {$current eq "dev"} {
           puts "hello"
         } else {
           puts "world"
         }
 
 The example above is a single command.  The first token, and the name
-of the command, is "if".
-The second token is '$current eq "dev"' - an expression.  (The outer {...}
+of the command, is `if`.
+The second token is `$current eq "dev"` - an expression.  (The outer {...}
 are removed from each token by the command parser.)  The third token
-is the 'puts "hello"', with its whitespace and newlines.  The fourth token
-is "else".  And the fifth and last token is 'puts "world"'.
+is the `puts "hello"`, with its whitespace and newlines.  The fourth token
+is `else"`  And the fifth and last token is `puts "world"`.
 
-The "if" command word by evaluating its first argument (the second token)
-as an expression, and if that expression is true, evaluating its
+The `if` command evaluates its first argument (the second token)
+as an expression, and if that expression is true, evaluates its
 second argument (the third token) as a TH1 script.
-If the expression is false and the third argument is "else" then
+If the expression is false and the third argument is `else`, then
 the fourth argument is evaluated as a TH1 expression.
 
 So, you see, even though the example above spans five lines, it is really
 just a single command.
+
+All of this also explains the emphasis on *unescaped* characters above:
+the curly braces `{ }` are string quoting characters in Tcl/TH1, not
+block delimiters as in C. This is how we can have a command that extends
+over multiple lines. It is also why the `else` keyword must be cuddled
+up with the closing brace for the `if` clause's scriptlet. The following
+is invalid Tcl/TH1:
+
+        if {$current eq "dev"} {
+          puts "hello"
+        }
+        else {
+          puts "world"
+        }
+
+If you try to run this under either Tcl or TH1, the interpreter will
+tell you that there is no `else` command, because with the newline on
+the third line, you terminated the `if` command.
+
+Occasionally in Tcl/TH1 scripts, you may need to use a backslash at the
+end of a line to allow a command to extend over multiple lines without
+being considered two separate commands. Here's an example from one of
+Fossil's test scripts:
+
+        return [lindex [regexp -line -inline -nocase -- \
+            {^uuid:\s+([0-9A-F]{40}) } [eval [getFossilCommand \
+            $repository "" info trunk]]] end]
+
+Those backslashes allow the command to wrap nicely within a standard
+terminal width while telling the interpreter to consider those three
+lines as a single command.
+
 
 Summary of Core TH1 Commands
 ----------------------------
 
 The original Tcl language after when TH1 is modeled has a very rich