Cosmetic fixes

* upgrade to latest versions of deps
* sort imports
* go mod tidy
* gofmt -w -s

Signed-off-by: Miek Gieben <[email protected]>

go.mod

@@ -4,6 +4,6 @@ go 1.12
 
 require (
 	github.com/BurntSushi/toml v0.3.1
-	github.com/gomarkdown/markdown v0.0.0-20190912180731-281270bc6d83
+	github.com/gomarkdown/markdown v0.0.0-20191229055418-359dc4b9d66b
 	github.com/google/go-cmp v0.2.0
 )

go.sum

@@ -1,7 +1,7 @@
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/gomarkdown/markdown v0.0.0-20190912180731-281270bc6d83 h1:w5VNUHB0SP2tr1+boQJWKvnyn3P61UFErZ2e2ih6x0A=
-github.com/gomarkdown/markdown v0.0.0-20190912180731-281270bc6d83/go.mod h1:aii0r/K0ZnHv7G0KF7xy1v0A7s2Ljrb5byB7MO5p6TU=
+github.com/gomarkdown/markdown v0.0.0-20191229055418-359dc4b9d66b h1:ZodsBXcms+0AapIcegMJ4zfcAzjqUbA50YWhYq8M48w=
+github.com/gomarkdown/markdown v0.0.0-20191229055418-359dc4b9d66b/go.mod h1:aii0r/K0ZnHv7G0KF7xy1v0A7s2Ljrb5byB7MO5p6TU=
 github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 golang.org/dl v0.0.0-20190829154251-82a15e2f2ead/go.mod h1:IUMfjQLJQd4UTqG1Z90tenwKoCX93Gn3MAQJMOSBsDQ=

lang/lang.go

