Revert "Fix associated keywords for headlines"

This reverts commit 337f973.
issues with rewinding - looks like lists and other places would need to be
updated to handle -1 since they were built under the assumption of >= 0. Not
finding the time for this right now so reverting to prevent people on latest
from running into this

See #127

Author: niklasfasching

org/document.go

@@ -255,9 +255,6 @@ func (d *Document) parseMany(i int, stop stopFn) (int, []Node) {
 	start, nodes := i, []Node{}
 	for i < len(d.tokens) && !stop(d, i) {
 		consumed, node := d.parseOne(i, stop)
-		if consumed == -1 {
-			break
-		}
 		i += consumed
 		nodes = append(nodes, node)
 	}

org/keyword.go

@@ -73,13 +73,11 @@ func (d *Document) parseKeyword(i int, stop stopFn) (int, Node) {
 		}
 		return 1, k
 	case "CAPTION", "ATTR_HTML":
-		consumed, node, ok := d.parseAffiliated(i, stop)
-		if ok {
+		consumed, node := d.parseAffiliated(i, stop)
+		if consumed != 0 {
 			return consumed, node
-		} else if i+consumed <= len(d.tokens)-1 {
-			return -1, nil
 		}
-		return 1, k
+		fallthrough
 	default:
 		if _, ok := d.BufferSettings[k.Key]; ok {
 			d.BufferSettings[k.Key] = strings.Join([]string{d.BufferSettings[k.Key], k.Value}, "\n")
@@ -102,7 +100,7 @@ func (d *Document) parseNodeWithName(k Keyword, i int, stop stopFn) (int, Node)
 	return consumed + 1, NodeWithName{k.Value, node}
 }
 
-func (d *Document) parseAffiliated(i int, stop stopFn) (int, Node, bool) {
+func (d *Document) parseAffiliated(i int, stop stopFn) (int, Node) {
 	start, meta := i, Metadata{}
 	for ; !stop(d, i) && d.tokens[i].kind == "keyword"; i++ {
 		switch k := parseKeyword(d.tokens[i]); k.Key {
@@ -127,18 +125,18 @@ func (d *Document) parseAffiliated(i int, stop stopFn) (int, Node, bool) {
 			}
 			meta.HTMLAttributes = append(meta.HTMLAttributes, attributes)
 		default:
-			return i - start, nil, false
+			return 0, nil
 		}
 	}
 	if stop(d, i) {
-		return i - start, nil, false
+		return 0, nil
 	}
 	consumed, node := d.parseOne(i, stop)
 	if consumed == 0 || node == nil {
-		return i - start, nil, false
+		return 0, nil
 	}
 	i += consumed
-	return i - start, NodeWithMeta{node, meta}, true
+	return i - start, NodeWithMeta{node, meta}
 }
 
 func parseKeyword(t token) Keyword {

org/testdata/keywords.html

@@ -53,35 +53,7 @@ <h2 id="headline-2">
 </li>
 <li><a href="#headline-2">table of contents</a>
 </li>
-<li><a href="#headline-3">meta keywords</a>
-<ul>
-<li><a href="#headline-4">nested</a>
-</li>
-</ul>
-</li>
-<li><a href="#headline-5">headline with dangling meta keyword</a>
-</li>
 </ul>
 </nav>
 </div>
 </div>
-<div id="outline-container-headline-3" class="outline-2 first">
-<h2 id="headline-3">
-meta keywords
-</h2>
-<div id="outline-text-headline-3" class="outline-text-2">
-<p>Keywords like <code class="verbatim">ATTR_HTML</code> and <code class="verbatim">CAPTION</code> are special and apply to the following node.
-We don&#39;t want them to become part of the previous headline body unilke everything
-else - unless there are no further nodes in the document.</p>
-<div id="outline-container-headline-4" class="outline-3 nested">
-<h3 id="headline-4">
-nested
-</h3>
-</div>
-</div>
-</div>
-<div id="outline-container-headline-5" class="outline-2 second">
-<h2 id="headline-5">
-headline with dangling meta keyword
-</h2>
-</div>

org/testdata/keywords.org

@@ -32,15 +32,3 @@ A table of contents can be rendered anywhere in the document by using
 #+end_src
 Where =$n= is the max headline lvl that will be included. You can use =headlines 0= to include all headlines.
 #+TOC: headlines 0
-
-#+ATTR_HTML: :class first
-* meta keywords
-Keywords like =ATTR_HTML= and =CAPTION= are special and apply to the following node.
-We don't want them to become part of the previous headline body unilke everything
-else - unless there are no further nodes in the document.
-#+ATTR_HTML: :class nested
-** nested
-#+ATTR_HTML: :class second
-* headline with dangling meta keyword
-#+ATTR_HTML: :class dangling1
-#+ATTR_HTML: :class dangling2

org/testdata/keywords.pretty_org

@@ -32,15 +32,3 @@ A table of contents can be rendered anywhere in the document by using
 #+END_SRC
 Where =$n= is the max headline lvl that will be included. You can use =headlines 0= to include all headlines.
 #+TOC: headlines 0
-
-#+ATTR_HTML: :class first
-* meta keywords
-Keywords like =ATTR_HTML= and =CAPTION= are special and apply to the following node.
-We don't want them to become part of the previous headline body unilke everything
-else - unless there are no further nodes in the document.
-#+ATTR_HTML: :class nested
-** nested
-#+ATTR_HTML: :class second
-* headline with dangling meta keyword
-#+ATTR_HTML: :class dangling1
-#+ATTR_HTML: :class dangling2