Skip to content

Commit e950efd

Browse files
miekgmiekg
committed
Cosmetic fixes
* upgrade to latest versions of deps * sort imports * go mod tidy * gofmt -w -s Signed-off-by: Miek Gieben <[email protected]>
1 parent 09f70f4 commit e950efd

File tree

15 files changed

+35
-26
lines changed

15 files changed

+35
-26
lines changed

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ go 1.12
44

55
require (
66
github.com/BurntSushi/toml v0.3.1
7-
github.com/gomarkdown/markdown v0.0.0-20190912180731-281270bc6d83
7+
github.com/gomarkdown/markdown v0.0.0-20191229055418-359dc4b9d66b
88
github.com/google/go-cmp v0.2.0
99
)

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
22
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
3-
github.com/gomarkdown/markdown v0.0.0-20190912180731-281270bc6d83 h1:w5VNUHB0SP2tr1+boQJWKvnyn3P61UFErZ2e2ih6x0A=
4-
github.com/gomarkdown/markdown v0.0.0-20190912180731-281270bc6d83/go.mod h1:aii0r/K0ZnHv7G0KF7xy1v0A7s2Ljrb5byB7MO5p6TU=
3+
github.com/gomarkdown/markdown v0.0.0-20191229055418-359dc4b9d66b h1:ZodsBXcms+0AapIcegMJ4zfcAzjqUbA50YWhYq8M48w=
4+
github.com/gomarkdown/markdown v0.0.0-20191229055418-359dc4b9d66b/go.mod h1:aii0r/K0ZnHv7G0KF7xy1v0A7s2Ljrb5byB7MO5p6TU=
55
github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ=
66
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
77
golang.org/dl v0.0.0-20190829154251-82a15e2f2ead/go.mod h1:IUMfjQLJQd4UTqG1Z90tenwKoCX93Gn3MAQJMOSBsDQ=

‎lang/lang.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,32 @@ func New(language string) Lang {
1111
// Add all lanaguages here, the keys should be named according to BCP47.
1212
// The keys must be in all lower case for normalized lookup.
1313
l.m = map[string]Term{
14-
"en": Term{
14+
"en": {
1515
Footnotes: "Footnotes",
1616
Bibliography: "Bibliography",
1717
Index: "Index",
1818
},
19-
"nl": Term{
19+
"nl": {
2020
Footnotes: "Voetnoten",
2121
Bibliography: "Bibliografie",
2222
Index: "Index",
2323
},
24-
"de": Term{
24+
"de": {
2525
Footnotes: "Fußnoten",
2626
Bibliography: "Literaturverzeichnis",
2727
Index: "Index",
2828
},
29-
"ja": Term{
29+
"ja": {
3030
Footnotes: "脚注",
3131
Bibliography: "参考文献",
3232
Index: "索引",
3333
},
34-
"zh-cn": Term{
34+
"zh-cn": {
3535
Footnotes: "注释",
3636
Bibliography: "参考文献",
3737
Index: "索引",
3838
},
39-
"zh-tw": Term{
39+
"zh-tw": {
4040
Footnotes: "註釋",
4141
Bibliography: "參考文獻",
4242
Index: "索引",

‎mast/bibliography.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package mast
22

33
import (
4-
"github.com/gomarkdown/markdown/ast"
54
"github.com/mmarkdown/mmark/mast/reference"
5+
6+
"github.com/gomarkdown/markdown/ast"
67
)
78

89
// Bibliography represents markdown bibliography node.

‎mast/nodes.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ func AttributeFilter(node ast.Node, filter func(key string) bool) {
155155
if !filter("class") {
156156
a.Classes = nil
157157
}
158-
for k, _ := range a.Attrs {
158+
for k := range a.Attrs {
159159
if !filter(k) {
160160
delete(a.Attrs, k)
161161
}

‎mmark.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,18 @@ import (
77
"log"
88
"os"
99

10-
"github.com/gomarkdown/markdown"
11-
"github.com/gomarkdown/markdown/ast"
12-
"github.com/gomarkdown/markdown/html"
13-
"github.com/gomarkdown/markdown/parser"
1410
"github.com/mmarkdown/mmark/lang"
1511
"github.com/mmarkdown/mmark/mast"
1612
"github.com/mmarkdown/mmark/mparser"
1713
"github.com/mmarkdown/mmark/render/man"
1814
mmarkout "github.com/mmarkdown/mmark/render/markdown"
1915
"github.com/mmarkdown/mmark/render/mhtml"
2016
"github.com/mmarkdown/mmark/render/xml"
17+
18+
"github.com/gomarkdown/markdown"
19+
"github.com/gomarkdown/markdown/ast"
20+
"github.com/gomarkdown/markdown/html"
21+
"github.com/gomarkdown/markdown/parser"
2122
)
2223

2324
var (

‎mmark_man_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import (
66
"path/filepath"
77
"testing"
88

9-
"github.com/gomarkdown/markdown"
10-
"github.com/gomarkdown/markdown/parser"
119
"github.com/mmarkdown/mmark/mparser"
1210
"github.com/mmarkdown/mmark/render/man"
1311

12+
"github.com/gomarkdown/markdown"
13+
"github.com/gomarkdown/markdown/parser"
1414
"github.com/google/go-cmp/cmp"
1515
)
1616

‎mmark_markdown_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ import (
66
"path/filepath"
77
"testing"
88

9+
"github.com/mmarkdown/mmark/mparser"
10+
mmarkdown "github.com/mmarkdown/mmark/render/markdown"
11+
912
"github.com/gomarkdown/markdown"
1013
"github.com/gomarkdown/markdown/parser"
1114
"github.com/google/go-cmp/cmp"
12-
"github.com/mmarkdown/mmark/mparser"
13-
mmarkdown "github.com/mmarkdown/mmark/render/markdown"
1415
)
1516

1617
func TestMmarkMarkdown(t *testing.T) {

‎mmark_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ import (
66
"path/filepath"
77
"testing"
88

9-
"github.com/gomarkdown/markdown"
10-
"github.com/gomarkdown/markdown/parser"
119
"github.com/mmarkdown/mmark/mparser"
1210
"github.com/mmarkdown/mmark/render/xml"
11+
12+
"github.com/gomarkdown/markdown"
13+
"github.com/gomarkdown/markdown/parser"
1314
)
1415

1516
func TestMmarkXML(t *testing.T) {

‎render/markdown/helpers.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ import (
66
"regexp"
77
"unicode"
88

9-
"github.com/gomarkdown/markdown/ast"
109
"github.com/mmarkdown/mmark/internal/text"
10+
11+
"github.com/gomarkdown/markdown/ast"
1112
)
1213

1314
func (r *Renderer) outOneOf(w io.Writer, outFirst bool, first, second string) {

0 commit comments

Comments
 (0)