dtext_rb 1.2.0 → 1.3.0

data/ext/dtext/dtext.rl

@@ -497,43 +497,6 @@ inline := |*
     }
   };
 
-  # these are block level elements that should kick us out of the inline
-  # scanner
-  header => {
-    dstack_rewind(sm);
-    fexec sm->a1 - 1;
-    fret;
-  };
-
-  header_with_id => {
-    dstack_rewind(sm);
-    fexec sm->a1 - 1;
-    fret;
-  };
-
-  '[quote]'i => {
-    g_debug("inline [quote]");
-    dstack_close_before_block(sm);
-    fexec sm->ts;
-    fret;
-  };
-
-  '[/quote]'i space* => {
-    g_debug("inline [/quote]");
-    dstack_close_before_block(sm);
-
-    if (dstack_check(sm, BLOCK_LI)) {
-      dstack_close_list(sm);
-    }
-
-    if (dstack_check(sm, BLOCK_QUOTE)) {
-      dstack_rewind(sm);
-      fret;
-    } else {
-      append_block(sm, "[/quote]");
-    }
-  };
-
   spoilers_open => {
     g_debug("inline [spoiler]");
     g_debug("  push <span>");
@@ -562,6 +525,38 @@ inline := |*
     }
   };
 
+  '[nodtext]'i => {
+    dstack_push(sm, &INLINE_NODTEXT);
+    g_debug("push inline nodtext");
+    fcall nodtext;
+  };
+  
+  # these are block level elements that should kick us out of the inline
+  # scanner
+
+  '[quote]'i => {
+    g_debug("inline [quote]");
+    dstack_close_before_block(sm);
+    fexec sm->ts;
+    fret;
+  };
+
+  '[/quote]'i space* => {
+    g_debug("inline [/quote]");
+    dstack_close_before_block(sm);
+
+    if (dstack_check(sm, BLOCK_LI)) {
+      dstack_close_list(sm);
+    }
+
+    if (dstack_check(sm, BLOCK_QUOTE)) {
+      dstack_rewind(sm);
+      fret;
+    } else {
+      append_block(sm, "[/quote]");
+    }
+  };
+
   '[expand]'i => {
     g_debug("inline [expand]");
     dstack_rewind(sm);
@@ -581,11 +576,6 @@ inline := |*
     }
   };
 
-  '[nodtext]'i => {
-    dstack_push(sm, &INLINE_NODTEXT);
-    fcall nodtext;
-  };
-
   '[/th]'i => {
     if (dstack_check(sm, BLOCK_TH)) {
       dstack_pop(sm);
@@ -670,14 +660,18 @@ code := |*
 
 nodtext := |*
   '[/nodtext]'i => {
-    if (dstack_check(sm, BLOCK_NODTEXT)) {
+    if (dstack_check2(sm, BLOCK_NODTEXT)) {
+      g_debug("block dstack check");
+      dstack_pop(sm);
       dstack_pop(sm);
       append_block(sm, "</p>");
       fret;
     } else if (dstack_check(sm, INLINE_NODTEXT)) {
+      g_debug("inline dstack check");
       dstack_pop(sm);
       fret;
     } else {
+      g_debug("else dstack check");
       append(sm, true, "[/nodtext]");
     }
   };
@@ -988,6 +982,8 @@ main := |*
     dstack_close_before_block(sm);
     dstack_push(sm, &BLOCK_NODTEXT);
     dstack_push(sm, &BLOCK_P);
+    g_debug("push block nodtext");
+    g_debug("push block p");
     append_block(sm, "<p>");
     fcall nodtext;
   };

data/test/dtext_test.rb

@@ -97,6 +97,10 @@ class DTextTest < Minitest::Test
     assert_parse("<ul><li>a</li></ul><h1>header</h1><ul><li>list</li></ul>", "* a\n\nh1. header\n* list")
   end
 
+  def test_inline_headers
+    assert_parse("<p>blah h1. blah</p>", "blah h1. blah")
+  end
+
   def test_headers_with_ids
     assert_parse("<h1 id=\"dtext-blah-blah\">header</h1>", "h1#blah-blah. header")
   end
@@ -281,4 +285,10 @@ class DTextTest < Minitest::Test
     assert_parse('<p><a href="/posts?tags=approver:葉月">7893</a></p>', '"7893":[/posts?tags=approver:葉月]')
     assert_parse('<p><a href="http://danbooru.donmai.us/posts?tags=approver:葉月">http://danbooru.donmai.us/posts?tags=approver:葉月</a></p>', 'http://danbooru.donmai.us/posts?tags=approver:葉月')
   end
+
+  def test_nodtext
+    assert_parse('<p>[b]not bold[/b]</p><p> <strong>bold</strong></p>', "[nodtext][b]not bold[/b][/nodtext] [b]bold[/b]")
+    assert_parse('<p>[b]not bold[/b]</p><p><strong>hello</strong></p>', "[nodtext][b]not bold[/b][/nodtext]\n\n[b]hello[/b]")
+    assert_parse('<p> [b]not bold[/b]</p>', " [nodtext][b]not bold[/b][/nodtext]")
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtext_rb
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - r888888888
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-13 00:00:00.000000000 Z
+date: 2017-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest