From b2e8cb1da859b6f0dc702bfd9590ad019cc73247 Mon Sep 17 00:00:00 2001
From: bouncepaw <bouncepaw2@ya.ru>
Date: Mon, 22 Mar 2021 19:06:31 +0500
Subject: [PATCH] Fix some bugs with links

---
 link/link.go | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/link/link.go b/link/link.go
index d547df2..1326118 100644
--- a/link/link.go
+++ b/link/link.go
@@ -66,7 +66,7 @@ func (l *Link) Classes() string {
 func (l *Link) Href() string {
 	switch l.Kind {
 	case LinkExternal, LinkLocalRoot:
-		return l.Address
+		return l.Address + l.Anchor
 	default:
 		return "/hypha/" + l.Address + l.Anchor
 	}
@@ -97,7 +97,7 @@ func From(address, display, hyphaName string) *Link {
 		link.Display = strings.TrimSpace(display)
 	}
 
-	if pos := strings.IndexRune(address, '#'); pos != -1 {
+	if pos := strings.IndexRune(address, '#'); pos != -1 && pos != 0 {
 		link.Anchor = address[pos:]
 		address = address[:pos]
 	}
@@ -114,7 +114,12 @@ func From(address, display, hyphaName string) *Link {
 				link.Display = link.Display[2:]
 			}
 		}
+		link.Display += link.Anchor
 		link.Address = address
+	case strings.HasPrefix(address, "#"):
+		link.Kind = LinkLocalHypha
+		link.Address = util.CanonicalName(hyphaName)
+		link.Anchor = address
 	case strings.HasPrefix(address, "/"):
 		link.Address = address
 		link.Kind = LinkLocalRoot
@@ -124,10 +129,6 @@ func From(address, display, hyphaName string) *Link {
 	case strings.HasPrefix(address, "../"):
 		link.Kind = LinkLocalHypha
 		link.Address = util.CanonicalName(path.Join(path.Dir(hyphaName), address[3:]))
-	case strings.HasPrefix(address, "#"):
-		link.Kind = LinkLocalHypha
-		link.Address = util.CanonicalName(hyphaName)
-		link.Anchor = address
 	default:
 		link.Kind = LinkLocalHypha
 		link.Address = util.CanonicalName(address)