Use go-graphviz 0.0.6 / Include mplus-1p-light.ttf font file

k1LoW · Jun 30, 2020 · 130c4d1 · 130c4d1
1 parent 1dc5cde
commit 130c4d1
Show file tree

Hide file tree

Showing 116 changed files with 644 additions and 644 deletions.
diff --git a/go.mod b/go.mod
@@ -4,12 +4,13 @@ require (
 	cloud.google.com/go/bigquery v1.6.0
 	cloud.google.com/go/spanner v1.5.1
 	github.com/aws/aws-sdk-go v1.30.9
+	github.com/beta/freetype v0.0.1
 	github.com/denisenkom/go-mssqldb v0.0.0-20200206145737-bbfc9a55622e
 	github.com/fatih/color v1.9.0 // indirect
 	github.com/go-sql-driver/mysql v1.5.0
 	github.com/gobuffalo/packr/v2 v2.8.0
 	github.com/gocarina/gocsv v0.0.0-20200330101823-46266ca37bd3
-	github.com/goccy/go-graphviz v0.0.5
+	github.com/goccy/go-graphviz v0.0.6
 	github.com/goccy/go-yaml v1.4.3
 	github.com/google/go-cmp v0.4.0
 	github.com/karrick/godirwalk v1.15.6 // indirect
@@ -26,6 +27,7 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/xo/dburl v0.0.0-20200124232849-e9ec94f52bc3
 	golang.org/x/crypto v0.0.0-20200414173820-0848c9571904 // indirect
+	golang.org/x/image v0.0.0-20200119044424-58c23975cae1
 	golang.org/x/tools v0.0.0-20200417140056-c07e33ef3290 // indirect
 	google.golang.org/api v0.21.0
 	google.golang.org/genproto v0.0.0-20200417142217-fb6d0575620b // indirect

diff --git a/go.sum b/go.sum
diff --git a/output/dot/templates/schema.dot.tmpl b/output/dot/templates/schema.dot.tmpl
@@ -8,7 +8,7 @@ digraph "{{ .Schema.Name }}" {
   // Tables
   {{- range $i, $t := .Schema.Tables }}
   "{{ $t.Name }}" [shape=none, label=<<table border="0" cellborder="1" cellspacing="0" cellpadding="6">
-                 <tr><td bgcolor="#EFEFEF"><font face="Arial Bold" point-size="18">{{ $t.Name | html }}</font> <font color="#666666">[{{ $t.Type | html }}]</font>{{ if $sc }}{{ if ne $t.Comment "" }}<br /><font color="#333333">{{ $t.Comment | html | nl2br_slash }}</font>{{ end }}{{ end }}</td></tr>
+                 <tr><td bgcolor="#EFEFEF"><font face="Bold" point-size="18">{{ $t.Name | html }}</font> <font color="#666666">[{{ $t.Type | html }}]</font>{{ if $sc }}{{ if ne $t.Comment "" }}<br /><font color="#333333">{{ $t.Comment | html | nl2br_slash }}</font>{{ end }}{{ end }}</td></tr>
                  {{- range $ii, $c := $t.Columns }}
                  <tr><td port="{{ $c.Name | html }}" align="left">{{ $c.Name | html }} <font color="#666666">[{{ $c.Type | html }}]</font>{{ if $sc }}{{ if ne $c.Comment "" }} {{ $c.Comment | html | nl2space }}{{ end }}{{ end }}</td></tr>
                  {{- end }}

diff --git a/output/dot/templates/table.dot.tmpl b/output/dot/templates/table.dot.tmpl
@@ -7,14 +7,14 @@ digraph "{{ .Table.Name }}" {
 
   // Tables
   "{{ .Table.Name }}" [shape=none, label=<<table border="3" cellborder="1" cellspacing="0" cellpadding="6">
-                 <tr><td bgcolor="#EFEFEF"><font face="Arial Bold" point-size="18">{{ .Table.Name | html }}</font> <font color="#666666">[{{ .Table.Type | html }}]</font>{{ if $sc }}{{ if ne .Table.Comment "" }}<br /><font color="#333333">{{ .Table.Comment | html | nl2br_slash }}</font>{{ end }}{{ end }}</td></tr>
+                 <tr><td bgcolor="#EFEFEF"><font face="Bold" point-size="18">{{ .Table.Name | html }}</font> <font color="#666666">[{{ .Table.Type | html }}]</font>{{ if $sc }}{{ if ne .Table.Comment "" }}<br /><font color="#333333">{{ .Table.Comment | html | nl2br_slash }}</font>{{ end }}{{ end }}</td></tr>
                  {{- range $ii, $c := .Table.Columns }}
                  <tr><td port="{{ $c.Name | html }}" align="left">{{ $c.Name | html }} <font color="#666666">[{{ $c.Type | html }}]</font>{{ if $sc }}{{ if ne $c.Comment "" }} {{ $c.Comment | html | nl2space }}{{ end }}{{ end }}</td></tr>
                  {{- end }}
               </table>>];
   {{- range $i, $t := .Tables }}
   "{{ $t.Name }}" [shape=none, label=<<table border="0" cellborder="1" cellspacing="0" cellpadding="6">
-                 <tr><td bgcolor="#EFEFEF"><font face="Arial Bold" point-size="18">{{ $t.Name | html }}</font> <font color="#666666">[{{ $t.Type | html }}]</font>{{ if $sc }}{{ if ne $t.Comment "" }}<br /><font color="#333333">{{ $t.Comment | html | nl2br_slash }}</font>{{ end }}{{ end }}</td></tr>
+                 <tr><td bgcolor="#EFEFEF"><font face="Bold" point-size="18">{{ $t.Name | html }}</font> <font color="#666666">[{{ $t.Type | html }}]</font>{{ if $sc }}{{ if ne $t.Comment "" }}<br /><font color="#333333">{{ $t.Comment | html | nl2br_slash }}</font>{{ end }}{{ end }}</td></tr>
                  {{- range $ii, $c := $t.Columns }}
                  <tr><td port="{{ $c.Name | html }}" align="left">{{ $c.Name | html }} <font color="#666666">[{{ $c.Type | html }}]</font>{{ if $sc }}{{ if ne $c.Comment "" }} {{ $c.Comment | html | nl2space }}{{ end }}{{ end }}</td></tr>
                  {{- end }}

diff --git a/output/gviz/font/mplus-1p-light.ttf b/output/gviz/font/mplus-1p-light.ttf
diff --git a/output/gviz/gviz.go b/output/gviz/gviz.go
@@ -4,24 +4,29 @@ import (
 	"bytes"
 	"io"
 
+	"github.com/beta/freetype/truetype"
+	"github.com/gobuffalo/packr/v2"
 	"github.com/goccy/go-graphviz"
 	"github.com/k1LoW/tbls/config"
 	"github.com/k1LoW/tbls/output/dot"
 	"github.com/k1LoW/tbls/schema"
 	"github.com/pkg/errors"
+	"golang.org/x/image/font"
 )
 
 // Gviz struct
 type Gviz struct {
 	config *config.Config
 	dot    *dot.Dot
+	box    *packr.Box
 }
 
 // New return Gviz
 func New(c *config.Config) *Gviz {
 	return &Gviz{
 		config: c,
 		dot:    dot.New(c),
+		box:    packr.New("font", "./font"),
 	}
 }
 
@@ -46,7 +51,26 @@ func (g *Gviz) OutputTable(wr io.Writer, t *schema.Table) error {
 }
 
 func (g *Gviz) render(wr io.Writer, b []byte) (e error) {
+	fb, err := g.box.Find("mplus-1p-light.ttf")
+	if err != nil {
+		return errors.WithStack(err)
+	}
+	ft, err := truetype.Parse(fb)
+	if err != nil {
+		return errors.WithStack(err)
+	}
 	gviz := graphviz.New()
+	gviz.SetFontFace(func(size float64) (font.Face, error) {
+		opt := &truetype.Options{
+			Size:              size,
+			DPI:               0,
+			Hinting:           0,
+			GlyphCacheEntries: 0,
+			SubPixelsX:        0,
+			SubPixelsY:        0,
+		}
+		return truetype.NewFace(ft, opt), nil
+	})
 	graph, err := graphviz.ParseBytes(b)
 	if err != nil {
 		return errors.WithStack(err)

diff --git a/sample/adjust/administrator.blogs.png b/sample/adjust/administrator.blogs.png
diff --git a/sample/adjust/backup.blog_options.png b/sample/adjust/backup.blog_options.png
diff --git a/sample/adjust/backup.blogs.png b/sample/adjust/backup.blogs.png
diff --git a/sample/adjust/public.CamelizeTable.png b/sample/adjust/public.CamelizeTable.png
diff --git a/sample/adjust/public.comment_stars.png b/sample/adjust/public.comment_stars.png
diff --git a/sample/adjust/public.comments.png b/sample/adjust/public.comments.png
diff --git a/sample/adjust/public.hyphen-table.png b/sample/adjust/public.hyphen-table.png
diff --git a/sample/adjust/public.logs.png b/sample/adjust/public.logs.png
diff --git a/sample/adjust/public.post_comment_stars.png b/sample/adjust/public.post_comment_stars.png
diff --git a/sample/adjust/public.post_comments.png b/sample/adjust/public.post_comments.png
diff --git a/sample/adjust/public.posts.png b/sample/adjust/public.posts.png
diff --git a/sample/adjust/public.user_options.png b/sample/adjust/public.user_options.png
diff --git a/sample/adjust/public.users.png b/sample/adjust/public.users.png
diff --git a/sample/adjust/schema.png b/sample/adjust/schema.png
diff --git a/sample/adjust/time.bar.png b/sample/adjust/time.bar.png
diff --git a/sample/adjust/time.hyphenated-table.png b/sample/adjust/time.hyphenated-table.png
diff --git a/sample/adjust/time.referencing.png b/sample/adjust/time.referencing.png
diff --git a/sample/dict/CamelizeTable.png b/sample/dict/CamelizeTable.png
diff --git a/sample/dict/comment_stars.png b/sample/dict/comment_stars.png
diff --git a/sample/dict/comments.png b/sample/dict/comments.png
diff --git a/sample/dict/hyphen-table.png b/sample/dict/hyphen-table.png
diff --git a/sample/dict/logs.png b/sample/dict/logs.png
diff --git a/sample/dict/post_comments.png b/sample/dict/post_comments.png
diff --git a/sample/dict/posts.png b/sample/dict/posts.png
diff --git a/sample/dict/schema.png b/sample/dict/schema.png
diff --git a/sample/dict/user_options.png b/sample/dict/user_options.png
diff --git a/sample/dict/users.png b/sample/dict/users.png
diff --git a/sample/dynamodb/Forum.png b/sample/dynamodb/Forum.png
diff --git a/sample/dynamodb/ProductCatalog.png b/sample/dynamodb/ProductCatalog.png
diff --git a/sample/dynamodb/Reply.png b/sample/dynamodb/Reply.png
diff --git a/sample/dynamodb/Thread.png b/sample/dynamodb/Thread.png
diff --git a/sample/dynamodb/schema.png b/sample/dynamodb/schema.png
diff --git a/sample/exclude/comment_stars.png b/sample/exclude/comment_stars.png
diff --git a/sample/exclude/comments.png b/sample/exclude/comments.png
diff --git a/sample/exclude/hyphen-table.png b/sample/exclude/hyphen-table.png
diff --git a/sample/exclude/post_comments.png b/sample/exclude/post_comments.png
diff --git a/sample/exclude/posts.png b/sample/exclude/posts.png
diff --git a/sample/exclude/schema.png b/sample/exclude/schema.png
diff --git a/sample/exclude/user_options.png b/sample/exclude/user_options.png
diff --git a/sample/exclude/users.png b/sample/exclude/users.png
diff --git a/sample/mssql/CamelizeTable.png b/sample/mssql/CamelizeTable.png
diff --git a/sample/mssql/comment_stars.png b/sample/mssql/comment_stars.png
diff --git a/sample/mssql/comments.png b/sample/mssql/comments.png
diff --git a/sample/mssql/hyphen-table.png b/sample/mssql/hyphen-table.png
diff --git a/sample/mssql/logs.png b/sample/mssql/logs.png
diff --git a/sample/mssql/post_comments.png b/sample/mssql/post_comments.png
diff --git a/sample/mssql/posts.png b/sample/mssql/posts.png
diff --git a/sample/mssql/schema.png b/sample/mssql/schema.png
diff --git a/sample/mssql/user_options.png b/sample/mssql/user_options.png
diff --git a/sample/mssql/users.png b/sample/mssql/users.png
diff --git a/sample/mysql/CamelizeTable.png b/sample/mysql/CamelizeTable.png
diff --git a/sample/mysql/comment_stars.png b/sample/mysql/comment_stars.png
diff --git a/sample/mysql/comments.png b/sample/mysql/comments.png
diff --git a/sample/mysql/hyphen-table.png b/sample/mysql/hyphen-table.png
diff --git a/sample/mysql/logs.png b/sample/mysql/logs.png
diff --git a/sample/mysql/post_comments.png b/sample/mysql/post_comments.png
diff --git a/sample/mysql/posts.png b/sample/mysql/posts.png
diff --git a/sample/mysql/schema.png b/sample/mysql/schema.png
diff --git a/sample/mysql/user_options.png b/sample/mysql/user_options.png
diff --git a/sample/mysql/users.png b/sample/mysql/users.png
diff --git a/sample/mysql8/CamelizeTable.png b/sample/mysql8/CamelizeTable.png
diff --git a/sample/mysql8/comment_stars.png b/sample/mysql8/comment_stars.png
diff --git a/sample/mysql8/comments.png b/sample/mysql8/comments.png
diff --git a/sample/mysql8/hyphen-table.png b/sample/mysql8/hyphen-table.png
diff --git a/sample/mysql8/logs.png b/sample/mysql8/logs.png
diff --git a/sample/mysql8/post_comments.png b/sample/mysql8/post_comments.png
diff --git a/sample/mysql8/posts.png b/sample/mysql8/posts.png
diff --git a/sample/mysql8/schema.png b/sample/mysql8/schema.png
diff --git a/sample/mysql8/user_options.png b/sample/mysql8/user_options.png
diff --git a/sample/mysql8/users.png b/sample/mysql8/users.png
diff --git a/sample/postgres/administrator.blogs.png b/sample/postgres/administrator.blogs.png
diff --git a/sample/postgres/backup.blog_options.png b/sample/postgres/backup.blog_options.png
diff --git a/sample/postgres/backup.blogs.png b/sample/postgres/backup.blogs.png
diff --git a/sample/postgres/public.CamelizeTable.png b/sample/postgres/public.CamelizeTable.png
diff --git a/sample/postgres/public.comment_stars.png b/sample/postgres/public.comment_stars.png
diff --git a/sample/postgres/public.comments.png b/sample/postgres/public.comments.png
diff --git a/sample/postgres/public.hyphen-table.png b/sample/postgres/public.hyphen-table.png
diff --git a/sample/postgres/public.logs.png b/sample/postgres/public.logs.png
diff --git a/sample/postgres/public.post_comment_stars.png b/sample/postgres/public.post_comment_stars.png
diff --git a/sample/postgres/public.post_comments.png b/sample/postgres/public.post_comments.png
diff --git a/sample/postgres/public.posts.png b/sample/postgres/public.posts.png
diff --git a/sample/postgres/public.user_options.png b/sample/postgres/public.user_options.png
diff --git a/sample/postgres/public.users.png b/sample/postgres/public.users.png
diff --git a/sample/postgres/schema.png b/sample/postgres/schema.png
diff --git a/sample/postgres/time.bar.png b/sample/postgres/time.bar.png
diff --git a/sample/postgres/time.hyphenated-table.png b/sample/postgres/time.hyphenated-table.png
diff --git a/sample/postgres/time.referencing.png b/sample/postgres/time.referencing.png
diff --git a/sample/sqlite/CamelizeTable.png b/sample/sqlite/CamelizeTable.png
diff --git a/sample/sqlite/access_log.png b/sample/sqlite/access_log.png
diff --git a/sample/sqlite/check_constraints.png b/sample/sqlite/check_constraints.png
diff --git a/sample/sqlite/comment_stars.png b/sample/sqlite/comment_stars.png
diff --git a/sample/sqlite/comments.png b/sample/sqlite/comments.png
diff --git a/sample/sqlite/hyphen-table.png b/sample/sqlite/hyphen-table.png
diff --git a/sample/sqlite/logs.png b/sample/sqlite/logs.png
diff --git a/sample/sqlite/post_comments.png b/sample/sqlite/post_comments.png
diff --git a/sample/sqlite/posts.png b/sample/sqlite/posts.png
diff --git a/sample/sqlite/schema.png b/sample/sqlite/schema.png
diff --git a/sample/sqlite/syslog.png b/sample/sqlite/syslog.png
diff --git a/sample/sqlite/user_options.png b/sample/sqlite/user_options.png
diff --git a/sample/sqlite/users.png b/sample/sqlite/users.png
diff --git a/sample/svg/CamelizeTable.svg b/sample/svg/CamelizeTable.svg