FIXED: Fix error in CriticMarkup highlights when accepting/rejecting (Thanks, Shahaf!)

diff --git a/Sources/libMultiMarkdown/critic_markup.c b/Sources/libMultiMarkdown/critic_markup.c
index 43d47a43db7de50119df2243a10b7a7a2fb9a34b..0afe3cda419494684bb23be54ae970b32db6461a 100644 (file)
--- a/Sources/libMultiMarkdown/critic_markup.c
+++ b/Sources/libMultiMarkdown/critic_markup.c
@@ -198,7 +198,6 @@ void accept_token(DString * d, token * t) {
                case CM_SUB_DIV:
                case CM_DEL_PAIR:
                case CM_COM_PAIR:
-               case CM_HI_PAIR:
                        // Erase these
                        d_string_erase(d, t->start, t->len);
                        break;
@@ -213,6 +212,7 @@ void accept_token(DString * d, token * t) {
                        break;
 
                case CM_ADD_PAIR:
+               case CM_HI_PAIR:
 
                        // Check children
                        if (t->child) {
@@ -282,7 +282,6 @@ void reject_token(DString * d, token * t) {
                case CM_SUB_DIV:
                case CM_ADD_PAIR:
                case CM_COM_PAIR:
-               case CM_HI_PAIR:
                        // Erase these
                        d_string_erase(d, t->start, t->len);
                        break;
@@ -297,6 +296,7 @@ void reject_token(DString * d, token * t) {
                        break;
 
                case CM_DEL_PAIR:
+               case CM_HI_PAIR:
 
                        // Check children
                        if (t->child) {

diff --git a/Sources/libMultiMarkdown/fodt.c b/Sources/libMultiMarkdown/fodt.c
index 54ffd7f4698aa41956bb8770a2455e721e84f6e9..ebfd32fa99bbbdd191279d9cf792333e2849c85e 100644 (file)
--- a/Sources/libMultiMarkdown/fodt.c
+++ b/Sources/libMultiMarkdown/fodt.c
@@ -1570,6 +1570,9 @@ parse_citation:
                        // Ignore if we're rejecting or accepting
                        if ((scratch->extensions & EXT_CRITIC_REJECT) ||
                                (scratch->extensions & EXT_CRITIC_ACCEPT)) {
+                               t->child->type = TEXT_EMPTY;
+                               t->child->mate->type = TEXT_EMPTY;
+                               mmd_export_token_tree_odf(out, source, t->child, scratch);
                                break;
                        }
 

diff --git a/Sources/libMultiMarkdown/html.c b/Sources/libMultiMarkdown/html.c
index db1e365cc9cbe2bbf234a0b969128a8384cac901..1d0027a71811957210e546254879fc86b33f2785 100644 (file)
--- a/Sources/libMultiMarkdown/html.c
+++ b/Sources/libMultiMarkdown/html.c
@@ -1732,6 +1732,9 @@ parse_citation:
                        // Ignore if we're rejecting or accepting
                        if ((scratch->extensions & EXT_CRITIC_REJECT) ||
                                (scratch->extensions & EXT_CRITIC_ACCEPT)) {
+                               t->child->type = TEXT_EMPTY;
+                               t->child->mate->type = TEXT_EMPTY;
+                               mmd_export_token_tree_html(out, source, t->child, scratch);
                                break;
                        }
 

diff --git a/Sources/libMultiMarkdown/latex.c b/Sources/libMultiMarkdown/latex.c
index efa32f24024702ce26ef135b22e6d997c028c642..3858d645e73ffb305a30027df26eae301eec96d5 100644 (file)
--- a/Sources/libMultiMarkdown/latex.c
+++ b/Sources/libMultiMarkdown/latex.c
@@ -1651,6 +1651,9 @@ parse_citation:
                        // Ignore if we're rejecting or accepting
                        if ((scratch->extensions & EXT_CRITIC_REJECT) ||
                                (scratch->extensions & EXT_CRITIC_ACCEPT)) {
+                               t->child->type = TEXT_EMPTY;
+                               t->child->mate->type = TEXT_EMPTY;
+                               mmd_export_token_tree_latex(out, source, t->child, scratch);
                                break;
                        }
 

diff --git a/Sources/libMultiMarkdown/opendocument-content.c b/Sources/libMultiMarkdown/opendocument-content.c
index 18ac45fda66676792c2580dfd4b15d146e2d6472..595fb45b4b03fd29166ef9f4fffb2ddc1804c1ca 100644 (file)
--- a/Sources/libMultiMarkdown/opendocument-content.c
+++ b/Sources/libMultiMarkdown/opendocument-content.c
@@ -1703,6 +1703,9 @@ parse_citation:
                        // Ignore if we're rejecting or accepting
                        if ((scratch->extensions & EXT_CRITIC_REJECT) ||
                                (scratch->extensions & EXT_CRITIC_ACCEPT)) {
+                               t->child->type = TEXT_EMPTY;
+                               t->child->mate->type = TEXT_EMPTY;
+                               mmd_export_token_tree_opendocument(out, source, t->child, scratch);
                                break;
                        }
 

diff --git a/tests/CriticMarkup/CriticMarkup.html b/tests/CriticMarkup/CriticMarkup.html
index d1799670aaeb1ce4f1e9f78e16030921c488a69b..84da01ec1d3d6a5dd660474257fd2f662c15d6cb 100644 (file)
--- a/tests/CriticMarkup/CriticMarkup.html
+++ b/tests/CriticMarkup/CriticMarkup.html
@@ -22,6 +22,16 @@
 
 <p>~~}between them.</p>
 
+<p><ins>foo</ins></p>
+
+<p><del>bar</del></p>
+
+<p><del>foo</del><ins>bar</ins></p>
+
+<p><span class="critic comment">foo</span></p>
+
+<p><mark>bar</mark></p>
+
 </body>
 </html>
 

diff --git a/tests/CriticMarkup/CriticMarkup.htmla b/tests/CriticMarkup/CriticMarkup.htmla
index d4e30615c0baa48f0827090a815f0bc3a7edd97b..4b673dd228257207cb0bc3eea4372d6048cee80b 100644 (file)
--- a/tests/CriticMarkup/CriticMarkup.htmla
+++ b/tests/CriticMarkup/CriticMarkup.htmla
@@ -18,6 +18,12 @@
 
 <p>between them.</p>
 
+<p>foo</p>
+
+<p>bar</p>
+
+<p>bar</p>
+
 </body>
 </html>
 

diff --git a/tests/CriticMarkup/CriticMarkup.htmlr b/tests/CriticMarkup/CriticMarkup.htmlr
index 773c00c456cd99a65ce60a0fa68a818c92fd904f..029050aa50885937bbe46926e305c52d479de9b4 100644 (file)
--- a/tests/CriticMarkup/CriticMarkup.htmlr
+++ b/tests/CriticMarkup/CriticMarkup.htmlr
@@ -16,6 +16,12 @@
 
 <p>with nothing between them.</p>
 
+<p>bar</p>
+
+<p>foo</p>
+
+<p>bar</p>
+
 </body>
 </html>
 

diff --git a/tests/CriticMarkup/CriticMarkup.text b/tests/CriticMarkup/CriticMarkup.text
index e63017a7c0328847720a4beb84a2caba7deab951..8f5fd06244f0d5f4bcecd90f616101c8ea948488 100644 (file)
--- a/tests/CriticMarkup/CriticMarkup.text
+++ b/tests/CriticMarkup/CriticMarkup.text
@@ -16,3 +16,13 @@ with nothing ~>
 With a *new* paragraph inserted
 
 ~~}between them.
+
+{++foo++}
+
+{--bar--}
+
+{~~foo~>bar~~}
+
+{>>foo<<}
+
+{==bar==}