Parse multiline list headings

[sixth.git] / src / main / java / eu / svjatoslav / sixth / core / document / Document.java

diff --git a/src/main/java/eu/svjatoslav/sixth/core/document/Document.java b/src/main/java/eu/svjatoslav/sixth/core/document/Document.java
index 262bee3..c4e18cd 100644 (file)
--- a/src/main/java/eu/svjatoslav/sixth/core/document/Document.java
+++ b/src/main/java/eu/svjatoslav/sixth/core/document/Document.java
@@ -1,6 +1,5 @@
 package eu.svjatoslav.sixth.core.document;
 
 package eu.svjatoslav.sixth.core.document;
 

-import eu.svjatoslav.commons.string.String2;

 import eu.svjatoslav.commons.string.tokenizer.InvalidSyntaxException;
 import eu.svjatoslav.commons.string.tokenizer.Tokenizer;
 import eu.svjatoslav.commons.string.tokenizer.TokenizerMatch;
 import eu.svjatoslav.commons.string.tokenizer.InvalidSyntaxException;
 import eu.svjatoslav.commons.string.tokenizer.Tokenizer;
 import eu.svjatoslav.commons.string.tokenizer.TokenizerMatch;


@@ -28,14 +27,10 @@ public class Document {
             return createHeading(name, targetLevel);
         }
 
             return createHeading(name, targetLevel);
         }
 

-        try {
-            Heading missingIntermediate = new Heading(fromOrg("<noname>"), currentHeading.level + 1, currentHeading);
-            currentHeading.addChild(missingIntermediate);
-            currentHeading = missingIntermediate;
-            return createHeading(name, targetLevel);
-        } catch (InvalidSyntaxException e) {
-            throw new IllegalStateException("impossible situation");
-        }
+        Heading missingIntermediate = new Heading(fromOrg("<noname>"), currentHeading.level + 1, currentHeading);
+        currentHeading.addChild(missingIntermediate);
+        currentHeading = missingIntermediate;
+        return createHeading(name, targetLevel);

     }
 
     public Heading getCurrentHeading(){
     }
 
     public Heading getCurrentHeading(){


@@ -43,10 +38,7 @@ public class Document {
     }
 
     private void parseHeading(TokenizerMatch token) throws InvalidSyntaxException {
     }
 
     private void parseHeading(TokenizerMatch token) throws InvalidSyntaxException {

-        // expected sample heading:
-        // ***** test heading
-
-        String[] headingSections = String2.getGroups(token.token, "(\\*+)[ \\t](.*)\\r?\\n");
+        String[] headingSections = token.getRegExpGroups();

         int level = headingSections[0].length();
         String title = headingSections[1];
         createHeading(fromOrg(title), level);
         int level = headingSections[0].length();
         String title = headingSections[1];
         createHeading(fromOrg(title), level);


@@ -57,15 +49,15 @@ public class Document {
 
         // Org heading:
         // "*** Example Heading 1234"
 
         // Org heading:
         // "*** Example Heading 1234"

-        tokenizer.addTerminator(PRESERVE, "\\*+[ \\t].*\\r?\\n", TG_HEADING);
+        tokenizer.addTerminator(PRESERVE, "(\\*+)[ \\t](.*)\\r?\\n", TG_HEADING);

 
         // Org list. Examples:
         // "   + my list title"
         // "   - my list title"
 
         // Org list. Examples:
         // "   + my list title"
         // "   - my list title"

-        tokenizer.addTerminator(PRESERVE, "[ \\t]*(\\+|-)([ \\t].*)?\\r?\\n", TG_LIST);
+        tokenizer.addTerminator(PRESERVE, "([ \\t]*)(\\+|-)[ \\t]?(.*)?\\r?\\n", TG_LIST);

 
         // "   * my list title"
 
         // "   * my list title"

-        tokenizer.addTerminator(PRESERVE, "[ \\t]+\\*([ \\t].*)?\\r?\\n", TG_LIST);
+        tokenizer.addTerminator(PRESERVE, "([ \\t]+)(\\*)[ \\t]?(.*)?\\r?\\n", TG_LIST);

 
         // DocumentProperty:
         // "#+OPTIONS: H:20 num:20"
 
         // DocumentProperty:
         // "#+OPTIONS: H:20 num:20"


@@ -83,8 +75,7 @@ public class Document {
                 continue;
             }
 
                 continue;
             }
 

-            tokenizer.unreadToken();
-            currentHeading.parse(tokenizer);
+            currentHeading.parse(tm);

         }
 
     }
         }
 
     }