tidy, gofmt, and imports

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

Author: miekg

go.sum

@@ -1,7 +1,5 @@
 github.com/BurntSushi/toml v1.2.0 h1:Rt8g24XnyGTyglgET/PRUNlrUeu9F5L+7FilkXfZgs0=
 github.com/BurntSushi/toml v1.2.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
-github.com/gomarkdown/markdown v0.0.0-20220825072242-90efaac57fb4 h1:YOfiTywt9f60GzIFrnor09U0Q3PySmqnyIqvK0o6fzI=
-github.com/gomarkdown/markdown v0.0.0-20220825072242-90efaac57fb4/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA=
 github.com/gomarkdown/markdown v0.0.0-20220830015526-01a3c37d6f50 h1:tSuUky4sFWjiIIEOefDDBjx5BUIT3kZwcXHM2CNDdTk=
 github.com/gomarkdown/markdown v0.0.0-20220830015526-01a3c37d6f50/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA=
 github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ=

mast/authors.go

@@ -1,8 +1,6 @@
 package mast
 
-import (
-	"github.com/gomarkdown/markdown/ast"
-)
+import "github.com/gomarkdown/markdown/ast"
 
 // Authors represents markdown authors section node.
 type Authors struct {

mast/bibliography.go

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

mmark.go

@@ -7,17 +7,16 @@ 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/v2/lang"
 	"github.com/mmarkdown/mmark/v2/mast"
 	"github.com/mmarkdown/mmark/v2/mparser"
 	"github.com/mmarkdown/mmark/v2/render/man"
 	"github.com/mmarkdown/mmark/v2/render/mhtml"
 	"github.com/mmarkdown/mmark/v2/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,12 +6,11 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/mmarkdown/mmark/v2/mparser"
-	"github.com/mmarkdown/mmark/v2/render/man"
-
 	"github.com/gomarkdown/markdown"
 	"github.com/gomarkdown/markdown/parser"
 	"github.com/google/go-cmp/cmp"
+	"github.com/mmarkdown/mmark/v2/mparser"
+	"github.com/mmarkdown/mmark/v2/render/man"
 )
 
 func TestMmarkMan(t *testing.T) {

mmark_test.go

@@ -7,12 +7,11 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/gomarkdown/markdown"
+	"github.com/gomarkdown/markdown/parser"
 	"github.com/mmarkdown/mmark/v2/lang"
 	"github.com/mmarkdown/mmark/v2/mparser"
 	"github.com/mmarkdown/mmark/v2/render/xml"
-
-	"github.com/gomarkdown/markdown"
-	"github.com/gomarkdown/markdown/parser"
 )
 
 func TestMmarkXML(t *testing.T) {

mparser/bibliography.go

@@ -7,10 +7,9 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/gomarkdown/markdown/ast"
 	"github.com/mmarkdown/mmark/v2/mast"
 	"github.com/mmarkdown/mmark/v2/mast/reference"
-
-	"github.com/gomarkdown/markdown/ast"
 )
 
 // CitationToBibliography walks the AST and gets all the citations from HTML blocks and groups them into
@@ -117,7 +116,7 @@ func NodeBackMatter(doc ast.Node) ast.Node {
 	return matter
 }
 
-// Parse '<reference anchor='CBR03' target=''>' and return the string after anchor= is the ID for the reference.
+// Parse '<reference anchor='CBR03' target=">' and return the string after anchor= is the ID for the reference.
 func anchorFromReference(data []byte) []byte {
 	if !bytes.HasPrefix(data, []byte("<reference ")) && !bytes.HasPrefix(data, []byte("<referencegroup ")) {
 		return nil

mparser/index.go

@@ -5,9 +5,8 @@ import (
 	"fmt"
 	"sort"
 
-	"github.com/mmarkdown/mmark/v2/mast"
-
 	"github.com/gomarkdown/markdown/ast"
+	"github.com/mmarkdown/mmark/v2/mast"
 )
 
 // IndexToDocumentIndex crawls the entire doc searching for indices, it will then return
@@ -17,8 +16,8 @@ import (
 // - IndexItem
 //   - IndexLink
 //   - IndexSubItem
-//     - IndexLink
-//     - IndexLink
+//   - IndexLink
+//   - IndexLink
 //
 // Which can then be rendered by the renderer.
 func IndexToDocumentIndex(doc ast.Node) *mast.DocumentIndex {

mparser/title.go

@@ -3,10 +3,9 @@ package mparser
 import (
 	"log"
 
-	"github.com/mmarkdown/mmark/v2/mast"
-
 	"github.com/BurntSushi/toml"
 	"github.com/gomarkdown/markdown/ast"
+	"github.com/mmarkdown/mmark/v2/mast"
 )
 
 // TitleHook will parse a title and returns it. The start and ending can

render/man/renderer.go

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