diff options
| author | 6543 <6543@obermui.de> | 2021-01-28 17:56:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-28 17:56:38 +0100 |
| commit | d1353e1f7c9bf648cd72bd9731b4f843b0dc9a86 (patch) | |
| tree | c41437643185d16ab257cf9856a3e1ae8a835112 /vendor/github.com/niklasfasching | |
| parent | e45bf12a34d04b18f09663f179fb58aca9ffa192 (diff) | |
| download | gitea-d1353e1f7c9bf648cd72bd9731b4f843b0dc9a86.tar.gz gitea-d1353e1f7c9bf648cd72bd9731b4f843b0dc9a86.zip | |
Vendor Update (#14496)
* update code.gitea.io/sdk/gitea v0.13.1 -> v0.13.2
* update github.com/go-swagger/go-swagger v0.25.0 -> v0.26.0
* update github.com/google/uuid v1.1.2 -> v1.2.0
* update github.com/klauspost/compress v1.11.3 -> v1.11.7
* update github.com/lib/pq 083382b7e6fc -> v1.9.0
* update github.com/markbates/goth v1.65.0 -> v1.66.1
* update github.com/mattn/go-sqlite3 v1.14.4 -> v1.14.6
* update github.com/mgechev/revive 246eac737dc7 -> v1.0.3
* update github.com/minio/minio-go/v7 v7.0.6 -> v7.0.7
* update github.com/niklasfasching/go-org v1.3.2 -> v1.4.0
* update github.com/olivere/elastic/v7 v7.0.21 -> v7.0.22
* update github.com/pquerna/otp v1.2.0 -> v1.3.0
* update github.com/xanzy/go-gitlab v0.39.0 -> v0.42.0
* update github.com/yuin/goldmark v1.2.1 -> v1.3.1
Diffstat (limited to 'vendor/github.com/niklasfasching')
| -rw-r--r-- | vendor/github.com/niklasfasching/go-org/org/drawer.go | 2 | ||||
| -rw-r--r-- | vendor/github.com/niklasfasching/go-org/org/html_writer.go | 15 |
2 files changed, 14 insertions, 3 deletions
diff --git a/vendor/github.com/niklasfasching/go-org/org/drawer.go b/vendor/github.com/niklasfasching/go-org/org/drawer.go index eee590d8c4..55763023fc 100644 --- a/vendor/github.com/niklasfasching/go-org/org/drawer.go +++ b/vendor/github.com/niklasfasching/go-org/org/drawer.go @@ -15,7 +15,7 @@ type PropertyDrawer struct { } var beginDrawerRegexp = regexp.MustCompile(`^(\s*):(\S+):\s*$`) -var endDrawerRegexp = regexp.MustCompile(`^(\s*):END:\s*$`) +var endDrawerRegexp = regexp.MustCompile(`(?i)^(\s*):END:\s*$`) var propertyRegexp = regexp.MustCompile(`^(\s*):(\S+):(\s+(.*)$|$)`) func lexDrawer(line string) (token, bool) { diff --git a/vendor/github.com/niklasfasching/go-org/org/html_writer.go b/vendor/github.com/niklasfasching/go-org/org/html_writer.go index d66e6effb3..f2e75a001e 100644 --- a/vendor/github.com/niklasfasching/go-org/org/html_writer.go +++ b/vendor/github.com/niklasfasching/go-org/org/html_writer.go @@ -15,8 +15,9 @@ import ( // HTMLWriter exports an org document into a html document. type HTMLWriter struct { - ExtendingWriter Writer - HighlightCodeBlock func(source, lang string, inline bool) string + ExtendingWriter Writer + HighlightCodeBlock func(source, lang string, inline bool) string + PrettyRelativeLinks bool strings.Builder document *Document @@ -342,6 +343,16 @@ func (w *HTMLWriter) WriteRegularLink(l RegularLink) { if l.Protocol == "file" { url = url[len("file:"):] } + if isRelative := l.Protocol == "file" || l.Protocol == ""; isRelative && w.PrettyRelativeLinks { + if !strings.HasPrefix(url, "/") { + url = "../" + url + } + if strings.HasSuffix(url, ".org") { + url = strings.TrimSuffix(url, ".org") + "/" + } + } else if isRelative && strings.HasSuffix(url, ".org") { + url = strings.TrimSuffix(url, ".org") + ".html" + } if prefix := w.document.Links[l.Protocol]; prefix != "" { url = html.EscapeString(prefix) + strings.TrimPrefix(url, l.Protocol+":") } |