Misc fixes:

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

diff --git a/src/main/java/eu/svjatoslav/sixth/core/document/text/FormattedText.java b/src/main/java/eu/svjatoslav/sixth/core/document/text/FormattedText.java
index b9d42a2..350abf3 100644 (file)
--- a/src/main/java/eu/svjatoslav/sixth/core/document/text/FormattedText.java
+++ b/src/main/java/eu/svjatoslav/sixth/core/document/text/FormattedText.java
@@ -1,14 +1,32 @@
 package eu.svjatoslav.sixth.core.document.text;
 
+import eu.svjatoslav.commons.string.tokenizer.Tokenizer;
+import eu.svjatoslav.commons.string.tokenizer.TokenizerMatch;
+
 import java.util.ArrayList;
 import java.util.List;
 
+import static eu.svjatoslav.sixth.core.document.Helper.TG_HYPERLINK;
+import static eu.svjatoslav.sixth.core.document.Utils.addIndentExceptFirstLine;
+
 public class FormattedText {
     List<FormattedTextElement> elements = new ArrayList<>();
 
-    public void parseOrgSyntax(String orgText){
-        PlainText plainText = new PlainText(orgText);
-        elements.add(plainText);
+    public void parseOrgSyntax(String orgText) {
+
+        Tokenizer tokenizer = getTokenizer(orgText);
+        while (tokenizer.hasMoreContent()) {
+            final TokenizerMatch token = tokenizer.getNextToken();
+
+            if (token.isGroup(TG_HYPERLINK)){
+                elements.add(Hyperlink.fromOrg(token));
+                continue;
+            }
+
+            PlainText plainText = new PlainText(token.token);
+            elements.add(plainText);
+        }
+
     }
 
     public static FormattedText fromOrg(String orgText){
@@ -17,12 +35,24 @@ public class FormattedText {
         return formattedText;
     }
 
-    public String compileMd(){
+    public String toMD(int indent){
         StringBuilder sb = new StringBuilder();
 
         for (FormattedTextElement element : elements)
-            sb.append(element.compileMd());
+            sb.append(element.toMD());
+
+        return addIndentExceptFirstLine(sb.toString(), indent);
+    }
+
+    private Tokenizer getTokenizer(String contents) {
+        final Tokenizer tokenizer = new Tokenizer(contents);
+        tokenizer.addTerminator(Hyperlink.orgTerminator);
+        tokenizer.addTerminator(Hyperlink.orgTerminator2);
+        return tokenizer;
+    }
+
 
-        return sb.toString();
+    public String toString(){
+        return toMD(0);
     }
 }