Fix mis-renditions of help text.

FossilOrigin-Name: 1a7a6b6f48327fffeff1173a8e437c9989f761ce236c99478f088087a386b155

diff --git a/manifest b/manifest
index 856e4461429ac2e046abcc4e3372c14af7c1d83a..cbca61dd058147dd5ca2d2adfc0c57ca3fdee996 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sembedded\sdoc,\sIntro\sto\sTcl\sExtension
-D 2022-04-11T08:07:16.927
+C Fix\smis-renditions\sof\shelp\stext.
+D 2022-04-11T18:42:15.073
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -557,7 +557,7 @@ F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
 F src/resolve.c 18d99e7146852d6064559561769fcca0743eb32b14a97da6dbed373a30ee0e76
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 7c106b3f36d483242b0a9c696614cd53d6f29e1ac81da6a3f0e9ea92f4211cc3
-F src/shell.c.in 9ae99f072005ee180a06c10ba53f465ae1db315573abc7767c1060c1b3c0198d
+F src/shell.c.in 9ff03d0ac2199d97b67bdf899879c35ffb9aa7d48f7b43348bf211487e663d35
 F src/shext_linkage.h 4f58ea112273f3e6769221739b7160852cf0d7cdd4ee757f6c696e90fb7ffcb9
 F src/sqlite.h.in 2a35f62185eb5e7ecc64a2f68442b538ce9be74f80f28a00abc24837edcf1c17
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1953,8 +1953,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 2596e7c439b6c4c89921079a78ba6174e99f766b30fab8763be20c1b631e49ec
-R e8438fa69346d1c129bb2ec9bef46aab
+P 33591833326e98882e0fa6225a7a55a7e915063a36bf24bb3c17c35e693d972e
+R 06acb2785a29d19ea9019a96853b9c1c
 U larrybr
-Z dacf014d371b12af7a2495c1fcf04998
+Z 87422813bd25290d430cff6780d4246f
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 747cbefcb959a6eaf2c1b781e8b8df63e0b09c9e..f878b2e4f10421ab0ff9536248be6800bff5bf29 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-33591833326e98882e0fa6225a7a55a7e915063a36bf24bb3c17c35e693d972e
\ No newline at end of file
+1a7a6b6f48327fffeff1173a8e437c9989f761ce236c99478f088087a386b155
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 744f55229a453763932d72de696585f26728c2da..362e675bd4d288b546cfa4001f4cd46b0fdd3d4b 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -8034,7 +8034,7 @@ static int register_adhoc_command(ShellExState *p, ExtensionId eid,
   u8 bRegNotRemove = zHelp!=0;
   const char *zSql = bRegNotRemove
     ? "INSERT OR REPLACE INTO "SHELL_AHELP_TAB
-    "(name, extIx, helpText) VALUES(?, ?, ?||?)"
+    "(name, extIx, helpText) VALUES(?, ?, ?||?||?)"
     : "DELETE FROM "SHELL_AHELP_TAB" WHERE name=? AND extIx=?";
   sqlite3_stmt *pStmt;
   int rc, ie;
@@ -8050,9 +8050,14 @@ static int register_adhoc_command(ShellExState *p, ExtensionId eid,
   sqlite3_bind_int(pStmt, 2, ie);
   if( bRegNotRemove ){
     int nc = strlen30(zHelp);
+    char cLead = *zHelp;
+    /* Add leading '.' if no help classifier present. */
+    const char *zCL = (cLead!='.' && cLead!=',')? "." : "";
+    /* Add trailing newline if not already there. */
     const char *zLE = (nc>0 && zHelp[nc-1]!='\n')? "\n" : "";
-    sqlite3_bind_text(pStmt, 3, zHelp, -1, 0);
-    sqlite3_bind_text(pStmt, 4, zLE, -1, 0);
+    sqlite3_bind_text(pStmt, 3, zCL, -1, 0);
+    sqlite3_bind_text(pStmt, 4, zHelp, -1, 0);
+    sqlite3_bind_text(pStmt, 5, zLE, -1, 0);
   }
   rc = sqlite3_step(pStmt);
   sqlite3_finalize(pStmt);
@@ -13785,7 +13790,7 @@ static MetaCommand * nextMatchingMetaCmd(MetaMatchIter *pMMI){
         assert(psi->pUnknown!=0);
         assert(extIx<psi->numExtLoaded && extIx>0);
         if( zHT==0 ) zHT = sqlite3_column_text(pMMI->stmt, 0);
-        pMMI->zAdhocHelpText = sqlite3_mprintf(".%s", zHT);
+        pMMI->zAdhocHelpText = sqlite3_mprintf("%s", zHT);
         return psi->pShxLoaded[extIx].pUnknown;
       }
     }else{
@@ -13898,27 +13903,24 @@ static int putSelectedCmdHelp(MetaCommand *pmc, int iLevel, char cLead,
   assert(pmc!=0);
 #if SHELL_DYNAMIC_EXTENSION
   if( zHelpText ){
+    const char *zHT = zHelpText+1; /* skip over classifier */
     if( cLead && *zHelpText!= cLead ) return 0;
-    const char *zLE = zHelpText;
-    if( iLevel<2 ){
-      while( *zLE && *zLE++!='\n' ) {}
-    }
+    if( *zHelpText==0 ) return 0;
+    const char *zLE = zHT;
     switch( iLevel ){
     case 0:
-      utf8_printf(out,"%.*s", (int)(zLE-zHelpText), zHelpText);
-      rc = 1;
-      break;
-    case 1:
-      utf8_printf(out,"%s", zHelpText);
+      while( *zLE && *zLE++!='\n' ) {}
+      utf8_printf(out,".%.*s", (int)(zLE-zHT), zHT);
       rc = 1;
       break;
     case 2:
       if( zSearch ){
-        if( !sqlite3_strlike(zSearch, zHelpText, 0) ) break;
+        if( !sqlite3_strlike(zSearch, zHT, 0) ) break;
       }
       /* else fall thru */
+    case 1:
     default:
-      utf8_printf(out,"%s", zHelpText);
+      utf8_printf(out,".%s", zHT);
       rc = 1;
     }
   }else
@@ -13930,13 +13932,12 @@ static int putSelectedCmdHelp(MetaCommand *pmc, int iLevel, char cLead,
     if( cLead && zHTp && *zHTp!= cLead ) return 0;
     switch( iLevel ){
     case 0:
+    case 1:
       if( zHTp ){
         utf8_printf(out, HELP_TEXT_FMTP, zHTp+1);
         rc = 1;
       }
-      break;
-    case 1:
-      if( zHTs ){
+      if( iLevel>0 && zHTs ){
         utf8_printf(out, HELP_TEXT_FMTS, zHTs);
         rc = 1;
       }