diff --git a/fonts/bitmap/pcf.go b/fonts/bitmap/pcf.go index 147d453..1c84dad 100644 --- a/fonts/bitmap/pcf.go +++ b/fonts/bitmap/pcf.go @@ -7,6 +7,7 @@ import ( "errors" "fmt" "io" + "io/ioutil" "github.com/benoitkugler/textlayout/fonts" ) @@ -642,7 +643,7 @@ func Parse(file fonts.Resource) (*Font, error) { return nil, err } - data, err := io.ReadAll(r) + data, err := ioutil.ReadAll(r) if err != nil { return nil, fmt.Errorf("can't load font file: %s", err) } diff --git a/fonts/type1/pfb_parser.go b/fonts/type1/pfb_parser.go index 0badd9a..555dc73 100644 --- a/fonts/type1/pfb_parser.go +++ b/fonts/type1/pfb_parser.go @@ -7,6 +7,7 @@ import ( "errors" "fmt" "io" + "io/ioutil" "strings" tk "github.com/benoitkugler/pstokenizer" @@ -112,7 +113,7 @@ func seekMarkers(pfb fonts.Resource) (segment1, segment2 []byte, err error) { if err != nil { return nil, nil, err } - data, err := io.ReadAll(pfb) + data, err := ioutil.ReadAll(pfb) if err != nil { return nil, nil, err } diff --git a/fonts/type1C/cff.go b/fonts/type1C/cff.go index a37cd80..5962972 100644 --- a/fonts/type1C/cff.go +++ b/fonts/type1C/cff.go @@ -7,6 +7,7 @@ package type1c import ( "errors" "io" + "io/ioutil" "strings" "github.com/benoitkugler/textlayout/fonts" @@ -71,7 +72,7 @@ func parse(file fonts.Resource) ([]Font, error) { // if this is really needed, we can modify the parser to directly use `file` // without reading all in memory - input, err := io.ReadAll(file) + input, err := ioutil.ReadAll(file) if err != nil { return nil, err } @@ -252,8 +253,3 @@ func (f *Font) LoadSummary() (fonts.FontSummary, error) { HasColorGlyphs: false, }, nil } - -// func (Font) LoadBitmaps() []fonts.BitmapSize { return nil } -// func (f *Font) LoadMetrics() fonts.FaceMetrics { -// return nil // TODO: -// } diff --git a/graphite/segment_fuzz_test.go b/graphite/segment_fuzz_test.go index 53ad5d5..b68dec3 100644 --- a/graphite/segment_fuzz_test.go +++ b/graphite/segment_fuzz_test.go @@ -3,6 +3,7 @@ package graphite import ( "bytes" "fmt" + "io/ioutil" "math/rand" "os" "os/exec" @@ -102,7 +103,7 @@ func fuzzReferenceShaping(possibles map[string]aggregatedInput, nbTry, maxInputS // store the expected output on disk expectedPath := "testdata/shape_refs/fuzz/" + failures[i].name + ".log" - if err := os.WriteFile(expectedPath, expecteds[i], os.ModePerm); err != nil { + if err := ioutil.WriteFile(expectedPath, expecteds[i], os.ModePerm); err != nil { t.Fatalf("can't write expected outputs: %s", err) } } diff --git a/harfbuzz/langs/gen.go b/harfbuzz/langs/gen.go index 28d9695..e99814b 100644 --- a/harfbuzz/langs/gen.go +++ b/harfbuzz/langs/gen.go @@ -26,6 +26,7 @@ import ( "flag" "fmt" "io" + "io/ioutil" "log" "net/http" "os" @@ -58,11 +59,11 @@ func fetchData() { log.Fatal(err) } defer resp.Body.Close() - tags, err := io.ReadAll(resp.Body) + tags, err := ioutil.ReadAll(resp.Body) if err != nil { log.Fatal(err) } - err = os.WriteFile("languagetags.html", tags, os.ModePerm) + err = ioutil.WriteFile("languagetags.html", tags, os.ModePerm) if err != nil { log.Fatal(err) } @@ -72,11 +73,11 @@ func fetchData() { log.Fatal(err) } defer resp.Body.Close() - subtags, err := io.ReadAll(resp.Body) + subtags, err := ioutil.ReadAll(resp.Body) if err != nil { log.Fatal(err) } - err = os.WriteFile("language-subtag-registry.txt", subtags, os.ModePerm) + err = ioutil.WriteFile("language-subtag-registry.txt", subtags, os.ModePerm) if err != nil { log.Fatal(err) } @@ -688,7 +689,7 @@ func newBCP47Parser() BCP47Parser { // Parse the BCP 47 subtag registry. func (pr *BCP47Parser) parse(filename string) { - b, err := os.ReadFile(filename) + b, err := ioutil.ReadFile(filename) if err != nil { log.Fatal(err) } @@ -754,9 +755,7 @@ func (pr *BCP47Parser) parse(filename string) { } else if !has_preferred_value && strings.HasPrefix(line, "Macrolanguage: ") { pr._add_macrolanguage(strings.Split(line, " ")[1], subtag) } else if subtag_type == "variant" { - // nothing to do } - if strings.HasPrefix(line, "Deprecated: ") { pr.scopes[subtag] = " (retired code)" + pr.scopes[subtag] } else if strings.HasPrefix(line, "Prefix: ") { diff --git a/harfbuzz/shaper_perf_test.go b/harfbuzz/shaper_perf_test.go index c0fa81e..8ed5b58 100644 --- a/harfbuzz/shaper_perf_test.go +++ b/harfbuzz/shaper_perf_test.go @@ -2,7 +2,7 @@ package harfbuzz import ( "bytes" - "os" + "io/ioutil" "testing" testdata "github.com/benoitkugler/textlayout-testdata/harfbuzz" @@ -83,7 +83,7 @@ func shapeOne(b *testing.B, textFile, fontFile string, direction Direction, scri font := NewFont(fonts[0]) - textB, err := os.ReadFile(textFile) + textB, err := ioutil.ReadFile(textFile) check(err) text := []rune(string(textB)) diff --git a/unicodedata/generate/fetcher.go b/unicodedata/generate/fetcher.go index c949255..8a8e3db 100644 --- a/unicodedata/generate/fetcher.go +++ b/unicodedata/generate/fetcher.go @@ -2,7 +2,7 @@ package main import ( "fmt" - "io" + "io/ioutil" "net/http" "os" "path" @@ -35,10 +35,10 @@ func fetchData(url string) { check(err) defer resp.Body.Close() - data, err := io.ReadAll(resp.Body) + data, err := ioutil.ReadAll(resp.Body) check(err) filename := path.Base(url) - err = os.WriteFile(filename, data, os.ModePerm) + err = ioutil.WriteFile(filename, data, os.ModePerm) check(err) } diff --git a/unicodedata/generate/main.go b/unicodedata/generate/main.go index 7c7ee2d..450323e 100644 --- a/unicodedata/generate/main.go +++ b/unicodedata/generate/main.go @@ -6,6 +6,7 @@ import ( "flag" "fmt" "io" + "io/ioutil" "log" "os" "os/exec" @@ -42,96 +43,96 @@ func main() { // parse fmt.Println("Parsing Unicode files...") - b, err := os.ReadFile("UnicodeData.txt") + b, err := ioutil.ReadFile("UnicodeData.txt") check(err) err = parseUnicodeDatabase(b) check(err) - b, err = os.ReadFile("emoji-data.txt") + b, err = ioutil.ReadFile("emoji-data.txt") check(err) emojis, err := parseAnnexTables(b) check(err) - b, err = os.ReadFile("emoji-test.txt") + b, err = ioutil.ReadFile("emoji-test.txt") check(err) emojisTests := parseEmojisTest(b) - b, err = os.ReadFile("BidiMirroring.txt") + b, err = ioutil.ReadFile("BidiMirroring.txt") check(err) mirrors, err := parseMirroring(b) check(err) dms, compEx := parseXML("ucd.nounihan.grouped.zip") - b, err = os.ReadFile("ArabicShaping.txt") + b, err = ioutil.ReadFile("ArabicShaping.txt") check(err) joiningTypes := parseArabicShaping(b) - b, err = os.ReadFile("Scripts.txt") + b, err = ioutil.ReadFile("Scripts.txt") check(err) scripts, err := parseAnnexTables(b) check(err) - b, err = os.ReadFile("Blocks.txt") + b, err = ioutil.ReadFile("Blocks.txt") check(err) blocks, err := parseAnnexTables(b) check(err) - b, err = os.ReadFile("IndicSyllabicCategory.txt") + b, err = ioutil.ReadFile("IndicSyllabicCategory.txt") check(err) indicS, err := parseAnnexTables(b) check(err) - b, err = os.ReadFile("IndicPositionalCategory.txt") + b, err = ioutil.ReadFile("IndicPositionalCategory.txt") check(err) indicP, err := parseAnnexTables(b) check(err) - b, err = os.ReadFile("ms-use/IndicSyllabicCategory-Additional.txt") + b, err = ioutil.ReadFile("ms-use/IndicSyllabicCategory-Additional.txt") check(err) indicSAdd, err := parseAnnexTables(b) check(err) - b, err = os.ReadFile("ms-use/IndicPositionalCategory-Additional.txt") + b, err = ioutil.ReadFile("ms-use/IndicPositionalCategory-Additional.txt") check(err) indicPAdd, err := parseAnnexTables(b) check(err) - b, err = os.ReadFile("ms-use/IndicShapingInvalidCluster.txt") + b, err = ioutil.ReadFile("ms-use/IndicShapingInvalidCluster.txt") check(err) vowelsConstraints := parseUSEInvalidCluster(b) - b, err = os.ReadFile("LineBreak.txt") + b, err = ioutil.ReadFile("LineBreak.txt") check(err) lineBreak, err := parseAnnexTables(b) check(err) - b, err = os.ReadFile("EastAsianWidth.txt") + b, err = ioutil.ReadFile("EastAsianWidth.txt") check(err) eastAsianWidth, err := parseAnnexTables(b) check(err) - b, err = os.ReadFile("SentenceBreakProperty.txt") + b, err = ioutil.ReadFile("SentenceBreakProperty.txt") check(err) sentenceBreaks, err := parseAnnexTables(b) check(err) - b, err = os.ReadFile("GraphemeBreakProperty.txt") + b, err = ioutil.ReadFile("GraphemeBreakProperty.txt") check(err) graphemeBreaks, err := parseAnnexTables(b) check(err) - b, err = os.ReadFile("Scripts.txt") + b, err = ioutil.ReadFile("Scripts.txt") check(err) scriptsRanges, err := parseAnnexTablesAsRanges(b) check(err) - b, err = os.ReadFile("Scripts-iso15924.txt") + b, err = ioutil.ReadFile("Scripts-iso15924.txt") check(err) scriptNames, err := parseScriptNames(b) check(err) - b, err = os.ReadFile("DerivedCoreProperties.txt") + b, err = ioutil.ReadFile("DerivedCoreProperties.txt") check(err) derivedCore, err := parseAnnexTables(b) check(err) diff --git a/unicodedata/generate/main_test.go b/unicodedata/generate/main_test.go index 281add5..2068032 100644 --- a/unicodedata/generate/main_test.go +++ b/unicodedata/generate/main_test.go @@ -3,23 +3,23 @@ package main import ( "fmt" "io" - "os" + "io/ioutil" "reflect" "testing" ) func TestVowel(t *testing.T) { - b, err := os.ReadFile("UnicodeData.txt") + b, err := ioutil.ReadFile("UnicodeData.txt") check(err) err = parseUnicodeDatabase(b) check(err) - b, err = os.ReadFile("Scripts.txt") + b, err = ioutil.ReadFile("Scripts.txt") check(err) scripts, err := parseAnnexTables(b) check(err) - b, err = os.ReadFile("ms-use/IndicShapingInvalidCluster.txt") + b, err = ioutil.ReadFile("ms-use/IndicShapingInvalidCluster.txt") check(err) vowelsConstraints := parseUSEInvalidCluster(b) @@ -38,20 +38,20 @@ func TestIndicCombineCategories(t *testing.T) { } func TestIndic(t *testing.T) { - b, err := os.ReadFile("UnicodeData.txt") + b, err := ioutil.ReadFile("UnicodeData.txt") check(err) err = parseUnicodeDatabase(b) check(err) - b, err = os.ReadFile("Blocks.txt") + b, err = ioutil.ReadFile("Blocks.txt") check(err) blocks, err := parseAnnexTables(b) check(err) - b, err = os.ReadFile("IndicSyllabicCategory.txt") + b, err = ioutil.ReadFile("IndicSyllabicCategory.txt") check(err) indicS, err := parseAnnexTables(b) check(err) - b, err = os.ReadFile("IndicPositionalCategory.txt") + b, err = ioutil.ReadFile("IndicPositionalCategory.txt") check(err) indicP, err := parseAnnexTables(b) check(err) @@ -69,12 +69,12 @@ func TestIndic(t *testing.T) { } func TestScripts(t *testing.T) { - b, err := os.ReadFile("Scripts.txt") + b, err := ioutil.ReadFile("Scripts.txt") check(err) scriptsRanges, err := parseAnnexTablesAsRanges(b) check(err) - b, err = os.ReadFile("Scripts-iso15924.txt") + b, err = ioutil.ReadFile("Scripts-iso15924.txt") check(err) scriptNames, err := parseScriptNames(b) check(err)