diff --git a/.gitignore b/.gitignore index 03f132a..7dd204e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ .vscode *.code-workspace dist/ +store/ +playground/ +bin/ \ No newline at end of file diff --git a/Rakefile b/Rakefile new file mode 100644 index 0000000..cd330a2 --- /dev/null +++ b/Rakefile @@ -0,0 +1,26 @@ +@versions = {} + +File.read("version").each_line do |line| + product,versionnumber = line.chomp.split(/=/) + @versions[product]=versionnumber +end + +@ets_version = @versions['ets_version'] + +desc "Show rake description" +task :default do + puts + puts "Run 'rake -T' for a list of tasks." + puts + puts "1: Use 'rake build' to build the 'ets' binary. That should be\n the starting point." + puts +end + + +desc "Compile and install necessary software" +task :build do + sh "go build -ldflags \"-X main.version=#{@ets_version}\" -o bin/ets github.com/speedata/ets/ets/ets" +end + + + diff --git a/Readme.md b/Readme.md index b646c0b..51291ea 100644 --- a/Readme.md +++ b/Readme.md @@ -3,24 +3,25 @@ This software repository contains a Lua frontend for the typesetting library [“Boxes and Glue”](https://github.com/speedata/boxesandglue) which is an algorithmic typesetting machine in the spirits of TeX. -## Build +## Running the software -You just need Go installed on your system, clone the repository and run +Download the software ([get the latest release here](https://github.com/speedata/ets/releases)), unzip the archive and call - go build -o bin/ets github.com/speedata/ets/ets/ets + bin/ets myscript.lua +on the command line. -## Running the software +## Build -call +You just need Go installed on your system, clone the repository and run + + go build -o bin/ets github.com/speedata/ets/ets/ets - bin/ets myscript.lua -on the command line ## Status -This software is more or less a demo of the architecture and usable for any serious purpose yet. +This software is more or less a demo of the architecture and not usable for any serious purpose yet. Feedback welcome! diff --git a/core/core.go b/core/core.go index b67be21..aaa1299 100644 --- a/core/core.go +++ b/core/core.go @@ -1,15 +1,51 @@ package core import ( + "os" + "path/filepath" + + "github.com/speedata/boxesandglue/backend/bag" lua "github.com/yuin/gopher-lua" + "go.uber.org/zap" + "go.uber.org/zap/zapcore" ) -// Dothings opens the Lua file and executes it -func Dothings(luafile string) error { +// Runs the Lua file if it exists. If the exename is "foo", it looks for a Lua file called "foo.lua" +func runDefaultLua(l *lua.LState, exename string) error { + var extension = filepath.Ext(exename) + var name = exename[0:len(exename)-len(extension)] + ".lua" + var err error + if _, err = os.Stat(name); err != nil { + return nil + } + return l.DoFile(name) +} + +func newZapLogger() *zap.SugaredLogger { + logger, _ := zap.Config{ + Level: zap.NewAtomicLevelAt(zapcore.DebugLevel), + Encoding: "console", + OutputPaths: []string{"stdout"}, + EncoderConfig: zapcore.EncoderConfig{ + EncodeLevel: zapcore.LowercaseColorLevelEncoder, + LevelKey: "level", + MessageKey: "message", + }, + }.Build() + return logger.Sugar() +} +// Dothings opens the Lua file and executes it +func Dothings(luafile string, exename string) error { l := lua.NewState() + bag.Logger = newZapLogger() registerDocumentType(l) registerNodeType(l) + + if err := runDefaultLua(l, exename); err != nil { + return err + } + if err := l.DoFile(luafile); err != nil { return err } diff --git a/core/document.go b/core/document.go index cf80fe4..55d842f 100644 --- a/core/document.go +++ b/core/document.go @@ -27,6 +27,7 @@ const ( func registerDocumentType(l *lua.LState) { mt := l.NewTypeMetatable(luaDocumentTypeName) l.SetGlobal("document", mt) + l.SetField(mt, "info", l.NewFunction(documentInfo)) l.SetField(mt, "new", l.NewFunction(newDocument)) l.SetField(mt, "sp", l.NewFunction(documentSP)) l.SetField(mt, "__index", l.NewFunction(indexDoc)) @@ -35,20 +36,16 @@ func registerDocumentType(l *lua.LState) { // Constructor func newDocument(l *lua.LState) int { doc := &doc{} - lv := l.Get(-1) + filename := l.CheckString(1) var w *os.File var err error - if str, ok := lv.(lua.LString); ok { - w, err = os.Create(string(str)) - if err != nil { - return lerr(l, err.Error()) - } - } else { - l.TypeError(1, lua.LTString) - return 0 + w, err = os.Create(filename) + if err != nil { + return lerr(l, err.Error()) } doc.w = w doc.d = document.NewDocument(w) + doc.d.Filename = filename ud := l.NewUserData() ud.Value = doc l.SetMetatable(ud, l.GetTypeMetatable(luaDocumentTypeName)) @@ -56,6 +53,22 @@ func newDocument(l *lua.LState) int { return 1 } +func documentSP(l *lua.LState) int { + arg := l.CheckString(1) + size, err := bag.Sp(arg) + if err != nil { + return lerr(l, err.Error()) + } + l.Push(lua.LNumber(size)) + return 1 +} + +func documentInfo(l *lua.LState) int { + str := l.CheckString(1) + bag.Logger.Info(str) + return 0 +} + func indexDoc(l *lua.LState) int { doc := checkDocument(l, 1) switch arg := l.CheckString(2); arg { @@ -115,16 +128,6 @@ func documentFinish(d *doc) lua.LGFunction { } } -func documentSP(l *lua.LState) int { - arg := l.CheckString(1) - size, err := bag.Sp(arg) - if err != nil { - return lerr(l, err.Error()) - } - l.Push(lua.LNumber(size)) - return 1 -} - func documentLoadPatternFile(doc *document.Document) lua.LGFunction { return func(l *lua.LState) int { fn := l.CheckString(1) diff --git a/core/node.go b/core/node.go index a8a2644..ce1fd62 100644 --- a/core/node.go +++ b/core/node.go @@ -125,7 +125,7 @@ func newNode(l *lua.LState) int { l.Push(newUserDataFromNode(l, bagnode.NewHList())) return 1 case "image": - l.Push(newUserDataFromNode(l, &bagnode.Image{})) + l.Push(newUserDataFromNode(l, bagnode.NewImage())) return 1 case "lang": l.Push(newUserDataFromNode(l, bagnode.NewLang())) @@ -149,6 +149,7 @@ func newUserDataFromNode(l *lua.LState, n bagnode.Node) *lua.LUserData { case *bagnode.Disc: mt = l.NewTypeMetatable(luaDiscNodeTypeName) l.SetField(mt, "__index", l.NewFunction(discIndex)) + l.SetField(mt, "__newindex", l.NewFunction(discNewIndex)) case *bagnode.Glue: mt = l.NewTypeMetatable(luaGlueNodeTypeName) l.SetField(mt, "__index", l.NewFunction(glueIndex)) @@ -160,6 +161,7 @@ func newUserDataFromNode(l *lua.LState, n bagnode.Node) *lua.LUserData { case *bagnode.HList: mt = l.NewTypeMetatable(luaHlistNodeTypeName) l.SetField(mt, "__index", l.NewFunction(hlistIndex)) + l.SetField(mt, "__newindex", l.NewFunction(hlistNewIndex)) case *bagnode.Image: mt = l.NewTypeMetatable(luaImageNodeTypeName) l.SetField(mt, "__index", l.NewFunction(imageNodeIndex)) @@ -186,7 +188,57 @@ func newUserDataFromNode(l *lua.LState, n bagnode.Node) *lua.LUserData { Disc nodes */ + +func checkDisc(l *lua.LState, argpos int) *bagnode.Disc { + ud := l.CheckUserData(argpos) + if v, ok := ud.Value.(*bagnode.Disc); ok { + return v + } + l.ArgError(argpos, "disc node expected") + return nil +} + func discIndex(l *lua.LState) int { + n := checkDisc(l, 1) + switch arg := l.ToString(2); arg { + case "next": + var other bagnode.Node + if other = n.Next(); other == nil { + return 0 + } + l.Push(newUserDataFromNode(l, other)) + return 1 + case "prev": + var other bagnode.Node + if other = n.Next(); other == nil { + return 0 + } + l.Push(newUserDataFromNode(l, other)) + return 1 + } + return 0 +} + +func discNewIndex(l *lua.LState) int { + n := checkDisc(l, 1) + switch arg := l.ToString(2); arg { + case "next": + if l.Get(3) == lua.LNil { + n.SetNext(nil) + } else { + n.SetNext(checkNode(l, 3)) + } + return 0 + case "prev": + if l.Get(3) == lua.LNil { + n.SetNext(nil) + } else { + n.SetNext(checkNode(l, 3)) + } + return 0 + default: + fmt.Println("newindex", arg) + } return 0 } @@ -207,6 +259,20 @@ func checkGlyph(l *lua.LState, argpos int) *bagnode.Glyph { func glyphNewIndex(l *lua.LState) int { n := checkGlyph(l, 1) switch arg := l.ToString(2); arg { + case "next": + if l.Get(3) == lua.LNil { + n.SetNext(nil) + } else { + n.SetNext(checkNode(l, 3)) + } + return 0 + case "prev": + if l.Get(3) == lua.LNil { + n.SetNext(nil) + } else { + n.SetNext(checkNode(l, 3)) + } + return 0 case "codepoint": arg := l.CheckNumber(3) n.Codepoint = int(arg) @@ -219,12 +285,6 @@ func glyphNewIndex(l *lua.LState) int { case "width": wd := l.CheckNumber(3) n.Width = bag.ScaledPoint(wd) - case "next": - nd := checkNode(l, 3) - n.SetNext(nd) - case "prev": - nd := checkNode(l, 3) - n.SetPrev(nd) default: fmt.Println("newindex", arg) _ = n @@ -234,6 +294,20 @@ func glyphNewIndex(l *lua.LState) int { func glyphIndex(l *lua.LState) int { n := checkGlyph(l, 1) switch arg := l.ToString(2); arg { + case "next": + var other bagnode.Node + if other = n.Next(); other == nil { + return 0 + } + l.Push(newUserDataFromNode(l, other)) + return 1 + case "prev": + var other bagnode.Node + if other = n.Next(); other == nil { + return 0 + } + l.Push(newUserDataFromNode(l, other)) + return 1 case "width": l.Push(lua.LNumber(n.Width)) return 1 @@ -262,15 +336,55 @@ func checkGlue(l *lua.LState, argpos int) *bagnode.Glue { } func glueIndex(l *lua.LState) int { - return 0 + n := checkGlue(l, 1) + switch arg := l.ToString(2); arg { + case "next": + var other bagnode.Node + if other = n.Next(); other == nil { + return 0 + } + l.Push(newUserDataFromNode(l, other)) + return 1 + case "prev": + var other bagnode.Node + if other = n.Next(); other == nil { + return 0 + } + l.Push(newUserDataFromNode(l, other)) + return 1 + case "width": + l.Push(lua.LNumber(n.Width)) + return 1 + default: + l.ArgError(2, fmt.Sprintf("unknown field %s in glue", arg)) + return 0 + } } func glueNewIndex(l *lua.LState) int { n := checkGlue(l, 1) switch arg := l.ToString(2); arg { + case "next": + if l.Get(3) == lua.LNil { + n.SetNext(nil) + } else { + n.SetNext(checkNode(l, 3)) + } + return 0 + case "prev": + if l.Get(3) == lua.LNil { + n.SetNext(nil) + } else { + n.SetNext(checkNode(l, 3)) + } + return 0 case "width": arg := l.CheckNumber(3) n.Width = bag.ScaledPoint(arg) + default: + l.ArgError(2, fmt.Sprintf("unknown field %s in glue", arg)) + return 0 + } return 0 } @@ -290,27 +404,57 @@ func checkHlist(l *lua.LState, argpos int) *bagnode.HList { } func hlistIndex(l *lua.LState) int { + var other bagnode.Node n := checkHlist(l, 1) switch arg := l.ToString(2); arg { case "list": - if n.List == nil { + if other = n.List; other == nil { return 0 } - l.Push(newUserDataFromNode(l, n.List)) + l.Push(newUserDataFromNode(l, other)) return 1 - case "set_head": - l.Push(l.NewFunction(setHead)) + case "next": + if other = n.Next(); other == nil { + return 0 + } + l.Push(newUserDataFromNode(l, other)) + return 1 + case "prev": + if other = n.Next(); other == nil { + return 0 + } + l.Push(newUserDataFromNode(l, other)) return 1 default: - fmt.Println("arg", arg) + l.ArgError(2, fmt.Sprintf("unknown field %s in hlist", arg)) + return 0 } - return 0 } -func setHead(l *lua.LState) int { - self := checkHlist(l, 1) - self.List = checkNode(l, 2) - return 0 +func hlistNewIndex(l *lua.LState) int { + n := checkHlist(l, 1) + switch arg := l.ToString(2); arg { + case "next": + if l.Get(3) == lua.LNil { + n.SetNext(nil) + } else { + n.SetNext(checkNode(l, 3)) + } + return 0 + case "prev": + if l.Get(3) == lua.LNil { + n.SetNext(nil) + } else { + n.SetNext(checkNode(l, 3)) + } + return 0 + case "list": + n.List = checkNode(l, 3) + return 0 + default: + l.ArgError(2, fmt.Sprintf("unknown field %s in hlist", arg)) + return 0 + } } /* @@ -319,17 +463,53 @@ func setHead(l *lua.LState) int { */ func imageNodeIndex(l *lua.LState) int { - return 0 + n := checkImageNode(l, 1) + switch arg := l.ToString(2); arg { + case "next": + var other bagnode.Node + if other = n.Next(); other == nil { + return 0 + } + l.Push(newUserDataFromNode(l, other)) + return 1 + case "prev": + var other bagnode.Node + if other = n.Next(); other == nil { + return 0 + } + l.Push(newUserDataFromNode(l, other)) + return 1 + default: + l.ArgError(2, fmt.Sprintf("unknown field %s in image", arg)) + return 0 + } } func imageNodeNewIndex(l *lua.LState) int { n := checkImageNode(l, 1) switch arg := l.ToString(2); arg { + case "next": + if l.Get(3) == lua.LNil { + n.SetNext(nil) + } else { + n.SetNext(checkNode(l, 3)) + } + return 0 + case "prev": + if l.Get(3) == lua.LNil { + n.SetNext(nil) + } else { + n.SetNext(checkNode(l, 3)) + } + return 0 case "img": n.Img = checkImage(l, 3) case "width": n.Width = bag.ScaledPoint(l.CheckNumber(3)) case "height": n.Height = bag.ScaledPoint(l.CheckNumber(3)) + default: + l.ArgError(2, fmt.Sprintf("unknown field %s in image", arg)) + return 0 } return 0 } @@ -361,6 +541,20 @@ func checkLangNode(l *lua.LState, argpos int) *bagnode.Lang { func langNodeNewIndex(l *lua.LState) int { n := checkLangNode(l, 1) switch arg := l.ToString(2); arg { + case "next": + if l.Get(3) == lua.LNil { + n.SetNext(nil) + } else { + n.SetNext(checkNode(l, 3)) + } + return 0 + case "prev": + if l.Get(3) == lua.LNil { + n.SetNext(nil) + } else { + n.SetNext(checkNode(l, 3)) + } + return 0 case "lang": pf := checkPatternFile(l, 3) n.Lang = pf @@ -371,6 +565,20 @@ func langNodeNewIndex(l *lua.LState) int { func langNodeIndex(l *lua.LState) int { n := checkLangNode(l, 1) switch arg := l.ToString(2); arg { + case "next": + var other bagnode.Node + if other = n.Next(); other == nil { + return 0 + } + l.Push(newUserDataFromNode(l, other)) + return 1 + case "prev": + var other bagnode.Node + if other = n.Next(); other == nil { + return 0 + } + l.Push(newUserDataFromNode(l, other)) + return 1 case "name": l.Push(lua.LString(n.Lang.Name)) return 1 @@ -396,6 +604,20 @@ func checkVList(l *lua.LState, argpos int) *bagnode.VList { func vlistNewIndex(l *lua.LState) int { n := checkVList(l, 1) switch arg := l.ToString(2); arg { + case "next": + if l.Get(3) == lua.LNil { + n.SetNext(nil) + } else { + n.SetNext(checkNode(l, 3)) + } + return 0 + case "prev": + if l.Get(3) == lua.LNil { + n.SetNext(nil) + } else { + n.SetNext(checkNode(l, 3)) + } + return 0 case "list": newnode := checkNode(l, 3) n.List = newnode @@ -406,23 +628,28 @@ func vlistNewIndex(l *lua.LState) int { func vlistIndex(l *lua.LState) int { n := checkVList(l, 1) switch arg := l.ToString(2); arg { + case "next": + var other bagnode.Node + if other = n.Next(); other == nil { + return 0 + } + l.Push(newUserDataFromNode(l, other)) + return 1 + case "prev": + var other bagnode.Node + if other = n.Next(); other == nil { + return 0 + } + l.Push(newUserDataFromNode(l, other)) + return 1 case "list": if n.List == nil { return 0 } l.Push(newUserDataFromNode(l, n.List)) return 1 - case "sethead": - l.Push(l.NewFunction(setVHead)) - return 1 default: fmt.Println("arg", arg) } return 0 } - -func setVHead(l *lua.LState) int { - self := checkHlist(l, 1) - self.List = checkNode(l, 2) - return 0 -} diff --git a/ets.lua b/ets.lua new file mode 100644 index 0000000..1b5c9fd --- /dev/null +++ b/ets.lua @@ -0,0 +1,6 @@ +-- This is the default file for initialization +-- It must be named like the executable file, just with the extension ".lua". +-- So for a binary name "ets.exe" or "ets", this file must be called "ets.lua" + +document.info("Loading ets.lua") +document.info("Loading ets.lua...done") diff --git a/ets/ets/main.go b/ets/ets/main.go index c1e02ab..fbc0603 100644 --- a/ets/ets/main.go +++ b/ets/ets/main.go @@ -3,25 +3,52 @@ package main import ( "fmt" "os" + "path/filepath" "time" "github.com/speedata/ets/core" "github.com/speedata/optionparser" ) +var ( + version string +) + +const ( + cmdRun = "run" + cmdHelp = "help" + cmdVersion = "version" +) + func dothings() error { + pathToExefile, err := os.Executable() + exename := filepath.Base(pathToExefile) + if err != nil { + return err + } + op := optionparser.NewOptionParser() - op.Command("version", "Show version information") + op.Banner = "experimental typesetting system\nrun: ets somefile.lua" + op.Command(cmdVersion, "Show version information") + op.Command(cmdHelp, "Show usage help") - err := op.Parse() + err = op.Parse() if err != nil { return err } if len(op.Extra) == 0 { - return fmt.Errorf("please specify a file to run") + return fmt.Errorf("Please specify a command or file to run. See %s --help", exename) + } + switch op.Extra[0] { + case cmdVersion: + fmt.Printf("%s verson %s\n", exename, version) + os.Exit(0) + case cmdHelp: + op.Help() + os.Exit(0) } - return core.Dothings(op.Extra[0]) + return core.Dothings(op.Extra[0], exename) } func main() { diff --git a/go.mod b/go.mod index 37895c0..b9af2a4 100644 --- a/go.mod +++ b/go.mod @@ -3,9 +3,10 @@ module github.com/speedata/ets go 1.17 require ( - github.com/speedata/boxesandglue v0.0.0-20211029075238-e1c07b278f7b + github.com/speedata/boxesandglue v0.0.0-20211102102252-92eec49ab5a8 github.com/speedata/optionparser v1.0.0 github.com/yuin/gopher-lua v0.0.0-20210529063254-f4c35e4016d9 + go.uber.org/zap v1.19.1 ) require ( @@ -15,7 +16,9 @@ require ( github.com/mattn/go-isatty v0.0.14 // indirect github.com/sirupsen/logrus v1.8.1 // indirect github.com/speedata/gofpdi v1.0.15 // indirect - github.com/speedata/gootf v0.0.0-20210922121111-803211d11afa // indirect + github.com/speedata/gootf v0.0.0-20211102101716-062a89e3221e // indirect github.com/speedata/hyphenation v1.0.1 // indirect + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/multierr v1.6.0 // indirect golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359 // indirect ) diff --git a/go.sum b/go.sum index 6b7ac2b..a423aec 100644 --- a/go.sum +++ b/go.sum @@ -1,13 +1,19 @@ github.com/antonfisher/nested-logrus-formatter v1.3.1 h1:NFJIr+pzwv5QLHTPyKz9UMEoHck02Q9L0FP13b/xSbQ= github.com/antonfisher/nested-logrus-formatter v1.3.1/go.mod h1:6WTfyWFkBc9+zyBaKIqRrg/KwMqBbodBjgbHjDz7zjA= +github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= +github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fatih/color v1.12.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.11 h1:nQ+aFkoE2TMGc0b68U2OKSexC+eq46+XwZzWXHRmPYs= @@ -15,29 +21,78 @@ github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/speedata/boxesandglue v0.0.0-20211029075238-e1c07b278f7b h1:4Jy2Xlgu8r1yLFQs4aOH5txtEpZHXQTP88zD7/L7SYY= github.com/speedata/boxesandglue v0.0.0-20211029075238-e1c07b278f7b/go.mod h1:v+UKsgo7MTFOvMYuU7xR2iuxoBekwVvT+s91ynM9wkM= +github.com/speedata/boxesandglue v0.0.0-20211102102252-92eec49ab5a8 h1:Ar28XsmuTAWESJOQzQcsBa2IkstqxnJFzN82kzX8p+w= +github.com/speedata/boxesandglue v0.0.0-20211102102252-92eec49ab5a8/go.mod h1:9BV4WsjEDggvn0iSppPMrFV//NB0wlOqX+XC9RImjh8= github.com/speedata/gofpdi v1.0.15 h1:PLFmzHTAdhgvCDMsWgvL/njaDFzTmvsYewqgw3UUEg4= github.com/speedata/gofpdi v1.0.15/go.mod h1:aRZ6VjhFbzJWwCoHeKOdbUjImuf4GMVCJpwS9+bCYuM= -github.com/speedata/gootf v0.0.0-20210922121111-803211d11afa h1:N7DXCiYMrnVG6eUxKjOTF3ZfPbA+6GABse8LvOnzSU8= github.com/speedata/gootf v0.0.0-20210922121111-803211d11afa/go.mod h1:bXdvybIvXGiKH0Yvm3KeIINmXldBdxe8RgHL7nkk25U= +github.com/speedata/gootf v0.0.0-20211102101716-062a89e3221e h1:NHpP15eopboLD2vKal/0qQ3IuXYa+ohenSH9+2YjDKs= +github.com/speedata/gootf v0.0.0-20211102101716-062a89e3221e/go.mod h1:W9eH+4fle8N24D52HYisQ4hJcp050D2lkx6QZ0e4xUs= github.com/speedata/hyphenation v1.0.1 h1:O9gKtVw2JvyiHybCYJwpB3zzHaeXEvDtXjiExZdm1TU= github.com/speedata/hyphenation v1.0.1/go.mod h1:vwrKKvBvJWFll0sVZw99hyWS/+r4YlMI7MAYjnje0nM= github.com/speedata/optionparser v1.0.0 h1:O9Bvoq20BQWMPq0b/id0kBT9oI0njNlHzY/wtQ3JA1o= github.com/speedata/optionparser v1.0.0/go.mod h1:AetA6qHxho+CGuukPCm44MsGu+Vvu/fATB/Er9PKmGk= -github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/gopher-lua v0.0.0-20210529063254-f4c35e4016d9 h1:k/gmLsJDWwWqbLCur2yWnJzwQEKRcAHXo6seXGuSwWw= github.com/yuin/gopher-lua v0.0.0-20210529063254-f4c35e4016d9/go.mod h1:E1AXubJBdNmFERAOucpDIxNzeGfLzg0mYh+UfMWdChA= +go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= +go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/goleak v1.1.11-0.20210813005559-691160354723 h1:sHOAIxRGBp443oHZIPB+HsUGaksVCXVQENPxwTfQdH4= +go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= +go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= +go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/zap v1.19.1 h1:ue41HOKd1vGURxrmeKIgELGb3jPW9DMUDGtsinblHwI= +go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359 h1:2B5p2L5IfGiD7+b9BOoRMC6DgObAVZV+Fsp050NqXik= golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/version b/version new file mode 100644 index 0000000..63f211d --- /dev/null +++ b/version @@ -0,0 +1 @@ +ets_version=0.0.2 \ No newline at end of file