diff options
| -rw-r--r-- | mkvlib/ass.go | 6 | ||||
| -rw-r--r-- | mkvlib/shared.go | 2 | ||||
| -rw-r--r-- | mkvtool/main.go | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/mkvlib/ass.go b/mkvlib/ass.go index 705c82f..7749bc2 100644 --- a/mkvlib/ass.go +++ b/mkvlib/ass.go @@ -472,9 +472,15 @@ func (self *assProcessor) matchFontName(m []map[string]bool, _k []string) bool { } if tk != "" { names[_k[0][:l]] = tk + if !m[1][_k[1]] { + names[_k[0]] = tk + } } } for name, _ := range m[0] { + if len(m[1]) == 0 { + return _k[0] == name + } for family, _ := range m[1] { if name != "" && family != "" && names[name] == family { return true diff --git a/mkvlib/shared.go b/mkvlib/shared.go index cfabdd0..ac29b06 100644 --- a/mkvlib/shared.go +++ b/mkvlib/shared.go @@ -11,7 +11,7 @@ import ( ) const libName = "mkvlib" -const libVer = "v1.7.4" +const libVer = "v1.7.5" const LibFName = libName + " " + libVer diff --git a/mkvtool/main.go b/mkvtool/main.go index 15dab25..fdac291 100644 --- a/mkvtool/main.go +++ b/mkvtool/main.go @@ -145,9 +145,9 @@ func main() { fmt.Printf("File Path: \t%s\n", info.File) l := len(info.Fonts) for _i := 0; _i < l; _i++ { - fmt.Printf("Font index:\t%d\n", _i) - fmt.Printf("Font names:\t%s\n", strings.Join(info.Fonts[_i], "\t")) - fmt.Printf("Font types:\t%s\n", strings.Join(info.Types[_i], "\t")) + fmt.Printf("\tFont index: %d\n", _i) + fmt.Printf("\t\tFont names:\t%s\n", strings.Join(info.Fonts[_i], "\n\t\t\t\t")) + fmt.Printf("\t\tFont types:\t%s\n", strings.Join(info.Types[_i], "\n\t\t\t\t")) } } else { log.Printf("Failed to get font info: [%s]", i) |