OrgGo/unipdf
1
0
Fork 0
mirror of https://github.com/unidoc/unipdf.git synced 2025-05-11 19:29:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use errors.Is(err, core.ErrNotSupported) to distinguish unsupported font errorrs.

Browse Source 
See https://blog.golang.org/go1.13-errors
This commit is contained in:
Peter Williams 2020-06-27 11:29:21 +10:00
parent 8f649664c4
commit 25414d4214
4 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
extractor/text.go
View File

@ -245,7 +245,7 @@ func (e *Extractor) extractPageText(contents string, resources *model.PdfPageRes
return err
}
err = to.setFont(name, size)
to.invalidFont = unsupportedFontErr(err)
to.invalidFont = errors.Is(err, core.ErrNotSupported)
if err != nil && !to.invalidFont {
return err
}
@ -372,23 +372,6 @@ func (e *Extractor) extractPageText(contents string, resources *model.PdfPageRes
return pageText, state.numChars, state.numMisses, err
}
// unsupportedFontErr returns true if `err` indicated that the selected font or encoding is not supported.
func unsupportedFontErr(err error) bool {
if err == model.ErrFontNotSupported ||
err == model.ErrType1CFontNotSupported ||
err == model.ErrType3FontNotSupported ||
err == model.ErrTTCmapNotSupported {
return true
}
if err == nil {
return false
}
errStr := err.Error()
return strings.Contains(errStr, "unsupported font encoding:") ||
strings.Contains(errStr, "unexpected subtable format:") ||
strings.Contains(errStr, "fonts based on PostScript outlines are not supported")
}
// textResult is used for holding results of PDF form processig
type textResult struct {
pageText PageText

2
internal/textencoding/simple.go
View File

@ -55,7 +55,7 @@ func NewSimpleTextEncoder(baseName string, differences map[CharCode]GlyphName) (
fnc, ok := simple[baseName]
if !ok {
common.Log.Debug("ERROR: NewSimpleTextEncoder. Unknown encoding %q", baseName)
return nil, fmt.Errorf("unsupported font encoding: %q", baseName)
return nil, fmt.Errorf("unsupported font encoding: %q (%w)", baseName, core.ErrNotSupported)
}
enc := fnc()
if len(differences) != 0 {

11
model/const.go
View File

@ -7,6 +7,9 @@ package model
import (
"errors"
"fmt"
"github.com/unidoc/unipdf/v3/core"
)
// Errors when parsing/loading data in PDF.
@ -18,8 +21,8 @@ var (
errRangeError = errors.New("range check error")
ErrEncrypted = errors.New("file needs to be decrypted first")
ErrNoFont = errors.New("font not defined")
ErrFontNotSupported = errors.New("unsupported font")
ErrType1CFontNotSupported = errors.New("Type1C fonts are not currently supported")
ErrType3FontNotSupported = errors.New("Type3 fonts are not currently supported")
ErrTTCmapNotSupported = errors.New("unsupported TrueType cmap format")
ErrFontNotSupported = fmt.Errorf("unsupported font (%w)", core.ErrNotSupported)
ErrType1CFontNotSupported = fmt.Errorf("Type1C fonts are not currently supported (%w)", core.ErrNotSupported)
ErrType3FontNotSupported = fmt.Errorf("Type3 fonts are not currently supported (%w)", core.ErrNotSupported)
ErrTTCmapNotSupported = fmt.Errorf("unsupported TrueType cmap format (%w)", core.ErrNotSupported)
)

5
model/internal/fonts/ttfparser.go
View File

@ -209,7 +209,8 @@ func (t *ttfParser) Parse() (TtfType, error) {
}
if version == "OTTO" {
// See https://docs.microsoft.com/en-us/typography/opentype/spec/otff
return TtfType{}, errors.New("fonts based on PostScript outlines are not supported")
return TtfType{}, fmt.Errorf("fonts based on PostScript outlines are not supported (%w)",
core.ErrNotSupported)
}
if version != "\x00\x01\x00\x00" && version != "true" {
// This is not an error. In the font_test.go example axes.txt we see version "true".
@ -376,7 +377,7 @@ func (t *ttfParser) parseCmapSubtable31(offset31 int64) error {
t.f.Seek(int64(t.tables["cmap"])+offset31, os.SEEK_SET)
format := t.ReadUShort()
if format != 4 {
return fmt.Errorf("unexpected subtable format: %d", format)
return fmt.Errorf("unexpected subtable format: %d (%w)", format, core.ErrNotSupported)
}
t.Skip(2 * 2) // length, language
segCount := int(t.ReadUShort() / 2)