X-Git-Url: http://www2.svjatoslav.eu/gitweb/?p=sixth.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fsixth%2Fcore%2Fdocument%2Ftext%2FHyperlink.java;h=508003c5c0a7993d5882d0b14c2964a8157134b1;hp=41d7ab54b1c2c945ec771e9fe14309fcc0c361a5;hb=168cf05300cec2bb4c0607711b752609976b2901;hpb=e8052e0b1948260c3701bfe80dfaa8fdf5c38053

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
--- 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) {