Fossil SCM
Import the recent changes to the sqlite3_qrf_wcwidth() function from SQLite check-in [https://sqlite.org/src/info/35f39f7cb1|35f39f7cb1] to cli_wcwidth() for feature parity.
Commit
98287b7b05d1b5ff452466487f2f927c6afb74d3b9e4c7e9494416bcd8de432c
Parent
fbe5269b7f53baa…
1 file changed
+2
-2
+2
-2
| --- src/comformat.c | ||
| +++ src/comformat.c | ||
| @@ -78,11 +78,11 @@ | ||
| 78 | 78 | {1, 0x00ece}, {0, 0x00f18}, {1, 0x00f1a}, {0, 0x00f35}, {1, 0x00f36}, |
| 79 | 79 | {0, 0x00f37}, {1, 0x00f38}, {0, 0x00f39}, {1, 0x00f3a}, {0, 0x00f71}, |
| 80 | 80 | {1, 0x00f7f}, {0, 0x00f80}, {1, 0x00f85}, {0, 0x00f86}, {1, 0x00f88}, |
| 81 | 81 | {0, 0x00f90}, {1, 0x00f98}, {0, 0x00f99}, {1, 0x00fbd}, {0, 0x00fc6}, |
| 82 | 82 | {1, 0x00fc7}, {0, 0x0102d}, {1, 0x01031}, {0, 0x01032}, {1, 0x01033}, |
| 83 | - {0, 0x01036}, {1, 0x01038}, {0, 0x01039}, {1, 0x0103a}, {0, 0x01058}, | |
| 83 | + {0, 0x01036}, {1, 0x0103b}, {0, 0x01058}, | |
| 84 | 84 | {1, 0x0105a}, {2, 0x01100}, {0, 0x01160}, {1, 0x01200}, {0, 0x0135f}, |
| 85 | 85 | {1, 0x01360}, {0, 0x01712}, {1, 0x01715}, {0, 0x01732}, {1, 0x01735}, |
| 86 | 86 | {0, 0x01752}, {1, 0x01754}, {0, 0x01772}, {1, 0x01774}, {0, 0x017b4}, |
| 87 | 87 | {1, 0x017b6}, {0, 0x017b7}, {1, 0x017be}, {0, 0x017c6}, {1, 0x017c7}, |
| 88 | 88 | {0, 0x017c9}, {1, 0x017d4}, {0, 0x017dd}, {1, 0x017de}, {0, 0x0180b}, |
| @@ -121,11 +121,11 @@ | ||
| 121 | 121 | */ |
| 122 | 122 | static int cli_wcwidth(int c){ |
| 123 | 123 | int iFirst, iLast; |
| 124 | 124 | |
| 125 | 125 | /* Fast path for common characters */ |
| 126 | - if( c<=0x300 ) return 1; | |
| 126 | + if( c<0x300 ) return 1; | |
| 127 | 127 | |
| 128 | 128 | /* The general case */ |
| 129 | 129 | iFirst = 0; |
| 130 | 130 | iLast = sizeof(aUWidth)/sizeof(aUWidth[0]) - 1; |
| 131 | 131 | while( iFirst<iLast-1 ){ |
| 132 | 132 |
| --- src/comformat.c | |
| +++ src/comformat.c | |
| @@ -78,11 +78,11 @@ | |
| 78 | {1, 0x00ece}, {0, 0x00f18}, {1, 0x00f1a}, {0, 0x00f35}, {1, 0x00f36}, |
| 79 | {0, 0x00f37}, {1, 0x00f38}, {0, 0x00f39}, {1, 0x00f3a}, {0, 0x00f71}, |
| 80 | {1, 0x00f7f}, {0, 0x00f80}, {1, 0x00f85}, {0, 0x00f86}, {1, 0x00f88}, |
| 81 | {0, 0x00f90}, {1, 0x00f98}, {0, 0x00f99}, {1, 0x00fbd}, {0, 0x00fc6}, |
| 82 | {1, 0x00fc7}, {0, 0x0102d}, {1, 0x01031}, {0, 0x01032}, {1, 0x01033}, |
| 83 | {0, 0x01036}, {1, 0x01038}, {0, 0x01039}, {1, 0x0103a}, {0, 0x01058}, |
| 84 | {1, 0x0105a}, {2, 0x01100}, {0, 0x01160}, {1, 0x01200}, {0, 0x0135f}, |
| 85 | {1, 0x01360}, {0, 0x01712}, {1, 0x01715}, {0, 0x01732}, {1, 0x01735}, |
| 86 | {0, 0x01752}, {1, 0x01754}, {0, 0x01772}, {1, 0x01774}, {0, 0x017b4}, |
| 87 | {1, 0x017b6}, {0, 0x017b7}, {1, 0x017be}, {0, 0x017c6}, {1, 0x017c7}, |
| 88 | {0, 0x017c9}, {1, 0x017d4}, {0, 0x017dd}, {1, 0x017de}, {0, 0x0180b}, |
| @@ -121,11 +121,11 @@ | |
| 121 | */ |
| 122 | static int cli_wcwidth(int c){ |
| 123 | int iFirst, iLast; |
| 124 | |
| 125 | /* Fast path for common characters */ |
| 126 | if( c<=0x300 ) return 1; |
| 127 | |
| 128 | /* The general case */ |
| 129 | iFirst = 0; |
| 130 | iLast = sizeof(aUWidth)/sizeof(aUWidth[0]) - 1; |
| 131 | while( iFirst<iLast-1 ){ |
| 132 |
| --- src/comformat.c | |
| +++ src/comformat.c | |
| @@ -78,11 +78,11 @@ | |
| 78 | {1, 0x00ece}, {0, 0x00f18}, {1, 0x00f1a}, {0, 0x00f35}, {1, 0x00f36}, |
| 79 | {0, 0x00f37}, {1, 0x00f38}, {0, 0x00f39}, {1, 0x00f3a}, {0, 0x00f71}, |
| 80 | {1, 0x00f7f}, {0, 0x00f80}, {1, 0x00f85}, {0, 0x00f86}, {1, 0x00f88}, |
| 81 | {0, 0x00f90}, {1, 0x00f98}, {0, 0x00f99}, {1, 0x00fbd}, {0, 0x00fc6}, |
| 82 | {1, 0x00fc7}, {0, 0x0102d}, {1, 0x01031}, {0, 0x01032}, {1, 0x01033}, |
| 83 | {0, 0x01036}, {1, 0x0103b}, {0, 0x01058}, |
| 84 | {1, 0x0105a}, {2, 0x01100}, {0, 0x01160}, {1, 0x01200}, {0, 0x0135f}, |
| 85 | {1, 0x01360}, {0, 0x01712}, {1, 0x01715}, {0, 0x01732}, {1, 0x01735}, |
| 86 | {0, 0x01752}, {1, 0x01754}, {0, 0x01772}, {1, 0x01774}, {0, 0x017b4}, |
| 87 | {1, 0x017b6}, {0, 0x017b7}, {1, 0x017be}, {0, 0x017c6}, {1, 0x017c7}, |
| 88 | {0, 0x017c9}, {1, 0x017d4}, {0, 0x017dd}, {1, 0x017de}, {0, 0x0180b}, |
| @@ -121,11 +121,11 @@ | |
| 121 | */ |
| 122 | static int cli_wcwidth(int c){ |
| 123 | int iFirst, iLast; |
| 124 | |
| 125 | /* Fast path for common characters */ |
| 126 | if( c<0x300 ) return 1; |
| 127 | |
| 128 | /* The general case */ |
| 129 | iFirst = 0; |
| 130 | iLast = sizeof(aUWidth)/sizeof(aUWidth[0]) - 1; |
| 131 | while( iFirst<iLast-1 ){ |
| 132 |