Merge pull request #20781 from pengkunbin/fix/chinese-font-names-gbk

Fix missing Chinese font name variants (SimFang and XiaoBiaoSong) in GBK encoding detection

src/core/evaluator.js

@@ -3723,6 +3723,8 @@ class PartialEvaluator {
         "\xB7\xC2\xCB\xCE_GB2312", // SimFang
         "\xC1\xA5\xCA\xE9", // SimLi
         "\xD0\xC2\xCB\xCE", // SimSun
+        "\xB7\xC2\xCB\xCE\xCC\xE5", // SimFang variant
+        "\xD0\xA1\xB1\xEA\xCB\xCE", // XiaoBiaoSong
       ];
 
       // Check for common Chinese font names and their GBK-encoded equivalents

test/pdfs/.gitignore

@@ -16,6 +16,7 @@
 !bug1727053.pdf
 !issue18408_reduced.pdf
 !bug1907000_reduced.pdf
+!SimFang-variant.pdf
 !bug1953099.pdf
 !issue11913.pdf
 !issue2391-1.pdf
@@ -81,6 +82,7 @@
 !issue7835.pdf
 !issue11922_reduced.pdf
 !issue7855.pdf
+!XiaoBiaoSong.pdf
 !issue11144_reduced.pdf
 !issue7872.pdf
 !issue7901.pdf

test/pdfs/SimFang-variant.pdf

