go.talks/present: allow multiple words for link label.
R=adg
CC=golang-dev
https://golang.org/cl/6631060
diff --git a/present/link.go b/present/link.go
index 9b692d8..7fccab5 100644
--- a/present/link.go
+++ b/present/link.go
@@ -26,9 +26,6 @@
func parseLink(fileName string, lineno int, text string) (Elem, error) {
args := strings.Fields(text)
- if len(args) != 2 {
- return nil, fmt.Errorf("%s:%d: too many arguments for .link", fileName, lineno)
- }
url, err := url.Parse(args[1])
if err != nil {
return nil, err
@@ -42,10 +39,8 @@
switch len(arg) {
case 0:
label = strings.Replace(url.String(), url.Scheme+"://", "", 1)
- case 1:
- label = arg[0]
default:
- return "", fmt.Errorf("incorrect link invocation: code %q %v", url, arg)
+ label = strings.Join(arg, " ")
}
return template.HTML(fmt.Sprintf(`<a href=%q>%s</a>`, url.String(), label)), nil
}