@@ -11,32 +11,32 @@ func New(language string) Lang {
 	// Add all lanaguages here, the keys should be named according to BCP47.
 	// The keys must be in all lower case for normalized lookup.
 	l.m = map[string]Term{
-		"en": Term{
+		"en": {
 			Footnotes:    "Footnotes",
 			Bibliography: "Bibliography",
 			Index:        "Index",
 		},
-		"nl": Term{
+		"nl": {
 			Footnotes:    "Voetnoten",
 			Bibliography: "Bibliografie",
 			Index:        "Index",
 		},
-		"de": Term{
+		"de": {
 			Footnotes:    "Fußnoten",
 			Bibliography: "Literaturverzeichnis",
 			Index:        "Index",
 		},
-		"ja": Term{
+		"ja": {
 			Footnotes:    "脚注",
 			Bibliography: "参考文献",
 			Index:        "索引",
 		},
-		"zh-cn": Term{
+		"zh-cn": {
 			Footnotes:    "注释",
 			Bibliography: "参考文献",
 			Index:        "索引",
 		},
-		"zh-tw": Term{
+		"zh-tw": {
 			Footnotes:    "註釋",
 			Bibliography: "參考文獻",
 			Index:        "索引",

mast/bibliography.go

@@ -1,8 +1,9 @@
 package mast
 
 import (
-	"github.com/gomarkdown/markdown/ast"
 	"github.com/mmarkdown/mmark/mast/reference"
+
+	"github.com/gomarkdown/markdown/ast"
 )
 
 // Bibliography represents markdown bibliography node.

mast/nodes.go

@@ -155,7 +155,7 @@ func AttributeFilter(node ast.Node, filter func(key string) bool) {
 	if !filter("class") {
 		a.Classes = nil
 	}
-	for k, _ := range a.Attrs {
+	for k := range a.Attrs {
 		if !filter(k) {
 			delete(a.Attrs, k)
 		}

mmark.go

@@ -7,17 +7,18 @@ import (
 	"log"
 	"os"
 
-	"github.com/gomarkdown/markdown"
-	"github.com/gomarkdown/markdown/ast"
-	"github.com/gomarkdown/markdown/html"
-	"github.com/gomarkdown/markdown/parser"
 	"github.com/mmarkdown/mmark/lang"
 	"github.com/mmarkdown/mmark/mast"
 	"github.com/mmarkdown/mmark/mparser"
 	"github.com/mmarkdown/mmark/render/man"
 	mmarkout "github.com/mmarkdown/mmark/render/markdown"
 	"github.com/mmarkdown/mmark/render/mhtml"
 	"github.com/mmarkdown/mmark/render/xml"
+
+	"github.com/gomarkdown/markdown"
+	"github.com/gomarkdown/markdown/ast"
+	"github.com/gomarkdown/markdown/html"
+	"github.com/gomarkdown/markdown/parser"
 )
 
 var (

mmark_man_test.go

@@ -6,11 +6,11 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/gomarkdown/markdown"
-	"github.com/gomarkdown/markdown/parser"
 	"github.com/mmarkdown/mmark/mparser"
 	"github.com/mmarkdown/mmark/render/man"
 
+	"github.com/gomarkdown/markdown"
+	"github.com/gomarkdown/markdown/parser"
 	"github.com/google/go-cmp/cmp"
 )
 

mmark_markdown_test.go

@@ -6,11 +6,12 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/mmarkdown/mmark/mparser"
+	mmarkdown "github.com/mmarkdown/mmark/render/markdown"
+
 	"github.com/gomarkdown/markdown"
 	"github.com/gomarkdown/markdown/parser"
 	"github.com/google/go-cmp/cmp"
-	"github.com/mmarkdown/mmark/mparser"
-	mmarkdown "github.com/mmarkdown/mmark/render/markdown"
 )
 
 func TestMmarkMarkdown(t *testing.T) {

mmark_test.go

@@ -6,10 +6,11 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/gomarkdown/markdown"
-	"github.com/gomarkdown/markdown/parser"
 	"github.com/mmarkdown/mmark/mparser"
 	"github.com/mmarkdown/mmark/render/xml"
+
+	"github.com/gomarkdown/markdown"
+	"github.com/gomarkdown/markdown/parser"
 )
 
 func TestMmarkXML(t *testing.T) {

render/markdown/helpers.go

@@ -6,8 +6,9 @@ import (
 	"regexp"
 	"unicode"
 
-	"github.com/gomarkdown/markdown/ast"
 	"github.com/mmarkdown/mmark/internal/text"
+
+	"github.com/gomarkdown/markdown/ast"
 )
 
 func (r *Renderer) outOneOf(w io.Writer, outFirst bool, first, second string) {

render/markdown/renderer.go

@@ -9,9 +9,10 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/mmarkdown/mmark/mast"
+
 	"github.com/gomarkdown/markdown/ast"
 	"github.com/gomarkdown/markdown/html"
-	"github.com/mmarkdown/mmark/mast"
 )
 
 // Flags control optional behavior of Markdown renderer.

render/xml/bibliography.go

@@ -6,8 +6,9 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/gomarkdown/markdown/ast"
 	"github.com/mmarkdown/mmark/mast"
+
+	"github.com/gomarkdown/markdown/ast"
 )
 
 func (r *Renderer) bibliography(w io.Writer, node *mast.Bibliography, entering bool) {

render/xml/helpers.go

@@ -6,9 +6,10 @@ import (
 	"io"
 	"strings"
 
+	"github.com/mmarkdown/mmark/mast"
+
 	"github.com/gomarkdown/markdown/ast"
 	"github.com/gomarkdown/markdown/html"
-	"github.com/mmarkdown/mmark/mast"
 )
 
 func (r *Renderer) out(w io.Writer, d []byte)  { w.Write(d) }

render/xml/title.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/gomarkdown/markdown/ast"
 	"github.com/gomarkdown/markdown/html"
+
 	"github.com/mmarkdown/mmark/mast"
 )
 

version.go

@@ -1,4 +1,4 @@
 package main
 
 // Version of mmark.
-var Version = "2.2.0"
+var Version = "2.2.1"