diff --git a/build.rs b/build.rs index 5f4a1f2e..d83dbdf6 100644 --- a/build.rs +++ b/build.rs @@ -71,13 +71,13 @@ use organic::parser::sexp::sexp_with_padding; fn is_expect_fail(name: &str) -> Option<&str> { match name { - "drawer_drawer_with_headline_inside" => Some("Apparently lines with :end: become their own paragraph. This odd behavior needs to be investigated more."), + "greater_element_drawer_drawer_with_headline_inside" => Some("Apparently lines with :end: become their own paragraph. This odd behavior needs to be investigated more."), "element_container_priority_footnote_definition_dynamic_block" => Some("Apparently broken begin lines become their own paragraph."), - "paragraphs_paragraph_with_backslash_line_breaks" => Some("The text we're getting out of the parse tree is already processed to remove line breaks, so our comparison needs to take that into account."), - "export_snippet_paragraph_break_precedence" => Some("The latest code for org-mode is matching the export snippet without the closing @@."), // https://list.orgmode.org/orgmode/fb61ea28-f004-4c25-adf7-69fc55683ed4@app.fastmail.com/T/#u - "plain_lists_trailing_whitespace_ownership_test_case_1" => Some("Seeing odd behavior about whitespace ownership."), // https://list.orgmode.org/9372527e-3852-419e-936a-7b4dd38cc847@app.fastmail.com/ - "plain_lists_trailing_whitespace_ownership_test_case_3" => Some("Seeing odd behavior about whitespace ownership."), // https://list.orgmode.org/9372527e-3852-419e-936a-7b4dd38cc847@app.fastmail.com/ - "plain_lists_trailing_whitespace_ownership_test_case_4" => Some("Seeing odd behavior about whitespace ownership."), // https://list.orgmode.org/9372527e-3852-419e-936a-7b4dd38cc847@app.fastmail.com/ + "lesser_element_paragraphs_paragraph_with_backslash_line_breaks" => Some("The text we're getting out of the parse tree is already processed to remove line breaks, so our comparison needs to take that into account."), + "object_export_snippet_paragraph_break_precedence" => Some("The latest code for org-mode is matching the export snippet without the closing @@."), // https://list.orgmode.org/orgmode/fb61ea28-f004-4c25-adf7-69fc55683ed4@app.fastmail.com/T/#u + "greater_element_plain_list_trailing_whitespace_ownership_test_case_1" => Some("Seeing odd behavior about whitespace ownership."), // https://list.orgmode.org/9372527e-3852-419e-936a-7b4dd38cc847@app.fastmail.com/ + "greater_element_plain_list_trailing_whitespace_ownership_test_case_3" => Some("Seeing odd behavior about whitespace ownership."), // https://list.orgmode.org/9372527e-3852-419e-936a-7b4dd38cc847@app.fastmail.com/ + "greater_element_plain_list_trailing_whitespace_ownership_test_case_4" => Some("Seeing odd behavior about whitespace ownership."), // https://list.orgmode.org/9372527e-3852-419e-936a-7b4dd38cc847@app.fastmail.com/ _ => None, } } diff --git a/org_mode_samples/drawer/drawer_with_headline_inside.org b/org_mode_samples/greater_element/drawer/drawer_with_headline_inside.org similarity index 100% rename from org_mode_samples/drawer/drawer_with_headline_inside.org rename to org_mode_samples/greater_element/drawer/drawer_with_headline_inside.org diff --git a/org_mode_samples/drawer/simple.org b/org_mode_samples/greater_element/drawer/simple.org similarity index 100% rename from org_mode_samples/drawer/simple.org rename to org_mode_samples/greater_element/drawer/simple.org diff --git a/org_mode_samples/footnote_definition/simple.org b/org_mode_samples/greater_element/footnote_definition/simple.org similarity index 100% rename from org_mode_samples/footnote_definition/simple.org rename to org_mode_samples/greater_element/footnote_definition/simple.org diff --git a/org_mode_samples/greater_block/indented.org b/org_mode_samples/greater_element/greater_block/indented.org similarity index 100% rename from org_mode_samples/greater_block/indented.org rename to org_mode_samples/greater_element/greater_block/indented.org diff --git a/org_mode_samples/greater_block/nested.org b/org_mode_samples/greater_element/greater_block/nested.org similarity index 100% rename from org_mode_samples/greater_block/nested.org rename to org_mode_samples/greater_element/greater_block/nested.org diff --git a/org_mode_samples/plain_lists/empty_list_item.org b/org_mode_samples/greater_element/plain_list/empty_list_item.org similarity index 100% rename from org_mode_samples/plain_lists/empty_list_item.org rename to org_mode_samples/greater_element/plain_list/empty_list_item.org diff --git a/org_mode_samples/plain_lists/indented_then_less_indented.org b/org_mode_samples/greater_element/plain_list/indented_then_less_indented.org similarity index 100% rename from org_mode_samples/plain_lists/indented_then_less_indented.org rename to org_mode_samples/greater_element/plain_list/indented_then_less_indented.org diff --git a/org_mode_samples/plain_lists/nested_paragraphs.org b/org_mode_samples/greater_element/plain_list/nested_paragraphs.org similarity index 100% rename from org_mode_samples/plain_lists/nested_paragraphs.org rename to org_mode_samples/greater_element/plain_list/nested_paragraphs.org diff --git a/org_mode_samples/plain_lists/paragraphs.org b/org_mode_samples/greater_element/plain_list/paragraphs.org similarity index 100% rename from org_mode_samples/plain_lists/paragraphs.org rename to org_mode_samples/greater_element/plain_list/paragraphs.org diff --git a/org_mode_samples/plain_lists/start_nested_list_same_line.README.txt b/org_mode_samples/greater_element/plain_list/start_nested_list_same_line.README.txt similarity index 100% rename from org_mode_samples/plain_lists/start_nested_list_same_line.README.txt rename to org_mode_samples/greater_element/plain_list/start_nested_list_same_line.README.txt diff --git a/org_mode_samples/plain_lists/start_nested_list_same_line.org b/org_mode_samples/greater_element/plain_list/start_nested_list_same_line.org similarity index 100% rename from org_mode_samples/plain_lists/start_nested_list_same_line.org rename to org_mode_samples/greater_element/plain_list/start_nested_list_same_line.org diff --git a/org_mode_samples/plain_lists/trailing_whitespace_ownership_test_case_1.org b/org_mode_samples/greater_element/plain_list/trailing_whitespace_ownership_test_case_1.org similarity index 100% rename from org_mode_samples/plain_lists/trailing_whitespace_ownership_test_case_1.org rename to org_mode_samples/greater_element/plain_list/trailing_whitespace_ownership_test_case_1.org diff --git a/org_mode_samples/plain_lists/trailing_whitespace_ownership_test_case_2.org b/org_mode_samples/greater_element/plain_list/trailing_whitespace_ownership_test_case_2.org similarity index 100% rename from org_mode_samples/plain_lists/trailing_whitespace_ownership_test_case_2.org rename to org_mode_samples/greater_element/plain_list/trailing_whitespace_ownership_test_case_2.org diff --git a/org_mode_samples/plain_lists/trailing_whitespace_ownership_test_case_3.org b/org_mode_samples/greater_element/plain_list/trailing_whitespace_ownership_test_case_3.org similarity index 100% rename from org_mode_samples/plain_lists/trailing_whitespace_ownership_test_case_3.org rename to org_mode_samples/greater_element/plain_list/trailing_whitespace_ownership_test_case_3.org diff --git a/org_mode_samples/plain_lists/trailing_whitespace_ownership_test_case_4.org b/org_mode_samples/greater_element/plain_list/trailing_whitespace_ownership_test_case_4.org similarity index 100% rename from org_mode_samples/plain_lists/trailing_whitespace_ownership_test_case_4.org rename to org_mode_samples/greater_element/plain_list/trailing_whitespace_ownership_test_case_4.org diff --git a/org_mode_samples/property_drawer/add_in_child.org b/org_mode_samples/greater_element/property_drawer/add_in_child.org similarity index 100% rename from org_mode_samples/property_drawer/add_in_child.org rename to org_mode_samples/greater_element/property_drawer/add_in_child.org diff --git a/org_mode_samples/property_drawer/empty.org b/org_mode_samples/greater_element/property_drawer/empty.org similarity index 100% rename from org_mode_samples/property_drawer/empty.org rename to org_mode_samples/greater_element/property_drawer/empty.org diff --git a/org_mode_samples/property_drawer/zeroth_section.org b/org_mode_samples/greater_element/property_drawer/zeroth_section.org similarity index 100% rename from org_mode_samples/property_drawer/zeroth_section.org rename to org_mode_samples/greater_element/property_drawer/zeroth_section.org diff --git a/org_mode_samples/property_drawer/zeroth_section_spaces_after_comment.org b/org_mode_samples/greater_element/property_drawer/zeroth_section_spaces_after_comment.org similarity index 100% rename from org_mode_samples/property_drawer/zeroth_section_spaces_after_comment.org rename to org_mode_samples/greater_element/property_drawer/zeroth_section_spaces_after_comment.org diff --git a/org_mode_samples/table/simple.org b/org_mode_samples/greater_element/table/simple.org similarity index 100% rename from org_mode_samples/table/simple.org rename to org_mode_samples/greater_element/table/simple.org diff --git a/org_mode_samples/clock/simple.org b/org_mode_samples/lesser_element/clock/simple.org similarity index 100% rename from org_mode_samples/clock/simple.org rename to org_mode_samples/lesser_element/clock/simple.org diff --git a/org_mode_samples/comment/indented.org b/org_mode_samples/lesser_element/comment/indented.org similarity index 100% rename from org_mode_samples/comment/indented.org rename to org_mode_samples/lesser_element/comment/indented.org diff --git a/org_mode_samples/comment/multiline_comment.org b/org_mode_samples/lesser_element/comment/multiline_comment.org similarity index 100% rename from org_mode_samples/comment/multiline_comment.org rename to org_mode_samples/lesser_element/comment/multiline_comment.org diff --git a/org_mode_samples/comment/require_whitespace_after_hash.org b/org_mode_samples/lesser_element/comment/require_whitespace_after_hash.org similarity index 100% rename from org_mode_samples/comment/require_whitespace_after_hash.org rename to org_mode_samples/lesser_element/comment/require_whitespace_after_hash.org diff --git a/org_mode_samples/diary_sexp/simple.org b/org_mode_samples/lesser_element/diary_sexp/simple.org similarity index 100% rename from org_mode_samples/diary_sexp/simple.org rename to org_mode_samples/lesser_element/diary_sexp/simple.org diff --git a/org_mode_samples/fixed_width_area/indented.org b/org_mode_samples/lesser_element/fixed_width_area/indented.org similarity index 100% rename from org_mode_samples/fixed_width_area/indented.org rename to org_mode_samples/lesser_element/fixed_width_area/indented.org diff --git a/org_mode_samples/horizontal_rule/simple.org b/org_mode_samples/lesser_element/horizontal_rule/simple.org similarity index 100% rename from org_mode_samples/horizontal_rule/simple.org rename to org_mode_samples/lesser_element/horizontal_rule/simple.org diff --git a/org_mode_samples/keyword/affiliated_keyword.org b/org_mode_samples/lesser_element/keyword/affiliated_keyword.org similarity index 100% rename from org_mode_samples/keyword/affiliated_keyword.org rename to org_mode_samples/lesser_element/keyword/affiliated_keyword.org diff --git a/org_mode_samples/keyword/simple.org b/org_mode_samples/lesser_element/keyword/simple.org similarity index 100% rename from org_mode_samples/keyword/simple.org rename to org_mode_samples/lesser_element/keyword/simple.org diff --git a/org_mode_samples/latex_environment/simple.org b/org_mode_samples/lesser_element/latex_environment/simple.org similarity index 100% rename from org_mode_samples/latex_environment/simple.org rename to org_mode_samples/lesser_element/latex_environment/simple.org diff --git a/org_mode_samples/lesser_block/export_with_no_data.org b/org_mode_samples/lesser_element/lesser_block/export_with_no_data.org similarity index 100% rename from org_mode_samples/lesser_block/export_with_no_data.org rename to org_mode_samples/lesser_element/lesser_block/export_with_no_data.org diff --git a/org_mode_samples/lesser_block/export_with_two_words.org b/org_mode_samples/lesser_element/lesser_block/export_with_two_words.org similarity index 100% rename from org_mode_samples/lesser_block/export_with_two_words.org rename to org_mode_samples/lesser_element/lesser_block/export_with_two_words.org diff --git a/org_mode_samples/lesser_block/simple.org b/org_mode_samples/lesser_element/lesser_block/simple.org similarity index 100% rename from org_mode_samples/lesser_block/simple.org rename to org_mode_samples/lesser_element/lesser_block/simple.org diff --git a/org_mode_samples/lesser_block/src_with_no_data.org b/org_mode_samples/lesser_element/lesser_block/src_with_no_data.org similarity index 100% rename from org_mode_samples/lesser_block/src_with_no_data.org rename to org_mode_samples/lesser_element/lesser_block/src_with_no_data.org diff --git a/org_mode_samples/paragraphs/many_blank_lines.org b/org_mode_samples/lesser_element/paragraph/many_blank_lines.org similarity index 100% rename from org_mode_samples/paragraphs/many_blank_lines.org rename to org_mode_samples/lesser_element/paragraph/many_blank_lines.org diff --git a/org_mode_samples/paragraphs/paragraph_with_backslash_line_breaks.org b/org_mode_samples/lesser_element/paragraph/paragraph_with_backslash_line_breaks.org similarity index 100% rename from org_mode_samples/paragraphs/paragraph_with_backslash_line_breaks.org rename to org_mode_samples/lesser_element/paragraph/paragraph_with_backslash_line_breaks.org diff --git a/org_mode_samples/paragraphs/paragraph_with_immediate_list.org b/org_mode_samples/lesser_element/paragraph/paragraph_with_immediate_list.org similarity index 100% rename from org_mode_samples/paragraphs/paragraph_with_immediate_list.org rename to org_mode_samples/lesser_element/paragraph/paragraph_with_immediate_list.org diff --git a/org_mode_samples/planning/simple.org b/org_mode_samples/lesser_element/planning/simple.org similarity index 100% rename from org_mode_samples/planning/simple.org rename to org_mode_samples/lesser_element/planning/simple.org diff --git a/org_mode_samples/angle_link/all_default_links.org b/org_mode_samples/object/angle_link/all_default_links.org similarity index 100% rename from org_mode_samples/angle_link/all_default_links.org rename to org_mode_samples/object/angle_link/all_default_links.org diff --git a/org_mode_samples/citation/simple.org b/org_mode_samples/object/citation/simple.org similarity index 100% rename from org_mode_samples/citation/simple.org rename to org_mode_samples/object/citation/simple.org diff --git a/org_mode_samples/entity/simple.org b/org_mode_samples/object/entity/simple.org similarity index 100% rename from org_mode_samples/entity/simple.org rename to org_mode_samples/object/entity/simple.org diff --git a/org_mode_samples/export_snippet/paragraph_break_precedence.org b/org_mode_samples/object/export_snippet/paragraph_break_precedence.org similarity index 100% rename from org_mode_samples/export_snippet/paragraph_break_precedence.org rename to org_mode_samples/object/export_snippet/paragraph_break_precedence.org diff --git a/org_mode_samples/export_snippet/simple.org b/org_mode_samples/object/export_snippet/simple.org similarity index 100% rename from org_mode_samples/export_snippet/simple.org rename to org_mode_samples/object/export_snippet/simple.org diff --git a/org_mode_samples/footnote_reference/simple.org b/org_mode_samples/object/footnote_reference/simple.org similarity index 100% rename from org_mode_samples/footnote_reference/simple.org rename to org_mode_samples/object/footnote_reference/simple.org diff --git a/org_mode_samples/inline_babel_call/simple.org b/org_mode_samples/object/inline_babel_call/simple.org similarity index 100% rename from org_mode_samples/inline_babel_call/simple.org rename to org_mode_samples/object/inline_babel_call/simple.org diff --git a/org_mode_samples/inline_source_block/simple.org b/org_mode_samples/object/inline_source_block/simple.org similarity index 100% rename from org_mode_samples/inline_source_block/simple.org rename to org_mode_samples/object/inline_source_block/simple.org diff --git a/org_mode_samples/latex_fragment/fragment_vs_environment.org b/org_mode_samples/object/latex_fragment/fragment_vs_environment.org similarity index 100% rename from org_mode_samples/latex_fragment/fragment_vs_environment.org rename to org_mode_samples/object/latex_fragment/fragment_vs_environment.org diff --git a/org_mode_samples/latex_fragment/math_mode.org b/org_mode_samples/object/latex_fragment/math_mode.org similarity index 100% rename from org_mode_samples/latex_fragment/math_mode.org rename to org_mode_samples/object/latex_fragment/math_mode.org diff --git a/org_mode_samples/latex_fragment/simple.org b/org_mode_samples/object/latex_fragment/simple.org similarity index 100% rename from org_mode_samples/latex_fragment/simple.org rename to org_mode_samples/object/latex_fragment/simple.org diff --git a/org_mode_samples/line_break/simple.org b/org_mode_samples/object/line_break/simple.org similarity index 100% rename from org_mode_samples/line_break/simple.org rename to org_mode_samples/object/line_break/simple.org diff --git a/org_mode_samples/macro/built_in_macro.org b/org_mode_samples/object/macro/built_in_macro.org similarity index 100% rename from org_mode_samples/macro/built_in_macro.org rename to org_mode_samples/object/macro/built_in_macro.org diff --git a/org_mode_samples/macro/macro_with_args.org b/org_mode_samples/object/macro/macro_with_args.org similarity index 100% rename from org_mode_samples/macro/macro_with_args.org rename to org_mode_samples/object/macro/macro_with_args.org diff --git a/org_mode_samples/plain_link/all_default_links.org b/org_mode_samples/object/plain_link/all_default_links.org similarity index 100% rename from org_mode_samples/plain_link/all_default_links.org rename to org_mode_samples/object/plain_link/all_default_links.org diff --git a/org_mode_samples/radio_link/before_and_after.org b/org_mode_samples/object/radio_link/before_and_after.org similarity index 100% rename from org_mode_samples/radio_link/before_and_after.org rename to org_mode_samples/object/radio_link/before_and_after.org diff --git a/org_mode_samples/radio_link/identical_or_semantically_identical.org b/org_mode_samples/object/radio_link/identical_or_semantically_identical.org similarity index 100% rename from org_mode_samples/radio_link/identical_or_semantically_identical.org rename to org_mode_samples/object/radio_link/identical_or_semantically_identical.org diff --git a/org_mode_samples/radio_link/simple.org b/org_mode_samples/object/radio_link/simple.org similarity index 100% rename from org_mode_samples/radio_link/simple.org rename to org_mode_samples/object/radio_link/simple.org diff --git a/org_mode_samples/regular_link/simple.org b/org_mode_samples/object/regular_link/simple.org similarity index 100% rename from org_mode_samples/regular_link/simple.org rename to org_mode_samples/object/regular_link/simple.org diff --git a/org_mode_samples/statistics_cookie/simple.org b/org_mode_samples/object/statistics_cookie/simple.org similarity index 100% rename from org_mode_samples/statistics_cookie/simple.org rename to org_mode_samples/object/statistics_cookie/simple.org diff --git a/org_mode_samples/subscript_and_superscript/simple.org b/org_mode_samples/object/subscript_and_superscript/simple.org similarity index 100% rename from org_mode_samples/subscript_and_superscript/simple.org rename to org_mode_samples/object/subscript_and_superscript/simple.org diff --git a/org_mode_samples/subscript_and_superscript/start_of_file.org b/org_mode_samples/object/subscript_and_superscript/start_of_file.org similarity index 100% rename from org_mode_samples/subscript_and_superscript/start_of_file.org rename to org_mode_samples/object/subscript_and_superscript/start_of_file.org diff --git a/org_mode_samples/target/simple.org b/org_mode_samples/object/target/simple.org similarity index 100% rename from org_mode_samples/target/simple.org rename to org_mode_samples/object/target/simple.org diff --git a/org_mode_samples/text_markup/all_variants.org b/org_mode_samples/object/text_markup/all_variants.org similarity index 100% rename from org_mode_samples/text_markup/all_variants.org rename to org_mode_samples/object/text_markup/all_variants.org diff --git a/org_mode_samples/text_markup/deep_nesting.org b/org_mode_samples/object/text_markup/deep_nesting.org similarity index 100% rename from org_mode_samples/text_markup/deep_nesting.org rename to org_mode_samples/object/text_markup/deep_nesting.org diff --git a/org_mode_samples/text_markup/opening_and_closing.org b/org_mode_samples/object/text_markup/opening_and_closing.org similarity index 100% rename from org_mode_samples/text_markup/opening_and_closing.org rename to org_mode_samples/object/text_markup/opening_and_closing.org diff --git a/org_mode_samples/text_markup/simple.org b/org_mode_samples/object/text_markup/simple.org similarity index 100% rename from org_mode_samples/text_markup/simple.org rename to org_mode_samples/object/text_markup/simple.org diff --git a/org_mode_samples/timestamp/simple.org b/org_mode_samples/object/timestamp/simple.org similarity index 100% rename from org_mode_samples/timestamp/simple.org rename to org_mode_samples/object/timestamp/simple.org