Fossil SCM
added end p elements if switching to lists,..
Commit
3bca39288da752d570d26ebe70b8c9eecfc52f2d
Parent
5bf2ede641b53df…
1 file changed
+7
-3
+7
-3
| --- src/wikiformat.c | ||
| +++ src/wikiformat.c | ||
| @@ -1133,11 +1133,11 @@ | ||
| 1133 | 1133 | }else{ |
| 1134 | 1134 | if( p->wikiList!=MARKUP_UL ){ |
| 1135 | 1135 | if( p->wikiList ){ |
| 1136 | 1136 | popStackToTag(p, p->wikiList); |
| 1137 | 1137 | } |
| 1138 | - endAutoParagraph(p); | |
| 1138 | + endAutoParagraph(p); | |
| 1139 | 1139 | pushStack(p, MARKUP_UL); |
| 1140 | 1140 | blob_append(p->pOut, "<ul>", 4); |
| 1141 | 1141 | p->wikiList = MARKUP_UL; |
| 1142 | 1142 | } |
| 1143 | 1143 | popStackToTag(p, MARKUP_LI); |
| @@ -1153,11 +1153,11 @@ | ||
| 1153 | 1153 | }else{ |
| 1154 | 1154 | if( p->wikiList!=MARKUP_OL ){ |
| 1155 | 1155 | if( p->wikiList ){ |
| 1156 | 1156 | popStackToTag(p, p->wikiList); |
| 1157 | 1157 | } |
| 1158 | - endAutoParagraph(p); | |
| 1158 | + endAutoParagraph(p); | |
| 1159 | 1159 | pushStack(p, MARKUP_OL); |
| 1160 | 1160 | blob_append(p->pOut, "<ol>", 4); |
| 1161 | 1161 | p->wikiList = MARKUP_OL; |
| 1162 | 1162 | } |
| 1163 | 1163 | popStackToTag(p, MARKUP_LI); |
| @@ -1173,10 +1173,11 @@ | ||
| 1173 | 1173 | }else{ |
| 1174 | 1174 | if( p->wikiList!=MARKUP_OL ){ |
| 1175 | 1175 | if( p->wikiList ){ |
| 1176 | 1176 | popStackToTag(p, p->wikiList); |
| 1177 | 1177 | } |
| 1178 | + endAutoParagraph(p); | |
| 1178 | 1179 | pushStack(p, MARKUP_OL); |
| 1179 | 1180 | blob_append(p->pOut, "<ol>", 4); |
| 1180 | 1181 | p->wikiList = MARKUP_OL; |
| 1181 | 1182 | } |
| 1182 | 1183 | popStackToTag(p, MARKUP_LI); |
| @@ -1349,16 +1350,19 @@ | ||
| 1349 | 1350 | blob_appendf(p->pOut, "<pre name='code' class='%s'>", |
| 1350 | 1351 | markup.aAttr[vAttrIdx].zValue); |
| 1351 | 1352 | vAttrDidAppend=1; |
| 1352 | 1353 | } |
| 1353 | 1354 | } |
| 1354 | - if( !vAttrDidAppend ) | |
| 1355 | + if( !vAttrDidAppend ) { | |
| 1356 | + endAutoParagraph(p); | |
| 1355 | 1357 | blob_append(p->pOut, "<pre class='verbatim'>",-1); |
| 1358 | + } | |
| 1356 | 1359 | p->wantAutoParagraph = 0; |
| 1357 | 1360 | }else |
| 1358 | 1361 | if( markup.iType==MUTYPE_LI ){ |
| 1359 | 1362 | if( backupToType(p, MUTYPE_LIST)==0 ){ |
| 1363 | + endAutoParagraph(p); | |
| 1360 | 1364 | pushStack(p, MARKUP_UL); |
| 1361 | 1365 | blob_append(p->pOut, "<ul>", 4); |
| 1362 | 1366 | } |
| 1363 | 1367 | pushStack(p, MARKUP_LI); |
| 1364 | 1368 | renderMarkup(p->pOut, &markup); |
| 1365 | 1369 |
| --- src/wikiformat.c | |
| +++ src/wikiformat.c | |
| @@ -1133,11 +1133,11 @@ | |
| 1133 | }else{ |
| 1134 | if( p->wikiList!=MARKUP_UL ){ |
| 1135 | if( p->wikiList ){ |
| 1136 | popStackToTag(p, p->wikiList); |
| 1137 | } |
| 1138 | endAutoParagraph(p); |
| 1139 | pushStack(p, MARKUP_UL); |
| 1140 | blob_append(p->pOut, "<ul>", 4); |
| 1141 | p->wikiList = MARKUP_UL; |
| 1142 | } |
| 1143 | popStackToTag(p, MARKUP_LI); |
| @@ -1153,11 +1153,11 @@ | |
| 1153 | }else{ |
| 1154 | if( p->wikiList!=MARKUP_OL ){ |
| 1155 | if( p->wikiList ){ |
| 1156 | popStackToTag(p, p->wikiList); |
| 1157 | } |
| 1158 | endAutoParagraph(p); |
| 1159 | pushStack(p, MARKUP_OL); |
| 1160 | blob_append(p->pOut, "<ol>", 4); |
| 1161 | p->wikiList = MARKUP_OL; |
| 1162 | } |
| 1163 | popStackToTag(p, MARKUP_LI); |
| @@ -1173,10 +1173,11 @@ | |
| 1173 | }else{ |
| 1174 | if( p->wikiList!=MARKUP_OL ){ |
| 1175 | if( p->wikiList ){ |
| 1176 | popStackToTag(p, p->wikiList); |
| 1177 | } |
| 1178 | pushStack(p, MARKUP_OL); |
| 1179 | blob_append(p->pOut, "<ol>", 4); |
| 1180 | p->wikiList = MARKUP_OL; |
| 1181 | } |
| 1182 | popStackToTag(p, MARKUP_LI); |
| @@ -1349,16 +1350,19 @@ | |
| 1349 | blob_appendf(p->pOut, "<pre name='code' class='%s'>", |
| 1350 | markup.aAttr[vAttrIdx].zValue); |
| 1351 | vAttrDidAppend=1; |
| 1352 | } |
| 1353 | } |
| 1354 | if( !vAttrDidAppend ) |
| 1355 | blob_append(p->pOut, "<pre class='verbatim'>",-1); |
| 1356 | p->wantAutoParagraph = 0; |
| 1357 | }else |
| 1358 | if( markup.iType==MUTYPE_LI ){ |
| 1359 | if( backupToType(p, MUTYPE_LIST)==0 ){ |
| 1360 | pushStack(p, MARKUP_UL); |
| 1361 | blob_append(p->pOut, "<ul>", 4); |
| 1362 | } |
| 1363 | pushStack(p, MARKUP_LI); |
| 1364 | renderMarkup(p->pOut, &markup); |
| 1365 |
| --- src/wikiformat.c | |
| +++ src/wikiformat.c | |
| @@ -1133,11 +1133,11 @@ | |
| 1133 | }else{ |
| 1134 | if( p->wikiList!=MARKUP_UL ){ |
| 1135 | if( p->wikiList ){ |
| 1136 | popStackToTag(p, p->wikiList); |
| 1137 | } |
| 1138 | endAutoParagraph(p); |
| 1139 | pushStack(p, MARKUP_UL); |
| 1140 | blob_append(p->pOut, "<ul>", 4); |
| 1141 | p->wikiList = MARKUP_UL; |
| 1142 | } |
| 1143 | popStackToTag(p, MARKUP_LI); |
| @@ -1153,11 +1153,11 @@ | |
| 1153 | }else{ |
| 1154 | if( p->wikiList!=MARKUP_OL ){ |
| 1155 | if( p->wikiList ){ |
| 1156 | popStackToTag(p, p->wikiList); |
| 1157 | } |
| 1158 | endAutoParagraph(p); |
| 1159 | pushStack(p, MARKUP_OL); |
| 1160 | blob_append(p->pOut, "<ol>", 4); |
| 1161 | p->wikiList = MARKUP_OL; |
| 1162 | } |
| 1163 | popStackToTag(p, MARKUP_LI); |
| @@ -1173,10 +1173,11 @@ | |
| 1173 | }else{ |
| 1174 | if( p->wikiList!=MARKUP_OL ){ |
| 1175 | if( p->wikiList ){ |
| 1176 | popStackToTag(p, p->wikiList); |
| 1177 | } |
| 1178 | endAutoParagraph(p); |
| 1179 | pushStack(p, MARKUP_OL); |
| 1180 | blob_append(p->pOut, "<ol>", 4); |
| 1181 | p->wikiList = MARKUP_OL; |
| 1182 | } |
| 1183 | popStackToTag(p, MARKUP_LI); |
| @@ -1349,16 +1350,19 @@ | |
| 1350 | blob_appendf(p->pOut, "<pre name='code' class='%s'>", |
| 1351 | markup.aAttr[vAttrIdx].zValue); |
| 1352 | vAttrDidAppend=1; |
| 1353 | } |
| 1354 | } |
| 1355 | if( !vAttrDidAppend ) { |
| 1356 | endAutoParagraph(p); |
| 1357 | blob_append(p->pOut, "<pre class='verbatim'>",-1); |
| 1358 | } |
| 1359 | p->wantAutoParagraph = 0; |
| 1360 | }else |
| 1361 | if( markup.iType==MUTYPE_LI ){ |
| 1362 | if( backupToType(p, MUTYPE_LIST)==0 ){ |
| 1363 | endAutoParagraph(p); |
| 1364 | pushStack(p, MARKUP_UL); |
| 1365 | blob_append(p->pOut, "<ul>", 4); |
| 1366 | } |
| 1367 | pushStack(p, MARKUP_LI); |
| 1368 | renderMarkup(p->pOut, &markup); |
| 1369 |