org_mode_samples/greater_element/greater_block/deeply_nested.org

@@ -1,18 +0,0 @@
-#+begin_defun
-foo
-#+begin_lorem
-,#+begin_center
-bar
-,#+end_center
-ipsum
-#+end_lorem
-baz
-#+end_defun
-
-#+begin_center
-#+begin_quote
-#+begin_center
-lorem
-#+end_center
-#+end_quote
-#+end_center

org_mode_samples/greater_element/greater_block/nested_special_block.org

@@ -1,12 +0,0 @@
-#+begin_defun
-foo
-#+begin_lorem
-ipsum
-#+end_lorem
-bar
-#+begin_center
-#+begin_quote
-baz
-#+end_quote
-#+end_center
-#+end_defun

org_mode_samples/greater_element/greater_block/special_block.org

@@ -1,5 +0,0 @@
-#+begin_defun
-foo
-
-{{{bar(baz)}}}
-#+end_defun

src/compare/diff.rs

@@ -737,7 +737,7 @@ fn compare_greater_block<'s>(
     let emacs_name = match rust.name.to_lowercase().as_str() {
         "center" => "center-block",
         "quote" => "quote-block",
-        _ => "special-block",
+        _ => todo!(),
     };
     if assert_name(emacs, emacs_name).is_err() {
         this_status = DiffStatus::Bad;

src/parser/greater_block.rs

@@ -12,7 +12,6 @@ use nom::multi::many_till;
 use nom::sequence::tuple;
 
 use super::org_source::OrgSource;
-use super::util::in_section;
 use super::Context;
 use crate::error::CustomError;
 use crate::error::MyError;
@@ -27,6 +26,7 @@ use crate::parser::source::SetSource;
 use crate::parser::util::blank_line;
 use crate::parser::util::exit_matcher_parser;
 use crate::parser::util::get_consumed;
+use crate::parser::util::immediate_in_section;
 use crate::parser::util::start_of_line;
 use crate::parser::Element;
 use crate::parser::Paragraph;
@@ -49,11 +49,11 @@ pub fn greater_block<'r, 's>(
         }),
     ))(remaining)?;
     let context_name = match Into::<&str>::into(name).to_lowercase().as_str() {
-        "center" => "center block".to_owned(),
+        "center" => "center block",
-        "quote" => "quote block".to_owned(),
+        "quote" => "quote block",
-        name @ _ => format!("special block {}", name),
+        _ => "greater block",
     };
-    if in_section(context, context_name.as_str()) {
+    if immediate_in_section(context, context_name) {
         return Err(nom::Err::Error(CustomError::MyError(MyError(
             "Cannot nest objects of the same element".into(),
         ))));
@@ -63,7 +63,7 @@ pub fn greater_block<'r, 's>(
     let (remaining, _nl) = line_ending(remaining)?;
     let parser_context = context
         .with_additional_node(ContextElement::ConsumeTrailingWhitespace(true))
-        .with_additional_node(ContextElement::Context(context_name.as_str()))
+        .with_additional_node(ContextElement::Context(context_name))
         .with_additional_node(ContextElement::ExitMatcherNode(ExitMatcherNode {
             class: ExitClass::Alpha,
             exit_matcher: &exit_with_name,