Fossil SCM

The safe-HTML feature of Markdown rendering now shows the full content of omitted HTML elements, without truncation.

drh 2020-06-04 14:23 trunk
Commit 16d68b0d4c92e3f9c1613c7051a25e1c8ffbf78830cd145ea504f6e13ee69f75
1 file changed +4 -1
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -2552,13 +2552,16 @@
25522552
}else{
25532553
i = j + n;
25542554
}
25552555
parseMarkup(&markup, zHtml+j);
25562556
if( markup.iCode==MARKUP_INVALID ){
2557
+ unparseMarkup(&markup);
25572558
blob_appendf(pBlob, "<span class='error'>&lt;%.*s&gt;</span>",
25582559
n-2, zHtml+j+1);
2559
- }else if( (markup.iType & MUTYPE_Nested)==0 || markup.iCode==MARKUP_P ){
2560
+ continue;
2561
+ }
2562
+ if( (markup.iType & MUTYPE_Nested)==0 || markup.iCode==MARKUP_P ){
25602563
renderMarkup(pBlob, &markup);
25612564
}else{
25622565
if( markup.endTag ){
25632566
html_tagstack_pop(&s, pBlob, markup.iCode);
25642567
}else{
25652568
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -2552,13 +2552,16 @@
2552 }else{
2553 i = j + n;
2554 }
2555 parseMarkup(&markup, zHtml+j);
2556 if( markup.iCode==MARKUP_INVALID ){
 
2557 blob_appendf(pBlob, "<span class='error'>&lt;%.*s&gt;</span>",
2558 n-2, zHtml+j+1);
2559 }else if( (markup.iType & MUTYPE_Nested)==0 || markup.iCode==MARKUP_P ){
 
 
2560 renderMarkup(pBlob, &markup);
2561 }else{
2562 if( markup.endTag ){
2563 html_tagstack_pop(&s, pBlob, markup.iCode);
2564 }else{
2565
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -2552,13 +2552,16 @@
2552 }else{
2553 i = j + n;
2554 }
2555 parseMarkup(&markup, zHtml+j);
2556 if( markup.iCode==MARKUP_INVALID ){
2557 unparseMarkup(&markup);
2558 blob_appendf(pBlob, "<span class='error'>&lt;%.*s&gt;</span>",
2559 n-2, zHtml+j+1);
2560 continue;
2561 }
2562 if( (markup.iType & MUTYPE_Nested)==0 || markup.iCode==MARKUP_P ){
2563 renderMarkup(pBlob, &markup);
2564 }else{
2565 if( markup.endTag ){
2566 html_tagstack_pop(&s, pBlob, markup.iCode);
2567 }else{
2568

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button