Fossil SCM
Fixed <p> inside of <ul> and <ol> elements when autoparagraph is on. Bug was reported on the fossil mailing list by Stephan Beal.
Commit
6f0df6c741887ef251d89224bc7c14894d489aed
Parent
6009ff325f020e4…
1 file changed
+1
-1
+1
-1
| --- src/wikiformat.c | ||
| +++ src/wikiformat.c | ||
| @@ -838,11 +838,11 @@ | ||
| 838 | 838 | |
| 839 | 839 | /* |
| 840 | 840 | ** Begin a new paragraph if that something that is needed. |
| 841 | 841 | */ |
| 842 | 842 | static void startAutoParagraph(Renderer *p){ |
| 843 | - if( p->wantAutoParagraph==0 ) return; | |
| 843 | + if( p->wantAutoParagraph==0 || p->wikiList==MARKUP_OL || p->wikiList==MARKUP_UL ) return; | |
| 844 | 844 | blob_appendf(p->pOut, "<p>", -1); |
| 845 | 845 | pushStack(p, MARKUP_P); |
| 846 | 846 | p->wantAutoParagraph = 0; |
| 847 | 847 | p->inAutoParagraph = 1; |
| 848 | 848 | } |
| 849 | 849 |
| --- src/wikiformat.c | |
| +++ src/wikiformat.c | |
| @@ -838,11 +838,11 @@ | |
| 838 | |
| 839 | /* |
| 840 | ** Begin a new paragraph if that something that is needed. |
| 841 | */ |
| 842 | static void startAutoParagraph(Renderer *p){ |
| 843 | if( p->wantAutoParagraph==0 ) return; |
| 844 | blob_appendf(p->pOut, "<p>", -1); |
| 845 | pushStack(p, MARKUP_P); |
| 846 | p->wantAutoParagraph = 0; |
| 847 | p->inAutoParagraph = 1; |
| 848 | } |
| 849 |
| --- src/wikiformat.c | |
| +++ src/wikiformat.c | |
| @@ -838,11 +838,11 @@ | |
| 838 | |
| 839 | /* |
| 840 | ** Begin a new paragraph if that something that is needed. |
| 841 | */ |
| 842 | static void startAutoParagraph(Renderer *p){ |
| 843 | if( p->wantAutoParagraph==0 || p->wikiList==MARKUP_OL || p->wikiList==MARKUP_UL ) return; |
| 844 | blob_appendf(p->pOut, "<p>", -1); |
| 845 | pushStack(p, MARKUP_P); |
| 846 | p->wantAutoParagraph = 0; |
| 847 | p->inAutoParagraph = 1; |
| 848 | } |
| 849 |