From 1e5a3696f58aae4710ff54b1fb21672f478c8588 Mon Sep 17 00:00:00 2001 From: Chris Waldon Date: Wed, 16 Mar 2022 16:01:33 -0400 Subject: [PATCH] deps,text,widget,font/opentype: [API] add harfbuzz-powered text shaper This commit introduces a new text shaping infrastructure powered by Benoit Kugler's Go source-port of harfbuzz. This shaper can properly display complex scripts and RTL text. This commit changes the signature of the text.Shaper function, which is a breaking API change. The new functionality is available via opentype.ParseHarfbuzz, which configures a text.Shaper leveraging the new backend. References: https://todo.sr.ht/~eliasnaur/gio/146 Signed-off-by: Chris Waldon --- font/opentype/internal/shaping.go | 531 +++++++++ font/opentype/internal/shaping_test.go | 1524 ++++++++++++++++++++++++ font/opentype/opentype.go | 144 ++- font/opentype/opentype_test.go | 77 +- go.mod | 11 +- go.sum | 606 ++++++++++ text/lru.go | 16 +- text/lru_test.go | 4 +- text/shaper.go | 44 +- text/text.go | 125 +- widget/editor.go | 66 +- widget/label.go | 4 +- 12 files changed, 3009 insertions(+), 143 deletions(-) create mode 100644 font/opentype/internal/shaping.go create mode 100644 font/opentype/internal/shaping_test.go diff --git a/font/opentype/internal/shaping.go b/font/opentype/internal/shaping.go new file mode 100644 index 00000000..75028ac2 --- /dev/null +++ b/font/opentype/internal/shaping.go @@ -0,0 +1,531 @@ +package internal + +import ( + "io" + + "gioui.org/io/system" + "gioui.org/text" + "github.com/benoitkugler/textlayout/language" + "github.com/go-text/typesetting/di" + "github.com/go-text/typesetting/font" + "github.com/go-text/typesetting/shaping" + "github.com/npillmayer/uax/segment" + "github.com/npillmayer/uax/uax14" + "golang.org/x/image/math/fixed" +) + +// computeGlyphClusters populates the Clusters field of a Layout. +// The order of the clusters is visual, meaning +// that the first cluster is the leftmost cluster displayed even when +// the cluster is part of RTL text. +func computeGlyphClusters(l *text.Layout) { + clusters := make([]text.GlyphCluster, 0, len(l.Glyphs)+1) + if len(l.Glyphs) < 1 { + if l.Runes.Count > 0 { + // Empty line corresponding to a newline character. + clusters = append(clusters, text.GlyphCluster{ + Runes: text.Range{ + Count: 1, + Offset: l.Runes.Offset, + }, + }) + } + l.Clusters = clusters + return + } + rtl := l.Direction == system.RTL + + // Check for trailing whitespace characters and synthesize + // GlyphClusters to represent them. + lastGlyph := l.Glyphs[len(l.Glyphs)-1] + if rtl { + lastGlyph = l.Glyphs[0] + } + trailingNewline := lastGlyph.ClusterIndex+lastGlyph.RuneCount < l.Runes.Count+l.Runes.Offset + newlineCluster := text.GlyphCluster{ + Runes: text.Range{ + Count: 1, + Offset: l.Runes.Count + l.Runes.Offset - 1, + }, + Glyphs: text.Range{ + Offset: len(l.Glyphs), + }, + } + + var ( + i int = 0 + inc int = 1 + runesProcessed int = 0 + glyphsProcessed int = 0 + ) + + if rtl { + i = len(l.Glyphs) - 1 + inc = -inc + glyphsProcessed = len(l.Glyphs) - 1 + newlineCluster.Glyphs.Offset = 0 + } + // Construct clusters from the line's glyphs. + for ; i < len(l.Glyphs) && i >= 0; i += inc { + g := l.Glyphs[i] + xAdv := g.XAdvance * fixed.Int26_6(inc) + for k := 0; k < g.GlyphCount-1 && k < len(l.Glyphs); k++ { + i += inc + xAdv += l.Glyphs[i].XAdvance * fixed.Int26_6(inc) + } + + startRune := runesProcessed + runeIncrement := g.RuneCount + startGlyph := glyphsProcessed + glyphIncrement := g.GlyphCount * inc + if rtl { + startGlyph = glyphsProcessed + glyphIncrement + 1 + } + clusters = append(clusters, text.GlyphCluster{ + Advance: xAdv, + Runes: text.Range{ + Count: g.RuneCount, + Offset: startRune + l.Runes.Offset, + }, + Glyphs: text.Range{ + Count: g.GlyphCount, + Offset: startGlyph, + }, + }) + runesProcessed += runeIncrement + glyphsProcessed += glyphIncrement + } + // Insert synthetic clusters at the right edge of the line. + if trailingNewline { + clusters = append(clusters, newlineCluster) + } + l.Clusters = clusters + return +} + +// langConfig describes the language and writing system of a body of text. +type langConfig struct { + // Language the text is written in. + language.Language + // Writing system used to represent the text. + language.Script + // Direction of the text, usually driven by the writing system. + di.Direction +} + +// mapRunesToClusterIndices returns a slice. Each index within that slice corresponds +// to an index within the runes input slice. The value stored at that index is the +// index of the glyph at the start of the corresponding glyph cluster shaped by +// harfbuzz. +func mapRunesToClusterIndices(runes []rune, glyphs []shaping.Glyph) []int { + mapping := make([]int, len(runes)) + glyphCursor := 0 + if len(runes) == 0 { + return nil + } + // If the final cluster values are lower than the starting ones, + // the text is RTL. + rtl := len(glyphs) > 0 && glyphs[len(glyphs)-1].ClusterIndex < glyphs[0].ClusterIndex + if rtl { + glyphCursor = len(glyphs) - 1 + } + for i := range runes { + for glyphCursor >= 0 && glyphCursor < len(glyphs) && + ((rtl && glyphs[glyphCursor].ClusterIndex <= i) || + (!rtl && glyphs[glyphCursor].ClusterIndex < i)) { + if rtl { + glyphCursor-- + } else { + glyphCursor++ + } + } + if rtl { + glyphCursor++ + } else if (glyphCursor >= 0 && glyphCursor < len(glyphs) && + glyphs[glyphCursor].ClusterIndex > i) || + (glyphCursor == len(glyphs) && len(glyphs) > 1) { + glyphCursor-- + targetClusterIndex := glyphs[glyphCursor].ClusterIndex + for glyphCursor-1 >= 0 && glyphs[glyphCursor-1].ClusterIndex == targetClusterIndex { + glyphCursor-- + } + } + if glyphCursor < 0 { + glyphCursor = 0 + } else if glyphCursor >= len(glyphs) { + glyphCursor = len(glyphs) - 1 + } + mapping[i] = glyphCursor + } + return mapping +} + +// inclusiveGlyphRange returns the inclusive range of runes and glyphs matching +// the provided start and breakAfter rune positions. +// runeToGlyph must be a valid mapping from the rune representation to the +// glyph reprsentation produced by mapRunesToClusterIndices. +// numGlyphs is the number of glyphs in the output representing the runes +// under consideration. +func inclusiveGlyphRange(start, breakAfter int, runeToGlyph []int, numGlyphs int) (glyphStart, glyphEnd int) { + rtl := runeToGlyph[len(runeToGlyph)-1] < runeToGlyph[0] + runeStart := start + runeEnd := breakAfter + if rtl { + glyphStart = runeToGlyph[runeEnd] + if runeStart-1 >= 0 { + glyphEnd = runeToGlyph[runeStart-1] - 1 + } else { + glyphEnd = numGlyphs - 1 + } + } else { + glyphStart = runeToGlyph[runeStart] + if runeEnd+1 < len(runeToGlyph) { + glyphEnd = runeToGlyph[runeEnd+1] - 1 + } else { + glyphEnd = numGlyphs - 1 + } + } + return +} + +// breakOption represets a location within the rune slice at which +// it may be safe to break a line of text. +type breakOption struct { + // breakAtRune is the index at which it is safe to break. + breakAtRune int + // penalty is the cost of breaking at this index. Negative + // penalties mean that the break is beneficial, and a penalty + // of uax14.PenaltyForMustBreak means a required break. + penalty int +} + +// getBreakOptions returns a slice of line break candidates for the +// text in the provided slice. +func getBreakOptions(text []rune) []breakOption { + // Collect options for breaking the lines in a slice. + var options []breakOption + const adjust = -1 + breaker := uax14.NewLineWrap() + segmenter := segment.NewSegmenter(breaker) + segmenter.InitFromSlice(text) + runeOffset := 0 + brokeAtEnd := false + for segmenter.Next() { + penalty, _ := segmenter.Penalties() + // Determine the indices of the breaking runes in the runes + // slice. Would be nice if the API provided this. + currentSegment := segmenter.Runes() + runeOffset += len(currentSegment) + + // Collect all break options. + options = append(options, breakOption{ + penalty: penalty, + breakAtRune: runeOffset + adjust, + }) + if options[len(options)-1].breakAtRune == len(text)-1 { + brokeAtEnd = true + } + } + if len(text) > 0 && !brokeAtEnd { + options = append(options, breakOption{ + penalty: uax14.PenaltyForMustBreak, + breakAtRune: len(text) - 1, + }) + } + return options +} + +type Shaper func(shaping.Input) (shaping.Output, error) + +// paragraph shapes a single paragraph of text, breaking it into multiple lines +// to fit within the provided maxWidth. +func paragraph(shaper Shaper, face font.Face, ppem fixed.Int26_6, maxWidth int, lc langConfig, paragraph []rune) ([]output, error) { + // TODO: handle splitting bidi text here + + // Shape the text. + input := toInput(face, ppem, lc, paragraph) + out, err := shaper(input) + if err != nil { + return nil, err + } + // Get a mapping from input runes to output glyphs. + runeToGlyph := mapRunesToClusterIndices(paragraph, out.Glyphs) + + // Fetch line break candidates. + breaks := getBreakOptions(paragraph) + + return lineWrap(out, input.Direction, paragraph, runeToGlyph, breaks, maxWidth), nil +} + +// shouldKeepSegmentOnLine decides whether the segment of text from the current +// end of the line to the provided breakOption should be kept on the current +// line. It should be called successively with each available breakOption, +// and the line should be broken (without keeping the current segment) +// whenever it returns false. +// +// The parameters require some explanation: +// out - the shaping.Output that is being line-broken. +// runeToGlyph - a mapping where accessing the slice at the index of a rune +// int out will yield the index of the first glyph corresponding to that rune. +// lineStartRune - the index of the first rune in the line. +// b - the line break candidate under consideration. +// curLineWidth - the amount of space total in the current line. +// curLineUsed - the amount of space in the current line that is already used. +// nextLineWidth - the amount of space available on the next line. +// +// This function returns both a valid shaping.Output broken at b and a boolean +// indicating whether the returned output should be used. +func shouldKeepSegmentOnLine(out shaping.Output, runeToGlyph []int, lineStartRune int, b breakOption, curLineWidth, curLineUsed, nextLineWidth int) (candidateLine shaping.Output, keep bool) { + // Convert the break target to an inclusive index. + glyphStart, glyphEnd := inclusiveGlyphRange(lineStartRune, b.breakAtRune, runeToGlyph, len(out.Glyphs)) + + // Construct a line out of the inclusive glyph range. + candidateLine = out + candidateLine.Glyphs = candidateLine.Glyphs[glyphStart : glyphEnd+1] + candidateLine.RecomputeAdvance() + candidateAdvance := candidateLine.Advance.Ceil() + if candidateAdvance > curLineWidth && candidateAdvance-curLineUsed <= nextLineWidth { + // If it fits on the next line, put it there. + return candidateLine, false + } + + return candidateLine, true +} + +// lineWrap wraps the shaped glyphs of a paragraph to a particular max width. +func lineWrap(out shaping.Output, dir di.Direction, paragraph []rune, runeToGlyph []int, breaks []breakOption, maxWidth int) []output { + var outputs []output + if len(breaks) == 0 { + // Pass empty lines through as empty. + outputs = append(outputs, output{ + Shaped: out, + RuneRange: text.Range{ + Count: len(paragraph), + }, + }) + return outputs + } + + for i := 0; i < len(breaks); i++ { + b := breaks[i] + if b.breakAtRune+1 < len(runeToGlyph) { + // Check if this break is valid. + gIdx := runeToGlyph[b.breakAtRune] + g2Idx := runeToGlyph[b.breakAtRune+1] + cIdx := out.Glyphs[gIdx].ClusterIndex + c2Idx := out.Glyphs[g2Idx].ClusterIndex + if cIdx == c2Idx { + // This break is within a harfbuzz cluster, and is + // therefore invalid. + copy(breaks[i:], breaks[i+1:]) + breaks = breaks[:len(breaks)-1] + i-- + } + } + } + + start := 0 + runesProcessed := 0 + for i := 0; i < len(breaks); i++ { + b := breaks[i] + // Always keep the first segment on a line. + good, _ := shouldKeepSegmentOnLine(out, runeToGlyph, start, b, maxWidth, 0, maxWidth) + end := b.breakAtRune + innerLoop: + for k := i + 1; k < len(breaks); k++ { + bb := breaks[k] + candidate, ok := shouldKeepSegmentOnLine(out, runeToGlyph, start, bb, maxWidth, good.Advance.Ceil(), maxWidth) + if ok { + // Use this new, longer segment. + good = candidate + end = bb.breakAtRune + i++ + } else { + break innerLoop + } + } + numRunes := end - start + 1 + outputs = append(outputs, output{ + Shaped: good, + RuneRange: text.Range{ + Count: numRunes, + Offset: runesProcessed, + }, + }) + runesProcessed += numRunes + start = end + 1 + } + return outputs +} + +// output is a run of shaped text with metadata about its position +// within a text document. +type output struct { + Shaped shaping.Output + RuneRange text.Range +} + +func toSystemDirection(d di.Direction) system.TextDirection { + switch d { + case di.DirectionLTR: + return system.LTR + case di.DirectionRTL: + return system.RTL + } + return system.LTR +} + +// toGioGlyphs converts text shaper glyphs into the minimal representation +// that Gio needs. +func toGioGlyphs(in []shaping.Glyph) []text.Glyph { + out := make([]text.Glyph, 0, len(in)) + for _, g := range in { + out = append(out, text.Glyph{ + ID: g.GlyphID, + ClusterIndex: g.ClusterIndex, + RuneCount: g.RuneCount, + GlyphCount: g.GlyphCount, + XAdvance: g.XAdvance, + YAdvance: g.YAdvance, + XOffset: g.XOffset, + YOffset: g.YOffset, + }) + } + return out +} + +// ToLine converts the output into a text.Line +func (o output) ToLine() text.Line { + advances := make([]fixed.Int26_6, 0, len(o.Shaped.Glyphs)) + for _, glyph := range o.Shaped.Glyphs { + advances = append(advances, glyph.XAdvance) + } + layout := text.Layout{ + Advances: advances, + Glyphs: toGioGlyphs(o.Shaped.Glyphs), + Runes: o.RuneRange, + Direction: toSystemDirection(o.Shaped.Direction), + } + return text.Line{ + Layout: layout, + Bounds: fixed.Rectangle26_6{ + Min: fixed.Point26_6{ + Y: -o.Shaped.LineBounds.Ascent, + }, + Max: fixed.Point26_6{ + X: o.Shaped.Advance, + Y: -o.Shaped.LineBounds.Ascent + o.Shaped.LineBounds.LineHeight(), + }, + }, + Width: o.Shaped.Advance, + Ascent: o.Shaped.LineBounds.Ascent, + Descent: -o.Shaped.LineBounds.Descent + o.Shaped.LineBounds.Gap, + } +} + +func mapDirection(d system.TextDirection) di.Direction { + switch d { + case system.LTR: + return di.DirectionLTR + case system.RTL: + return di.DirectionRTL + } + return di.DirectionLTR +} + +// Document shapes text using the given font, ppem, maximum line width, language, +// and sequence of runes. It returns a slice of lines corresponding to the txt, +// broken to fit within maxWidth and on paragraph boundaries. +func Document(shaper Shaper, face font.Face, ppem fixed.Int26_6, maxWidth int, lc system.Locale, txt io.RuneReader) []text.Line { + var ( + outputs []text.Line + startByte int + startRune int + paragraphText []rune + done bool + langs = make(map[language.Script]int) + ) + for !done { + var ( + bytes int + runes int + ) + newlineAdjust := 0 + paragraphLoop: + for r, sz, re := txt.ReadRune(); !done; r, sz, re = txt.ReadRune() { + if re != nil { + done = true + continue + } + paragraphText = append(paragraphText, r) + script := language.LookupScript(r) + if _, ok := langs[script]; ok { + langs[script]++ + } else { + langs[script] = 1 + } + bytes += sz + runes++ + if r == '\n' { + newlineAdjust = 1 + break paragraphLoop + } + } + var ( + primary language.Script + primaryTotal int + ) + for script, total := range langs { + if total > primaryTotal { + primary = script + primaryTotal = total + } + } + if lc.Language == "" { + lc.Language = "EN" + } + lcfg := langConfig{ + Language: language.NewLanguage(lc.Language), + Script: primary, + Direction: mapDirection(lc.Direction), + } + lines, _ := paragraph(shaper, face, ppem, maxWidth, lcfg, paragraphText[:len(paragraphText)-newlineAdjust]) + for i := range lines { + // Update the offsets of each paragraph to be correct within the + // whole document. + lines[i].RuneRange.Offset += startRune + // Update the cluster values to be rune indices within the entire + // document. + for k := range lines[i].Shaped.Glyphs { + lines[i].Shaped.Glyphs[k].ClusterIndex += startRune + } + outputs = append(outputs, lines[i].ToLine()) + } + // If there was a trailing newline update the byte counts to include + // it on the last line of the paragraph. + if newlineAdjust > 0 { + outputs[len(outputs)-1].Layout.Runes.Count += newlineAdjust + } + paragraphText = paragraphText[:0] + startByte += bytes + startRune += runes + } + for i := range outputs { + computeGlyphClusters(&outputs[i].Layout) + } + return outputs +} + +// toInput converts its parameters into a shaping.Input. +func toInput(face font.Face, ppem fixed.Int26_6, lc langConfig, runes []rune) shaping.Input { + var input shaping.Input + input.Direction = lc.Direction + input.Text = runes + input.Size = ppem + input.Face = face + input.Language = lc.Language + input.Script = lc.Script + input.RunStart = 0 + input.RunEnd = len(runes) + return input +} diff --git a/font/opentype/internal/shaping_test.go b/font/opentype/internal/shaping_test.go new file mode 100644 index 00000000..8912b676 --- /dev/null +++ b/font/opentype/internal/shaping_test.go @@ -0,0 +1,1524 @@ +package internal + +import ( + "bytes" + "reflect" + "sort" + "testing" + "testing/quick" + + "gioui.org/io/system" + "gioui.org/text" + "github.com/go-text/typesetting/di" + "github.com/go-text/typesetting/shaping" + "golang.org/x/image/math/fixed" +) + +// glyph returns a glyph with the given cluster. Its dimensions +// are a square sitting atop the baseline, with 10 units to a side. +func glyph(cluster int) shaping.Glyph { + return shaping.Glyph{ + XAdvance: fixed.I(10), + YAdvance: fixed.I(10), + Width: fixed.I(10), + Height: fixed.I(10), + YBearing: fixed.I(10), + ClusterIndex: cluster, + } +} + +func max(a, b int) int { + if a > b { + return a + } + return b +} +func min(a, b int) int { + if a < b { + return a + } + return b +} + +// glyphs returns a slice of glyphs with clusters from start to +// end. If start is greater than end, the glyphs will be returned +// with descending cluster values. +func glyphs(start, end int) []shaping.Glyph { + inc := 1 + if start > end { + inc = -inc + } + num := max(start, end) - min(start, end) + 1 + g := make([]shaping.Glyph, 0, num) + for i := start; i >= 0 && i <= max(start, end); i += inc { + g = append(g, glyph(i)) + } + return g +} + +func TestMapRunesToClusterIndices(t *testing.T) { + type testcase struct { + name string + runes []rune + glyphs []shaping.Glyph + expected []int + } + for _, tc := range []testcase{ + { + name: "simple", + runes: make([]rune, 5), + glyphs: []shaping.Glyph{ + glyph(0), + glyph(1), + glyph(2), + glyph(3), + glyph(4), + }, + expected: []int{0, 1, 2, 3, 4}, + }, + { + name: "simple rtl", + runes: make([]rune, 5), + glyphs: []shaping.Glyph{ + glyph(4), + glyph(3), + glyph(2), + glyph(1), + glyph(0), + }, + expected: []int{4, 3, 2, 1, 0}, + }, + { + name: "fused clusters", + runes: make([]rune, 5), + glyphs: []shaping.Glyph{ + glyph(0), + glyph(0), + glyph(2), + glyph(3), + glyph(3), + }, + expected: []int{0, 0, 2, 3, 3}, + }, + { + name: "fused clusters rtl", + runes: make([]rune, 5), + glyphs: []shaping.Glyph{ + glyph(3), + glyph(3), + glyph(2), + glyph(0), + glyph(0), + }, + expected: []int{3, 3, 2, 0, 0}, + }, + { + name: "ligatures", + runes: make([]rune, 5), + glyphs: []shaping.Glyph{ + glyph(0), + glyph(2), + glyph(3), + }, + expected: []int{0, 0, 1, 2, 2}, + }, + { + name: "ligatures rtl", + runes: make([]rune, 5), + glyphs: []shaping.Glyph{ + glyph(3), + glyph(2), + glyph(0), + }, + expected: []int{2, 2, 1, 0, 0}, + }, + { + name: "expansion", + runes: make([]rune, 5), + glyphs: []shaping.Glyph{ + glyph(0), + glyph(1), + glyph(1), + glyph(1), + glyph(2), + glyph(3), + glyph(4), + }, + expected: []int{0, 1, 4, 5, 6}, + }, + { + name: "expansion rtl", + runes: make([]rune, 5), + glyphs: []shaping.Glyph{ + glyph(4), + glyph(3), + glyph(2), + glyph(1), + glyph(1), + glyph(1), + glyph(0), + }, + expected: []int{6, 3, 2, 1, 0}, + }, + } { + t.Run(tc.name, func(t *testing.T) { + mapping := mapRunesToClusterIndices(tc.runes, tc.glyphs) + if !reflect.DeepEqual(tc.expected, mapping) { + t.Errorf("expected %v, got %v", tc.expected, mapping) + } + }) + } +} + +func TestInclusiveRange(t *testing.T) { + type testcase struct { + name string + // inputs + start int + breakAfter int + runeToGlyph []int + numGlyphs int + // expected outputs + gs, ge int + } + for _, tc := range []testcase{ + { + name: "simple at start", + numGlyphs: 5, + start: 0, + breakAfter: 2, + runeToGlyph: []int{0, 1, 2, 3, 4}, + gs: 0, + ge: 2, + }, + { + name: "simple in middle", + numGlyphs: 5, + start: 1, + breakAfter: 3, + runeToGlyph: []int{0, 1, 2, 3, 4}, + gs: 1, + ge: 3, + }, + { + name: "simple at end", + numGlyphs: 5, + start: 2, + breakAfter: 4, + runeToGlyph: []int{0, 1, 2, 3, 4}, + gs: 2, + ge: 4, + }, + { + name: "simple at start rtl", + numGlyphs: 5, + start: 0, + breakAfter: 2, + runeToGlyph: []int{4, 3, 2, 1, 0}, + gs: 2, + ge: 4, + }, + { + name: "simple in middle rtl", + numGlyphs: 5, + start: 1, + breakAfter: 3, + runeToGlyph: []int{4, 3, 2, 1, 0}, + gs: 1, + ge: 3, + }, + { + name: "simple at end rtl", + numGlyphs: 5, + start: 2, + breakAfter: 4, + runeToGlyph: []int{4, 3, 2, 1, 0}, + gs: 0, + ge: 2, + }, + { + name: "fused clusters at start", + numGlyphs: 5, + start: 0, + breakAfter: 1, + runeToGlyph: []int{0, 0, 2, 3, 3}, + gs: 0, + ge: 1, + }, + { + name: "fused clusters start and middle", + numGlyphs: 5, + start: 0, + breakAfter: 2, + runeToGlyph: []int{0, 0, 2, 3, 3}, + gs: 0, + ge: 2, + }, + { + name: "fused clusters middle and end", + numGlyphs: 5, + start: 2, + breakAfter: 4, + runeToGlyph: []int{0, 0, 2, 3, 3}, + gs: 2, + ge: 4, + }, + { + name: "fused clusters at end", + numGlyphs: 5, + start: 3, + breakAfter: 4, + runeToGlyph: []int{0, 0, 2, 3, 3}, + gs: 3, + ge: 4, + }, + { + name: "fused clusters at start rtl", + numGlyphs: 5, + start: 0, + breakAfter: 1, + runeToGlyph: []int{3, 3, 2, 0, 0}, + gs: 3, + ge: 4, + }, + { + name: "fused clusters start and middle rtl", + numGlyphs: 5, + start: 0, + breakAfter: 2, + runeToGlyph: []int{3, 3, 2, 0, 0}, + gs: 2, + ge: 4, + }, + { + name: "fused clusters middle and end rtl", + numGlyphs: 5, + start: 2, + breakAfter: 4, + runeToGlyph: []int{3, 3, 2, 0, 0}, + gs: 0, + ge: 2, + }, + { + name: "fused clusters at end rtl", + numGlyphs: 5, + start: 3, + breakAfter: 4, + runeToGlyph: []int{3, 3, 2, 0, 0}, + gs: 0, + ge: 1, + }, + { + name: "ligatures at start", + numGlyphs: 3, + start: 0, + breakAfter: 2, + runeToGlyph: []int{0, 0, 1, 2, 2}, + gs: 0, + ge: 1, + }, + { + name: "ligatures in middle", + numGlyphs: 3, + start: 2, + breakAfter: 2, + runeToGlyph: []int{0, 0, 1, 2, 2}, + gs: 1, + ge: 1, + }, + { + name: "ligatures at end", + numGlyphs: 3, + start: 2, + breakAfter: 4, + runeToGlyph: []int{0, 0, 1, 2, 2}, + gs: 1, + ge: 2, + }, + { + name: "ligatures at start rtl", + numGlyphs: 3, + start: 0, + breakAfter: 2, + runeToGlyph: []int{2, 2, 1, 0, 0}, + gs: 1, + ge: 2, + }, + { + name: "ligatures in middle rtl", + numGlyphs: 3, + start: 2, + breakAfter: 2, + runeToGlyph: []int{2, 2, 1, 0, 0}, + gs: 1, + ge: 1, + }, + { + name: "ligatures at end rtl", + numGlyphs: 3, + start: 2, + breakAfter: 4, + runeToGlyph: []int{2, 2, 1, 0, 0}, + gs: 0, + ge: 1, + }, + { + name: "expansion at start", + numGlyphs: 7, + start: 0, + breakAfter: 2, + runeToGlyph: []int{0, 1, 4, 5, 6}, + gs: 0, + ge: 4, + }, + { + name: "expansion in middle", + numGlyphs: 7, + start: 1, + breakAfter: 3, + runeToGlyph: []int{0, 1, 4, 5, 6}, + gs: 1, + ge: 5, + }, + { + name: "expansion at end", + numGlyphs: 7, + start: 2, + breakAfter: 4, + runeToGlyph: []int{0, 1, 4, 5, 6}, + gs: 4, + ge: 6, + }, + { + name: "expansion at start rtl", + numGlyphs: 7, + start: 0, + breakAfter: 2, + runeToGlyph: []int{6, 3, 2, 1, 0}, + gs: 2, + ge: 6, + }, + { + name: "expansion in middle rtl", + numGlyphs: 7, + start: 1, + breakAfter: 3, + runeToGlyph: []int{6, 3, 2, 1, 0}, + gs: 1, + ge: 5, + }, + { + name: "expansion at end rtl", + numGlyphs: 7, + start: 2, + breakAfter: 4, + runeToGlyph: []int{6, 3, 2, 1, 0}, + gs: 0, + ge: 2, + }, + } { + t.Run(tc.name, func(t *testing.T) { + gs, ge := inclusiveGlyphRange(tc.start, tc.breakAfter, tc.runeToGlyph, tc.numGlyphs) + if gs != tc.gs { + t.Errorf("glyphStart mismatch, got %d, expected %d", gs, tc.gs) + } + if ge != tc.ge { + t.Errorf("glyphEnd mismatch, got %d, expected %d", ge, tc.ge) + } + }) + } +} + +var ( + // Assume the simple case of 1:1:1 glyph:rune:byte for this input. + text1 = "text one is ltr" + shapedText1 = shaping.Output{ + Advance: fixed.I(10 * len([]rune(text1))), + LineBounds: shaping.Bounds{ + Ascent: fixed.I(10), + Descent: fixed.I(5), + // No line gap. + }, + GlyphBounds: shaping.Bounds{ + Ascent: fixed.I(10), + // No glyphs descend. + }, + Glyphs: glyphs(0, 14), + } + text1Trailing = text1 + " " + shapedText1Trailing = func() shaping.Output { + out := shapedText1 + out.Glyphs = append(out.Glyphs, glyph(len(out.Glyphs))) + out.RecalculateAll() + return out + }() + // Test M:N:O glyph:rune:byte for this input. + // The substring `lig` is shaped as a ligature. + // The substring `DROP` is not shaped at all. + text2 = "안П你 ligDROP 안П你 ligDROP" + shapedText2 = shaping.Output{ + // There are 11 glyphs shaped for this string. + Advance: fixed.I(10 * 11), + LineBounds: shaping.Bounds{ + Ascent: fixed.I(10), + Descent: fixed.I(5), + // No line gap. + }, + GlyphBounds: shaping.Bounds{ + Ascent: fixed.I(10), + // No glyphs descend. + }, + Glyphs: []shaping.Glyph{ + 0: glyph(0), // 안 - 4 bytes + 1: glyph(1), // П - 3 bytes + 2: glyph(2), // 你 - 4 bytes + 3: glyph(3), // - 1 byte + 4: glyph(4), // lig - 3 runes, 3 bytes + // DROP - 4 runes, 4 bytes + 5: glyph(11), // - 1 byte + 6: glyph(12), // 안 - 4 bytes + 7: glyph(13), // П - 3 bytes + 8: glyph(14), // 你 - 4 bytes + 9: glyph(15), // - 1 byte + 10: glyph(16), // lig - 3 runes, 3 bytes + // DROP - 4 runes, 4 bytes + }, + } + // Test RTL languages. + text3 = "שלום أهلا שלום أهلا" + shapedText3 = shaping.Output{ + // There are 15 glyphs shaped for this string. + Advance: fixed.I(10 * 15), + LineBounds: shaping.Bounds{ + Ascent: fixed.I(10), + Descent: fixed.I(5), + // No line gap. + }, + GlyphBounds: shaping.Bounds{ + Ascent: fixed.I(10), + // No glyphs descend. + }, + Glyphs: []shaping.Glyph{ + 0: glyph(16), // LIGATURE of three runes: + // ا - 3 bytes + // ل - 3 bytes + // ه - 3 bytes + 1: glyph(15), // أ - 3 bytes + 2: glyph(14), // - 1 byte + 3: glyph(13), // ם - 3 bytes + 4: glyph(12), // ו - 3 bytes + 5: glyph(11), // ל - 3 bytes + 6: glyph(10), // ש - 3 bytes + 7: glyph(9), // - 1 byte + 8: glyph(6), // LIGATURE of three runes: + // ا - 3 bytes + // ل - 3 bytes + // ه - 3 bytes + 9: glyph(5), // أ - 3 bytes + 10: glyph(4), // - 1 byte + 11: glyph(3), // ם - 3 bytes + 12: glyph(2), // ו - 3 bytes + 13: glyph(1), // ל - 3 bytes + 14: glyph(0), // ש - 3 bytes + }, + } +) + +//splitShapedAt splits a single shaped output into multiple. It splits +// on each provided glyph index in indices, with the index being the end of +// a slice range (so it's exclusive). You can think of the index as the +// first glyph of the next output. +func splitShapedAt(shaped shaping.Output, direction di.Direction, indices ...int) []shaping.Output { + numOut := len(indices) + 1 + outputs := make([]shaping.Output, 0, numOut) + start := 0 + for _, i := range indices { + newOut := shaped + newOut.Glyphs = newOut.Glyphs[start:i] + newOut.RecalculateAll() + outputs = append(outputs, newOut) + start = i + } + newOut := shaped + newOut.Glyphs = newOut.Glyphs[start:] + newOut.RecalculateAll() + outputs = append(outputs, newOut) + return outputs +} + +func TestEngineLineWrap(t *testing.T) { + type testcase struct { + name string + direction di.Direction + shaped shaping.Output + paragraph []rune + maxWidth int + expected []output + } + for _, tc := range []testcase{ + { + // This test case verifies that no line breaks occur if they are not + // necessary, and that the proper Offsets are reported in the output. + name: "all one line", + shaped: shapedText1, + direction: di.DirectionLTR, + paragraph: []rune(text1), + maxWidth: 1000, + expected: []output{ + { + RuneRange: text.Range{ + Count: len([]rune(text1)), + }, + Shaped: shapedText1, + }, + }, + }, + { + // This test case verifies that trailing whitespace characters on a + // line do not just disappear if it's the first line. + name: "trailing whitespace", + shaped: shapedText1Trailing, + direction: di.DirectionLTR, + paragraph: []rune(text1Trailing), + maxWidth: 1000, + expected: []output{ + { + RuneRange: text.Range{ + Count: len([]rune(text1)) + 1, + }, + Shaped: shapedText1Trailing, + }, + }, + }, + { + // This test case verifies that the line wrapper rejects line break + // candidates that would split a glyph cluster. + name: "reject mid-cluster line breaks", + shaped: shaping.Output{ + Advance: fixed.I(10 * 3), + LineBounds: shaping.Bounds{ + Ascent: fixed.I(10), + Descent: fixed.I(5), + // No line gap. + }, + GlyphBounds: shaping.Bounds{ + Ascent: fixed.I(10), + // No glyphs descend. + }, + Glyphs: []shaping.Glyph{ + simpleGlyph(0), + complexGlyph(1, 2, 2), + complexGlyph(1, 2, 2), + }, + }, + direction: di.DirectionLTR, + // This unicode data was discovered in a testing/quick failure + // for widget.Editor. It has the property that the middle two + // runes form a harfbuzz cluster but also have a legal UAX#14 + // segment break between them. + paragraph: []rune{0xa8e58, 0x3a4fd, 0x119dd}, + maxWidth: 20, + expected: []output{ + { + RuneRange: text.Range{ + Count: 1, + }, + Shaped: shaping.Output{ + Direction: di.DirectionLTR, + Advance: fixed.I(10), + LineBounds: shaping.Bounds{ + Ascent: fixed.I(10), + Descent: fixed.I(5), + }, + GlyphBounds: shaping.Bounds{ + Ascent: fixed.I(10), + }, + Glyphs: []shaping.Glyph{ + simpleGlyph(0), + }, + }, + }, + { + RuneRange: text.Range{ + Count: 2, + Offset: 1, + }, + Shaped: shaping.Output{ + Direction: di.DirectionLTR, + Advance: fixed.I(20), + LineBounds: shaping.Bounds{ + Ascent: fixed.I(10), + Descent: fixed.I(5), + }, + GlyphBounds: shaping.Bounds{ + Ascent: fixed.I(10), + }, + Glyphs: []shaping.Glyph{ + complexGlyph(1, 2, 2), + complexGlyph(1, 2, 2), + }, + }, + }, + }, + }, + { + // This test case verifies that line breaking does occur, and that + // all lines have proper offsets. + name: "line break on last word", + shaped: shapedText1, + direction: di.DirectionLTR, + paragraph: []rune(text1), + maxWidth: 120, + expected: []output{ + { + RuneRange: text.Range{ + Count: len([]rune(text1)) - 3, + }, + Shaped: splitShapedAt(shapedText1, di.DirectionLTR, 12)[0], + }, + { + RuneRange: text.Range{ + Offset: len([]rune(text1)) - 3, + Count: 3, + }, + Shaped: splitShapedAt(shapedText1, di.DirectionLTR, 12)[1], + }, + }, + }, + { + // This test case verifies that many line breaks still result in + // correct offsets. This test also ensures that leading whitespace + // is correctly hidden on lines after the first. + name: "line break several times", + shaped: shapedText1, + direction: di.DirectionLTR, + paragraph: []rune(text1), + maxWidth: 70, + expected: []output{ + { + RuneRange: text.Range{ + Count: 5, + }, + Shaped: splitShapedAt(shapedText1, di.DirectionLTR, 5)[0], + }, + { + RuneRange: text.Range{ + Offset: 5, + Count: 7, + }, + Shaped: splitShapedAt(shapedText1, di.DirectionLTR, 5, 12)[1], + }, + { + RuneRange: text.Range{ + Offset: 12, + Count: 3, + }, + Shaped: splitShapedAt(shapedText1, di.DirectionLTR, 12)[1], + }, + }, + }, + { + // This test case verifies baseline offset math for more complicated input. + name: "all one line 2", + shaped: shapedText2, + direction: di.DirectionLTR, + paragraph: []rune(text2), + maxWidth: 1000, + expected: []output{ + { + RuneRange: text.Range{ + Count: len([]rune(text2)), + }, + Shaped: shapedText2, + }, + }, + }, + { + // This test case verifies that offset accounting correctly handles complex + // input across line breaks. It is legal to line-break within words composed + // of more than one script, so this test expects that to occur. + name: "line break several times 2", + shaped: shapedText2, + direction: di.DirectionLTR, + paragraph: []rune(text2), + maxWidth: 40, + expected: []output{ + { + RuneRange: text.Range{ + Count: len([]rune("안П你 ")), + }, + Shaped: splitShapedAt(shapedText2, di.DirectionLTR, 4)[0], + }, + { + RuneRange: text.Range{ + Count: len([]rune("ligDROP 안П")), + Offset: len([]rune("안П你 ")), + }, + Shaped: splitShapedAt(shapedText2, di.DirectionLTR, 4, 8)[1], + }, + { + RuneRange: text.Range{ + Count: len([]rune("你 ligDROP")), + Offset: len([]rune("안П你 ligDROP 안П")), + }, + Shaped: splitShapedAt(shapedText2, di.DirectionLTR, 8, 11)[1], + }, + }, + }, + { + // This test case verifies baseline offset math for complex RTL input. + name: "all one line 3", + shaped: shapedText3, + direction: di.DirectionLTR, + paragraph: []rune(text3), + maxWidth: 1000, + expected: []output{ + { + RuneRange: text.Range{ + Count: len([]rune(text3)), + }, + Shaped: shapedText3, + }, + }, + }, + { + // This test case verifies line wrapping logic in RTL mode. + name: "line break once [RTL]", + shaped: shapedText3, + direction: di.DirectionRTL, + paragraph: []rune(text3), + maxWidth: 100, + expected: []output{ + { + RuneRange: text.Range{ + Count: len([]rune("שלום أهلا ")), + }, + Shaped: splitShapedAt(shapedText3, di.DirectionRTL, 7)[1], + }, + { + RuneRange: text.Range{ + Count: len([]rune("שלום أهلا")), + Offset: len([]rune("שלום أهلا ")), + }, + Shaped: splitShapedAt(shapedText3, di.DirectionRTL, 7)[0], + }, + }, + }, + { + // This test case verifies line wrapping logic in RTL mode. + name: "line break several times [RTL]", + shaped: shapedText3, + direction: di.DirectionRTL, + paragraph: []rune(text3), + maxWidth: 50, + expected: []output{ + { + RuneRange: text.Range{ + Count: len([]rune("שלום ")), + }, + Shaped: splitShapedAt(shapedText3, di.DirectionRTL, 10)[1], + }, + { + RuneRange: text.Range{ + Count: len([]rune("أهلا ")), + Offset: len([]rune("שלום ")), + }, + Shaped: splitShapedAt(shapedText3, di.DirectionRTL, 7, 10)[1], + }, + { + RuneRange: text.Range{ + Count: len([]rune("שלום ")), + Offset: len([]rune("שלום أهلا ")), + }, + Shaped: splitShapedAt(shapedText3, di.DirectionRTL, 2, 7)[1], + }, + { + RuneRange: text.Range{ + Count: len([]rune("أهلا")), + Offset: len([]rune("שלום أهلا שלום ")), + }, + Shaped: splitShapedAt(shapedText3, di.DirectionRTL, 2)[0], + }, + }, + }, + } { + t.Run(tc.name, func(t *testing.T) { + // Get a mapping from input runes to output glyphs. + runeToGlyph := mapRunesToClusterIndices(tc.paragraph, tc.shaped.Glyphs) + + // Fetch line break candidates. + breaks := getBreakOptions(tc.paragraph) + + outs := lineWrap(tc.shaped, tc.direction, tc.paragraph, runeToGlyph, breaks, tc.maxWidth) + if len(tc.expected) != len(outs) { + t.Errorf("expected %d lines, got %d", len(tc.expected), len(outs)) + } + for i := range tc.expected { + e := tc.expected[i] + o := outs[i] + lenE := len(e.Shaped.Glyphs) + lenO := len(o.Shaped.Glyphs) + if lenE != lenO { + t.Errorf("line %d: expected %d glyphs, got %d", i, lenE, lenO) + } else { + for k := range e.Shaped.Glyphs { + e := e.Shaped.Glyphs[k] + o := o.Shaped.Glyphs[k] + if !reflect.DeepEqual(e, o) { + t.Errorf("line %d: glyph mismatch at index %d, expected: %#v, got %#v", i, k, e, o) + } + } + } + if e.RuneRange != o.RuneRange { + t.Errorf("line %d: expected %#v offsets, got %#v", i, e.RuneRange, o.RuneRange) + } + if e.Shaped.Direction != o.Shaped.Direction { + t.Errorf("line %d: expected %v direction, got %v", i, e.Shaped.Direction, o.Shaped.Direction) + } + // Reduce the verbosity of the reflect mismatch since we already + // compared the glyphs. + e.Shaped.Glyphs = nil + o.Shaped.Glyphs = nil + if !reflect.DeepEqual(e.Shaped, o.Shaped) { + t.Errorf("line %d: expected: %#v, got %#v", i, e, o) + } + } + }) + } +} + +func TestEngineDocument(t *testing.T) { + const doc = `Rutrum quisque non tellus orci ac auctor augue. +At risus viverra adipiscing at.` + const numLines = 2 + english := system.Locale{ + Language: "EN", + Direction: system.LTR, + } + docRunes := len([]rune(doc)) + + // Override the shaping engine with one that will return a simple + // square glyph info for each rune in the input. + shaper := func(in shaping.Input) (shaping.Output, error) { + o := shaping.Output{ + // TODO: ensure that this is either inclusive or exclusive + Glyphs: glyphs(in.RunStart, in.RunEnd), + } + o.RecalculateAll() + return o, nil + } + + lines := Document(shaper, nil, 10, 100, english, bytes.NewBufferString(doc)) + + lineRunes := 0 + for i, line := range lines { + t.Logf("Line %d: runeOffset %d, runes %d", + i, line.Layout.Runes.Offset, line.Layout.Runes.Count) + if line.Layout.Runes.Offset != lineRunes { + t.Errorf("expected line %d to start at byte %d, got %d", i, lineRunes, line.Layout.Runes.Offset) + } + lineRunes += line.Layout.Runes.Count + } + if lineRunes != docRunes { + t.Errorf("unexpected count: expected %d runes, got %d runes", + docRunes, lineRunes) + } +} + +// simpleGlyph returns a simple square glyph with the provided cluster +//value. +func simpleGlyph(cluster int) shaping.Glyph { + return complexGlyph(cluster, 1, 1) +} + +// ligatureGlyph returns a simple square glyph with the provided cluster +//value and number of runes. +func ligatureGlyph(cluster, runes int) shaping.Glyph { + return complexGlyph(cluster, runes, 1) +} + +// expansionGlyph returns a simple square glyph with the provided cluster +//value and number of glyphs. +func expansionGlyph(cluster, glyphs int) shaping.Glyph { + return complexGlyph(cluster, 1, glyphs) +} + +// complexGlyph returns a simple square glyph with the provided cluster +//value, number of associated runes, and number of glyphs in the cluster. +func complexGlyph(cluster, runes, glyphs int) shaping.Glyph { + return shaping.Glyph{ + Width: fixed.I(10), + Height: fixed.I(10), + XAdvance: fixed.I(10), + YAdvance: fixed.I(10), + YBearing: fixed.I(10), + ClusterIndex: cluster, + GlyphCount: glyphs, + RuneCount: runes, + } +} + +func simpleCluster(runeOffset, glyphOffset int, ltr bool) text.GlyphCluster { + g := text.GlyphCluster{ + Advance: fixed.I(10), + Runes: text.Range{ + Count: 1, + Offset: runeOffset, + }, + Glyphs: text.Range{ + Count: 1, + Offset: glyphOffset, + }, + } + if !ltr { + g.Advance = -g.Advance + } + return g +} + +func TestLayoutComputeClusters(t *testing.T) { + type testcase struct { + name string + line text.Layout + lastLine bool + expected []text.GlyphCluster + } + for _, tc := range []testcase{ + { + name: "empty", + expected: []text.GlyphCluster{}, + }, + { + name: "just newline", + line: text.Layout{ + Direction: system.LTR, + Glyphs: toGioGlyphs([]shaping.Glyph{}), + Runes: text.Range{ + Count: 1, + }, + }, + expected: []text.GlyphCluster{ + { + Runes: text.Range{ + Count: 1, + }, + }, + }, + }, + { + name: "simple", + line: text.Layout{ + Direction: system.LTR, + Glyphs: toGioGlyphs([]shaping.Glyph{ + simpleGlyph(0), + simpleGlyph(1), + simpleGlyph(2), + }), + Runes: text.Range{ + Count: 3, + }, + }, + expected: []text.GlyphCluster{ + simpleCluster(0, 0, true), + simpleCluster(1, 1, true), + simpleCluster(2, 2, true), + }, + }, + { + name: "simple with newline", + line: text.Layout{ + Direction: system.LTR, + Glyphs: toGioGlyphs([]shaping.Glyph{ + simpleGlyph(0), + simpleGlyph(1), + simpleGlyph(2), + }), + Runes: text.Range{ + Count: 4, + }, + }, + expected: []text.GlyphCluster{ + simpleCluster(0, 0, true), + simpleCluster(1, 1, true), + simpleCluster(2, 2, true), + { + Runes: text.Range{ + Count: 1, + Offset: 3, + }, + Glyphs: text.Range{ + Offset: 3, + }, + }, + }, + }, + { + name: "ligature", + line: text.Layout{ + Direction: system.LTR, + Glyphs: toGioGlyphs([]shaping.Glyph{ + ligatureGlyph(0, 2), + simpleGlyph(2), + simpleGlyph(3), + }), + Runes: text.Range{ + Count: 4, + }, + }, + expected: []text.GlyphCluster{ + { + Advance: fixed.I(10), + Runes: text.Range{ + Count: 2, + }, + Glyphs: text.Range{ + Count: 1, + }, + }, + simpleCluster(2, 1, true), + simpleCluster(3, 2, true), + }, + }, + { + name: "ligature with newline", + line: text.Layout{ + Direction: system.LTR, + Glyphs: toGioGlyphs([]shaping.Glyph{ + ligatureGlyph(0, 2), + }), + Runes: text.Range{ + Count: 3, + }, + }, + expected: []text.GlyphCluster{ + { + Advance: fixed.I(10), + Runes: text.Range{ + Count: 2, + }, + Glyphs: text.Range{ + Count: 1, + }, + }, + { + Runes: text.Range{ + Count: 1, + Offset: 2, + }, + Glyphs: text.Range{ + Offset: 1, + }, + }, + }, + }, + { + name: "expansion", + line: text.Layout{ + Direction: system.LTR, + Glyphs: toGioGlyphs([]shaping.Glyph{ + expansionGlyph(0, 2), + expansionGlyph(0, 2), + simpleGlyph(1), + simpleGlyph(2), + }), + Runes: text.Range{ + Count: 3, + }, + }, + expected: []text.GlyphCluster{ + { + Advance: fixed.I(20), + Runes: text.Range{ + Count: 1, + }, + Glyphs: text.Range{ + Count: 2, + }, + }, + simpleCluster(1, 2, true), + simpleCluster(2, 3, true), + }, + }, + { + name: "deletion", + line: text.Layout{ + Direction: system.LTR, + Glyphs: toGioGlyphs([]shaping.Glyph{ + simpleGlyph(0), + ligatureGlyph(1, 2), + simpleGlyph(3), + simpleGlyph(4), + }), + Runes: text.Range{ + Count: 5, + }, + }, + expected: []text.GlyphCluster{ + simpleCluster(0, 0, true), + { + Advance: fixed.I(10), + Runes: text.Range{ + Count: 2, + Offset: 1, + }, + Glyphs: text.Range{ + Count: 1, + Offset: 1, + }, + }, + simpleCluster(3, 2, true), + simpleCluster(4, 3, true), + }, + }, + { + name: "simple rtl", + line: text.Layout{ + Direction: system.RTL, + Glyphs: toGioGlyphs([]shaping.Glyph{ + simpleGlyph(2), + simpleGlyph(1), + simpleGlyph(0), + }), + Runes: text.Range{ + Count: 3, + }, + }, + expected: []text.GlyphCluster{ + simpleCluster(0, 2, false), + simpleCluster(1, 1, false), + simpleCluster(2, 0, false), + }, + }, + { + name: "simple rtl with newline", + line: text.Layout{ + Direction: system.RTL, + Glyphs: toGioGlyphs([]shaping.Glyph{ + simpleGlyph(2), + simpleGlyph(1), + simpleGlyph(0), + }), + Runes: text.Range{ + Count: 4, + }, + }, + expected: []text.GlyphCluster{ + simpleCluster(0, 2, false), + simpleCluster(1, 1, false), + simpleCluster(2, 0, false), + { + Runes: text.Range{ + Count: 1, + Offset: 3, + }, + }, + }, + }, + { + name: "ligature rtl", + line: text.Layout{ + Direction: system.RTL, + Glyphs: toGioGlyphs([]shaping.Glyph{ + simpleGlyph(3), + simpleGlyph(2), + ligatureGlyph(0, 2), + }), + Runes: text.Range{ + Count: 4, + }, + }, + expected: []text.GlyphCluster{ + { + Advance: fixed.I(-10), + Runes: text.Range{ + Count: 2, + }, + Glyphs: text.Range{ + Count: 1, + Offset: 2, + }, + }, + simpleCluster(2, 1, false), + simpleCluster(3, 0, false), + }, + }, + { + name: "ligature rtl with newline", + line: text.Layout{ + Direction: system.RTL, + Glyphs: toGioGlyphs([]shaping.Glyph{ + ligatureGlyph(0, 2), + }), + Runes: text.Range{ + Count: 3, + }, + }, + expected: []text.GlyphCluster{ + { + Advance: fixed.I(-10), + Runes: text.Range{ + Count: 2, + }, + Glyphs: text.Range{ + Count: 1, + }, + }, + { + Runes: text.Range{ + Count: 1, + Offset: 2, + }, + }, + }, + }, + { + name: "expansion rtl", + line: text.Layout{ + Direction: system.RTL, + Glyphs: toGioGlyphs([]shaping.Glyph{ + simpleGlyph(2), + simpleGlyph(1), + expansionGlyph(0, 2), + expansionGlyph(0, 2), + }), + Runes: text.Range{ + Count: 3, + }, + }, + expected: []text.GlyphCluster{ + { + Advance: fixed.I(-20), + Runes: text.Range{ + Count: 1, + }, + Glyphs: text.Range{ + Count: 2, + Offset: 2, + }, + }, + simpleCluster(1, 1, false), + simpleCluster(2, 0, false), + }, + }, + { + name: "deletion rtl", + line: text.Layout{ + Direction: system.RTL, + Glyphs: toGioGlyphs([]shaping.Glyph{ + simpleGlyph(4), + simpleGlyph(3), + ligatureGlyph(1, 2), + simpleGlyph(0), + }), + Runes: text.Range{ + Count: 5, + }, + }, + expected: []text.GlyphCluster{ + simpleCluster(0, 3, false), + { + Advance: fixed.I(-10), + Runes: text.Range{ + Count: 2, + Offset: 1, + }, + Glyphs: text.Range{ + Count: 1, + Offset: 2, + }, + }, + simpleCluster(3, 1, false), + simpleCluster(4, 0, false), + }, + }, + } { + t.Run(tc.name, func(t *testing.T) { + computeGlyphClusters(&tc.line) + actual := tc.line.Clusters + if !reflect.DeepEqual(actual, tc.expected) { + t.Errorf("expected %v, got %v", tc.expected, actual) + } + }) + } +} + +func TestGetBreakOptions(t *testing.T) { + if err := quick.Check(func(runes []rune) bool { + options := getBreakOptions(runes) + // Ensure breaks are in valid range. + for _, o := range options { + if o.breakAtRune < 0 || o.breakAtRune > len(runes)-1 { + return false + } + } + // Ensure breaks are sorted. + if !sort.SliceIsSorted(options, func(i, j int) bool { + return options[i].breakAtRune < options[j].breakAtRune + }) { + return false + } + + // Ensure breaks are unique. + m := make([]bool, len(runes)) + for _, o := range options { + if m[o.breakAtRune] { + return false + } else { + m[o.breakAtRune] = true + } + } + + return true + }, nil); err != nil { + t.Errorf("generated invalid break options: %v", err) + } +} + +func TestLayoutSlice(t *testing.T) { + type testcase struct { + name string + in text.Layout + expected text.Layout + start, end int + } + + ltrGlyphs := toGioGlyphs([]shaping.Glyph{ + simpleGlyph(0), + complexGlyph(1, 2, 2), + complexGlyph(1, 2, 2), + simpleGlyph(3), + simpleGlyph(4), + simpleGlyph(5), + ligatureGlyph(6, 3), + simpleGlyph(9), + simpleGlyph(10), + }) + rtlGlyphs := toGioGlyphs([]shaping.Glyph{ + simpleGlyph(10), + simpleGlyph(9), + ligatureGlyph(6, 3), + simpleGlyph(5), + simpleGlyph(4), + simpleGlyph(3), + complexGlyph(1, 2, 2), + complexGlyph(1, 2, 2), + simpleGlyph(0), + }) + + for _, tc := range []testcase{ + { + name: "ltr", + in: func() text.Layout { + l := text.Layout{ + Glyphs: ltrGlyphs, + Direction: system.LTR, + Runes: text.Range{ + Count: 11, + }, + } + computeGlyphClusters(&l) + return l + }(), + expected: func() text.Layout { + l := text.Layout{ + Glyphs: ltrGlyphs[5:], + Direction: system.LTR, + Runes: text.Range{ + Count: 6, + Offset: 5, + }, + } + return l + }(), + start: 4, + end: 8, + }, + { + name: "ltr different range", + in: func() text.Layout { + l := text.Layout{ + Glyphs: ltrGlyphs, + Direction: system.LTR, + Runes: text.Range{ + Count: 11, + }, + } + computeGlyphClusters(&l) + return l + }(), + expected: func() text.Layout { + l := text.Layout{ + Glyphs: ltrGlyphs[3:7], + Direction: system.LTR, + Runes: text.Range{ + Count: 6, + Offset: 3, + }, + } + return l + }(), + start: 2, + end: 6, + }, + { + name: "ltr zero len", + in: func() text.Layout { + l := text.Layout{ + Glyphs: ltrGlyphs, + Direction: system.LTR, + Runes: text.Range{ + Count: 11, + }, + } + computeGlyphClusters(&l) + return l + }(), + expected: text.Layout{}, + start: 0, + end: 0, + }, + { + name: "rtl", + in: func() text.Layout { + l := text.Layout{ + Glyphs: rtlGlyphs, + Direction: system.RTL, + Runes: text.Range{ + Count: 11, + }, + } + computeGlyphClusters(&l) + return l + }(), + expected: func() text.Layout { + l := text.Layout{ + Glyphs: rtlGlyphs[:4], + Direction: system.RTL, + Runes: text.Range{ + Count: 6, + Offset: 5, + }, + } + return l + }(), + start: 4, + end: 8, + }, + } { + t.Run(tc.name, func(t *testing.T) { + out := tc.in.Slice(tc.start, tc.end) + if len(out.Glyphs) != len(tc.expected.Glyphs) { + t.Errorf("expected %v glyphs, got %v", len(tc.expected.Glyphs), len(out.Glyphs)) + } + if len(out.Clusters) != len(tc.expected.Clusters) { + t.Errorf("expected %v clusters, got %v", len(tc.expected.Clusters), len(out.Clusters)) + } + if out.Runes != tc.expected.Runes { + t.Errorf("expected %#+v, got %#+v", tc.expected.Runes, out.Runes) + } + if out.Direction != tc.expected.Direction { + t.Errorf("expected %#+v, got %#+v", tc.expected.Direction, out.Direction) + } + }) + } +} diff --git a/font/opentype/opentype.go b/font/opentype/opentype.go index 1f42330d..bb8798a9 100644 --- a/font/opentype/opentype.go +++ b/font/opentype/opentype.go @@ -6,20 +6,75 @@ package opentype import ( "bytes" + "fmt" + "image" "io" "unicode" "unicode/utf8" + "github.com/benoitkugler/textlayout/fonts" + "github.com/benoitkugler/textlayout/fonts/truetype" + "github.com/benoitkugler/textlayout/harfbuzz" + "github.com/go-text/typesetting/shaping" "golang.org/x/image/font" "golang.org/x/image/font/sfnt" "golang.org/x/image/math/fixed" "gioui.org/f32" + "gioui.org/font/opentype/internal" + "gioui.org/io/system" "gioui.org/op" "gioui.org/op/clip" "gioui.org/text" ) +// HarfbuzzFont implements the text.Shaper interface using a rich text +// shaping engine. +type HarfbuzzFont struct { + font *truetype.Font +} + +// ParseHarfbuzz constructs a HarfbuzzFont from source bytes. +func ParseHarfbuzz(src []byte) (*HarfbuzzFont, error) { + face, err := truetype.Parse(bytes.NewReader(src)) + if err != nil { + return nil, fmt.Errorf("failed parsing truetype font: %w", err) + } + return &HarfbuzzFont{ + font: face, + }, nil +} + +func (f *HarfbuzzFont) Layout(ppem fixed.Int26_6, maxWidth int, lc system.Locale, txt io.RuneReader) ([]text.Line, error) { + return internal.Document(shaping.Shape, f.font, ppem, maxWidth, lc, txt), nil +} + +func (f *HarfbuzzFont) Shape(ppem fixed.Int26_6, str text.Layout) clip.PathSpec { + return harfbuzzTextPath(ppem, f, str) +} + +func (f *HarfbuzzFont) Metrics(ppem fixed.Int26_6) font.Metrics { + metrics := font.Metrics{} + font := harfbuzz.NewFont(f.font) + font.XScale = int32(ppem.Ceil()) << 6 + font.YScale = font.XScale + // Use any horizontal direction. + fontExtents := font.ExtentsForDirection(harfbuzz.LeftToRight) + ascender := fixed.I(int(fontExtents.Ascender * 64)) + descender := fixed.I(int(fontExtents.Descender * 64)) + gap := fixed.I(int(fontExtents.LineGap * 64)) + metrics.Height = ascender + descender + gap + metrics.Ascent = ascender + metrics.Descent = descender + // These three are not readily available. + // TODO(whereswaldon): figure out how to get these values. + metrics.XHeight = ascender + metrics.CapHeight = ascender + metrics.CaretSlope = image.Pt(0, 1) + + return metrics +} + // Font implements text.Face. Its methods are safe to use // concurrently. type Font struct { @@ -109,7 +164,7 @@ func (c *Collection) Font(i int) (*Font, error) { return &Font{font: c.fonts[i].Font}, nil } -func (f *Font) Layout(ppem fixed.Int26_6, maxWidth int, txt io.Reader) ([]text.Line, error) { +func (f *Font) Layout(ppem fixed.Int26_6, maxWidth int, lc system.Locale, txt io.RuneReader) ([]text.Line, error) { glyphs, err := readGlyphs(txt) if err != nil { return nil, err @@ -130,7 +185,7 @@ func (f *Font) Metrics(ppem fixed.Int26_6) font.Metrics { return o.Metrics(&buf, ppem) } -func (c *Collection) Layout(ppem fixed.Int26_6, maxWidth int, txt io.Reader) ([]text.Line, error) { +func (c *Collection) Layout(ppem fixed.Int26_6, maxWidth int, lc system.Locale, txt io.RuneReader) ([]text.Line, error) { glyphs, err := readGlyphs(txt) if err != nil { return nil, err @@ -325,31 +380,82 @@ func textPath(buf *sfnt.Buffer, ppem fixed.Int26_6, fonts []*opentype, str text. return builder.End() } -func readGlyphs(r io.Reader) ([]glyph, error) { +func harfbuzzTextPath(ppem fixed.Int26_6, font *HarfbuzzFont, str text.Layout) clip.PathSpec { + var lastPos f32.Point + var builder clip.Path + ops := new(op.Ops) + var x fixed.Int26_6 + builder.Begin(ops) + rune := 0 + ppemInt := ppem.Round() + ppem16 := uint16(ppemInt) + scaleFactor := float32(ppemInt) / float32(font.font.Upem()) + for _, g := range str.Glyphs { + advance := g.XAdvance + outline, ok := font.font.GlyphData(g.ID, ppem16, ppem16).(fonts.GlyphOutline) + if !ok { + continue + } + // Move to glyph position. + pos := f32.Point{ + X: float32(x)/64 - float32(g.XOffset)/64, + Y: -float32(g.YOffset) / 64, + } + builder.Move(pos.Sub(lastPos)) + lastPos = pos + var lastArg f32.Point + + // Convert sfnt.Segments to relative segments. + for _, fseg := range outline.Segments { + nargs := 1 + switch fseg.Op { + case fonts.SegmentOpQuadTo: + nargs = 2 + case fonts.SegmentOpCubeTo: + nargs = 3 + } + var args [3]f32.Point + for i := 0; i < nargs; i++ { + a := f32.Point{ + X: fseg.Args[i].X * scaleFactor, + Y: -fseg.Args[i].Y * scaleFactor, + } + args[i] = a.Sub(lastArg) + if i == nargs-1 { + lastArg = a + } + } + switch fseg.Op { + case fonts.SegmentOpMoveTo: + builder.Move(args[0]) + case fonts.SegmentOpLineTo: + builder.Line(args[0]) + case fonts.SegmentOpQuadTo: + builder.Quad(args[0], args[1]) + case fonts.SegmentOpCubeTo: + builder.Cube(args[0], args[1], args[2]) + default: + panic("unsupported segment op") + } + } + lastPos = lastPos.Add(lastArg) + x += advance + rune++ + } + return builder.End() +} + +func readGlyphs(r io.RuneReader) ([]glyph, error) { var glyphs []glyph - buf := make([]byte, 0, 1024) for { - n, err := r.Read(buf[len(buf):cap(buf)]) - buf = buf[:len(buf)+n] - lim := len(buf) - // Read full runes if possible. - if err != io.EOF { - lim -= utf8.UTFMax - 1 - } - i := 0 - for i < lim { - c, s := utf8.DecodeRune(buf[i:]) - i += s - glyphs = append(glyphs, glyph{Rune: c}) - } - n = copy(buf, buf[i:]) - buf = buf[:n] + c, _, err := r.ReadRune() if err != nil { if err == io.EOF { break } return nil, err } + glyphs = append(glyphs, glyph{Rune: c}) } return glyphs, nil } diff --git a/font/opentype/opentype_test.go b/font/opentype/opentype_test.go index 67683c35..c47d24c2 100644 --- a/font/opentype/opentype_test.go +++ b/font/opentype/opentype_test.go @@ -16,80 +16,15 @@ import ( "golang.org/x/image/math/fixed" "gioui.org/internal/ops" + "gioui.org/io/system" "gioui.org/op" "gioui.org/op/clip" "gioui.org/text" ) -func TestCollectionAsFace(t *testing.T) { - // Load two fonts with disjoint glyphs. Font 1 supports only '1', and font 2 supports only '2'. - // The fonts have different glyphs for the replacement character (".notdef"). - font1, ttf1, err := decompressFontFile("testdata/only1.ttf.gz") - if err != nil { - t.Fatalf("failed to load test font 1: %v", err) - } - font2, ttf2, err := decompressFontFile("testdata/only2.ttf.gz") - if err != nil { - t.Fatalf("failed to load test font 2: %v", err) - } - - otc := mergeFonts(ttf1, ttf2) - coll, err := ParseCollection(otc) - if err != nil { - t.Fatalf("failed to load merged test font: %v", err) - } - - shapeValid1, err := shapeRune(font1, '1') - if err != nil { - t.Fatalf("failed shaping valid glyph with font 1: %v", err) - } - shapeInvalid1, err := shapeRune(font1, '3') - if err != nil { - t.Fatalf("failed shaping invalid glyph with font 1: %v", err) - } - shapeValid2, err := shapeRune(font2, '2') - if err != nil { - t.Fatalf("failed shaping valid glyph with font 2: %v", err) - } - shapeInvalid2, err := shapeRune(font2, '3') // Same invalid glyph as before to test replacement glyph difference - if err != nil { - t.Fatalf("failed shaping invalid glyph with font 2: %v", err) - } - shapeCollValid1, err := shapeRune(coll, '1') - if err != nil { - t.Fatalf("failed shaping valid glyph for font 1 with font collection: %v", err) - } - shapeCollValid2, err := shapeRune(coll, '2') - if err != nil { - t.Fatalf("failed shaping valid glyph for font 2 with font collection: %v", err) - } - shapeCollInvalid, err := shapeRune(coll, '4') // Different invalid glyph to confirm use of the replacement glyph - if err != nil { - t.Fatalf("failed shaping invalid glyph with font collection: %v", err) - } - - // All shapes from the original fonts should be distinct because the glyphs are distinct, including the replacement - // glyphs. - distinctShapes := []clip.PathSpec{shapeValid1, shapeInvalid1, shapeValid2, shapeInvalid2} - for i := 0; i < len(distinctShapes); i++ { - for j := i + 1; j < len(distinctShapes); j++ { - if areShapesEqual(distinctShapes[i], distinctShapes[j]) { - t.Errorf("font shapes %d and %d are not distinct", i, j) - } - } - } - - // Font collections should render glyphs from the first supported font. Replacement glyphs should come from the - // first font in all cases. - if !areShapesEqual(shapeCollValid1, shapeValid1) { - t.Error("font collection did not render the valid glyph using font 1") - } - if !areShapesEqual(shapeCollValid2, shapeValid2) { - t.Error("font collection did not render the valid glyph using font 2") - } - if !areShapesEqual(shapeCollInvalid, shapeInvalid1) { - t.Error("font collection did not render the invalid glyph using the replacement from font 1") - } +var english = system.Locale{ + Language: "EN", + Direction: system.LTR, } func TestEmptyString(t *testing.T) { @@ -100,7 +35,7 @@ func TestEmptyString(t *testing.T) { ppem := fixed.I(200) - lines, err := face.Layout(ppem, 2000, strings.NewReader("")) + lines, err := face.Layout(ppem, 2000, english, strings.NewReader("")) if err != nil { t.Fatal(err) } @@ -176,7 +111,7 @@ func mergeFonts(ttf1, ttf2 []byte) []byte { // shapeRune uses a given Face to shape exactly one rune at a fixed size, then returns the resulting shape data. func shapeRune(f text.Face, r rune) (clip.PathSpec, error) { ppem := fixed.I(200) - lines, err := f.Layout(ppem, 2000, strings.NewReader(string(r))) + lines, err := f.Layout(ppem, 2000, english, strings.NewReader(string(r))) if err != nil { return clip.PathSpec{}, err } diff --git a/go.mod b/go.mod index fc55938d..a0c63ecf 100644 --- a/go.mod +++ b/go.mod @@ -9,8 +9,17 @@ require ( ) require ( + eliasnaur.com/font v0.0.0-20220124212145-832bb8fc08c3 gioui.org/cpu v0.0.0-20210817075930-8d6a761490d2 gioui.org/shader v1.0.6 + github.com/benoitkugler/textlayout v0.0.5 + github.com/go-text/typesetting v0.0.0-20220112121102-58fe93c84506 + github.com/npillmayer/uax v0.2.0 ) -require golang.org/x/text v0.3.6 // indirect +require ( + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/jolestar/go-commons-pool v2.0.0+incompatible // indirect + github.com/npillmayer/schuko v0.2.0-alpha.3 // indirect + golang.org/x/text v0.3.6 // indirect +) diff --git a/go.sum b/go.sum index ed3fdb43..05216fe6 100644 --- a/go.sum +++ b/go.sum @@ -1,14 +1,620 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= +cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= +cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= +cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= +cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= +cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= +cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= +cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +eliasnaur.com/font v0.0.0-20220124212145-832bb8fc08c3 h1:djFprmHZgrSepsHAIRMp5UJn3PzsoTg9drI+BDmif5Q= +eliasnaur.com/font v0.0.0-20220124212145-832bb8fc08c3/go.mod h1:OYVuxibdk9OSLX8vAqydtRPP87PyTFcT9uH3MlEGBQA= gioui.org/cpu v0.0.0-20210808092351-bfe733dd3334/go.mod h1:A8M0Cn5o+vY5LTMlnRoK3O5kG+rH0kWfJjeKd9QpBmQ= gioui.org/cpu v0.0.0-20210817075930-8d6a761490d2 h1:AGDDxsJE1RpcXTAxPG2B4jrwVUJGFDjINIPi1jtO6pc= gioui.org/cpu v0.0.0-20210817075930-8d6a761490d2/go.mod h1:A8M0Cn5o+vY5LTMlnRoK3O5kG+rH0kWfJjeKd9QpBmQ= gioui.org/shader v1.0.6 h1:cvZmU+eODFR2545X+/8XucgZdTtEjR3QWW6W65b0q5Y= gioui.org/shader v1.0.6/go.mod h1:mWdiME581d/kV7/iEhLmUgUK5iZ09XR5XpduXzbePVM= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= +github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= +github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= +github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= +github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= +github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= +github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= +github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= +github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= +github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= +github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= +github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.6.0/go.mod h1:gqlclDEZp4aqJOancXK6TN24aKhT0W0Ae9MHk3wzTMM= +github.com/aws/aws-sdk-go-v2/internal/ini v1.2.4/go.mod h1:ZcBrrI3zBKlhGFNYWvju0I3TR93I7YIgAfy82Fh4lcQ= +github.com/aws/aws-sdk-go-v2/service/appconfig v1.4.2/go.mod h1:FZ3HkCe+b10uFZZkFdvf98LHW21k49W8o8J366lqVKY= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.3.2/go.mod h1:72HRZDLMtmVQiLG2tLfQcaWLCssELvGl+Zf2WVxMmR8= +github.com/aws/aws-sdk-go-v2/service/sso v1.4.2/go.mod h1:NBvT9R1MEF+Ud6ApJKM0G+IkPchKS7p7c2YPKwHmBOk= +github.com/aws/aws-sdk-go-v2/service/sts v1.7.2/go.mod h1:8EzeIqfWt2wWT4rJVu3f21TfrhJ8AEMzVybRNSb/b4g= +github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/benoitkugler/pstokenizer v1.0.0/go.mod h1:l1G2Voirz0q/jj0TQfabNxVsa8HZXh/VMxFSRALWTiE= +github.com/benoitkugler/textlayout v0.0.5 h1:ZjMg+//sxYAxIhdirTaDBNnAfhxHm9D5q4WHNYlR888= +github.com/benoitkugler/textlayout v0.0.5/go.mod h1:puH4v13Uz7uIhIH0XMk5jgc8U3MXcn5r3VlV9K8n0D8= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= +github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= +github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21/go.mod h1:po7NpZ/QiTKzBKyrsEAxwnTamCoh8uDk/egRpQ7siIc= +github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= +github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= +github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= +github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= +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/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= +github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= +github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= +github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= +github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= +github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= +github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= +github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= +github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= +github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= +github.com/go-ldap/ldap v3.0.2+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp40uXYvFoEVrNEPqRc= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= +github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= +github.com/go-text/typesetting v0.0.0-20220112121102-58fe93c84506 h1:1TPz/Gn/MsXwJ6bEtI9wdkPcQYr2X3V9I+wz4wPYUdY= +github.com/go-text/typesetting v0.0.0-20220112121102-58fe93c84506/go.mod h1:R0mlTNeyszZ/tKQhbZA7SRGjx+OHsmNzgN2jTV7yZcs= +github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= +github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= +github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= +github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= +github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI= +github.com/hashicorp/go-hclog v0.8.0/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= +github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-plugin v1.0.1/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn3cQptSMzBuY= +github.com/hashicorp/go-retryablehttp v0.5.4/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= +github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= +github.com/hashicorp/go-rootcerts v1.0.1/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= +github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A= +github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= +github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= +github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= +github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= +github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/hashicorp/vault/api v1.0.4/go.mod h1:gDcqh3WGcR1cpF5AJz/B1UFheUEneMoIospckxBxk6Q= +github.com/hashicorp/vault/sdk v0.1.13/go.mod h1:B+hVj7TpuQY1Y/GPbCpffmgd+tSEwvhkWnjtSYCaS2M= +github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= +github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= +github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= +github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= +github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= +github.com/jolestar/go-commons-pool v2.0.0+incompatible h1:uHn5uRKsLLQSf9f1J5QPY2xREWx/YH+e4bIIXcAuAaE= +github.com/jolestar/go-commons-pool v2.0.0+incompatible/go.mod h1:ChJYIbIch0DMCSU6VU0t0xhPoWDR2mMFIQek3XWU0s8= +github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/knadh/koanf v1.3.2/go.mod h1:HZ7HMLIGbrWJUfgtEzfHvzR/rX+eIqQlBNPRr4Vt42s= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +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/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= +github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= +github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= +github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= +github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= +github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= +github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= +github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= +github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= +github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= +github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= +github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= +github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= +github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= +github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= +github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= +github.com/npillmayer/nestext v0.1.3/go.mod h1:h2lrijH8jpicr25dFY+oAJLyzlya6jhnuG+zWp9L0Uk= +github.com/npillmayer/schuko v0.2.0-alpha.3 h1:gVG+7ffq71R0B8ILewC2MHzwUlzNsKBnnAeeY5NeXUU= +github.com/npillmayer/schuko v0.2.0-alpha.3/go.mod h1:fmY+GquSPYHz66HRFIfNO8LvDw9eHeoqjeFBw6moyH0= +github.com/npillmayer/uax v0.2.0 h1:e1ahw7GVhhUT4Ax6O70hiTFaDmzQnBadS2eVqu+gYMg= +github.com/npillmayer/uax v0.2.0/go.mod h1:fbPQknCU/rsScwIkFJFkPSIvnN0MbNMK4avBLx6ItvU= +github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= +github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= +github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= +github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.15.0/go.mod h1:hF8qUzuuC8DJGygJH3726JnCZX4MYbRB8yFfISqnKUg= +github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48= +github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= +github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= +github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= +github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA= +github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= +github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= +github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= +github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= +github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= +github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= +github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= +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/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= +github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= +github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/rhnvrm/simples3 v0.6.1/go.mod h1:Y+3vYm2V7Y4VijFoJHHTrja6OgPrJ2cBti8dPGkC3sA= +github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= +github.com/rs/zerolog v1.21.0/go.mod h1:ZPhntP/xmq1nnND05hhpAh2QMhSsA4UN3MGZ6O2J3hM= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= +github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= +github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= +github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= +github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= +github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/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.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= +github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= +go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= +go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= +go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= +go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= +go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= +go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw= +go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= +go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= +go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= +go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4= +golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= +golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= golang.org/x/exp v0.0.0-20210722180016-6781d3edade3 h1:IlrJD2AM5p8JhN/wVny9jt6gJ9hut2VALhSeZ3SYluk= golang.org/x/exp v0.0.0-20210722180016-6781d3edade3/go.mod h1:DVyR6MI7P4kEQgvZJSj1fQGrWIi2RzIrfYWycwheUAc= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20210504121937-7319ad40d33e/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20210607152325-775e3b0c77b9/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d h1:RNPAfi2nHY7C2srAV8A49jpsYr0ADedCk1wq6fTMTvs= golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +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-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/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-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/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.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +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-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= +google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= +google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= +google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= +google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.22.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw= +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/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= +gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0/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-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ= +gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= +rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= +sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= diff --git a/text/lru.go b/text/lru.go index 10448b16..55b8ad4b 100644 --- a/text/lru.go +++ b/text/lru.go @@ -3,6 +3,7 @@ package text import ( + "gioui.org/io/system" "gioui.org/op/clip" "golang.org/x/image/math/fixed" ) @@ -27,17 +28,20 @@ type path struct { next, prev *path key pathKey val clip.PathSpec + layout Layout } type layoutKey struct { ppem fixed.Int26_6 maxWidth int str string + locale system.Locale } type pathKey struct { - ppem fixed.Int26_6 - str string + ppem fixed.Int26_6 + str string + gidHash uint64 } const maxSize = 1000 @@ -81,8 +85,8 @@ func (l *layoutCache) insert(lt *layoutElem) { lt.next.prev = lt } -func (c *pathCache) Get(k pathKey) (clip.PathSpec, bool) { - if v, ok := c.m[k]; ok { +func (c *pathCache) Get(k pathKey, l Layout) (clip.PathSpec, bool) { + if v, ok := c.m[k]; ok && l.equals(v.layout) { c.remove(v) c.insert(v) return v.val, true @@ -90,7 +94,7 @@ func (c *pathCache) Get(k pathKey) (clip.PathSpec, bool) { return clip.PathSpec{}, false } -func (c *pathCache) Put(k pathKey, v clip.PathSpec) { +func (c *pathCache) Put(k pathKey, l Layout, v clip.PathSpec) { if c.m == nil { c.m = make(map[pathKey]*path) c.head = new(path) @@ -98,7 +102,7 @@ func (c *pathCache) Put(k pathKey, v clip.PathSpec) { c.head.prev = c.tail c.tail.next = c.head } - val := &path{key: k, val: v} + val := &path{key: k, val: v, layout: l} c.m[k] = val c.insert(val) if len(c.m) > maxSize { diff --git a/text/lru_test.go b/text/lru_test.go index 820de5a7..bbce9d73 100644 --- a/text/lru_test.go +++ b/text/lru_test.go @@ -24,10 +24,10 @@ func TestLayoutLRU(t *testing.T) { func TestPathLRU(t *testing.T) { c := new(pathCache) put := func(i int) { - c.Put(pathKey{str: strconv.Itoa(i)}, clip.PathSpec{}) + c.Put(pathKey{str: strconv.Itoa(i), gidHash: uint64(i)}, Layout{Runes: Range{Count: i}}, clip.PathSpec{}) } get := func(i int) bool { - _, ok := c.Get(pathKey{str: strconv.Itoa(i)}) + _, ok := c.Get(pathKey{str: strconv.Itoa(i), gidHash: uint64(i)}, Layout{Runes: Range{Count: i}}) return ok } testLRU(t, put, get) diff --git a/text/shaper.go b/text/shaper.go index 59020e07..f71ac0c0 100644 --- a/text/shaper.go +++ b/text/shaper.go @@ -3,20 +3,23 @@ package text import ( + "encoding/binary" + "hash/maphash" "io" "strings" "golang.org/x/image/math/fixed" + "gioui.org/io/system" "gioui.org/op/clip" ) // Shaper implements layout and shaping of text. type Shaper interface { // Layout a text according to a set of options. - Layout(font Font, size fixed.Int26_6, maxWidth int, txt io.Reader) ([]Line, error) + Layout(font Font, size fixed.Int26_6, maxWidth int, lc system.Locale, txt io.RuneReader) ([]Line, error) // LayoutString is Layout for strings. - LayoutString(font Font, size fixed.Int26_6, maxWidth int, str string) []Line + LayoutString(font Font, size fixed.Int26_6, maxWidth int, lc system.Locale, str string) []Line // Shape a line of text and return a clipping operation for its outline. Shape(font Font, size fixed.Int26_6, layout Layout) clip.PathSpec } @@ -44,6 +47,7 @@ type faceCache struct { face Face layoutCache layoutCache pathCache pathCache + seed maphash.Seed } func (c *Cache) lookup(font Font) *faceCache { @@ -108,15 +112,15 @@ func NewCache(collection []FontFace) *Cache { } // Layout implements the Shaper interface. -func (c *Cache) Layout(font Font, size fixed.Int26_6, maxWidth int, txt io.Reader) ([]Line, error) { +func (c *Cache) Layout(font Font, size fixed.Int26_6, maxWidth int, lc system.Locale, txt io.RuneReader) ([]Line, error) { cache := c.lookup(font) - return cache.face.Layout(size, maxWidth, txt) + return cache.face.Layout(size, maxWidth, lc, txt) } // LayoutString is a caching implementation of the Shaper interface. -func (c *Cache) LayoutString(font Font, size fixed.Int26_6, maxWidth int, str string) []Line { +func (c *Cache) LayoutString(font Font, size fixed.Int26_6, maxWidth int, lc system.Locale, str string) []Line { cache := c.lookup(font) - return cache.layout(size, maxWidth, str) + return cache.layout(size, maxWidth, lc, str) } // Shape is a caching implementation of the Shaper interface. Shape assumes that the layout @@ -126,7 +130,7 @@ func (c *Cache) Shape(font Font, size fixed.Int26_6, layout Layout) clip.PathSpe return cache.shape(size, layout) } -func (f *faceCache) layout(ppem fixed.Int26_6, maxWidth int, str string) []Line { +func (f *faceCache) layout(ppem fixed.Int26_6, maxWidth int, lc system.Locale, str string) []Line { if f == nil { return nil } @@ -134,27 +138,43 @@ func (f *faceCache) layout(ppem fixed.Int26_6, maxWidth int, str string) []Line ppem: ppem, maxWidth: maxWidth, str: str, + locale: lc, } if l, ok := f.layoutCache.Get(lk); ok { return l } - l, _ := f.face.Layout(ppem, maxWidth, strings.NewReader(str)) + l, _ := f.face.Layout(ppem, maxWidth, lc, strings.NewReader(str)) f.layoutCache.Put(lk, l) return l } +// hashGIDs returns a 64-bit hash value of the font GIDs contained +// within the provided layout. +func (f *faceCache) hashGIDs(layout Layout) uint64 { + if f.seed == (maphash.Seed{}) { + f.seed = maphash.MakeSeed() + } + var h maphash.Hash + h.SetSeed(f.seed) + for _, g := range layout.Glyphs { + binary.Write(&h, binary.LittleEndian, g.ID) + } + return h.Sum64() +} + func (f *faceCache) shape(ppem fixed.Int26_6, layout Layout) clip.PathSpec { if f == nil { return clip.PathSpec{} } pk := pathKey{ - ppem: ppem, - str: layout.Text, + ppem: ppem, + str: layout.Text, + gidHash: f.hashGIDs(layout), } - if clip, ok := f.pathCache.Get(pk); ok { + if clip, ok := f.pathCache.Get(pk, layout); ok { return clip } clip := f.face.Shape(ppem, layout) - f.pathCache.Put(pk, clip) + f.pathCache.Put(pk, layout, clip) return clip } diff --git a/text/text.go b/text/text.go index 12d39f5c..fa61a36e 100644 --- a/text/text.go +++ b/text/text.go @@ -5,7 +5,9 @@ package text import ( "io" + "gioui.org/io/system" "gioui.org/op/clip" + "github.com/go-text/typesetting/font" "golang.org/x/image/math/fixed" ) @@ -23,9 +25,130 @@ type Line struct { Bounds fixed.Rectangle26_6 } +// Range describes the position and quantity of a range of text elements +// within a larger slice. The unit is usually runes of unicode data or +// glyphs of shaped font data. +type Range struct { + // Count describes the number of items represented by the Range. + Count int + // Offset describes the start position of the represented + // items within a larger list. + Offset int +} + +// GlyphID uniquely identifies a glyph within a specific font. +type GlyphID = font.GID + +// Glyph contains the metadata needed to render a glyph. +type Glyph struct { + // ID is this glyph's identifier within the font it was shaped with. + ID GlyphID + // ClusterIndex is the identifier for the text shaping cluster that + // this glyph is part of. + ClusterIndex int + // GlyphCount is the number of glyphs in the same cluster as this glyph. + GlyphCount int + // RuneCount is the quantity of runes in the source text that this glyph + // corresponds to. + RuneCount int + // XAdvance and YAdvance describe the distance the dot moves when + // laying out the glyph on the X or Y axis. + XAdvance, YAdvance fixed.Int26_6 + // XOffset and YOffset describe offsets from the dot that should be + // applied when rendering the glyph. + XOffset, YOffset fixed.Int26_6 +} + +// GlyphCluster provides metadata about a sequence of indivisible shaped +// glyphs. +type GlyphCluster struct { + // Advance is the cumulative advance of all glyphs in the cluster. + Advance fixed.Int26_6 + // Runes indicates the position and quantity of the runes represented by + // this cluster within the text. + Runes Range + // Glyphs indicates the position and quantity of the glyphs within this + // cluster in a Layout's Glyphs slice. + Glyphs Range +} + +// RuneWidth returns the effective width of one rune for this cluster. +// If the cluster contains multiple runes, the width of the glyphs of +// the cluster is divided evenly among the runes. +func (c GlyphCluster) RuneWidth() fixed.Int26_6 { + if c.Runes.Count == 0 { + return 0 + } + return c.Advance / fixed.Int26_6(c.Runes.Count) +} + type Layout struct { + // Glyphs are the actual font characters for the text. The are ordered + // from left to right regardless of the text direction of the underlying + // text. + Glyphs []Glyph + // Clusters is metadata about the shaped glyphs. It is mostly useful for + // interactive text widgets like editors. The order of clusters is logical, + // so the first cluster will describe the beginning of the text and may + // refer to the final glyphs in the Glyphs field if the text is RTL. + Clusters []GlyphCluster Text string Advances []fixed.Int26_6 + // Runes describes the position of the text data this layout represents + // within the overall body of text being shaped. + Runes Range + // Direction is the layout direction of the text. + Direction system.TextDirection +} + +// Slice returns a layout starting at the glyph cluster index start +// and running through the glyph cluster index end. The Offsets field +// of the returned layout is adjusted to reflect the new rune range +// covered by the layout. The returned layout will have no Clusters. +func (l Layout) Slice(start, end int) Layout { + if start == end || end == 0 || start == len(l.Clusters) { + return Layout{} + } + newRuneStart := l.Clusters[start].Runes.Offset + runesBefore := newRuneStart - l.Runes.Offset + endCluster := l.Clusters[end-1] + startCluster := l.Clusters[start] + runesAfter := l.Runes.Offset + l.Runes.Count - (endCluster.Runes.Offset + endCluster.Runes.Count) + + if l.Direction.Progression() == system.TowardOrigin { + startCluster, endCluster = endCluster, startCluster + } + glyphStart := startCluster.Glyphs.Offset + glyphEnd := endCluster.Glyphs.Offset + endCluster.Glyphs.Count + + out := l + out.Clusters = nil + out.Glyphs = out.Glyphs[glyphStart:glyphEnd] + out.Runes.Offset = newRuneStart + out.Runes.Count -= runesBefore + runesAfter + + return out +} + +// equals returns true when l2 is logically equivalent to l. +func (l Layout) equals(l2 Layout) bool { + if len(l.Glyphs) != len(l2.Glyphs) || len(l.Clusters) != len(l2.Clusters) { + return false + } + if l.Runes != l2.Runes || l.Direction != l2.Direction { + return false + } + for i := range l.Clusters { + if l.Clusters[i] != l2.Clusters[i] { + return false + } + } + for i := range l.Glyphs { + if l.Glyphs[i] != l2.Glyphs[i] { + return false + } + } + return true } // Style is the font style. @@ -47,7 +170,7 @@ type Font struct { // Face implements text layout and shaping for a particular font. All // methods must be safe for concurrent use. type Face interface { - Layout(ppem fixed.Int26_6, maxWidth int, txt io.Reader) ([]Line, error) + Layout(ppem fixed.Int26_6, maxWidth int, lc system.Locale, txt io.RuneReader) ([]Line, error) Shape(ppem fixed.Int26_6, str Layout) clip.PathSpec } diff --git a/widget/editor.go b/widget/editor.go index a1fd3648..6bd7033c 100644 --- a/widget/editor.go +++ b/widget/editor.go @@ -3,8 +3,8 @@ package widget import ( - "bufio" "bytes" + "fmt" "image" "io" "math" @@ -21,6 +21,7 @@ import ( "gioui.org/io/event" "gioui.org/io/key" "gioui.org/io/pointer" + "gioui.org/io/system" "gioui.org/layout" "gioui.org/op" "gioui.org/op/clip" @@ -102,6 +103,8 @@ type Editor struct { events []EditorEvent // prevEvents is the number of events from the previous frame. prevEvents int + + locale system.Locale } type offEntry struct { @@ -155,31 +158,20 @@ func (m *maskReader) Reset(r io.RuneReader, mr rune) { m.mask = m.maskBuf[:n] } -// Read reads from the underlying reader and replaces every +// ReadRune reads a rune from the underlying reader and replaces every // rune with the mask rune. -func (m *maskReader) Read(b []byte) (n int, err error) { - for len(b) > 0 { - var replacement []byte - if len(m.overflow) > 0 { - replacement = m.overflow - } else { - var r rune - r, _, err = m.rr.ReadRune() - if err != nil { - break - } - if r == '\n' { - replacement = []byte{'\n'} - } else { - replacement = m.mask - } - } - nn := copy(b, replacement) - m.overflow = replacement[nn:] - n += nn - b = b[nn:] +func (m *maskReader) ReadRune() (r rune, n int, err error) { + r, _, err = m.rr.ReadRune() + if err != nil { + return } - return n, err + if r != '\n' { + r, _ = utf8.DecodeRune(m.mask) + n = len(m.mask) + } else { + n = 1 + } + return } type EditorEvent interface { @@ -505,6 +497,10 @@ func (e *Editor) Focused() bool { // Layout lays out the editor. If content is not nil, it is laid out on top. func (e *Editor) Layout(gtx layout.Context, sh text.Shaper, font text.Font, size unit.Value, content layout.Widget) layout.Dimensions { + if e.locale != gtx.Locale { + e.locale = gtx.Locale + e.invalidate() + } textSize := fixed.I(gtx.Px(size)) if e.font != font || e.textSize != textSize { e.invalidate() @@ -877,14 +873,18 @@ func (e *Editor) moveCoord(pos image.Point) { func (e *Editor) layoutText(s text.Shaper) ([]text.Line, layout.Dimensions) { e.rr.Reset() - var r io.Reader = &e.rr + var r io.RuneReader = &e.rr if e.Mask != 0 { e.maskReader.Reset(&e.rr, e.Mask) r = &e.maskReader } var lines []text.Line if s != nil { - lines, _ = s.Layout(e.font, e.textSize, e.maxWidth, r) + lines, _ = s.Layout(e.font, e.textSize, e.maxWidth, e.locale, r) + if len(lines) == 0 { + // The editor does not tolerate a zero-length list of lines being returned from the shaper. + lines = append(lines, text.Line{}) + } } else { lines, _ = nullLayout(r) } @@ -926,7 +926,7 @@ func (e *Editor) indexPosition(pos combinedPos) combinedPos { // of p2. All fields of p1 must be a consistent and valid. func positionGreaterOrEqual(lines []text.Line, p1, p2 combinedPos) bool { l := lines[p1.lineCol.Y] - endCol := len(l.Layout.Advances) - 1 + endCol := l.Layout.Runes.Count - 1 if lastLine := p1.lineCol.Y == len(lines)-1; lastLine { endCol++ } @@ -1391,8 +1391,7 @@ func sortPoints(a, b screenPos) (a2, b2 screenPos) { return a, b } -func nullLayout(r io.Reader) ([]text.Line, error) { - rr := bufio.NewReader(r) +func nullLayout(rr io.RuneReader) ([]text.Line, error) { var rerr error var n int var buf bytes.Buffer @@ -1405,9 +1404,18 @@ func nullLayout(r io.Reader) ([]text.Line, error) { n++ buf.WriteRune(r) } + clusters := make([]text.GlyphCluster, n) + for i := range clusters { + clusters[i].Runes.Count = 1 + clusters[i].Runes.Offset = i + } return []text.Line{ { Layout: text.Layout{ + Clusters: clusters, + Runes: text.Range{ + Count: n, + }, Text: buf.String(), Advances: make([]fixed.Int26_6, n), }, diff --git a/widget/label.go b/widget/label.go index 067196dd..4131d0e7 100644 --- a/widget/label.go +++ b/widget/label.go @@ -58,7 +58,7 @@ func clipLine(lines []text.Line, alignment text.Alignment, width int, clip image func subLayout(line text.Line, startCol, endCol int) text.Layout { adv := line.Layout.Advances - if startCol == len(adv) { + if startCol == line.Layout.Runes.Count { return text.Layout{} } adv = adv[startCol:endCol] @@ -90,7 +90,7 @@ func (p1 screenPos) Less(p2 screenPos) bool { func (l Label) Layout(gtx layout.Context, s text.Shaper, font text.Font, size unit.Value, txt string) layout.Dimensions { cs := gtx.Constraints textSize := fixed.I(gtx.Px(size)) - lines := s.LayoutString(font, textSize, cs.Max.X, txt) + lines := s.LayoutString(font, textSize, cs.Max.X, gtx.Locale, txt) if max := l.MaxLines; max > 0 && len(lines) > max { lines = lines[:max] }