dtext_rb 1.0.0 → 1.0.2

data/ext/dtext/dtext.rl

@@ -9,7 +9,7 @@
 #include <glib.h>
 
 typedef struct StateMachine {
-  int top;
+  size_t top;
   int cs;
   int act;
   const char * p;
@@ -23,6 +23,7 @@ typedef struct StateMachine {
   const char * b1;
   const char * b2;
   bool f_inline;
+  bool f_strip;
   bool list_mode;
   GString * output;
   GArray * stack;
@@ -32,7 +33,8 @@ typedef struct StateMachine {
   int b;
 } StateMachine;
 
-static const int MAX_STACK_DEPTH = 512;
+static const size_t MAX_STACK_DEPTH = 512;
+
 static const int BLOCK_P = 1;
 static const int INLINE_SPOILER = 2;
 static const int BLOCK_SPOILER = 3;
@@ -139,113 +141,124 @@ list_item = '*'+ >mark_a1 %mark_a2 ws+ nonnewline+ >mark_b1 %mark_b2;
 
 inline := |*
   post_id => {
-    append(sm, "<a href=\"/posts/");
-    append_segment(sm, sm->a1, sm->a2 - 1);
-    append(sm, "\">post #");
-    append_segment(sm, sm->a1, sm->a2 - 1);
-    append(sm, "</a>");
+    append(sm, true, "<a href=\"/posts/");
+    append_segment(sm, true, sm->a1, sm->a2 - 1);
+    append(sm, true, "\">");
+    append(sm, false, "post #");
+    append_segment(sm, false, sm->a1, sm->a2 - 1);
+    append(sm, true, "</a>");
   };
 
   forum_post_id => {
-    append(sm, "<a href=\"/forum_posts/");
-    append_segment(sm, sm->a1, sm->a2 - 1);
-    append(sm, "\">forum #");
-    append_segment(sm, sm->a1, sm->a2 - 1);
-    append(sm, "</a>");
+    append(sm, true, "<a href=\"/forum_posts/");
+    append_segment(sm, true, sm->a1, sm->a2 - 1);
+    append(sm, true, "\">");
+    append(sm, false, "forum #");
+    append_segment(sm, false, sm->a1, sm->a2 - 1);
+    append(sm, true, "</a>");
   };
 
   forum_topic_id => {
-    append(sm, "<a href=\"/forum_topics/");
-    append_segment(sm, sm->a1, sm->a2 - 1);
-    append(sm, "\">topic #");
-    append_segment(sm, sm->a1, sm->a2 - 1);
-    append(sm, "</a>");
+    append(sm, true, "<a href=\"/forum_topics/");
+    append_segment(sm, true, sm->a1, sm->a2 - 1);
+    append(sm, true, "\">");
+    append(sm, false, "topic #");
+    append_segment(sm, false, sm->a1, sm->a2 - 1);
+    append(sm, true, "</a>");
   };
 
   forum_topic_paged_id => {
-    append(sm, "<a href=\"/forum_topics/");
-    append_segment(sm, sm->a1, sm->a2 - 1);
-    append(sm, "?page=");
-    append_segment(sm, sm->b1, sm->b2 - 1);
-    append(sm, "\">topic #");
-    append_segment(sm, sm->a1, sm->a2 - 1);
-    append(sm, "/p");
-    append_segment(sm, sm->b1, sm->b2 - 1);
-    append(sm, "</a>");
+    append(sm, true, "<a href=\"/forum_topics/");
+    append_segment(sm, true, sm->a1, sm->a2 - 1);
+    append(sm, true, "?page=");
+    append_segment(sm, true, sm->b1, sm->b2 - 1);
+    append(sm, true, "\">");
+    append(sm, false, "topic #");
+    append_segment(sm, false, sm->a1, sm->a2 - 1);
+    append(sm, false, "/p");
+    append_segment(sm, false, sm->b1, sm->b2 - 1);
+    append(sm, true, "</a>");
   };
 
   comment_id => {
-    append(sm, "<a href=\"/comments/");
-    append_segment(sm, sm->a1, sm->a2 - 1);
-    append(sm, "\">comment #");
-    append_segment(sm, sm->a1, sm->a2 - 1);
-    append(sm, "</a>");
+    append(sm, true, "<a href=\"/comments/");
+    append_segment(sm, true, sm->a1, sm->a2 - 1);
+    append(sm, true, "\">");
+    append(sm, false, "comment #");
+    append_segment(sm, false, sm->a1, sm->a2 - 1);
+    append(sm, true, "</a>");
   };
 
   pool_id => {
-    append(sm, "<a href=\"/pools/");
-    append_segment(sm, sm->a1, sm->a2 - 1);
-    append(sm, "\">pool #");
-    append_segment(sm, sm->a1, sm->a2 - 1);
-    append(sm, "</a>");
+    append(sm, true, "<a href=\"/pools/");
+    append_segment(sm, true, sm->a1, sm->a2 - 1);
+    append(sm, true, "\">");
+    append(sm, false, "pool #");
+    append_segment(sm, false, sm->a1, sm->a2 - 1);
+    append(sm, true, "</a>");
   };
 
   user_id => {
-    append(sm, "<a href=\"/users/");
-    append_segment(sm, sm->a1, sm->a2 - 1);
-    append(sm, "\">user #");
-    append_segment(sm, sm->a1, sm->a2 - 1);
-    append(sm, "</a>");
+    append(sm, true, "<a href=\"/users/");
+    append_segment(sm, true, sm->a1, sm->a2 - 1);
+    append(sm, true, "\">");
+    append(sm, false, "user #");
+    append_segment(sm, false, sm->a1, sm->a2 - 1);
+    append(sm, true, "</a>");
   };
 
   artist_id => {
-    append(sm, "<a href=\"/artists/");
-    append_segment(sm, sm->a1, sm->a2 - 1);
-    append(sm, "\">artist #");
-    append_segment(sm, sm->a1, sm->a2 - 1);
-    append(sm, "</a>");
+    append(sm, true, "<a href=\"/artists/");
+    append_segment(sm, true, sm->a1, sm->a2 - 1);
+    append(sm, true, "\">");
+    append(sm, false, "artist #");
+    append_segment(sm, false, sm->a1, sm->a2 - 1);
+    append(sm, true, "</a>");
   };
 
   github_issue_id => {
-    append(sm, "<a href=\"https://github.com/r888888888/danbooru/issues/");
-    append_segment(sm, sm->a1, sm->a2 - 1);
-    append(sm, "\">issue #");
-    append_segment(sm, sm->a1, sm->a2 - 1);
-    append(sm, "</a>");
+    append(sm, true, "<a href=\"https://github.com/r888888888/danbooru/issues/");
+    append_segment(sm, true, sm->a1, sm->a2 - 1);
+    append(sm, true, "\">");
+    append(sm, false, "issue #");
+    append_segment(sm, false, sm->a1, sm->a2 - 1);
+    append(sm, true, "</a>");
   };
 
   pixiv_id => {
-    append(sm, "<a href=\"http://www.pixiv.net/member_illust.php?mode=medium&illust_id=");
-    append_segment(sm, sm->a1, sm->a2 - 1);
-    append(sm, "\">pixiv #");
-    append_segment(sm, sm->a1, sm->a2 - 1);
-    append(sm, "</a>");
+    append(sm, true, "<a href=\"http://www.pixiv.net/member_illust.php?mode=medium&illust_id=");
+    append_segment(sm, true, sm->a1, sm->a2 - 1);
+    append(sm, true, "\">");
+    append(sm, false, "pixiv #");
+    append_segment(sm, false, sm->a1, sm->a2 - 1);
+    append(sm, true, "</a>");
   };
 
   pixiv_paged_id => {
-    append(sm, "<a href=\"http://www.pixiv.net/member_illust.php?mode=manga_big&illust_id=");
-    append_segment(sm, sm->a1, sm->a2 - 1);
-    append(sm, "&page=");
-    append_segment(sm, sm->b1, sm->b2 - 1);
-    append(sm, "\">pixiv #");
-    append_segment(sm, sm->a1, sm->a2 - 1);
-    append(sm, "/p");
-    append_segment(sm, sm->b1, sm->b2 - 1);
-    append(sm, "</a>");
+    append(sm, true, "<a href=\"http://www.pixiv.net/member_illust.php?mode=manga_big&illust_id=");
+    append_segment(sm, true, sm->a1, sm->a2 - 1);
+    append(sm, true, "&page=");
+    append_segment(sm, true, sm->b1, sm->b2 - 1);
+    append(sm, true, "\">");
+    append(sm, false, "pixiv #");
+    append_segment(sm, false, sm->a1, sm->a2 - 1);
+    append(sm, false, "/p");
+    append_segment(sm, false, sm->b1, sm->b2 - 1);
+    append(sm, true, "</a>");
   };
 
   post_link => {
-    append(sm, "<a rel=\"nofollow\" href=\"/posts?tags=");
+    append(sm, true, "<a rel=\"nofollow\" href=\"/posts?tags=");
     append_segment_uri_escaped(sm, sm->a1, sm->a2 - 1);
-    append(sm, "\">");
+    append(sm, true, "\">");
     append_segment_html_escaped(sm, sm->a1, sm->a2 - 1);
-    append(sm, "</a>");
+    append(sm, true, "</a>");
   };
 
   basic_wiki_link => {
     GString * segment = g_string_new_len(sm->a1, sm->a2 - sm->a1);
-    underscore_string(segment->str, segment->len);
     GString * lowercase_segment = NULL;
+    underscore_string(segment->str, segment->len);
 
     if (g_utf8_validate(segment->str, -1, NULL)) {
       lowercase_segment = g_string_new(g_utf8_strdown(segment->str, -1));
@@ -253,11 +266,11 @@ inline := |*
       lowercase_segment = g_string_new(g_ascii_strdown(segment->str, -1));
     }
 
-    append(sm, "<a href=\"/wiki_pages/show_or_new?title=");
+    append(sm, true, "<a href=\"/wiki_pages/show_or_new?title=");
     append_segment_uri_escaped(sm, lowercase_segment->str, lowercase_segment->str + lowercase_segment->len - 1);
-    append(sm, "\">");
+    append(sm, true, "\">");
     append_segment_html_escaped(sm, sm->a1, sm->a2 - 1);
-    append(sm, "</a>");
+    append(sm, true, "</a>");
 
     g_string_free(lowercase_segment, TRUE);
     g_string_free(segment, TRUE);
@@ -265,8 +278,8 @@ inline := |*
 
   aliased_wiki_link => {
     GString * segment = g_string_new_len(sm->a1, sm->a2 - sm->a1);
-    underscore_string(segment->str, segment->len);
     GString * lowercase_segment = NULL;
+    underscore_string(segment->str, segment->len);
 
     if (g_utf8_validate(segment->str, -1, NULL)) {
       lowercase_segment = g_string_new(g_utf8_strdown(segment->str, -1));
@@ -274,11 +287,11 @@ inline := |*
       lowercase_segment = g_string_new(g_ascii_strdown(segment->str, -1));
     }
 
-    append(sm, "<a href=\"/wiki_pages/show_or_new?title=");
+    append(sm, true, "<a href=\"/wiki_pages/show_or_new?title=");
     append_segment_uri_escaped(sm, lowercase_segment->str, lowercase_segment->str + lowercase_segment->len - 1);
-    append(sm, "\">");
+    append(sm, true, "\">");
     append_segment_html_escaped(sm, sm->b1, sm->b2 - 1);
-    append(sm, "</a>");
+    append(sm, true, "</a>");
 
     g_string_free(lowercase_segment, TRUE);
     g_string_free(segment, TRUE);
@@ -293,11 +306,11 @@ inline := |*
       sm->b = false;
     }
 
-    append(sm, "<a href=\"");
+    append(sm, true, "<a href=\"");
     append_segment_uri_escaped(sm, sm->b1, sm->b2 - sm->d);
-    append(sm, "\">");
+    append(sm, true, "\">");
     append_segment_html_escaped(sm, sm->a1, sm->a2 - 1);
-    append(sm, "</a>");
+    append(sm, true, "</a>");
 
     if (sm->b) {
       append_c_html_escaped(sm, fc);
@@ -305,11 +318,11 @@ inline := |*
   };
 
   bracketed_textile_link => {
-    append(sm, "<a href=\"");
+    append(sm, true, "<a href=\"");
     append_segment_uri_escaped(sm, sm->b1, sm->b2 - 1);
-    append(sm, "\">");
+    append(sm, true, "\">");
     append_segment_html_escaped(sm, sm->a1, sm->a2 - 1);
-    append(sm, "</a>");
+    append(sm, true, "</a>");
   };
 
   url => {
@@ -321,11 +334,11 @@ inline := |*
       sm->d = 1;
     }
 
-    append(sm, "<a href=\"");
+    append(sm, true, "<a href=\"");
     append_segment_uri_escaped(sm, sm->ts, sm->te - sm->d);
-    append(sm, "\">");
+    append(sm, true, "\">");
     append_segment_html_escaped(sm, sm->ts, sm->te - sm->d);
-    append(sm, "</a>");
+    append(sm, true, "</a>");
 
     if (sm->b) {
       append_c_html_escaped(sm, fc);
@@ -334,7 +347,7 @@ inline := |*
 
   # probably a tag. examples include @.@ and @_@
   '@' graph '@' => {
-    append_segment(sm, sm->ts, sm->te - 1);
+    append_segment_html_escaped(sm, sm->ts, sm->te - 1);
   };
 
   mention => {
@@ -346,11 +359,12 @@ inline := |*
       sm->d = 1;
     }
 
-    append(sm, "<a rel=\"nofollow\" href=\"/users?name=");
+    append(sm, true, "<a rel=\"nofollow\" href=\"/users?name=");
     append_segment_uri_escaped(sm, sm->a1, sm->a2 - sm->d);
-    append(sm, "\">@");
+    append(sm, true, "\">");
+    append_c(sm, '@');
     append_segment_html_escaped(sm, sm->a1, sm->a2 - sm->d);
-    append(sm, "</a>");
+    append(sm, true, "</a>");
 
     if (sm->b) {
       append_c_html_escaped(sm, fc);
@@ -372,63 +386,63 @@ inline := |*
 
   '[b]' => {
     dstack_push(sm, &INLINE_B);
-    append(sm, "<strong>");
+    append(sm, true, "<strong>");
   };
 
   '[/b]' => {
     if (dstack_check(sm, INLINE_B)) {
       dstack_pop(sm);
-      append(sm, "</strong>");
+      append(sm, true, "</strong>");
     } else {
-      append(sm, "[/b]");
+      append(sm, true, "[/b]");
     }
   };
 
   '[i]' => {
     dstack_push(sm, &INLINE_I);
-    append(sm, "<em>");
+    append(sm, true, "<em>");
   };
 
   '[/i]' => {
     if (dstack_check(sm, INLINE_I)) {
       dstack_pop(sm);
-      append(sm, "</em>");
+      append(sm, true, "</em>");
     } else {
-      append(sm, "[/i]");
+      append(sm, true, "[/i]");
     }
   };
 
   '[s]' => {
     dstack_push(sm, &INLINE_S);
-    append(sm, "<s>");
+    append(sm, true, "<s>");
   };
 
   '[/s]' => {
     if (dstack_check(sm, INLINE_S)) {
       dstack_pop(sm);
-      append(sm, "</s>");
+      append(sm, true, "</s>");
     } else {
-      append(sm, "[/s]");
+      append(sm, true, "[/s]");
     }
   };
 
   '[u]' => {
     dstack_push(sm, &INLINE_U);
-    append(sm, "<u>");
+    append(sm, true, "<u>");
   };
 
   '[/u]' => {
     if (dstack_check(sm, INLINE_U)) {
       dstack_pop(sm);
-      append(sm, "</u>");
+      append(sm, true, "</u>");
     } else {
-      append(sm, "[/u]");
+      append(sm, true, "[/u]");
     }
   };
 
   '[tn]' => {
     dstack_push(sm, &INLINE_TN);
-    append(sm, "<span class=\"tn\">");
+    append(sm, true, "<span class=\"tn\">");
   };
 
   '[/tn]' => {
@@ -439,9 +453,9 @@ inline := |*
       fret;
     } else if (dstack_check(sm, INLINE_TN)) {
       dstack_pop(sm);
-      append(sm, "</span>");
+      append(sm, true, "</span>");
     } else {
-      append(sm, "[/tn]");
+      append_block(sm, "[/tn]");
     }
   };
 
@@ -453,7 +467,7 @@ inline := |*
     fret;
   };
 
-  (space* '[quote]') => {
+  '[quote]' => {
     g_debug("inline [quote]");
 
     if (dstack_check(sm, BLOCK_P)) {
@@ -465,11 +479,11 @@ inline := |*
       append_newline(sm);
     } 
 
-    fexec sm->p - 6;
+    fexec sm->ts;
     fret;
   };
 
-  (space* '[/quote]') => {
+  '[/quote]' space* => {
     g_debug("inline [/quote]");
 
     if (dstack_check(sm, BLOCK_P)) {
@@ -480,7 +494,7 @@ inline := |*
       dstack_rewind(sm);
       fret;
     } else {
-      append(sm, "[/quote]");
+      append_block(sm, "[/quote]");
     }
   };
 
@@ -488,17 +502,17 @@ inline := |*
     g_debug("inline [spoiler]");
     g_debug("  push <span>");
     dstack_push(sm, &INLINE_SPOILER);
-    append(sm, "<span class=\"spoiler\">");
+    append(sm, true, "<span class=\"spoiler\">");
   };
 
-  (space* '[/spoiler]') => {
+  '[/spoiler]' => {
     g_debug("inline [/spoiler]");
 
     if (dstack_check(sm, INLINE_SPOILER)) {
       g_debug("  pop dstack");
       g_debug("  print </span>");
       dstack_pop(sm);
-      append(sm, "</span>");
+      append(sm, true, "</span>");
     } else if (dstack_check(sm, BLOCK_P) && dstack_check2(sm, BLOCK_SPOILER)) {
       g_debug("  pop dstack");
       g_debug("  print </p></div>");
@@ -513,17 +527,18 @@ inline := |*
 
       fret;
     } else {
-      append(sm, "[/spoiler]");
+      append_block(sm, "[/spoiler]");
     }
   };
 
-  (space* '[expand]' space*) => {
+  '[expand]' => {
+    g_debug("inline [expand]");
     dstack_rewind(sm);
-    fexec(sm->p - 8);
+    fexec(sm->p - 7);
     fret;
   };
 
-  (space* '[/expand]') => {
+  '[/expand]' => {
     if (dstack_check(sm, BLOCK_P)) {
       append_closing_p(sm);
       append_newline(sm);
@@ -538,7 +553,7 @@ inline := |*
       dstack_pop(sm);
       fret;
     } else {
-      append(sm, "[/expand]");
+      append_block(sm, "[/expand]");
     }
   };
 
@@ -555,7 +570,7 @@ inline := |*
       append_newline(sm);
       fret;
     } else {
-      append(sm, "[/th]");
+      append_block(sm, "[/th]");
     }
   };
 
@@ -567,7 +582,7 @@ inline := |*
       append_newline(sm);
       fret;
     } else {
-      append(sm, "[/td]");
+      append_block(sm, "[/td]");
     }
   };
 
@@ -601,7 +616,7 @@ inline := |*
     if (sm->list_mode && (*(sm->p+1) == '*') && dstack_check(sm, BLOCK_LI)) {
       dstack_rewind(sm);
     } else {
-      append(sm, "<br>");
+      append(sm, true, "<br>");
       append_newline(sm);
     }
   };
@@ -617,7 +632,7 @@ code := |*
     if (dstack_check(sm, BLOCK_CODE)) {
       dstack_rewind(sm);
     } else {
-      append(sm, "[/code]");
+      append(sm, true, "[/code]");
     }
     fret;
   };
@@ -645,7 +660,7 @@ nodtext := |*
       dstack_pop(sm);
       fret;
     } else {
-      append(sm, "[/nodtext]");
+      append(sm, true, "[/nodtext]");
     }
   };
 
