Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13920 from Snuffleupagus/issue-13916

Browse Source 
Extend the glyph maps for standard respectively Calibri fonts (issue 13916)
This commit is contained in:
Tim van der Meij 2021-08-21 15:05:08 +02:00 committed by GitHub
commit 83e1064360
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 252 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/core/standard_fonts.js
View File

@ -471,12 +471,17 @@ const getGlyphMapForStandardFonts = getLookupTableFactory(function (t) {
t[169] = 171;
t[170] = 187;
t[171] = 8230;
t[200] = 193;
t[203] = 205;
t[210] = 218;
t[223] = 711;
t[224] = 321;
t[225] = 322;
t[226] = 352;
t[227] = 353;
t[228] = 381;
t[229] = 382;
t[233] = 221;
t[234] = 253;
t[252] = 263;
t[253] = 268;
@ -486,11 +491,13 @@ const getGlyphMapForStandardFonts = getLookupTableFactory(function (t) {
t[261] = 261;
t[265] = 280;
t[266] = 281;
t[267] = 282;
t[268] = 283;
t[269] = 313;
t[275] = 323;
t[276] = 324;
t[278] = 328;
t[283] = 344;
t[284] = 345;
t[285] = 346;
t[286] = 347;
@ -714,14 +721,19 @@ const getSupplementalGlyphMapForArialBlack = getLookupTableFactory(function (
const getSupplementalGlyphMapForCalibri = getLookupTableFactory(function (t) {
t[1] = 32;
t[4] = 65;
t[6] = 193;
t[17] = 66;
t[18] = 67;
t[21] = 268;
t[24] = 68;
t[28] = 69;
t[30] = 201;
t[32] = 282;
t[38] = 70;
t[39] = 71;
t[44] = 72;
t[47] = 73;
t[49] = 205;
t[58] = 74;
t[60] = 75;
t[62] = 76;
@ -731,26 +743,35 @@ const getSupplementalGlyphMapForCalibri = getLookupTableFactory(function (t) {
t[87] = 80;
t[89] = 81;
t[90] = 82;
t[92] = 344;
t[94] = 83;
t[97] = 352;
t[100] = 84;
t[104] = 85;
t[115] = 86;
t[116] = 87;
t[121] = 88;
t[122] = 89;
t[124] = 221;
t[127] = 90;
t[129] = 381;
t[258] = 97;
t[260] = 225;
t[268] = 261;
t[271] = 98;
t[272] = 99;
t[273] = 263;
t[275] = 269;
t[282] = 100;
t[286] = 101;
t[288] = 233;
t[290] = 283;
t[295] = 281;
t[296] = 102;
t[336] = 103;
t[346] = 104;
t[349] = 105;
t[351] = 237;
t[361] = 106;
t[364] = 107;
t[367] = 108;
@ -762,15 +783,19 @@ const getSupplementalGlyphMapForCalibri = getLookupTableFactory(function (t) {
t[393] = 112;
t[395] = 113;
t[396] = 114;
t[398] = 345;
t[400] = 115;
t[401] = 347;
t[403] = 353;
t[410] = 116;
t[437] = 117;
t[448] = 118;
t[449] = 119;
t[454] = 120;
t[455] = 121;
t[457] = 253;
t[460] = 122;
t[462] = 382;
t[463] = 380;
t[853] = 44;
t[855] = 58;

1
test/pdfs/.gitignore vendored
View File

@ -109,6 +109,7 @@
!issue11578_reduced.pdf
!issue11651.pdf
!issue11878.pdf
!issue13916.pdf
!bad-PageLabels.pdf
!decodeACSuccessive.pdf
!filled-background.pdf

220
test/pdfs/issue13916.pdf Normal file
View File

@ -0,0 +1,220 @@
%PDF-1.7
%âãÏÓ
1 0 obj
<<
/Kids [2 0 R]
/Count 1
/Type /Pages
>>
endobj
2 0 obj
<<
/Rotate 0
/Parent 1 0 R
/Resources
<<
/Font
<<
/C2_0 3 0 R
/TT4 4 0 R
/TT1 5 0 R
/C2_1 6 0 R
>>
>>
/MediaBox [0 0 595.32 81.92]
/pdftk_PageNum 1
/Type /Page
/Contents 7 0 R
>>
endobj
3 0 obj
<<
/BaseFont /ArialMT
/DescendantFonts 8 0 R
/Subtype /Type0
/Encoding /Identity-H
/Type /Font
>>
endobj
4 0 obj
<<
/BaseFont /Calibri
/LastChar 255
/Subtype /TrueType
/FontDescriptor 9 0 R
/Widths [507 507 507 507 507 507 507 507 507 507 507 507 507 507 507 507 507 507 507 507 507 507 507 507 507 507 507 507 507 507 507 507 226 326 401 498 507 715 682 221 303 303 498 498 250 306 252 386 507 507 507 507 507 507 507 507 507 507 268 268 498 498 498 463 894 579 544 533 615 488 459 631 623 252 319 520 420 855 646 662 517 673 543 459 487 642 567 890 519 487 468 307 386 307 498 498 291 479 525 423 525 498 305 471 525 229 239 455 229 799 525 527 525 525 349 391 335 525 452 715 433 453 395 314 460 314 498 498 507 498 250 305 418 690 498 498 395 1038 459 339 867 498 468 498 498 250 250 418 418 498 498 905 450 705 391 339 850 498 395 487 226 326 498 507 498 507 498 498 393 834 402 512 498 306 507 394 339 498 336 334 292 550 586 252 307 246 422 512 636 671 675 463 579 579 579 579 579 579 763 533 488 488 488 488 252 252 252 252 625 646 662 662 662 662 662 498 664 642 642 642 642 487 517 527 479 479 479 479 479 479 773 423 498 498 498 498 229 229 229 229 525 525 527 527 527 527 527 498 529 525 525 525 525 453 525 453]
/Encoding /WinAnsiEncoding
/Type /Font
/FirstChar 0
>>
endobj
5 0 obj
<<
/BaseFont /Calibri
/LastChar 255
/Subtype /TrueType
/FontDescriptor 9 0 R
/Widths [507 507 507 507 507 507 507 507 507 507 507 507 507 507 507 507 507 507 507 507 507 507 507 507 507 507 507 507 507 507 507 507 226 326 401 498 507 715 682 221 303 303 498 498 250 306 252 386 507 507 507 507 507 507 507 507 507 507 268 268 498 498 498 463 894 579 544 533 615 488 459 631 623 252 319 520 420 855 646 662 517 673 543 459 487 642 567 890 519 487 468 307 386 307 498 498 291 479 525 423 525 498 305 471 525 229 239 455 229 799 525 527 525 525 349 391 335 525 452 715 433 453 395 314 460 314 498 498 507 498 250 305 418 690 498 498 395 1038 459 339 867 498 468 498 498 250 250 418 418 498 498 905 450 705 391 339 850 498 395 487 226 326 498 507 498 507 498 498 393 834 402 512 498 306 507 394 339 498 336 334 292 550 586 252 307 246 422 512 636 671 675 463 579 579 579 579 579 579 763 533 488 488 488 488 252 252 252 252 625 646 662 662 662 662 662 498 664 642 642 642 642 487 517 527 479 479 479 479 479 479 773 423 498 498 498 498 229 229 229 229 525 525 527 527 527 527 527 498 529 525 525 525 525 453 525 453]
/Encoding /WinAnsiEncoding
/Type /Font
/FirstChar 0
>>
endobj
6 0 obj
<<
/BaseFont /Calibri
/DescendantFonts 10 0 R
/Subtype /Type0
/Encoding /Identity-H
/Type /Font
>>
endobj
7 0 obj
<<
/Length 486
>>
stream
BT
/C2_0 1 Tf
16 0 0 16 25.32001 15 Tm
<010C00E300FE011C00E500EA006900740070010B00E200FD011B00E400E900C800CB00650000010B00E200FD011B00E400E900C800CB0065010C00E300FE011C00E500EA006900740070000000E30057010C005300690051000F0003005D004400530044004F004400FE000F0003010C00E300FE011C00E500EA00690074>Tj
<0070007E0124>Tj
/C2_1 1 Tf
16 0 0 16 73.32001 47 Tm
<0061002000610015005C0081007C00060031001E>Tj
/TT1 1 Tf
12.125 0 Td
(18.08.2021)Tj
/TT4 1 Tf
20 0 0 20 440.32001 45 Tm
(31.08.2023)Tj
ET
endstream
endobj
8 0 obj [11 0 R]
endobj
9 0 obj
<<
/FontName /Calibri
/StemV 80
/Ascent 1026
/Flags 32
/FontWeight 400
/FontFamily (Calibri)
/XHeight 467
/FontStretch /Normal
/Descent -312
/ItalicAngle 0
/FontBBox [-503 -312 1240 1026]
/Type /FontDescriptor
/CapHeight 632
>>
endobj
10 0 obj [12 0 R]
endobj
13 0 obj
<<
/Pages 1 0 R
/Type /Catalog
>>
endobj
11 0 obj
<<
/BaseFont /ArialMT
/CIDSystemInfo 14 0 R
/DW 1000
/Subtype /CIDFontType2
/FontDescriptor 15 0 R
/W [0 [750] 3 [278] 15 [278] 68 [556] 79 [222] 81 [556] 83 [556] 87 [278] 93 [500] 101 [667] 105 [556] 112 [556] 116 [278] 126 [556] 200 [667] 203 [278] 226 [667 500 611 500] 233 [667 500] 253 [722 500] 267 [667 556] 283 [722 333] 292 [556]]
/Type /Font
>>
endobj
12 0 obj
<<
/BaseFont /Calibri
/CIDSystemInfo 16 0 R
/DW 1000
/Subtype /CIDFontType2
/FontDescriptor 17 0 R
/W [6 [579] 21 [533] 30 [488] 32 [488] 49 [252] 92 [543] 97 [459] 124 [487] 129 [468]]
/Type /Font
>>
endobj
14 0 obj
<<
/Supplement 0
/Ordering (Identity)
/Registry (Adobe)
>>
endobj
15 0 obj
<<
/FontName /ArialMT
/StemV 88
/Ascent 1040
/Flags 4
/FontWeight 400
/FontFamily (Arial)
/XHeight 519
/FontStretch /Normal
/Descent -325
/ItalicAngle 0
/FontBBox [-665 -325 2000 1040]
/Type /FontDescriptor
/CapHeight 716
>>
endobj
16 0 obj
<<
/Supplement 0
/Ordering (Identity)
/Registry (Adobe)
>>
endobj
17 0 obj
<<
/FontName /Calibri
/StemV 80
/Ascent 1026
/Flags 4
/FontWeight 400
/FontFamily (Calibri)
/XHeight 467
/FontStretch /Normal
/Descent -312
/ItalicAngle 0
/FontBBox [-503 -312 1240 1026]
/Type /FontDescriptor
/CapHeight 632
>>
endobj xref
0 18
0000000000 65535 f
0000000015 00000 n
0000000074 00000 n
0000000272 00000 n
0000000387 00000 n
0000001571 00000 n
0000002755 00000 n
0000002871 00000 n
0000003411 00000 n
0000003436 00000 n
0000003681 00000 n
0000003759 00000 n
0000004133 00000 n
0000003707 00000 n
0000004352 00000 n
0000004429 00000 n
0000004672 00000 n
0000004749 00000 n
trailer
<<
/Root 13 0 R
/Size 18
>>
startxref
4993
%%EOF

6
test/test_manifest.json
View File

@ -4955,6 +4955,12 @@
"type": "eq",
"about": "JPX packets"
},
{ "id": "issue13916",
"file": "pdfs/issue13916.pdf",
"md5": "5cfaff104b17f325610936875363541f",
"rounds": 1,
"type": "eq"
},
{ "id": "bug766138",
"file": "pdfs/bug766138.pdf",
"md5": "b171f5cf8d9834348112fba60ee54f8c",