@@ -0,0 +1,175 @@
+%PDF-1.4
+%âãÏÓ
+4 0 obj
+<<
+/Type /Font
+/Subtype /TrueType
+/Name /F5
+/BaseFont /#BA#DA#CC#E5
+/Encoding /WinAnsiEncoding
+/FirstChar 0
+/LastChar 255
+/Widths [500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500]
+/FontDescriptor <<
+/MissingWidth 1000
+/Ascent 1000
+/CapHeight 1000
+/Descent -200
+/Flags 4
+/FontBBox [0 -200 1000 1000]
+/FontName <D0A1B1EACBCE>
+/ItalicAngle 0
+/StemV 100
+>>
+>>
+endobj
+6 0 obj
+<<
+/ProcSet [/PDF]
+>>
+endobj
+7 0 obj
+<<
+/Type /Encoding
+/Differences [65 /G065]
+>>
+endobj
+9 0 obj
+<<
+/Length 103
+/Filter /FlateDecode
+>>
+stream
+xœE<EFBFBD>»
€0DûHÙáFÀø¼¢‚ý[âÄ<C3A2>ÊOwOg7¸áÜjÑfx&8îZä@ã
º€VE!˜´„¹‰€<»L-v<>$|3©J~W3Wž^¿´Š9ÕMòÿK‡«–Žh#Þ
+
+endstream
+endobj
+8 0 obj
+<<
+/G065 9 0 R
+>>
+endobj
+5 0 obj
+<<
+/Name /X0
+/Type /Font
+/Subtype /Type3
+/Resources 6 0 R
+/FontBBox [0 0 96 96]
+/FontMatrix [0.00999 0 0 0.00999 0 0]
+/FirstChar 65
+/LastChar 65
+/Encoding 7 0 R
+/CharProcs 8 0 R
+/Widths [96]
+>>
+endobj
+10 0 obj
+<<
+/Filter /FlateDecode
+/Length 179
+>>
+stream
+xœm<EFBFBD>9
+1E{ŸBeÒh$ï!àõîÓd<C393>”sÿ"ž­<18>Oÿ‹<C3BF>½3°|
<01>¶
Xip†å%ÞÂ12lMIB	Ú+tûª[{uclbj<62>€%’gh}¥gTZ<54>ž­ìè)nɇ(éí+Ø"¹Õ¾ñ<C2BE>hÄc.n¨/¹õ²†Ï&ד3j§TH·hõ‰‡á™RƱu?QÔŸšzü}§OÎíºK¸®’ÒÄ"£Sj
+endstream
+endobj
+13 0 obj
+<<
+/Filter [/ASCII85Decode /LZWDecode]
+/Length 488
+>>
+stream
+J,g]g+e/h_!_gCtO=0f)$P%cIi8Zdfc5&3j_8$7g.@L`YKUJNGBP\poR=_;Dl'P(T
+(7Boo^^S:71(MN]ZQX/+Cbu.lK"p74pe1T%s.DY%&\1TdJhr54.M9au6>79n6`Q:4
+PbLSZTLEE(8E@'*1mg_*eTnN*;*'V3+gm-EEetX%;Bo$ur2ss*N`.-!.kG_q6GDD'
+dKoL!8Ka#EV,@V!\j8ZFbp6EE<9cn=N6j<M8Q?[#7"dq'1>0nf;(&;QU6bUD')c@\
+9-d\DA=cZ0Q>gIM$$;cd2O@&a;X,Nn_a<?V-PVE%?Sf]idH6WRZqHGq]Zm<uCi"]?
+Stg(<gV-H9NB<SA\T=sN)Il%(BDIak7/H&mV!kmDUo4X;8;]V>P(]I1aRc(K1^ue>
+gF/(+GaKo$qneLWDrQ#;5\S(\$q'4Q,85`-8;S(=Z"WSBOV*FM)4,?B],R<gbPN=#
+OmIK<a:\o8+ioO-!W~>
+endstream
+endobj
+12 0 obj
+[/Indexed /DeviceRGB 255 13 0 R]
+endobj
+11 0 obj
+<<
+/Filter [/ASCII85Decode /LZWDecode]
+/Width 57
+/Height 78
+/ColorSpace 12 0 R
+/BitsPerComponent 8
+/Length 384
+>>
+stream
+J2Q'--mT93"b]2#:mbcG*<g4EU+e!c7O8k.7O$6IjDI*qL<*fo3>@cD)N)[K'"I;.
+4!p=d-;nQ"Sm*b8:1ggMjN`/[Ra>[].D6LH8"Rq<PH#W]NCfpFBGB`C)OEOb<b`@a
+V-^c;YZC)_b9^1P8Qo;7<kDqO`Eok*/Cl>J*p%UNg$CZ.V<7;f^0kYVlm7t`LS%r?
+fVo&_*Iu4?k89/RNu<Y^j7?Cn^.0]GKkGF/m+qt9Vi>@I>!6JU=0'h`14!3.a'5n%
+hY,]@cIXe_g1bdN.=VR7_qX^*[LPd=NOn$>H!L6M2_iM9oXQcLa"t-9l?Bb/\mKZf
+j5bKu?;CNUX6oP+\fW#jld]qKHTqGC[ZgF$^97Y<]0@k[!W~>
+endstream
+endobj
+3 0 obj
+<<
+/Type /Page
+/CropBox [0 0 462.5 625.9]
+/MediaBox [0 0 462.5 625.9]
+/Resources <<
+/Font <<
+/TT0 4 0 R
+/T3_0 5 0 R
+>>
+>>
+/Contents 10 0 R
+/Thumb 11 0 R
+/Parent 2 0 R
+>>
+endobj
+2 0 obj
+<<
+/Type /Pages
+/Kids [3 0 R]
+/Count 1
+>>
+endobj
+1 0 obj
+<<
+/Type /Catalog
+/Pages 2 0 R
+>>
+endobj
+14 0 obj
+<<
+/ModDate (D:20260303075300Z)
+/Producer (Pdftools SDK)
+>>
+endobj
+xref
+0 15
+0000000000 65535 f
+0000003528 00000 n
+0000003471 00000 n
+0000003286 00000 n
+0000000015 00000 n
+0000001668 00000 n
+0000001362 00000 n
+0000001399 00000 n
+0000001635 00000 n
+0000001460 00000 n
+0000001877 00000 n
+0000002754 00000 n
+0000002705 00000 n
+0000002129 00000 n
+0000003577 00000 n
+trailer
+<<
+/Size 15
+/Root 1 0 R
+/Info 14 0 R
+/ID [<42230467D173E23BC1D16DD8BFFDB792> <5275A2D429D61242E799751CBE8A1B51>]
+>>
+startxref
+3653
+%%EOF

test/test_manifest.json

@@ -13971,5 +13971,19 @@
     "md5": "ead167e0328f1a1f4f8901cee501a9c4",
     "rounds": 1,
     "type": "eq"
+  },
+  {
+    "id": "SimFang-variant",
+    "file": "pdfs/SimFang-variant.pdf",
+    "md5": "d412460812cd940917091e8975620faf",
+    "rounds": 1,
+    "type": "eq"
+  },
+  {
+    "id": "XiaoBiaoSong",
+    "file": "pdfs/XiaoBiaoSong.pdf",
+    "md5": "7072f6763bf2f0d6df14d5fc86962c5a",
+    "rounds": 1,
+    "type": "eq"
   }
 ]