From: drh <> Date: Fri, 7 Nov 2025 13:23:29 +0000 (+0000) Subject: Update documentation to clarify that mxTotalWidth and mxLength are not X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eedf22670000996d24075dffd719b95117d6b80e;p=thirdparty%2Fsqlite.git Update documentation to clarify that mxTotalWidth and mxLength are not yet implemented. FossilOrigin-Name: c25806fc5491554f1cd55174c6cf98b509d619e3011b8e26abdf05b24133a6e8 --- diff --git a/ext/qrf/README.md b/ext/qrf/README.md index b291d2a463..000f2cc36d 100644 --- a/ext/qrf/README.md +++ b/ext/qrf/README.md @@ -272,6 +272,10 @@ Content length limits only apply to TEXT and BLOB values. Numeric values and NULLs always display their full text regardless of the mxLength setting. +*This setting is a place-holder. +As for 2025-11-07, the mxLength constraint is not yet implemented. +The current behavior is always as if mxLength where zero.* + ### 2.9 Word Wrapping In Columnar Modes (mxColWidth, mxTotalWidth, bWordWrap) When using columnar formatting modes (QRF_STYLE_Box, QRF_STYLE_Column, @@ -288,7 +292,7 @@ beyond the mxTotalWidth if the table has too many columns to squeeze into the specified space. In order to keep individual columns, or the entire table, within -requested length limits, it is sometimes necessary to wrap the content +requested width limits, it is sometimes necessary to wrap the content for a single row of a single column across multiple lines. When this becomes necessary and if the bWordWrap setting is QRF_SW_On, then the formatter attempts to split the content on whitespace or at a word boundary. @@ -298,6 +302,11 @@ anywhere, including in the middle of a word. For narrow columns and wide words, it might sometimes be necessary to split a column in the middle of a word, even when bWordWrap is QRF_SW_On. +*The mxTotalWidth setting is a place-holder. +As for 2025-11-07, the mxTotalWidth constraint is not yet implemented. +The current behavior is always as if mxTotalWidth where zero.* + + ### 2.10 Column width and alignment (nWidth and aWidth) The sqlite3_qrf_spec.aWidth field is a pointer to an array of diff --git a/ext/qrf/qrf.c b/ext/qrf/qrf.c index bf2d3cc05b..8eda109c47 100644 --- a/ext/qrf/qrf.c +++ b/ext/qrf/qrf.c @@ -1354,7 +1354,8 @@ static void qrfColumnar(Qrf *p){ sqlite3_str_appendchar(p->pOut, (w-n)/2, ' '); sqlite3_str_appendall(p->pOut, azData[i]); sqlite3_str_appendchar(p->pOut, (w-n+1)/2, ' '); - sqlite3_str_appendall(p->pOut, i==nColumn-1?" "BOX_13"\n":" "BOX_13" "); + sqlite3_str_appendall(p->pOut, + i==nColumn-1 ? (" "BOX_13"\n"):(" "BOX_13" ")); } qrfBoxSeparator(p, BOX_123, BOX_1234, BOX_134); } diff --git a/manifest b/manifest index 230ba0988a..573e98b777 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Rename\s"mxWidth"\sto\s"mxColWidth".\s\sAdd\s"mxTotalWidth"\sand\s"mxLength"\nsettings\sand\shook\sthem\sup\sto\sthe\sTCL\sinterface,\sbut\sthose\ssettings\sare\nnot\syet\simplemented. -D 2025-11-07T13:11:16.220 +C Update\sdocumentation\sto\sclarify\sthat\smxTotalWidth\sand\smxLength\sare\snot\nyet\simplemented. +D 2025-11-07T13:23:29.694 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -416,8 +416,8 @@ F ext/misc/wholenumber.c 0fa0c082676b7868bf2fa918e911133f2b349bcdceabd1198bba5f6 F ext/misc/windirent.h 02211ce51f3034c675f2dbf4d228194d51b3ee05734678bad5106fff6292e60c F ext/misc/zipfile.c 09e6e3a3ff40a99677de3c0bc6569bd5f4709b1844ac3d1c1452a456c5a62f1c F ext/misc/zorder.c bddff2e1b9661a90c95c2a9a9c7ecd8908afab5763256294dd12d609d4664eee -F ext/qrf/README.md a8d288316000b17675400e8e141e5377a1e0bb0090d443421dbf062ef88e2bac -F ext/qrf/qrf.c ca5394613a0e755f68db3622b33c4abae23aacd3c4c2544dcf355558220217c3 +F ext/qrf/README.md d91dccf517075567048e510b527cb7785d2ac73a5dd0e9076b1ccd513de9f6cf +F ext/qrf/qrf.c 2b4584ebe730e5fbedd2aa9444b8ff1ddb27d0cc5382f57f8319585f66d24688 F ext/qrf/qrf.h a02d156e54e05c5ef66012b66817beecd6e2c60327491d98eb11361e7c0a19e2 F ext/rbu/rbu.c 801450b24eaf14440d8fd20385aacc751d5c9d6123398df41b1b5aa804bf4ce8 F ext/rbu/rbu1.test 25870dd7db7eb5597e2b4d6e29e7a7e095abf332660f67d89959552ce8f8f255 @@ -2173,8 +2173,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 fb040354901569915389c8c4c1530dfda8b724be7885adfde654e229d3e98eec -R 07c0c21d8a92a6dbfbd7b3fed9158cb5 +P 3f327e8fbc295b43c79118f8f49f8d2e20c2f3ac96e3b7f996720dab858d8199 +R 291d8ef19851bb32af2d813dcd936c30 U drh -Z f2a96b5e64232cb1c60df6a68367fba5 +Z 66cdea4d6e2d02de091d01bffff99742 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index e49e88e9cf..0a847ffaf3 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -3f327e8fbc295b43c79118f8f49f8d2e20c2f3ac96e3b7f996720dab858d8199 +c25806fc5491554f1cd55174c6cf98b509d619e3011b8e26abdf05b24133a6e8