In QRF in bSplitColumn mode, increase the spacing between columns to be as

wide as five, for improved legibility, if screen width allows.

FossilOrigin-Name: 673648cc812e1549c2b3e7749306e7395d0b7e396a7d5ac432948eb3a6c3713f

diff --git a/ext/qrf/qrf.c b/ext/qrf/qrf.c
index 3b2405ed2e35c259e2f704b3e5e02972230b8e81..77c5a14e00e109df64c5cdb5e446420e97f3d894 100644 (file)
--- a/ext/qrf/qrf.c
+++ b/ext/qrf/qrf.c
@@ -1520,6 +1520,7 @@ static void qrfSplitColumn(qrfColData *pData, Qrf *p){
   char **az = 0;
   int *aiWth = 0;
   int nColNext = 2;
+  int w;
   struct qrfPerCol *a = 0;
   sqlite3_int64 nRow = 1;
   sqlite3_int64 i;
@@ -1582,7 +1583,9 @@ static void qrfSplitColumn(qrfColData *pData, Qrf *p){
   pData->a = a;
   pData->nCol = nCol;
   pData->n = pData->nAlloc = nRow*nCol;
-  pData->nMargin = 2;
+  for(i=w=0; i<nCol; i++) w += a[i].w;
+  pData->nMargin = (p->spec.nScreenWidth - w)/(nCol - 1);
+  if( pData->nMargin>5 ) pData->nMargin = 5;
 }
 
 /*
@@ -1830,7 +1833,13 @@ static void qrfColumnar(Qrf *p){
       break;
     case QRF_STYLE_Column:
       rowStart = "";
-      colSep = data.nMargin ? "  " : " ";
+      if( data.nMargin<2 ){
+        colSep = " ";
+      }else if( data.nMargin<=5 ){
+        colSep = "     " + (5-data.nMargin);
+      }else{
+        colSep = "     ";
+      }
       rowSep = "\n";
       break;
     default:  /*case QRF_STYLE_Markdown:*/

diff --git a/manifest b/manifest
index 7e1c82a507763193e4cfd98cba72c30dd0648f62..99a136399b061e22c20deac907a81e4f49a38342 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Use\sthe\snew\s"split"\smode\sto\ssimplify\sand\simprove\sthe\simplementation\sof\nthe\s".tables"\sand\s".indexes"\scommands\sin\sthe\sCLI.\s\sFix\sa\sbug\sin\sQRF\nthat\sthis\snew\simplementation\sfound.
-D 2025-11-23T00:10:06.101
+C In\sQRF\sin\sbSplitColumn\smode,\sincrease\sthe\sspacing\sbetween\scolumns\sto\sbe\sas\nwide\sas\sfive,\sfor\simproved\slegibility,\sif\sscreen\swidth\sallows.
+D 2025-11-23T00:45:47.805
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -417,7 +417,7 @@ F ext/misc/windirent.h 02211ce51f3034c675f2dbf4d228194d51b3ee05734678bad5106fff6
 F ext/misc/zipfile.c 09e6e3a3ff40a99677de3c0bc6569bd5f4709b1844ac3d1c1452a456c5a62f1c
 F ext/misc/zorder.c bddff2e1b9661a90c95c2a9a9c7ecd8908afab5763256294dd12d609d4664eee
 F ext/qrf/README.md dd565fd1ca0c46ea37dbf4d496e368b9ecade768c92669640bc106e039629016
-F ext/qrf/qrf.c 1dea934e7af5718ce64c8101182250cdfcf2954ec6263496ed2847ca39e336e2
+F ext/qrf/qrf.c 7f8498231be49e9fa6290f75c611ccb8658e2d50f0e0dc4207923e59bc63c6f9
 F ext/qrf/qrf.h bccc9d1c1b6a05fa0da56332bba29d85782318926f022c849114a63da916393f
 F ext/rbu/rbu.c 801450b24eaf14440d8fd20385aacc751d5c9d6123398df41b1b5aa804bf4ce8
 F ext/rbu/rbu1.test 25870dd7db7eb5597e2b4d6e29e7a7e095abf332660f67d89959552ce8f8f255
@@ -2178,8 +2178,8 @@ F tool/version-info.c 33d0390ef484b3b1cb685d59362be891ea162123cea181cb8e6d2cf6dd
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 2530f04d1bb02b800fda83544f5b5dcd42f52b3e56ad625cd03b40e42f24ac6b
-R 51d2374ea006c46fbfbd23ef805a7a3f
+P b73df612b621699cd58de6ef327fefdeb8f52eb620f0d2df00d38ff6608a8dd5
+R 21cb4fdd07b535e967358e7f11ed0f3e
 U drh
-Z 753707664ad527223b8edfa6977e8080
+Z 22bfdb54bd9f215342f9c6ccdefd6051
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 8e781dd5db436db0c5d2026374d126edfac891a7..14341ea2c8ae4170109f3b2982be3338341f6cd5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b73df612b621699cd58de6ef327fefdeb8f52eb620f0d2df00d38ff6608a8dd5
+673648cc812e1549c2b3e7749306e7395d0b7e396a7d5ac432948eb3a6c3713f