diff --git a/pdf/model/font_test.go b/pdf/model/font_test.go index ecdad4ff..8089b46f 100644 --- a/pdf/model/font_test.go +++ b/pdf/model/font_test.go @@ -150,6 +150,72 @@ func TestCharcodeBytesToUnicode(t *testing.T) { } var charcodeBytesToUnicodeTest = []fontFragmentTest{ + fontFragmentTest{"Helvetica built-in", + "testdata/simple.txt", 1, + []byte{32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, + 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, + 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, + 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, + 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 128, 130, 131, 132, 133, + 134, 135, 136, 137, 138, 139, 140, 142, 145, 146, 147, 148, 149, 150, 151, 152, 153, + 154, 155, 156, 158, 159, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, + 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, + 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, + 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, + 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, + 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255}, + " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`" + + "abcdefghijklmnopqrstuvwxyz{|}~€‚ƒ„…†‡ˆ‰Š‹OEŽ‘’“”•–—˜™š›oežŸ¡¢£¤¥¦§¨©ª«¬®¯°±²³´µ¶·" + + "¸¹º»¼½¾¿ÀÁÂÃÄÅAEÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖרÙÚÛÜÝÞfzàáâãäåaeçèéêëìíîïðñòóôõö÷øùúûüýþÿ", + }, + fontFragmentTest{"Symbol built-in", + "testdata/simple.txt", 3, + []byte{32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, + 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, + 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 97, + 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, + 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 160, 161, 162, 163, 164, 165, 166, + 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, + 185, 186, 187, 188, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, + 205, 206, 207, 208, 209, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, + 229, 241, 242, 243, 245}, + " !∀#∃%&∋()∗+,−./0123456789:;<=>?≅ΑΒΧΔΕΦΓΗΙϑΚΛΜΝΟΠΘΡΣΤΥςΩΞΨΖ[∴]⊥_αβχδεφγηιϕκλμνοπθρστυϖω" + + "ξψζ{|}∼€ϒ′≤⁄∞ƒ♣♦♥♠↔←↑→↓°±″≥×∝∂•÷≠≡≈…↵ℵℑℜ℘⊗⊕∅∩∪⊃⊇⊄⊂⊆∈∉∠∇∏√⋅¬∧∨⇔⇐⇑⇒⇓◊〈∑〉∫⌠⌡", + }, + fontFragmentTest{"ZapfDingbats built-in", + "testdata/simple.txt", 4, + []byte{32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, + 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, + 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, + 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, + 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 161, 162, 163, 164, 165, + 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, + 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, + 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, + 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, + 238, 239, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254}, + " ✁✂✃✄☎✆✇✈✉☛☞✌✍✎✏✐✑✒✓✔✕✖✗✘✙✚✛✜✝✞✟✠✡✢✣✤✥✦✧★✩✪✫✬✭✮✯✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾✿❀❁❂❃❄❅❆❇❈❉❊❋●❍■❏❐❑❒▲▼◆❖◗" + + "❘❙❚❛❜❝❞❡❢❣❤❥❦❧♣♦♥♠①②③④⑤⑥⑦⑧⑨⑩❶❷❸❹❺❻❼❽❾❿➀➁➂➃➄➅➆➇➈➉➊➋➌➍➎➏➐➑➒➓➔→↔↕" + + "➘➙➚➛➜➝➞➟➠➡➢➣➤➥➦➧➨➩➪➫➬➭➮➯➱➲➳➴➵➶➷➸➹➺➻➼➽➾", + }, + fontFragmentTest{"MacRoman encoding", + "testdata/axes.txt", 10, + []byte{32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, + 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, + 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, + 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, + 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 128, 129, 130, 131, 132, 133, + 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, + 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, + 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, + 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 203, 204, 205, 206, + 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, + 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 241, 242, 243, + 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255}, + " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`" + + "abcdefghijklmnopqrstuvwxyz{|}~ÄÅÇÉÑÖÜáàâäãåçéèêëíìîïñóòôöõúùûü†°¢£§•¶fz®©™´¨≠AEØ∞" + + "±≤≥¥µ∂∑∏π∫ªºΩaeø¿¡¬√ƒ≈∆«»…ÀÃÕOEoe–—“”‘’÷◊ÿŸ⁄€‹›fifl‡·‚„‰ÂÊÁËÈÍÎÏÌÓÔÒÚÛÙıˆ˜¯˘˙˚¸˝˛ˇ", + }, fontFragmentTest{"Test beginbfchar and beginbfrange cmap entries", "testdata/Yemeni.txt", 470, []byte{0x1, 0xa8, 0x1, 0xb3, 0x1, 0xc2, 0x1, 0xcc, 0x1, 0xe7, 0x1, 0xef, 0x1, 0xf3, 0x0, @@ -192,22 +258,26 @@ type fontFragmentTest struct { } func (f *fontFragmentTest) String() string { - return fmt.Sprintf("TEST{%q file=%q obj=%d|", f.description, f.filename, f.objNum) + return fmt.Sprintf("TEST{%q file=%q obj=%d}", f.description, f.filename, f.objNum) } // check loads the font in PDF fragment `filename`, object number `objNum`, runs // CharcodeBytesToUnicode on `data` and checks that output equals `expected`. func (f *fontFragmentTest) check(t *testing.T) { - common.Log.Debug("fontFragmentTest: %s", f.description) + common.Log.Debug("fontFragmentTest: %s", f) numObj, err := parsePdfFragment(f.filename) if err != nil { t.Errorf("Failed to parse. %s err=%v", f, err) return } - fontObj := numObj[f.objNum] + fontObj, ok := numObj[f.objNum] + if !ok { + t.Errorf("fontFragmentTest: %s. Unknown object. %d", f, f.objNum) + return + } font, err := model.NewPdfFontFromPdfObject(fontObj) if err != nil { - t.Errorf("Failed to create font. %s err=%v", f, err) + t.Errorf("fontFragmentTest: %s. Failed to create font. err=%v", f, err) return } @@ -221,8 +291,8 @@ func (f *fontFragmentTest) check(t *testing.T) { f, f.expected, actualText) } if numChars != len([]rune(actualText)) { - t.Errorf("Incorrect numChars. %s numChars=%d expected=%d", - f, numChars, len(actualText)) + t.Errorf("Incorrect numChars. %s numChars=%d expected=%d\n%+v\n%c", + f, numChars, len([]rune(actualText)), []rune(actualText), []rune(actualText)) } } @@ -271,17 +341,21 @@ func parsePdfFragment(filename string) (map[int]core.PdfObject, error) { func parsePdfObjects(text string) (map[int]core.PdfObject, error) { numObj := map[int]core.PdfObject{} parser := core.NewParserFromString(text) + common.Log.Debug("parsePdfObjects") // Build the numObj {object number: object} map nums := []int{} for { obj, err := parser.ParseIndirectObject() + common.Log.Debug("parsePdfObjects: %T %v", obj, err) if err != nil { if err == io.EOF { break } + common.Log.Debug("parsePdfObjects: err=%v", err) return numObj, err } + common.Log.Debug("parsePdfObjects: %d %T", len(numObj), obj) switch t := obj.(type) { case *core.PdfIndirectObject: numObj[int(t.ObjectNumber)] = obj diff --git a/pdf/model/testdata/axes.txt b/pdf/model/testdata/axes.txt new file mode 100755 index 00000000..931ee993 Binary files /dev/null and b/pdf/model/testdata/axes.txt differ diff --git a/pdf/model/testdata/simple.txt b/pdf/model/testdata/simple.txt new file mode 100644 index 00000000..b14c8a3a --- /dev/null +++ b/pdf/model/testdata/simple.txt @@ -0,0 +1,12 @@ +1 0 obj +<< /Type /Font /Subtype /Type1 /BaseFont /Helvetica >> +endobj +2 0 obj +<< /Type /Font /Subtype /Type1 /BaseFont /Courier >> +endobj +3 0 obj +<< /Type /Font /Subtype /Type1 /BaseFont /Symbol >> +endobj +4 0 obj +<< /Type /Font /Subtype /Type1 /BaseFont /ZapfDingbats >> +endobj