From a9f067e25a43bdfbce384a8d8e502f4e74da45a3 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Wed, 11 Oct 2023 15:25:09 -0400 Subject: [PATCH] Update name tests to use all the affiliated keywords. --- .../drawer/affiliated_keyword.org | 74 +++++++++++++++++++ .../greater_element/drawer/name.org | 10 --- .../dynamic_block/affiliated_keyword.org | 72 ++++++++++++++++++ .../greater_element/dynamic_block/name.org | 7 -- .../affiliated_keyword.org | 63 ++++++++++++++++ .../center/affiliated_keyword.org | 67 +++++++++++++++++ .../greater_block/center/name.org | 4 - .../quote/affiliated_keyword.org | 67 +++++++++++++++++ .../greater_block/quote/name.org | 4 - .../special/affiliated_keyword.org | 71 ++++++++++++++++++ .../greater_block/special/name.org | 6 -- .../greater_element/plain_list/name.org | 2 - .../table/affiliated_keyword.org | 63 ++++++++++++++++ .../greater_element/table/name.org | 2 - .../babel_call/affiliated_keyword.org | 63 ++++++++++++++++ .../lesser_element/babel_call/name.org | 2 - .../diary_sexp/affiliated_keyword.org | 63 ++++++++++++++++ .../lesser_element/diary_sexp/name.org | 2 - .../fixed_width_area/affiliated_keyword.org | 63 ++++++++++++++++ .../lesser_element/fixed_width_area/name.org | 2 - .../horizontal_rule/affiliated_keyword.org | 63 ++++++++++++++++ .../lesser_element/horizontal_rule/name.org | 2 - .../keyword/affiliated_keyword.org | 69 +++++++++++++++-- .../affiliated_keywords_short_version.org | 7 -- .../lesser_element/keyword/name.org | 2 - .../latex_environment/affiliated_keyword.org | 67 +++++++++++++++++ .../lesser_element/latex_environment/name.org | 4 - .../comment/affiliated_keyword.org | 67 +++++++++++++++++ .../lesser_block/comment/name.org | 4 - .../example/affiliated_keyword.org | 67 +++++++++++++++++ .../lesser_block/example/name.org | 4 - .../export/affiliated_keyword.org | 67 +++++++++++++++++ .../lesser_block/export/name.org | 4 - .../lesser_block/src/affiliated_keyword.org | 67 +++++++++++++++++ .../lesser_element/lesser_block/src/name.org | 4 - .../lesser_block/verse/affiliated_keyword.org | 67 +++++++++++++++++ .../lesser_block/verse/name.org | 4 - .../paragraph/affiliated_keyword.org | 63 ++++++++++++++++ .../lesser_element/paragraph/name.org | 2 - src/parser/affiliated_keyword.rs | 3 +- 40 files changed, 1258 insertions(+), 86 deletions(-) create mode 100644 org_mode_samples/greater_element/drawer/affiliated_keyword.org delete mode 100644 org_mode_samples/greater_element/drawer/name.org create mode 100644 org_mode_samples/greater_element/dynamic_block/affiliated_keyword.org delete mode 100644 org_mode_samples/greater_element/dynamic_block/name.org create mode 100644 org_mode_samples/greater_element/footnote_definition/affiliated_keyword.org create mode 100644 org_mode_samples/greater_element/greater_block/center/affiliated_keyword.org delete mode 100644 org_mode_samples/greater_element/greater_block/center/name.org create mode 100644 org_mode_samples/greater_element/greater_block/quote/affiliated_keyword.org delete mode 100644 org_mode_samples/greater_element/greater_block/quote/name.org create mode 100644 org_mode_samples/greater_element/greater_block/special/affiliated_keyword.org delete mode 100644 org_mode_samples/greater_element/greater_block/special/name.org delete mode 100644 org_mode_samples/greater_element/plain_list/name.org create mode 100644 org_mode_samples/greater_element/table/affiliated_keyword.org delete mode 100644 org_mode_samples/greater_element/table/name.org create mode 100644 org_mode_samples/lesser_element/babel_call/affiliated_keyword.org delete mode 100644 org_mode_samples/lesser_element/babel_call/name.org create mode 100644 org_mode_samples/lesser_element/diary_sexp/affiliated_keyword.org delete mode 100644 org_mode_samples/lesser_element/diary_sexp/name.org create mode 100644 org_mode_samples/lesser_element/fixed_width_area/affiliated_keyword.org delete mode 100644 org_mode_samples/lesser_element/fixed_width_area/name.org create mode 100644 org_mode_samples/lesser_element/horizontal_rule/affiliated_keyword.org delete mode 100644 org_mode_samples/lesser_element/horizontal_rule/name.org delete mode 100644 org_mode_samples/lesser_element/keyword/affiliated_keywords_short_version.org delete mode 100644 org_mode_samples/lesser_element/keyword/name.org create mode 100644 org_mode_samples/lesser_element/latex_environment/affiliated_keyword.org delete mode 100644 org_mode_samples/lesser_element/latex_environment/name.org create mode 100644 org_mode_samples/lesser_element/lesser_block/comment/affiliated_keyword.org delete mode 100644 org_mode_samples/lesser_element/lesser_block/comment/name.org create mode 100644 org_mode_samples/lesser_element/lesser_block/example/affiliated_keyword.org delete mode 100644 org_mode_samples/lesser_element/lesser_block/example/name.org create mode 100644 org_mode_samples/lesser_element/lesser_block/export/affiliated_keyword.org delete mode 100644 org_mode_samples/lesser_element/lesser_block/export/name.org create mode 100644 org_mode_samples/lesser_element/lesser_block/src/affiliated_keyword.org delete mode 100644 org_mode_samples/lesser_element/lesser_block/src/name.org create mode 100644 org_mode_samples/lesser_element/lesser_block/verse/affiliated_keyword.org delete mode 100644 org_mode_samples/lesser_element/lesser_block/verse/name.org create mode 100644 org_mode_samples/lesser_element/paragraph/affiliated_keyword.org delete mode 100644 org_mode_samples/lesser_element/paragraph/name.org diff --git a/org_mode_samples/greater_element/drawer/affiliated_keyword.org b/org_mode_samples/greater_element/drawer/affiliated_keyword.org new file mode 100644 index 00000000..b77f7990 --- /dev/null +++ b/org_mode_samples/greater_element/drawer/affiliated_keyword.org @@ -0,0 +1,74 @@ +* Headline +before +#+NAME: a +#+caption: b *lorem* ipsum +#+results: c +#+headers: d +#+header: e +#+label: f +#+plot: g +#+resname: h +#+result: i +#+source: j +#+srcname: k +#+tblname: l +#+attr_latex: m +#+attr_html: n +#+NAME: aa +#+caption: bb *lorem* ipsum +#+results: cc +#+headers: dd +#+header: ee +#+label: ff +#+plot: gg +#+resname: hh +#+result: ii +#+source: jj +#+srcname: kk +#+tblname: ll +#+attr_latex: mm +#+attr_html: nn +:candle: +inside + +the drawer +:end: + + + + +#+NAME: A +#+CAPTION: B *LOREM* IPSUM +#+RESULTS: C +#+HEADERS: D +#+HEADER: E +#+LABEL: F +#+PLOT: G +#+RESNAME: H +#+RESULT: I +#+SOURCE: J +#+SRCNAME: K +#+TBLNAME: L +#+ATTR_LATEX: M +#+ATTR_HTML: N +#+NAME: AA +#+CAPTION: BB *LOREM* IPSUM +#+RESULTS: CC +#+HEADERS: DD +#+HEADER: EE +#+LABEL: FF +#+PLOT: GG +#+RESNAME: HH +#+RESULT: II +#+SOURCE: JJ +#+SRCNAME: KK +#+TBLNAME: LL +#+ATTR_LATEX: MM +#+ATTR_HTML: NN +:candle: +inside + +the drawer +:end: + +after diff --git a/org_mode_samples/greater_element/drawer/name.org b/org_mode_samples/greater_element/drawer/name.org deleted file mode 100644 index 41b7c3d4..00000000 --- a/org_mode_samples/greater_element/drawer/name.org +++ /dev/null @@ -1,10 +0,0 @@ -* Headline -before -#+NAME: foo -:candle: -inside - -the drawer -:end: - -after diff --git a/org_mode_samples/greater_element/dynamic_block/affiliated_keyword.org b/org_mode_samples/greater_element/dynamic_block/affiliated_keyword.org new file mode 100644 index 00000000..3eba6cf3 --- /dev/null +++ b/org_mode_samples/greater_element/dynamic_block/affiliated_keyword.org @@ -0,0 +1,72 @@ +#+NAME: a +#+caption: b *lorem* ipsum +#+results: c +#+headers: d +#+header: e +#+label: f +#+plot: g +#+resname: h +#+result: i +#+source: j +#+srcname: k +#+tblname: l +#+attr_latex: m +#+attr_html: n +#+NAME: aa +#+caption: bb *lorem* ipsum +#+results: cc +#+headers: dd +#+header: ee +#+label: ff +#+plot: gg +#+resname: hh +#+result: ii +#+source: jj +#+srcname: kk +#+tblname: ll +#+attr_latex: mm +#+attr_html: nn +#+BEGIN: clocktable :scope file :maxlevel 2 +#+CAPTION: Clock summary at [2023-08-25 Fri 05:34] +| Headline | Time | +|--------------+--------| +| *Total time* | *0:00* | +#+END: + + + + +#+NAME: A +#+CAPTION: B *LOREM* IPSUM +#+RESULTS: C +#+HEADERS: D +#+HEADER: E +#+LABEL: F +#+PLOT: G +#+RESNAME: H +#+RESULT: I +#+SOURCE: J +#+SRCNAME: K +#+TBLNAME: L +#+ATTR_LATEX: M +#+ATTR_HTML: N +#+NAME: AA +#+CAPTION: BB *LOREM* IPSUM +#+RESULTS: CC +#+HEADERS: DD +#+HEADER: EE +#+LABEL: FF +#+PLOT: GG +#+RESNAME: HH +#+RESULT: II +#+SOURCE: JJ +#+SRCNAME: KK +#+TBLNAME: LL +#+ATTR_LATEX: MM +#+ATTR_HTML: NN +#+BEGIN: clocktable :scope file :maxlevel 2 +#+CAPTION: Clock summary at [2023-08-25 Fri 05:34] +| Headline | Time | +|--------------+--------| +| *Total time* | *0:00* | +#+END: diff --git a/org_mode_samples/greater_element/dynamic_block/name.org b/org_mode_samples/greater_element/dynamic_block/name.org deleted file mode 100644 index 4da2f796..00000000 --- a/org_mode_samples/greater_element/dynamic_block/name.org +++ /dev/null @@ -1,7 +0,0 @@ -#+NAME: foo -#+BEGIN: clocktable :scope file :maxlevel 2 -#+CAPTION: Clock summary at [2023-08-25 Fri 05:34] -| Headline | Time | -|--------------+--------| -| *Total time* | *0:00* | -#+END: diff --git a/org_mode_samples/greater_element/footnote_definition/affiliated_keyword.org b/org_mode_samples/greater_element/footnote_definition/affiliated_keyword.org new file mode 100644 index 00000000..bfe6f231 --- /dev/null +++ b/org_mode_samples/greater_element/footnote_definition/affiliated_keyword.org @@ -0,0 +1,63 @@ +#+NAME: a +#+caption: b *lorem* ipsum +#+results: c +#+headers: d +#+header: e +#+label: f +#+plot: g +#+resname: h +#+result: i +#+source: j +#+srcname: k +#+tblname: l +#+attr_latex: m +#+attr_html: n +#+NAME: aa +#+caption: bb *lorem* ipsum +#+results: cc +#+headers: dd +#+header: ee +#+label: ff +#+plot: gg +#+resname: hh +#+result: ii +#+source: jj +#+srcname: kk +#+tblname: ll +#+attr_latex: mm +#+attr_html: nn +[fn:1] A footnote. + + + + + +#+NAME: A +#+CAPTION: B *LOREM* IPSUM +#+RESULTS: C +#+HEADERS: D +#+HEADER: E +#+LABEL: F +#+PLOT: G +#+RESNAME: H +#+RESULT: I +#+SOURCE: J +#+SRCNAME: K +#+TBLNAME: L +#+ATTR_LATEX: M +#+ATTR_HTML: N +#+NAME: AA +#+CAPTION: BB *LOREM* IPSUM +#+RESULTS: CC +#+HEADERS: DD +#+HEADER: EE +#+LABEL: FF +#+PLOT: GG +#+RESNAME: HH +#+RESULT: II +#+SOURCE: JJ +#+SRCNAME: KK +#+TBLNAME: LL +#+ATTR_LATEX: MM +#+ATTR_HTML: NN +[fn:1] A footnote. diff --git a/org_mode_samples/greater_element/greater_block/center/affiliated_keyword.org b/org_mode_samples/greater_element/greater_block/center/affiliated_keyword.org new file mode 100644 index 00000000..eb3e8296 --- /dev/null +++ b/org_mode_samples/greater_element/greater_block/center/affiliated_keyword.org @@ -0,0 +1,67 @@ +#+NAME: a +#+caption: b *lorem* ipsum +#+results: c +#+headers: d +#+header: e +#+label: f +#+plot: g +#+resname: h +#+result: i +#+source: j +#+srcname: k +#+tblname: l +#+attr_latex: m +#+attr_html: n +#+NAME: aa +#+caption: bb *lorem* ipsum +#+results: cc +#+headers: dd +#+header: ee +#+label: ff +#+plot: gg +#+resname: hh +#+result: ii +#+source: jj +#+srcname: kk +#+tblname: ll +#+attr_latex: mm +#+attr_html: nn +#+begin_center + +#+end_center + + + + + +#+NAME: A +#+CAPTION: B *LOREM* IPSUM +#+RESULTS: C +#+HEADERS: D +#+HEADER: E +#+LABEL: F +#+PLOT: G +#+RESNAME: H +#+RESULT: I +#+SOURCE: J +#+SRCNAME: K +#+TBLNAME: L +#+ATTR_LATEX: M +#+ATTR_HTML: N +#+NAME: AA +#+CAPTION: BB *LOREM* IPSUM +#+RESULTS: CC +#+HEADERS: DD +#+HEADER: EE +#+LABEL: FF +#+PLOT: GG +#+RESNAME: HH +#+RESULT: II +#+SOURCE: JJ +#+SRCNAME: KK +#+TBLNAME: LL +#+ATTR_LATEX: MM +#+ATTR_HTML: NN +#+begin_center + +#+end_center diff --git a/org_mode_samples/greater_element/greater_block/center/name.org b/org_mode_samples/greater_element/greater_block/center/name.org deleted file mode 100644 index e0f9c0cf..00000000 --- a/org_mode_samples/greater_element/greater_block/center/name.org +++ /dev/null @@ -1,4 +0,0 @@ -#+NAME: foo -#+begin_center - -#+end_center diff --git a/org_mode_samples/greater_element/greater_block/quote/affiliated_keyword.org b/org_mode_samples/greater_element/greater_block/quote/affiliated_keyword.org new file mode 100644 index 00000000..a4cc5402 --- /dev/null +++ b/org_mode_samples/greater_element/greater_block/quote/affiliated_keyword.org @@ -0,0 +1,67 @@ +#+NAME: a +#+caption: b *lorem* ipsum +#+results: c +#+headers: d +#+header: e +#+label: f +#+plot: g +#+resname: h +#+result: i +#+source: j +#+srcname: k +#+tblname: l +#+attr_latex: m +#+attr_html: n +#+NAME: aa +#+caption: bb *lorem* ipsum +#+results: cc +#+headers: dd +#+header: ee +#+label: ff +#+plot: gg +#+resname: hh +#+result: ii +#+source: jj +#+srcname: kk +#+tblname: ll +#+attr_latex: mm +#+attr_html: nn +#+begin_quote + +#+end_quote + + + + + +#+NAME: A +#+CAPTION: B *LOREM* IPSUM +#+RESULTS: C +#+HEADERS: D +#+HEADER: E +#+LABEL: F +#+PLOT: G +#+RESNAME: H +#+RESULT: I +#+SOURCE: J +#+SRCNAME: K +#+TBLNAME: L +#+ATTR_LATEX: M +#+ATTR_HTML: N +#+NAME: AA +#+CAPTION: BB *LOREM* IPSUM +#+RESULTS: CC +#+HEADERS: DD +#+HEADER: EE +#+LABEL: FF +#+PLOT: GG +#+RESNAME: HH +#+RESULT: II +#+SOURCE: JJ +#+SRCNAME: KK +#+TBLNAME: LL +#+ATTR_LATEX: MM +#+ATTR_HTML: NN +#+begin_quote + +#+end_quote diff --git a/org_mode_samples/greater_element/greater_block/quote/name.org b/org_mode_samples/greater_element/greater_block/quote/name.org deleted file mode 100644 index fe2fa3a4..00000000 --- a/org_mode_samples/greater_element/greater_block/quote/name.org +++ /dev/null @@ -1,4 +0,0 @@ -#+NAME: foo -#+begin_quote - -#+end_quote diff --git a/org_mode_samples/greater_element/greater_block/special/affiliated_keyword.org b/org_mode_samples/greater_element/greater_block/special/affiliated_keyword.org new file mode 100644 index 00000000..71c12ce8 --- /dev/null +++ b/org_mode_samples/greater_element/greater_block/special/affiliated_keyword.org @@ -0,0 +1,71 @@ +#+NAME: a +#+caption: b *lorem* ipsum +#+results: c +#+headers: d +#+header: e +#+label: f +#+plot: g +#+resname: h +#+result: i +#+source: j +#+srcname: k +#+tblname: l +#+attr_latex: m +#+attr_html: n +#+NAME: aa +#+caption: bb *lorem* ipsum +#+results: cc +#+headers: dd +#+header: ee +#+label: ff +#+plot: gg +#+resname: hh +#+result: ii +#+source: jj +#+srcname: kk +#+tblname: ll +#+attr_latex: mm +#+attr_html: nn +#+begin_defun +foo + +{{{bar(baz)}}} +#+end_defun + + + + + +#+NAME: A +#+CAPTION: B *LOREM* IPSUM +#+RESULTS: C +#+HEADERS: D +#+HEADER: E +#+LABEL: F +#+PLOT: G +#+RESNAME: H +#+RESULT: I +#+SOURCE: J +#+SRCNAME: K +#+TBLNAME: L +#+ATTR_LATEX: M +#+ATTR_HTML: N +#+NAME: AA +#+CAPTION: BB *LOREM* IPSUM +#+RESULTS: CC +#+HEADERS: DD +#+HEADER: EE +#+LABEL: FF +#+PLOT: GG +#+RESNAME: HH +#+RESULT: II +#+SOURCE: JJ +#+SRCNAME: KK +#+TBLNAME: LL +#+ATTR_LATEX: MM +#+ATTR_HTML: NN +#+begin_defun +foo + +{{{bar(baz)}}} +#+end_defun diff --git a/org_mode_samples/greater_element/greater_block/special/name.org b/org_mode_samples/greater_element/greater_block/special/name.org deleted file mode 100644 index 6b513b12..00000000 --- a/org_mode_samples/greater_element/greater_block/special/name.org +++ /dev/null @@ -1,6 +0,0 @@ -#+NAME: foo -#+begin_defun -foo - -{{{bar(baz)}}} -#+end_defun diff --git a/org_mode_samples/greater_element/plain_list/name.org b/org_mode_samples/greater_element/plain_list/name.org deleted file mode 100644 index d80b7ba8..00000000 --- a/org_mode_samples/greater_element/plain_list/name.org +++ /dev/null @@ -1,2 +0,0 @@ -#+NAME: foo -1. bar diff --git a/org_mode_samples/greater_element/table/affiliated_keyword.org b/org_mode_samples/greater_element/table/affiliated_keyword.org new file mode 100644 index 00000000..043d251a --- /dev/null +++ b/org_mode_samples/greater_element/table/affiliated_keyword.org @@ -0,0 +1,63 @@ +#+NAME: a +#+caption: b *lorem* ipsum +#+results: c +#+headers: d +#+header: e +#+label: f +#+plot: g +#+resname: h +#+result: i +#+source: j +#+srcname: k +#+tblname: l +#+attr_latex: m +#+attr_html: n +#+NAME: aa +#+caption: bb *lorem* ipsum +#+results: cc +#+headers: dd +#+header: ee +#+label: ff +#+plot: gg +#+resname: hh +#+result: ii +#+source: jj +#+srcname: kk +#+tblname: ll +#+attr_latex: mm +#+attr_html: nn +| foo | bar | + + + + + +#+NAME: A +#+CAPTION: B *LOREM* IPSUM +#+RESULTS: C +#+HEADERS: D +#+HEADER: E +#+LABEL: F +#+PLOT: G +#+RESNAME: H +#+RESULT: I +#+SOURCE: J +#+SRCNAME: K +#+TBLNAME: L +#+ATTR_LATEX: M +#+ATTR_HTML: N +#+NAME: AA +#+CAPTION: BB *LOREM* IPSUM +#+RESULTS: CC +#+HEADERS: DD +#+HEADER: EE +#+LABEL: FF +#+PLOT: GG +#+RESNAME: HH +#+RESULT: II +#+SOURCE: JJ +#+SRCNAME: KK +#+TBLNAME: LL +#+ATTR_LATEX: MM +#+ATTR_HTML: NN +| foo | bar | diff --git a/org_mode_samples/greater_element/table/name.org b/org_mode_samples/greater_element/table/name.org deleted file mode 100644 index b5d3a567..00000000 --- a/org_mode_samples/greater_element/table/name.org +++ /dev/null @@ -1,2 +0,0 @@ -#+NAME: foo -| foo | bar | diff --git a/org_mode_samples/lesser_element/babel_call/affiliated_keyword.org b/org_mode_samples/lesser_element/babel_call/affiliated_keyword.org new file mode 100644 index 00000000..677e1654 --- /dev/null +++ b/org_mode_samples/lesser_element/babel_call/affiliated_keyword.org @@ -0,0 +1,63 @@ +#+NAME: a +#+caption: b *lorem* ipsum +#+results: c +#+headers: d +#+header: e +#+label: f +#+plot: g +#+resname: h +#+result: i +#+source: j +#+srcname: k +#+tblname: l +#+attr_latex: m +#+attr_html: n +#+NAME: aa +#+caption: bb *lorem* ipsum +#+results: cc +#+headers: dd +#+header: ee +#+label: ff +#+plot: gg +#+resname: hh +#+result: ii +#+source: jj +#+srcname: kk +#+tblname: ll +#+attr_latex: mm +#+attr_html: nn +#+call: foo(bar="baz") + + + + + +#+NAME: A +#+CAPTION: B *LOREM* IPSUM +#+RESULTS: C +#+HEADERS: D +#+HEADER: E +#+LABEL: F +#+PLOT: G +#+RESNAME: H +#+RESULT: I +#+SOURCE: J +#+SRCNAME: K +#+TBLNAME: L +#+ATTR_LATEX: M +#+ATTR_HTML: N +#+NAME: AA +#+CAPTION: BB *LOREM* IPSUM +#+RESULTS: CC +#+HEADERS: DD +#+HEADER: EE +#+LABEL: FF +#+PLOT: GG +#+RESNAME: HH +#+RESULT: II +#+SOURCE: JJ +#+SRCNAME: KK +#+TBLNAME: LL +#+ATTR_LATEX: MM +#+ATTR_HTML: NN +#+call: foo(bar="baz") diff --git a/org_mode_samples/lesser_element/babel_call/name.org b/org_mode_samples/lesser_element/babel_call/name.org deleted file mode 100644 index da7aea93..00000000 --- a/org_mode_samples/lesser_element/babel_call/name.org +++ /dev/null @@ -1,2 +0,0 @@ -#+NAME: foo -#+call: foo(bar="baz") diff --git a/org_mode_samples/lesser_element/diary_sexp/affiliated_keyword.org b/org_mode_samples/lesser_element/diary_sexp/affiliated_keyword.org new file mode 100644 index 00000000..e94349ed --- /dev/null +++ b/org_mode_samples/lesser_element/diary_sexp/affiliated_keyword.org @@ -0,0 +1,63 @@ +#+NAME: a +#+caption: b *lorem* ipsum +#+results: c +#+headers: d +#+header: e +#+label: f +#+plot: g +#+resname: h +#+result: i +#+source: j +#+srcname: k +#+tblname: l +#+attr_latex: m +#+attr_html: n +#+NAME: aa +#+caption: bb *lorem* ipsum +#+results: cc +#+headers: dd +#+header: ee +#+label: ff +#+plot: gg +#+resname: hh +#+result: ii +#+source: jj +#+srcname: kk +#+tblname: ll +#+attr_latex: mm +#+attr_html: nn +%%(foo) + + + + + +#+NAME: A +#+CAPTION: B *LOREM* IPSUM +#+RESULTS: C +#+HEADERS: D +#+HEADER: E +#+LABEL: F +#+PLOT: G +#+RESNAME: H +#+RESULT: I +#+SOURCE: J +#+SRCNAME: K +#+TBLNAME: L +#+ATTR_LATEX: M +#+ATTR_HTML: N +#+NAME: AA +#+CAPTION: BB *LOREM* IPSUM +#+RESULTS: CC +#+HEADERS: DD +#+HEADER: EE +#+LABEL: FF +#+PLOT: GG +#+RESNAME: HH +#+RESULT: II +#+SOURCE: JJ +#+SRCNAME: KK +#+TBLNAME: LL +#+ATTR_LATEX: MM +#+ATTR_HTML: NN +%%(foo) diff --git a/org_mode_samples/lesser_element/diary_sexp/name.org b/org_mode_samples/lesser_element/diary_sexp/name.org deleted file mode 100644 index 34e6155b..00000000 --- a/org_mode_samples/lesser_element/diary_sexp/name.org +++ /dev/null @@ -1,2 +0,0 @@ -#+NAME: foo -%%(foo) diff --git a/org_mode_samples/lesser_element/fixed_width_area/affiliated_keyword.org b/org_mode_samples/lesser_element/fixed_width_area/affiliated_keyword.org new file mode 100644 index 00000000..57664010 --- /dev/null +++ b/org_mode_samples/lesser_element/fixed_width_area/affiliated_keyword.org @@ -0,0 +1,63 @@ +#+NAME: a +#+caption: b *lorem* ipsum +#+results: c +#+headers: d +#+header: e +#+label: f +#+plot: g +#+resname: h +#+result: i +#+source: j +#+srcname: k +#+tblname: l +#+attr_latex: m +#+attr_html: n +#+NAME: aa +#+caption: bb *lorem* ipsum +#+results: cc +#+headers: dd +#+header: ee +#+label: ff +#+plot: gg +#+resname: hh +#+result: ii +#+source: jj +#+srcname: kk +#+tblname: ll +#+attr_latex: mm +#+attr_html: nn +: bar + + + + + +#+NAME: A +#+CAPTION: B *LOREM* IPSUM +#+RESULTS: C +#+HEADERS: D +#+HEADER: E +#+LABEL: F +#+PLOT: G +#+RESNAME: H +#+RESULT: I +#+SOURCE: J +#+SRCNAME: K +#+TBLNAME: L +#+ATTR_LATEX: M +#+ATTR_HTML: N +#+NAME: AA +#+CAPTION: BB *LOREM* IPSUM +#+RESULTS: CC +#+HEADERS: DD +#+HEADER: EE +#+LABEL: FF +#+PLOT: GG +#+RESNAME: HH +#+RESULT: II +#+SOURCE: JJ +#+SRCNAME: KK +#+TBLNAME: LL +#+ATTR_LATEX: MM +#+ATTR_HTML: NN +: bar diff --git a/org_mode_samples/lesser_element/fixed_width_area/name.org b/org_mode_samples/lesser_element/fixed_width_area/name.org deleted file mode 100644 index 482c0d26..00000000 --- a/org_mode_samples/lesser_element/fixed_width_area/name.org +++ /dev/null @@ -1,2 +0,0 @@ -#+NAME: foo -: bar diff --git a/org_mode_samples/lesser_element/horizontal_rule/affiliated_keyword.org b/org_mode_samples/lesser_element/horizontal_rule/affiliated_keyword.org new file mode 100644 index 00000000..88bbdf7b --- /dev/null +++ b/org_mode_samples/lesser_element/horizontal_rule/affiliated_keyword.org @@ -0,0 +1,63 @@ +#+NAME: a +#+caption: b *lorem* ipsum +#+results: c +#+headers: d +#+header: e +#+label: f +#+plot: g +#+resname: h +#+result: i +#+source: j +#+srcname: k +#+tblname: l +#+attr_latex: m +#+attr_html: n +#+NAME: aa +#+caption: bb *lorem* ipsum +#+results: cc +#+headers: dd +#+header: ee +#+label: ff +#+plot: gg +#+resname: hh +#+result: ii +#+source: jj +#+srcname: kk +#+tblname: ll +#+attr_latex: mm +#+attr_html: nn +----- + + + + + +#+NAME: A +#+CAPTION: B *LOREM* IPSUM +#+RESULTS: C +#+HEADERS: D +#+HEADER: E +#+LABEL: F +#+PLOT: G +#+RESNAME: H +#+RESULT: I +#+SOURCE: J +#+SRCNAME: K +#+TBLNAME: L +#+ATTR_LATEX: M +#+ATTR_HTML: N +#+NAME: AA +#+CAPTION: BB *LOREM* IPSUM +#+RESULTS: CC +#+HEADERS: DD +#+HEADER: EE +#+LABEL: FF +#+PLOT: GG +#+RESNAME: HH +#+RESULT: II +#+SOURCE: JJ +#+SRCNAME: KK +#+TBLNAME: LL +#+ATTR_LATEX: MM +#+ATTR_HTML: NN +----- diff --git a/org_mode_samples/lesser_element/horizontal_rule/name.org b/org_mode_samples/lesser_element/horizontal_rule/name.org deleted file mode 100644 index 252fc4f1..00000000 --- a/org_mode_samples/lesser_element/horizontal_rule/name.org +++ /dev/null @@ -1,2 +0,0 @@ -#+NAME: foo ------ diff --git a/org_mode_samples/lesser_element/keyword/affiliated_keyword.org b/org_mode_samples/lesser_element/keyword/affiliated_keyword.org index 2323b993..c5b92a11 100644 --- a/org_mode_samples/lesser_element/keyword/affiliated_keyword.org +++ b/org_mode_samples/lesser_element/keyword/affiliated_keyword.org @@ -1,8 +1,63 @@ -#+name: foo -#+caption: bar -#+caption: baz -[[file:lorem/ipsum.png]] +#+NAME: a +#+caption: b *lorem* ipsum +#+results: c +#+headers: d +#+header: e +#+label: f +#+plot: g +#+resname: h +#+result: i +#+source: j +#+srcname: k +#+tblname: l +#+attr_latex: m +#+attr_html: n +#+NAME: aa +#+caption: bb *lorem* ipsum +#+results: cc +#+headers: dd +#+header: ee +#+label: ff +#+plot: gg +#+resname: hh +#+result: ii +#+source: jj +#+srcname: kk +#+tblname: ll +#+attr_latex: mm +#+attr_html: nn +#+foo: bar -#+name: cat -#+caption: dog -[[file:lorem/ipsum.png]] + + + + +#+NAME: A +#+CAPTION: B *LOREM* IPSUM +#+RESULTS: C +#+HEADERS: D +#+HEADER: E +#+LABEL: F +#+PLOT: G +#+RESNAME: H +#+RESULT: I +#+SOURCE: J +#+SRCNAME: K +#+TBLNAME: L +#+ATTR_LATEX: M +#+ATTR_HTML: N +#+NAME: AA +#+CAPTION: BB *LOREM* IPSUM +#+RESULTS: CC +#+HEADERS: DD +#+HEADER: EE +#+LABEL: FF +#+PLOT: GG +#+RESNAME: HH +#+RESULT: II +#+SOURCE: JJ +#+SRCNAME: KK +#+TBLNAME: LL +#+ATTR_LATEX: MM +#+ATTR_HTML: NN +#+foo: bar diff --git a/org_mode_samples/lesser_element/keyword/affiliated_keywords_short_version.org b/org_mode_samples/lesser_element/keyword/affiliated_keywords_short_version.org deleted file mode 100644 index 4de56bea..00000000 --- a/org_mode_samples/lesser_element/keyword/affiliated_keywords_short_version.org +++ /dev/null @@ -1,7 +0,0 @@ -# This test is to prove that the parser works with affiliated keywords that have both a shorter and longer version. - -#+results: -#+result: -#+begin_latex -\foo -#+end_latex diff --git a/org_mode_samples/lesser_element/keyword/name.org b/org_mode_samples/lesser_element/keyword/name.org deleted file mode 100644 index 51bc2fad..00000000 --- a/org_mode_samples/lesser_element/keyword/name.org +++ /dev/null @@ -1,2 +0,0 @@ -#+NAME: foo -#+FOO: BAR diff --git a/org_mode_samples/lesser_element/latex_environment/affiliated_keyword.org b/org_mode_samples/lesser_element/latex_environment/affiliated_keyword.org new file mode 100644 index 00000000..fea212de --- /dev/null +++ b/org_mode_samples/lesser_element/latex_environment/affiliated_keyword.org @@ -0,0 +1,67 @@ +#+NAME: a +#+caption: b *lorem* ipsum +#+results: c +#+headers: d +#+header: e +#+label: f +#+plot: g +#+resname: h +#+result: i +#+source: j +#+srcname: k +#+tblname: l +#+attr_latex: m +#+attr_html: n +#+NAME: aa +#+caption: bb *lorem* ipsum +#+results: cc +#+headers: dd +#+header: ee +#+label: ff +#+plot: gg +#+resname: hh +#+result: ii +#+source: jj +#+srcname: kk +#+tblname: ll +#+attr_latex: mm +#+attr_html: nn +\begin{foo} +bar +\end{foo} + + + + + +#+NAME: A +#+CAPTION: B *LOREM* IPSUM +#+RESULTS: C +#+HEADERS: D +#+HEADER: E +#+LABEL: F +#+PLOT: G +#+RESNAME: H +#+RESULT: I +#+SOURCE: J +#+SRCNAME: K +#+TBLNAME: L +#+ATTR_LATEX: M +#+ATTR_HTML: N +#+NAME: AA +#+CAPTION: BB *LOREM* IPSUM +#+RESULTS: CC +#+HEADERS: DD +#+HEADER: EE +#+LABEL: FF +#+PLOT: GG +#+RESNAME: HH +#+RESULT: II +#+SOURCE: JJ +#+SRCNAME: KK +#+TBLNAME: LL +#+ATTR_LATEX: MM +#+ATTR_HTML: NN +\begin{foo} +bar +\end{foo} diff --git a/org_mode_samples/lesser_element/latex_environment/name.org b/org_mode_samples/lesser_element/latex_environment/name.org deleted file mode 100644 index 51a64715..00000000 --- a/org_mode_samples/lesser_element/latex_environment/name.org +++ /dev/null @@ -1,4 +0,0 @@ -#+NAME: foo -\begin{foo} -bar -\end{foo} diff --git a/org_mode_samples/lesser_element/lesser_block/comment/affiliated_keyword.org b/org_mode_samples/lesser_element/lesser_block/comment/affiliated_keyword.org new file mode 100644 index 00000000..b844b824 --- /dev/null +++ b/org_mode_samples/lesser_element/lesser_block/comment/affiliated_keyword.org @@ -0,0 +1,67 @@ +#+NAME: a +#+caption: b *lorem* ipsum +#+results: c +#+headers: d +#+header: e +#+label: f +#+plot: g +#+resname: h +#+result: i +#+source: j +#+srcname: k +#+tblname: l +#+attr_latex: m +#+attr_html: n +#+NAME: aa +#+caption: bb *lorem* ipsum +#+results: cc +#+headers: dd +#+header: ee +#+label: ff +#+plot: gg +#+resname: hh +#+result: ii +#+source: jj +#+srcname: kk +#+tblname: ll +#+attr_latex: mm +#+attr_html: nn +#+begin_comment text +bar +#+end_comment + + + + + +#+NAME: A +#+CAPTION: B *LOREM* IPSUM +#+RESULTS: C +#+HEADERS: D +#+HEADER: E +#+LABEL: F +#+PLOT: G +#+RESNAME: H +#+RESULT: I +#+SOURCE: J +#+SRCNAME: K +#+TBLNAME: L +#+ATTR_LATEX: M +#+ATTR_HTML: N +#+NAME: AA +#+CAPTION: BB *LOREM* IPSUM +#+RESULTS: CC +#+HEADERS: DD +#+HEADER: EE +#+LABEL: FF +#+PLOT: GG +#+RESNAME: HH +#+RESULT: II +#+SOURCE: JJ +#+SRCNAME: KK +#+TBLNAME: LL +#+ATTR_LATEX: MM +#+ATTR_HTML: NN +#+begin_comment text +bar +#+end_comment diff --git a/org_mode_samples/lesser_element/lesser_block/comment/name.org b/org_mode_samples/lesser_element/lesser_block/comment/name.org deleted file mode 100644 index ad25dbd6..00000000 --- a/org_mode_samples/lesser_element/lesser_block/comment/name.org +++ /dev/null @@ -1,4 +0,0 @@ -#+NAME: foo -#+begin_comment text -bar -#+end_comment diff --git a/org_mode_samples/lesser_element/lesser_block/example/affiliated_keyword.org b/org_mode_samples/lesser_element/lesser_block/example/affiliated_keyword.org new file mode 100644 index 00000000..32de53ca --- /dev/null +++ b/org_mode_samples/lesser_element/lesser_block/example/affiliated_keyword.org @@ -0,0 +1,67 @@ +#+NAME: a +#+caption: b *lorem* ipsum +#+results: c +#+headers: d +#+header: e +#+label: f +#+plot: g +#+resname: h +#+result: i +#+source: j +#+srcname: k +#+tblname: l +#+attr_latex: m +#+attr_html: n +#+NAME: aa +#+caption: bb *lorem* ipsum +#+results: cc +#+headers: dd +#+header: ee +#+label: ff +#+plot: gg +#+resname: hh +#+result: ii +#+source: jj +#+srcname: kk +#+tblname: ll +#+attr_latex: mm +#+attr_html: nn +#+begin_example text +bar +#+end_example + + + + + +#+NAME: A +#+CAPTION: B *LOREM* IPSUM +#+RESULTS: C +#+HEADERS: D +#+HEADER: E +#+LABEL: F +#+PLOT: G +#+RESNAME: H +#+RESULT: I +#+SOURCE: J +#+SRCNAME: K +#+TBLNAME: L +#+ATTR_LATEX: M +#+ATTR_HTML: N +#+NAME: AA +#+CAPTION: BB *LOREM* IPSUM +#+RESULTS: CC +#+HEADERS: DD +#+HEADER: EE +#+LABEL: FF +#+PLOT: GG +#+RESNAME: HH +#+RESULT: II +#+SOURCE: JJ +#+SRCNAME: KK +#+TBLNAME: LL +#+ATTR_LATEX: MM +#+ATTR_HTML: NN +#+begin_example text +bar +#+end_example diff --git a/org_mode_samples/lesser_element/lesser_block/example/name.org b/org_mode_samples/lesser_element/lesser_block/example/name.org deleted file mode 100644 index 84b09c58..00000000 --- a/org_mode_samples/lesser_element/lesser_block/example/name.org +++ /dev/null @@ -1,4 +0,0 @@ -#+NAME: foo -#+begin_example text -bar -#+end_example diff --git a/org_mode_samples/lesser_element/lesser_block/export/affiliated_keyword.org b/org_mode_samples/lesser_element/lesser_block/export/affiliated_keyword.org new file mode 100644 index 00000000..cce0eece --- /dev/null +++ b/org_mode_samples/lesser_element/lesser_block/export/affiliated_keyword.org @@ -0,0 +1,67 @@ +#+NAME: a +#+caption: b *lorem* ipsum +#+results: c +#+headers: d +#+header: e +#+label: f +#+plot: g +#+resname: h +#+result: i +#+source: j +#+srcname: k +#+tblname: l +#+attr_latex: m +#+attr_html: n +#+NAME: aa +#+caption: bb *lorem* ipsum +#+results: cc +#+headers: dd +#+header: ee +#+label: ff +#+plot: gg +#+resname: hh +#+result: ii +#+source: jj +#+srcname: kk +#+tblname: ll +#+attr_latex: mm +#+attr_html: nn +#+begin_export text +bar +#+end_export + + + + + +#+NAME: A +#+CAPTION: B *LOREM* IPSUM +#+RESULTS: C +#+HEADERS: D +#+HEADER: E +#+LABEL: F +#+PLOT: G +#+RESNAME: H +#+RESULT: I +#+SOURCE: J +#+SRCNAME: K +#+TBLNAME: L +#+ATTR_LATEX: M +#+ATTR_HTML: N +#+NAME: AA +#+CAPTION: BB *LOREM* IPSUM +#+RESULTS: CC +#+HEADERS: DD +#+HEADER: EE +#+LABEL: FF +#+PLOT: GG +#+RESNAME: HH +#+RESULT: II +#+SOURCE: JJ +#+SRCNAME: KK +#+TBLNAME: LL +#+ATTR_LATEX: MM +#+ATTR_HTML: NN +#+begin_export text +bar +#+end_export diff --git a/org_mode_samples/lesser_element/lesser_block/export/name.org b/org_mode_samples/lesser_element/lesser_block/export/name.org deleted file mode 100644 index cfba5df2..00000000 --- a/org_mode_samples/lesser_element/lesser_block/export/name.org +++ /dev/null @@ -1,4 +0,0 @@ -#+NAME: foo -#+begin_export text -bar -#+end_export diff --git a/org_mode_samples/lesser_element/lesser_block/src/affiliated_keyword.org b/org_mode_samples/lesser_element/lesser_block/src/affiliated_keyword.org new file mode 100644 index 00000000..65871f96 --- /dev/null +++ b/org_mode_samples/lesser_element/lesser_block/src/affiliated_keyword.org @@ -0,0 +1,67 @@ +#+NAME: a +#+caption: b *lorem* ipsum +#+results: c +#+headers: d +#+header: e +#+label: f +#+plot: g +#+resname: h +#+result: i +#+source: j +#+srcname: k +#+tblname: l +#+attr_latex: m +#+attr_html: n +#+NAME: aa +#+caption: bb *lorem* ipsum +#+results: cc +#+headers: dd +#+header: ee +#+label: ff +#+plot: gg +#+resname: hh +#+result: ii +#+source: jj +#+srcname: kk +#+tblname: ll +#+attr_latex: mm +#+attr_html: nn +#+begin_src text +bar +#+end_src + + + + + +#+NAME: A +#+CAPTION: B *LOREM* IPSUM +#+RESULTS: C +#+HEADERS: D +#+HEADER: E +#+LABEL: F +#+PLOT: G +#+RESNAME: H +#+RESULT: I +#+SOURCE: J +#+SRCNAME: K +#+TBLNAME: L +#+ATTR_LATEX: M +#+ATTR_HTML: N +#+NAME: AA +#+CAPTION: BB *LOREM* IPSUM +#+RESULTS: CC +#+HEADERS: DD +#+HEADER: EE +#+LABEL: FF +#+PLOT: GG +#+RESNAME: HH +#+RESULT: II +#+SOURCE: JJ +#+SRCNAME: KK +#+TBLNAME: LL +#+ATTR_LATEX: MM +#+ATTR_HTML: NN +#+begin_src text +bar +#+end_src diff --git a/org_mode_samples/lesser_element/lesser_block/src/name.org b/org_mode_samples/lesser_element/lesser_block/src/name.org deleted file mode 100644 index 31af9ebc..00000000 --- a/org_mode_samples/lesser_element/lesser_block/src/name.org +++ /dev/null @@ -1,4 +0,0 @@ -#+NAME: foo -#+begin_src text -bar -#+end_src diff --git a/org_mode_samples/lesser_element/lesser_block/verse/affiliated_keyword.org b/org_mode_samples/lesser_element/lesser_block/verse/affiliated_keyword.org new file mode 100644 index 00000000..14c600ae --- /dev/null +++ b/org_mode_samples/lesser_element/lesser_block/verse/affiliated_keyword.org @@ -0,0 +1,67 @@ +#+NAME: a +#+caption: b *lorem* ipsum +#+results: c +#+headers: d +#+header: e +#+label: f +#+plot: g +#+resname: h +#+result: i +#+source: j +#+srcname: k +#+tblname: l +#+attr_latex: m +#+attr_html: n +#+NAME: aa +#+caption: bb *lorem* ipsum +#+results: cc +#+headers: dd +#+header: ee +#+label: ff +#+plot: gg +#+resname: hh +#+result: ii +#+source: jj +#+srcname: kk +#+tblname: ll +#+attr_latex: mm +#+attr_html: nn +#+begin_verse text +bar +#+end_verse + + + + + +#+NAME: A +#+CAPTION: B *LOREM* IPSUM +#+RESULTS: C +#+HEADERS: D +#+HEADER: E +#+LABEL: F +#+PLOT: G +#+RESNAME: H +#+RESULT: I +#+SOURCE: J +#+SRCNAME: K +#+TBLNAME: L +#+ATTR_LATEX: M +#+ATTR_HTML: N +#+NAME: AA +#+CAPTION: BB *LOREM* IPSUM +#+RESULTS: CC +#+HEADERS: DD +#+HEADER: EE +#+LABEL: FF +#+PLOT: GG +#+RESNAME: HH +#+RESULT: II +#+SOURCE: JJ +#+SRCNAME: KK +#+TBLNAME: LL +#+ATTR_LATEX: MM +#+ATTR_HTML: NN +#+begin_verse text +bar +#+end_verse diff --git a/org_mode_samples/lesser_element/lesser_block/verse/name.org b/org_mode_samples/lesser_element/lesser_block/verse/name.org deleted file mode 100644 index 94e58779..00000000 --- a/org_mode_samples/lesser_element/lesser_block/verse/name.org +++ /dev/null @@ -1,4 +0,0 @@ -#+NAME: foo -#+begin_verse text -bar -#+end_verse diff --git a/org_mode_samples/lesser_element/paragraph/affiliated_keyword.org b/org_mode_samples/lesser_element/paragraph/affiliated_keyword.org new file mode 100644 index 00000000..2bb3278f --- /dev/null +++ b/org_mode_samples/lesser_element/paragraph/affiliated_keyword.org @@ -0,0 +1,63 @@ +#+NAME: a +#+caption: b *lorem* ipsum +#+results: c +#+headers: d +#+header: e +#+label: f +#+plot: g +#+resname: h +#+result: i +#+source: j +#+srcname: k +#+tblname: l +#+attr_latex: m +#+attr_html: n +#+NAME: aa +#+caption: bb *lorem* ipsum +#+results: cc +#+headers: dd +#+header: ee +#+label: ff +#+plot: gg +#+resname: hh +#+result: ii +#+source: jj +#+srcname: kk +#+tblname: ll +#+attr_latex: mm +#+attr_html: nn +bar + + + + + +#+NAME: A +#+CAPTION: B *LOREM* IPSUM +#+RESULTS: C +#+HEADERS: D +#+HEADER: E +#+LABEL: F +#+PLOT: G +#+RESNAME: H +#+RESULT: I +#+SOURCE: J +#+SRCNAME: K +#+TBLNAME: L +#+ATTR_LATEX: M +#+ATTR_HTML: N +#+NAME: AA +#+CAPTION: BB *LOREM* IPSUM +#+RESULTS: CC +#+HEADERS: DD +#+HEADER: EE +#+LABEL: FF +#+PLOT: GG +#+RESNAME: HH +#+RESULT: II +#+SOURCE: JJ +#+SRCNAME: KK +#+TBLNAME: LL +#+ATTR_LATEX: MM +#+ATTR_HTML: NN +bar diff --git a/org_mode_samples/lesser_element/paragraph/name.org b/org_mode_samples/lesser_element/paragraph/name.org deleted file mode 100644 index 5cc5a63f..00000000 --- a/org_mode_samples/lesser_element/paragraph/name.org +++ /dev/null @@ -1,2 +0,0 @@ -#+NAME: foo -bar diff --git a/src/parser/affiliated_keyword.rs b/src/parser/affiliated_keyword.rs index 22cb9409..0dc9cfa3 100644 --- a/src/parser/affiliated_keyword.rs +++ b/src/parser/affiliated_keyword.rs @@ -97,9 +97,10 @@ fn is_single_string_keyword<'g, 's>( } fn is_list_of_single_string_keyword<'g, 's>( - global_settings: &'g GlobalSettings<'g, 's>, + _global_settings: &'g GlobalSettings<'g, 's>, name: &'s str, ) -> bool { + // TODO: Is this defined by an elisp variable? for single_string_name in ["results"] { if name.eq_ignore_ascii_case(single_string_name) { return true;