Misc fixes:

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

diff --git a/src/main/java/eu/svjatoslav/sixth/core/document/text/Hyperlink.java b/src/main/java/eu/svjatoslav/sixth/core/document/text/Hyperlink.java
index 41d7ab5..508003c 100644 (file)
--- a/src/main/java/eu/svjatoslav/sixth/core/document/text/Hyperlink.java
+++ b/src/main/java/eu/svjatoslav/sixth/core/document/text/Hyperlink.java
@@ -9,17 +9,21 @@ import static eu.svjatoslav.sixth.core.document.Helper.TG_HYPERLINK;
 public class Hyperlink implements FormattedTextElement {
 
     public static final Terminator orgTerminator =
-            new Terminator(PRESERVE, "\\[\\[(.+)\\][ \\t]*\\[(.+)\\]\\]", TG_HYPERLINK);
+            new Terminator(PRESERVE, "\\[\\[([\\s\\S]+)\\][ \\t\\r\\n]*\\[([\\s\\S]+)\\]\\]", TG_HYPERLINK);
 
         public static final Terminator orgTerminator2 =
-            new Terminator(PRESERVE, "\\[\\[(.*)\\]\\]", TG_HYPERLINK);
+            new Terminator(PRESERVE, "\\[\\[([\\s\\S]+)\\]\\]", TG_HYPERLINK);
 
     private String label;
     private String URL;
 
     @Override
     public String toMD() {
-        return "<URL: " + URL + ", LABEL: " + label + ">";
+
+        if (URL.startsWith("id:"))
+            return label; // TODO
+
+        return  "[" + label + "]("+ URL + ")";
     }
 
     public static Hyperlink fromOrg(TokenizerMatch tokenizerMatch) {