@@ -674,7 +689,7 @@ table := |*
       append_block(sm, "</thead>");
       append_newline(sm);
     } else {
-      append(sm, "[/thead]");
+      append(sm, true, "[/thead]");
     }
   };
 
@@ -692,7 +707,7 @@ table := |*
       append_block(sm, "</tbody>");
       append_newline(sm);
     } else {
-      append(sm, "[/tbody]");
+      append(sm, true, "[/tbody]");
     }
   };
 
@@ -718,7 +733,7 @@ table := |*
       append_block(sm, "</tr>");
       append_newline(sm);
     } else {
-      append(sm, "[/tr]");
+      append(sm, true, "[/tr]");
     }
   };
 
@@ -739,7 +754,7 @@ table := |*
       append_newline(sm);
       fret;
     } else {
-      append(sm, "[/table]");
+      append(sm, true, "[/table]");
     }
   };
 
@@ -753,15 +768,16 @@ table := |*
 
 list := |*
   list_item => {
+    int prev_nest = sm->list_nest;
     g_debug("list start");
 
-    int prev_nest = sm->list_nest;
     sm->list_mode = true;
     sm->list_nest = sm->a2 - sm->a1;
     fexec sm->b1;
 
     if (sm->list_nest > prev_nest) {
-      for (int i=prev_nest; i<sm->list_nest; ++i) {
+      int i=0;
+      for (i=prev_nest; i<sm->list_nest; ++i) {
         g_debug("  dstack push ul");
         g_debug("  print <ul>");
         append_block(sm, "<ul>");
@@ -769,7 +785,8 @@ list := |*
         dstack_push(sm, &BLOCK_UL);
       }
     } else if (sm->list_nest < prev_nest) {
-      for (int i=sm->list_nest; i<prev_nest; ++i) {
+      int i=0;
+      for (i=sm->list_nest; i<prev_nest; ++i) {
         if (dstack_check(sm, BLOCK_UL)) {
           g_debug("  dstack pop");
           g_debug("  print </ul>");
@@ -816,18 +833,22 @@ main := |*
 
     append_newline(sm);
     append_newline(sm);
-    append(sm, "<h");
-    append_c(sm, header);
-    append_c(sm, '>');
-    append_segment(sm, sm->b1, sm->b2 - 1);
-    append(sm, "</h");
-    append_c(sm, header);
-    append(sm, ">");
+    if (!sm->f_strip) {
+      append(sm, true, "<h");
+      append_c(sm, header);
+      append_c(sm, '>');
+    }
+    append_segment(sm, false, sm->b1, sm->b2 - 1);
+    if (!sm->f_strip) {
+      append(sm, true, "</h");
+      append_c(sm, header);
+      append_c(sm, '>');
+    }
     append_newline(sm);
     append_newline(sm);
   };
 
-  ('[quote]' space*) => {
+  '[quote]' space* => {
     g_debug("block [quote]");
     g_debug("  push quote");
     g_debug("  push p");
@@ -844,7 +865,7 @@ main := |*
     fcall inline;
   };
 
-  ('[spoiler]' space*) => {
+  '[spoiler]' space* => {
     g_debug("block [spoiler]");
     g_debug("  push spoiler");
     g_debug("  push p");
@@ -870,7 +891,7 @@ main := |*
     }
   };
 
-  ('[code]' space*) => {
+  '[code]' space* => {
     dstack_push(sm, &BLOCK_CODE);
     append_newline(sm);
     append_newline(sm);
@@ -879,7 +900,7 @@ main := |*
     fcall code;
   };
 
-  ('[expand]' space*) => {
+  '[expand]' space* => {
     dstack_push(sm, &BLOCK_EXPAND);
     dstack_push(sm, &BLOCK_P);
     append_newline(sm);
@@ -892,22 +913,22 @@ main := |*
     fcall inline;
   };
 
-  (aliased_expand space*) => {
+  aliased_expand space* => {
     dstack_push(sm, &BLOCK_EXPAND);
     dstack_push(sm, &BLOCK_P);
     append_newline(sm);
     append_newline(sm);
     append_block(sm, "<div class=\"expandable\"><div class=\"expandable-header\">");
-    append(sm, "<span>");
+    append(sm, true, "<span>");
     append_segment_html_escaped(sm, sm->a1, sm->a2);
-    append(sm, "</span>");
+    append(sm, true, "</span>");
     append_block(sm, "<input type=\"button\" value=\"Show\" class=\"expandable-button\"/></div>");
     append_block(sm, "<div class=\"expandable-content\">");
     append_newline(sm);
     fcall inline;
   };
 
-  ('[nodtext]' space*) => {
+  '[nodtext]' space* => {
     dstack_push(sm, &BLOCK_NODTEXT);
     append_newline(sm);
     append_block(sm, "<p>");
@@ -965,7 +986,7 @@ main := |*
     g_debug("block c: %c", fc);
     fhold;
 
-    if (g_queue_is_empty(sm->dstack) || dstack_check(sm, BLOCK_QUOTE) || dstack_check(sm, BLOCK_SPOILER)) {
+    if (g_queue_is_empty(sm->dstack) || dstack_check(sm, BLOCK_QUOTE) || dstack_check(sm, BLOCK_SPOILER) || dstack_check(sm, BLOCK_EXPAND)) {
       g_debug("  push p");
       g_debug("  print <p>");
       dstack_push(sm, &BLOCK_P);
@@ -989,8 +1010,10 @@ static inline void underscore_string(char * str, size_t len) {
   }
 }
 
-static inline void append(StateMachine * sm, const char * s) {
-  sm->output = g_string_append(sm->output, s);
+static inline void append(StateMachine * sm, bool is_markup, const char * s) {
+  if (!(is_markup && sm->f_strip)) {
+    sm->output = g_string_append(sm->output, s);
+  }
 }
 
 static inline void append_newline(StateMachine * sm) {
@@ -1023,11 +1046,17 @@ static inline void append_c_html_escaped(StateMachine * sm, char s) {
   }
 }
 
-static inline void append_segment(StateMachine * sm, const char * a, const char * b) {
-  sm->output = g_string_append_len(sm->output, a, b - a + 1);
+static inline void append_segment(StateMachine * sm, bool is_markup, const char * a, const char * b) {
+  if (!(is_markup && sm->f_strip)) {
+    sm->output = g_string_append_len(sm->output, a, b - a + 1);
+  }
 }
 
 static inline void append_segment_uri_escaped(StateMachine * sm, const char * a, const char * b) {
+  if (sm->f_strip) {
+    return;
+  }
+
   GString * segment_string = g_string_new_len(a, b - a + 1);
   char * segment = g_uri_escape_string(segment_string->str, G_URI_RESERVED_CHARS_ALLOWED_IN_PATH "#%?", TRUE);
   sm->output = g_string_append(sm->output, segment);
@@ -1044,6 +1073,8 @@ static inline void append_segment_html_escaped(StateMachine * sm, const char * a
 static inline void append_block(StateMachine * sm, const char * s) {
   if (sm->f_inline) {
     sm->output = g_string_append_c(sm->output, ' ');
+  } else if (sm->f_strip) {
+    // do nothing
   } else {
     sm->output = g_string_append(sm->output, s);
   }
@@ -1081,22 +1112,16 @@ static inline bool dstack_check(StateMachine * sm, int expected_element) {
 }
 
 static inline bool dstack_check2(StateMachine * sm, int expected_element) {
+  int * top2 = NULL;
+
   if (sm->dstack->length < 2) {
     return false;
   }
 
-  int * top2 = g_queue_peek_nth(sm->dstack, sm->dstack->length - 2);
+  top2 = g_queue_peek_nth(sm->dstack, sm->dstack->length - 2);
   return top2 && *top2 == expected_element;
 }
 
-static void dstack_print_element(gpointer data, gpointer user_data) {
-  printf("%i\n", *(int *)data);
-}
-
-static void dstack_dump(StateMachine * sm) {
-  g_queue_foreach(sm->dstack, dstack_print_element, NULL);
-}
-
 static void dstack_rewind(StateMachine * sm) {
   int * element = dstack_pop(sm);
 
@@ -1104,95 +1129,73 @@ static void dstack_rewind(StateMachine * sm) {
     return;
   }
 
-  switch (*element) {
-  case BLOCK_P:
+  if (*element == BLOCK_P) {
     append_closing_p(sm);
     append_newline(sm);
-    break;
 
-  case INLINE_SPOILER:
-    append(sm, "</span>");
-    break;
+  } else if (*element == INLINE_SPOILER) {
+    append(sm, true, "</span>");
 
-  case BLOCK_SPOILER:
+  } else if (*element == BLOCK_SPOILER) {
     append_block(sm, "</div>");
-    break;
 
-  case BLOCK_QUOTE:
+  } else if (*element == BLOCK_QUOTE) {
     append_block(sm, "</blockquote>");
-    break;
 
-  case BLOCK_EXPAND:
+  } else if (*element == BLOCK_EXPAND) {
     append_block(sm, "</div></div>");
-    break;
 
-  case BLOCK_NODTEXT:
+  } else if (*element == BLOCK_NODTEXT) {
     append_closing_p(sm);
     append_newline(sm);
-    break;
 
-  case BLOCK_CODE:
+  } else if (*element == BLOCK_CODE) {
     append_block(sm, "</pre>");
-    break;
 
-  case BLOCK_TD:
+  } else if (*element == BLOCK_TD) {
     append_block(sm, "</td>");
-    break;
 
-  case INLINE_NODTEXT:
-    break;
+  } else if (*element == INLINE_NODTEXT) {
 
-  case INLINE_B:
-    append(sm, "</strong>");
-    break;
+  } else if (*element == INLINE_B) {
+    append(sm, true, "</strong>");
 
-  case INLINE_I:
-    append(sm, "</em>");
-    break;
+  } else if (*element == INLINE_I) {
+    append(sm, true, "</em>");
 
-  case INLINE_U:
-    append(sm, "</u>");
-    break;
+  } else if (*element == INLINE_U) {
+    append(sm, true, "</u>");
 
-  case INLINE_S:
-    append(sm, "</s>");
-    break;
+  } else if (*element == INLINE_S) {
+    append(sm, true, "</s>");
 
-  case INLINE_TN:
-    append(sm, "</span>");
-    break;
+  } else if (*element == INLINE_TN) {
+    append(sm, true, "</span>");
 
-  case BLOCK_TN:
+  } else if (*element == BLOCK_TN) {
     append_closing_p(sm);
     append_newline(sm);
-    break;
 
-  case BLOCK_TABLE:
+  } else if (*element == BLOCK_TABLE) {
     append_block(sm, "</table>");
-    break;
 
-  case BLOCK_THEAD:
+  } else if (*element == BLOCK_THEAD) {
     append_block(sm, "</thead>");
-    break;
 
-  case BLOCK_TBODY:
+  } else if (*element == BLOCK_TBODY) {
     append_block(sm, "</tbody>");
-    break;
 
-  case BLOCK_TR:
+  } else if (*element == BLOCK_TR) {
     append_block(sm, "</tr>");
-    break;
 
-  case BLOCK_UL:
+  } else if (*element == BLOCK_UL) {
     append_block(sm, "</ul>");
     append_newline(sm);
-    break;
 
-  case BLOCK_LI:
+  } else if (*element == BLOCK_LI) {
     append_block(sm, "</li>");
     append_newline(sm);
-    break;
-}
+  }
 }
 
 static void dstack_close(StateMachine * sm) {
@@ -1220,6 +1223,7 @@ static inline bool is_boundary_c(char c) {
 }
 
 static void init_machine(StateMachine * sm, VALUE input) {
+  size_t output_length = 0;
   sm->p = RSTRING_PTR(input);
   sm->pe = sm->p + RSTRING_LEN(input);
   sm->eof = sm->pe;
@@ -1228,7 +1232,7 @@ static void init_machine(StateMachine * sm, VALUE input) {
   sm->cs = 0;
   sm->act = 0;
   sm->top = 0;
-  size_t output_length = RSTRING_LEN(input);
+  output_length = RSTRING_LEN(input);
   if (output_length < (INT16_MAX / 2)) {
     output_length *= 2;
   }
@@ -1238,6 +1242,7 @@ static void init_machine(StateMachine * sm, VALUE input) {
   sm->b1 = NULL;
   sm->b2 = NULL;
   sm->f_inline = false;
+  sm->f_strip = false;
   sm->stack = g_array_sized_new(FALSE, TRUE, sizeof(int), 16);
   sm->dstack = g_queue_new();
   sm->list_nest = 0;
@@ -1252,24 +1257,35 @@ static void free_machine(StateMachine * sm) {
 }
 
 static VALUE parse(int argc, VALUE * argv, VALUE self) {
+  VALUE input;
+  VALUE options;
+  VALUE opt_inline;
+  VALUE opt_strip;
+  VALUE ret;
+  StateMachine * sm = NULL;
+
   g_debug("start\n");
 
   if (argc == 0) {
     rb_raise(rb_eArgError, "wrong number of arguments (0 for 1)");
   }
 
-  VALUE input = argv[0];
+  input = argv[0];
   
-  StateMachine * sm = (StateMachine *)g_malloc0(sizeof(StateMachine));
+  sm = (StateMachine *)g_malloc0(sizeof(StateMachine));
   input = rb_str_cat(input, "\0", 1);
   init_machine(sm, input);
 
   if (argc > 1) {
-    VALUE options = argv[1];
+    options = argv[1];
 
     if (!NIL_P(options)) {
-      VALUE opt_inline = rb_hash_aref(options, ID2SYM(rb_intern("inline")));
+      opt_strip  = rb_hash_aref(options, ID2SYM(rb_intern("strip")));
+      if (RTEST(opt_strip)) {
+        sm->f_strip = true;
+      }
 
+      opt_inline = rb_hash_aref(options, ID2SYM(rb_intern("inline")));
       if (RTEST(opt_inline)) {
         sm->f_inline = true;
       }
@@ -1281,7 +1297,7 @@ static VALUE parse(int argc, VALUE * argv, VALUE self) {
 
   dstack_close(sm);
 
-  VALUE ret = rb_str_new(sm->output->str, sm->output->len);
+  ret = rb_str_new(sm->output->str, sm->output->len);
 
   free_machine(sm);