Fossil SCM
Fix broken lookup of <verbatim> after adding <wbr> to aMarkup[]. The wbr row was inserted out of alphabetical order, breaking findTag() binary search. Symptom: ticket descriptions wrapped in <verbatim> rendered as escaped text instead of <pre class='verbatim'>.
Commit
a8c66b188c5dffe929ce019587c7e43f342e2efc0ccf88a1b3218c18fc28e65d
Parent
d35aad4da2a7cbe…
1 file changed
+3
-3
+3
-3
| --- src/wikiformat.c | ||
| +++ src/wikiformat.c | ||
| @@ -302,12 +302,12 @@ | ||
| 302 | 302 | MARKUP_TR, |
| 303 | 303 | MARKUP_TT, |
| 304 | 304 | MARKUP_U, |
| 305 | 305 | MARKUP_UL, |
| 306 | 306 | MARKUP_VAR, |
| 307 | - MARKUP_WBR, | |
| 308 | - MARKUP_VERBATIM | |
| 307 | + MARKUP_VERBATIM, | |
| 308 | + MARKUP_WBR | |
| 309 | 309 | }; |
| 310 | 310 | |
| 311 | 311 | /* |
| 312 | 312 | ** The various markup is divided into the following types: |
| 313 | 313 | */ |
| @@ -469,13 +469,13 @@ | ||
| 469 | 469 | { "tt", MARKUP_TT, MUTYPE_FONT, AMSK_STYLE }, |
| 470 | 470 | { "u", MARKUP_U, MUTYPE_FONT, AMSK_STYLE }, |
| 471 | 471 | { "ul", MARKUP_UL, MUTYPE_LIST, |
| 472 | 472 | AMSK_TYPE|AMSK_COMPACT|AMSK_STYLE }, |
| 473 | 473 | { "var", MARKUP_VAR, MUTYPE_FONT, AMSK_STYLE }, |
| 474 | - { "wbr", MARKUP_WBR, MUTYPE_SINGLE, 0 }, | |
| 475 | 474 | { "verbatim", MARKUP_VERBATIM, MUTYPE_SPECIAL, |
| 476 | 475 | AMSK_ID|AMSK_TYPE }, |
| 476 | + { "wbr", MARKUP_WBR, MUTYPE_SINGLE, 0 }, | |
| 477 | 477 | }; |
| 478 | 478 | |
| 479 | 479 | void show_allowed_wiki_markup( void ){ |
| 480 | 480 | int i; /* loop over allowedAttr */ |
| 481 | 481 | for( i=1 ; i<=count(aMarkup) - 1 ; i++ ){ |
| 482 | 482 |
| --- src/wikiformat.c | |
| +++ src/wikiformat.c | |
| @@ -302,12 +302,12 @@ | |
| 302 | MARKUP_TR, |
| 303 | MARKUP_TT, |
| 304 | MARKUP_U, |
| 305 | MARKUP_UL, |
| 306 | MARKUP_VAR, |
| 307 | MARKUP_WBR, |
| 308 | MARKUP_VERBATIM |
| 309 | }; |
| 310 | |
| 311 | /* |
| 312 | ** The various markup is divided into the following types: |
| 313 | */ |
| @@ -469,13 +469,13 @@ | |
| 469 | { "tt", MARKUP_TT, MUTYPE_FONT, AMSK_STYLE }, |
| 470 | { "u", MARKUP_U, MUTYPE_FONT, AMSK_STYLE }, |
| 471 | { "ul", MARKUP_UL, MUTYPE_LIST, |
| 472 | AMSK_TYPE|AMSK_COMPACT|AMSK_STYLE }, |
| 473 | { "var", MARKUP_VAR, MUTYPE_FONT, AMSK_STYLE }, |
| 474 | { "wbr", MARKUP_WBR, MUTYPE_SINGLE, 0 }, |
| 475 | { "verbatim", MARKUP_VERBATIM, MUTYPE_SPECIAL, |
| 476 | AMSK_ID|AMSK_TYPE }, |
| 477 | }; |
| 478 | |
| 479 | void show_allowed_wiki_markup( void ){ |
| 480 | int i; /* loop over allowedAttr */ |
| 481 | for( i=1 ; i<=count(aMarkup) - 1 ; i++ ){ |
| 482 |
| --- src/wikiformat.c | |
| +++ src/wikiformat.c | |
| @@ -302,12 +302,12 @@ | |
| 302 | MARKUP_TR, |
| 303 | MARKUP_TT, |
| 304 | MARKUP_U, |
| 305 | MARKUP_UL, |
| 306 | MARKUP_VAR, |
| 307 | MARKUP_VERBATIM, |
| 308 | MARKUP_WBR |
| 309 | }; |
| 310 | |
| 311 | /* |
| 312 | ** The various markup is divided into the following types: |
| 313 | */ |
| @@ -469,13 +469,13 @@ | |
| 469 | { "tt", MARKUP_TT, MUTYPE_FONT, AMSK_STYLE }, |
| 470 | { "u", MARKUP_U, MUTYPE_FONT, AMSK_STYLE }, |
| 471 | { "ul", MARKUP_UL, MUTYPE_LIST, |
| 472 | AMSK_TYPE|AMSK_COMPACT|AMSK_STYLE }, |
| 473 | { "var", MARKUP_VAR, MUTYPE_FONT, AMSK_STYLE }, |
| 474 | { "verbatim", MARKUP_VERBATIM, MUTYPE_SPECIAL, |
| 475 | AMSK_ID|AMSK_TYPE }, |
| 476 | { "wbr", MARKUP_WBR, MUTYPE_SINGLE, 0 }, |
| 477 | }; |
| 478 | |
| 479 | void show_allowed_wiki_markup( void ){ |
| 480 | int i; /* loop over allowedAttr */ |
| 481 | for( i=1 ; i<=count(aMarkup) - 1 ; i++ ){ |
| 482 |