Commit 8dcae785 authored by Ilya.Kirillov's avatar Ilya.Kirillov Committed by Alexander Trofimov

Реализована работа с 14 стандартными шрифтами. Сами шрифты обновлены, они...

Реализована работа с 14 стандартными шрифтами. Сами шрифты обновлены, они взяты из проекта ghostscript. 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@62493 954022d7-b5bf-4e40-9824-e11837661b57
parent 724a6aa3
......@@ -7287,24 +7287,38 @@ OfficeCore/Test/TestConsole/bin/Debug/TestConsole.vshost.exe svn_mime_002dtype=a
OfficeCore/Test/TestConsole/bin/Release/Interop.OfficeCore.dll svn_mime_002dtype=application%2Foctet-stream
OfficeCore/Test/TestConsole/bin/Release/TestConsole.exe svn_mime_002dtype=application%2Foctet-stream
OfficeCore/Test/TestConsole/bin/Release/TestConsole.pdb svn_mime_002dtype=application%2Foctet-stream
/PdfReader svnc_tsvn_003alogminsize=5
/PdfReader svnc_tsvn_003alogminsize=5 svn_global_002dignores=*%0A
PdfReader/PdfReaderTest svnc_tsvn_003alogminsize=5
PdfReader/Resources svnc_tsvn_003alogminsize=5
PdfReader/Resources/Fonts svnc_tsvn_003alogminsize=5
PdfReader/Resources/Fonts/d050000l.pfb svn_mime_002dtype=application%2Foctet-stream
PdfReader/Resources/Fonts/d050000l.pfm svn_mime_002dtype=application%2Foctet-stream
PdfReader/Resources/Fonts/n019003l.pfb svn_mime_002dtype=application%2Foctet-stream
PdfReader/Resources/Fonts/n019003l.pfm svn_mime_002dtype=application%2Foctet-stream
PdfReader/Resources/Fonts/n019004l.pfb svn_mime_002dtype=application%2Foctet-stream
PdfReader/Resources/Fonts/n019004l.pfm svn_mime_002dtype=application%2Foctet-stream
PdfReader/Resources/Fonts/n019023l.pfb svn_mime_002dtype=application%2Foctet-stream
PdfReader/Resources/Fonts/n019023l.pfm svn_mime_002dtype=application%2Foctet-stream
PdfReader/Resources/Fonts/n019024l.pfb svn_mime_002dtype=application%2Foctet-stream
PdfReader/Resources/Fonts/n019024l.pfm svn_mime_002dtype=application%2Foctet-stream
PdfReader/Resources/Fonts/n021003l.pfb svn_mime_002dtype=application%2Foctet-stream
PdfReader/Resources/Fonts/n021003l.pfm svn_mime_002dtype=application%2Foctet-stream
PdfReader/Resources/Fonts/n021004l.pfb svn_mime_002dtype=application%2Foctet-stream
PdfReader/Resources/Fonts/n021004l.pfm svn_mime_002dtype=application%2Foctet-stream
PdfReader/Resources/Fonts/n021023l.pfb svn_mime_002dtype=application%2Foctet-stream
PdfReader/Resources/Fonts/n021023l.pfm svn_mime_002dtype=application%2Foctet-stream
PdfReader/Resources/Fonts/n021024l.pfb svn_mime_002dtype=application%2Foctet-stream
PdfReader/Resources/Fonts/n021024l.pfm svn_mime_002dtype=application%2Foctet-stream
PdfReader/Resources/Fonts/n022003l.pfb svn_mime_002dtype=application%2Foctet-stream
PdfReader/Resources/Fonts/n022003l.pfm svn_mime_002dtype=application%2Foctet-stream
PdfReader/Resources/Fonts/n022004l.pfb svn_mime_002dtype=application%2Foctet-stream
PdfReader/Resources/Fonts/n022004l.pfm svn_mime_002dtype=application%2Foctet-stream
PdfReader/Resources/Fonts/n022023l.pfb svn_mime_002dtype=application%2Foctet-stream
PdfReader/Resources/Fonts/n022023l.pfm svn_mime_002dtype=application%2Foctet-stream
PdfReader/Resources/Fonts/n022024l.pfb svn_mime_002dtype=application%2Foctet-stream
PdfReader/Resources/Fonts/n022024l.pfm svn_mime_002dtype=application%2Foctet-stream
PdfReader/Resources/Fonts/s050000l.pfb svn_mime_002dtype=application%2Foctet-stream
PdfReader/Resources/Fonts/s050000l.pfm svn_mime_002dtype=application%2Foctet-stream
PdfReader/Src svnc_tsvn_003alogminsize=5
Redist/ASCEBOOKWriter.dll svn_mime_002dtype=application%2Foctet-stream
Redist/ASCFontConverter.dll svn_mime_002dtype=application%2Foctet-stream
......@@ -99,13 +99,6 @@ namespace PdfReader
m_pFontList->Clear();
if (L"CheckPassword" != wsOptions)
{
m_pGlobalParams->SetTempFolder(m_wsTempFolder);
m_pGlobalParams->SetCMapFolder(m_wsCMapFolder);
m_pGlobalParams->SetFontManager(m_pFontManager);
}
return (errorNone == m_pPDFDocument->GetErrorCode());
}
void CPdfReader::Close()
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
The font and related files in this directory are distributed under the
GNU AFFERO GENERAL PUBLIC LICENSE Version 3 (see the file COPYING), with
the following exemption:
As a special exception, permission is granted to include these font
programs in a Postscript or PDF file that consists of a document that
contains text to be displayed or printed using this font, regardless
of the conditions or license applying to the document itself.
StartFontMetrics 3.0
Comment Copyright (URW)++,Copyright 2003 by (URW)++ Design & Development
Comment Creation Date: 9/4/2003
FontName Dingbats
FullName Dingbats
FamilyName Dingbats
Weight Regular
ItalicAngle 0.0
IsFixedPitch false
UnderlinePosition -72
UnderlineThickness 36
Version 1.05
Notice (URW)++,Copyright 2003 by (URW)++ Design & Development
EncodingScheme FontSpecific
FontBBox -1 -143 981 819
CapHeight 691
XHeight 567
Descender -143
Ascender 691
StartCharMetrics 203
C 32 ; WX 278 ; N space ; B 0 0 0 0 ;
C 33 ; WX 974 ; N a1 ; B 35 71 939 617 ;
C 34 ; WX 961 ; N a2 ; B 35 81 927 611 ;
C 35 ; WX 974 ; N a202 ; B 35 69 939 615 ;
C 36 ; WX 980 ; N a3 ; B 35 0 945 691 ;
C 37 ; WX 719 ; N a4 ; B 34 138 685 566 ;
C 38 ; WX 789 ; N a5 ; B 35 -13 755 707 ;
C 39 ; WX 790 ; N a119 ; B 35 -14 755 706 ;
C 40 ; WX 791 ; N a118 ; B 35 -13 761 705 ;
C 41 ; WX 690 ; N a117 ; B 35 137 655 556 ;
C 42 ; WX 960 ; N a11 ; B 35 122 925 568 ;
C 43 ; WX 939 ; N a12 ; B 35 133 904 559 ;
C 44 ; WX 549 ; N a13 ; B 29 -10 516 706 ;
C 45 ; WX 855 ; N a14 ; B 33 59 820 632 ;
C 46 ; WX 911 ; N a15 ; B 35 51 876 641 ;
C 47 ; WX 933 ; N a16 ; B 35 141 899 550 ;
C 48 ; WX 911 ; N a105 ; B 35 49 876 636 ;
C 49 ; WX 945 ; N a17 ; B 35 139 909 550 ;
C 50 ; WX 974 ; N a18 ; B 35 103 938 588 ;
C 51 ; WX 755 ; N a19 ; B 34 -14 721 706 ;
C 52 ; WX 846 ; N a20 ; B 36 -14 811 706 ;
C 53 ; WX 762 ; N a21 ; B 35 0 727 692 ;
C 54 ; WX 761 ; N a22 ; B 35 0 727 692 ;
C 55 ; WX 571 ; N a23 ; B -1 -69 572 660 ;
C 56 ; WX 677 ; N a24 ; B 36 -14 642 705 ;
C 57 ; WX 763 ; N a25 ; B 35 0 728 694 ;
C 58 ; WX 760 ; N a26 ; B 35 0 726 691 ;
C 59 ; WX 759 ; N a27 ; B 35 0 725 690 ;
C 60 ; WX 754 ; N a28 ; B 35 0 720 685 ;
C 61 ; WX 494 ; N a6 ; B 35 0 460 691 ;
C 62 ; WX 552 ; N a7 ; B 35 0 517 691 ;
C 63 ; WX 537 ; N a8 ; B 35 0 503 691 ;
C 64 ; WX 577 ; N a9 ; B 35 96 542 595 ;
C 65 ; WX 692 ; N a10 ; B 35 -14 657 702 ;
C 66 ; WX 786 ; N a29 ; B 35 -13 751 705 ;
C 67 ; WX 788 ; N a30 ; B 35 -14 752 703 ;
C 68 ; WX 788 ; N a31 ; B 35 -14 753 705 ;
C 69 ; WX 790 ; N a32 ; B 35 -14 756 707 ;
C 70 ; WX 793 ; N a33 ; B 35 -13 759 705 ;
C 71 ; WX 794 ; N a34 ; B 35 -14 759 705 ;
C 72 ; WX 816 ; N a35 ; B 35 -13 782 707 ;
C 73 ; WX 823 ; N a36 ; B 35 2 787 719 ;
C 74 ; WX 789 ; N a37 ; B 35 -13 754 706 ;
C 75 ; WX 841 ; N a38 ; B 35 -14 807 706 ;
C 76 ; WX 823 ; N a39 ; B 35 -12 789 706 ;
C 77 ; WX 833 ; N a40 ; B 35 -14 798 706 ;
C 78 ; WX 816 ; N a41 ; B 35 -13 782 705 ;
C 79 ; WX 831 ; N a42 ; B 35 -13 796 707 ;
C 80 ; WX 923 ; N a43 ; B 35 -13 888 706 ;
C 81 ; WX 744 ; N a44 ; B 35 0 710 691 ;
C 82 ; WX 723 ; N a45 ; B 35 0 688 691 ;
C 83 ; WX 749 ; N a46 ; B 35 0 714 691 ;
C 84 ; WX 790 ; N a47 ; B 34 -15 756 706 ;
C 85 ; WX 792 ; N a48 ; B 35 -14 758 705 ;
C 86 ; WX 695 ; N a49 ; B 35 -16 661 706 ;
C 87 ; WX 776 ; N a50 ; B 35 -7 741 698 ;
C 88 ; WX 768 ; N a51 ; B 35 -7 734 699 ;
C 89 ; WX 792 ; N a52 ; B 35 -1 757 720 ;
C 90 ; WX 759 ; N a53 ; B 35 0 725 693 ;
C 91 ; WX 707 ; N a54 ; B 35 -11 672 704 ;
C 92 ; WX 708 ; N a55 ; B 35 -14 672 704 ;
C 93 ; WX 682 ; N a56 ; B 35 -3 647 694 ;
C 94 ; WX 701 ; N a57 ; B 35 -13 666 708 ;
C 95 ; WX 826 ; N a58 ; B 35 -18 791 716 ;
C 96 ; WX 815 ; N a59 ; B 35 -16 780 705 ;
C 97 ; WX 789 ; N a60 ; B 35 -14 754 704 ;
C 98 ; WX 789 ; N a61 ; B 35 -14 754 704 ;
C 99 ; WX 707 ; N a62 ; B 33 0 674 717 ;
C 100 ; WX 687 ; N a63 ; B 36 0 651 688 ;
C 101 ; WX 696 ; N a64 ; B 35 0 661 693 ;
C 102 ; WX 689 ; N a65 ; B 35 0 655 681 ;
C 103 ; WX 786 ; N a66 ; B 34 -14 751 703 ;
C 104 ; WX 787 ; N a67 ; B 35 -15 752 704 ;
C 105 ; WX 713 ; N a68 ; B 35 -13 678 709 ;
C 106 ; WX 791 ; N a69 ; B 35 -14 756 707 ;
C 107 ; WX 785 ; N a70 ; B 36 -14 751 701 ;
C 108 ; WX 791 ; N a71 ; B 35 -14 757 708 ;
C 109 ; WX 873 ; N a72 ; B 35 -13 838 705 ;
C 110 ; WX 761 ; N a73 ; B 35 0 726 691 ;
C 111 ; WX 762 ; N a74 ; B 35 0 727 691 ;
C 112 ; WX 762 ; N a203 ; B 35 0 727 691 ;
C 113 ; WX 759 ; N a75 ; B 35 0 725 691 ;
C 114 ; WX 759 ; N a204 ; B 35 0 725 691 ;
C 115 ; WX 892 ; N a76 ; B 35 0 858 706 ;
C 116 ; WX 892 ; N a77 ; B 35 -14 858 691 ;
C 117 ; WX 788 ; N a78 ; B 35 -14 754 705 ;
C 118 ; WX 784 ; N a79 ; B 35 -14 749 705 ;
C 119 ; WX 438 ; N a81 ; B 35 -14 403 705 ;
C 120 ; WX 138 ; N a82 ; B 35 0 104 691 ;
C 121 ; WX 277 ; N a83 ; B 35 0 242 691 ;
C 122 ; WX 415 ; N a84 ; B 35 0 380 691 ;
C 123 ; WX 392 ; N a97 ; B 35 263 357 705 ;
C 124 ; WX 392 ; N a98 ; B 34 262 357 705 ;
C 125 ; WX 668 ; N a99 ; B 35 263 633 707 ;
C 126 ; WX 668 ; N a100 ; B 36 261 634 705 ;
C 128 ; WX 390 ; N a89 ; B 35 -14 356 705 ;
C 129 ; WX 390 ; N a90 ; B 35 -14 355 705 ;
C 130 ; WX 317 ; N a93 ; B 35 0 283 691 ;
C 131 ; WX 317 ; N a94 ; B 35 0 283 691 ;
C 132 ; WX 276 ; N a91 ; B 35 0 242 691 ;
C 133 ; WX 276 ; N a92 ; B 35 0 242 691 ;
C 134 ; WX 509 ; N a205 ; B 35 0 475 691 ;
C 135 ; WX 509 ; N a85 ; B 35 0 475 691 ;
C 136 ; WX 410 ; N a206 ; B 35 0 375 691 ;
C 137 ; WX 410 ; N a86 ; B 35 0 375 691 ;
C 138 ; WX 234 ; N a87 ; B 35 -14 199 705 ;
C 139 ; WX 234 ; N a88 ; B 35 -14 199 705 ;
C 140 ; WX 334 ; N a95 ; B 35 0 299 691 ;
C 141 ; WX 334 ; N a96 ; B 35 0 299 691 ;
C 161 ; WX 732 ; N a101 ; B 35 -143 697 805 ;
C 162 ; WX 544 ; N a102 ; B 56 -14 488 705 ;
C 163 ; WX 544 ; N a103 ; B 34 -14 508 704 ;
C 164 ; WX 910 ; N a104 ; B 35 40 875 651 ;
C 165 ; WX 667 ; N a106 ; B 35 -13 633 706 ;
C 166 ; WX 760 ; N a107 ; B 35 -13 726 705 ;
C 167 ; WX 760 ; N a108 ; B 0 121 758 570 ;
C 168 ; WX 776 ; N a112 ; B 35 0 741 705 ;
C 169 ; WX 595 ; N a111 ; B 34 -14 560 705 ;
C 170 ; WX 694 ; N a110 ; B 35 -14 659 704 ;
C 171 ; WX 626 ; N a109 ; B 34 0 591 705 ;
C 172 ; WX 788 ; N a120 ; B 35 -13 754 706 ;
C 173 ; WX 788 ; N a121 ; B 35 -13 754 706 ;
C 174 ; WX 788 ; N a122 ; B 35 -13 754 706 ;
C 175 ; WX 788 ; N a123 ; B 35 -14 754 705 ;
C 176 ; WX 788 ; N a124 ; B 35 -13 754 706 ;
C 177 ; WX 788 ; N a125 ; B 35 -13 754 706 ;
C 178 ; WX 788 ; N a126 ; B 35 -13 754 706 ;
C 179 ; WX 788 ; N a127 ; B 35 -13 754 706 ;
C 180 ; WX 788 ; N a128 ; B 35 -13 754 706 ;
C 181 ; WX 788 ; N a129 ; B 35 -13 754 706 ;
C 182 ; WX 788 ; N a130 ; B 35 -13 754 706 ;
C 183 ; WX 788 ; N a131 ; B 35 -13 754 706 ;
C 184 ; WX 788 ; N a132 ; B 35 -13 754 706 ;
C 185 ; WX 788 ; N a133 ; B 35 -13 754 706 ;
C 186 ; WX 788 ; N a134 ; B 35 -13 754 706 ;
C 187 ; WX 788 ; N a135 ; B 35 -13 754 706 ;
C 188 ; WX 788 ; N a136 ; B 35 -13 754 706 ;
C 189 ; WX 788 ; N a137 ; B 35 -13 754 706 ;
C 190 ; WX 788 ; N a138 ; B 35 -13 754 706 ;
C 191 ; WX 788 ; N a139 ; B 35 -13 754 706 ;
C 192 ; WX 788 ; N a140 ; B 35 -13 754 706 ;
C 193 ; WX 788 ; N a141 ; B 35 -13 754 706 ;
C 194 ; WX 788 ; N a142 ; B 35 -13 754 706 ;
C 195 ; WX 788 ; N a143 ; B 35 -13 754 706 ;
C 196 ; WX 788 ; N a144 ; B 35 -13 754 706 ;
C 197 ; WX 788 ; N a145 ; B 35 -13 754 706 ;
C 198 ; WX 788 ; N a146 ; B 35 -13 754 706 ;
C 199 ; WX 788 ; N a147 ; B 35 -13 754 706 ;
C 200 ; WX 788 ; N a148 ; B 35 -13 754 706 ;
C 201 ; WX 788 ; N a149 ; B 35 -13 754 706 ;
C 202 ; WX 788 ; N a150 ; B 35 -13 755 706 ;
C 203 ; WX 788 ; N a151 ; B 34 -13 754 706 ;
C 204 ; WX 788 ; N a152 ; B 34 -13 754 706 ;
C 205 ; WX 788 ; N a153 ; B 35 -13 754 706 ;
C 206 ; WX 788 ; N a154 ; B 35 -13 754 706 ;
C 207 ; WX 788 ; N a155 ; B 35 -13 754 706 ;
C 208 ; WX 788 ; N a156 ; B 35 -13 754 706 ;
C 209 ; WX 788 ; N a157 ; B 35 -13 754 706 ;
C 210 ; WX 788 ; N a158 ; B 35 -13 754 706 ;
C 211 ; WX 788 ; N a159 ; B 35 -13 754 706 ;
C 212 ; WX 894 ; N a160 ; B 35 58 860 634 ;
C 213 ; WX 838 ; N a161 ; B 35 151 803 537 ;
C 214 ; WX 1016 ; N a163 ; B 34 151 981 537 ;
C 215 ; WX 458 ; N a164 ; B 35 -128 422 819 ;
C 216 ; WX 748 ; N a196 ; B 35 94 698 597 ;
C 217 ; WX 924 ; N a165 ; B 35 140 890 551 ;
C 218 ; WX 748 ; N a192 ; B 35 94 698 597 ;
C 219 ; WX 918 ; N a166 ; B 35 167 884 526 ;
C 220 ; WX 927 ; N a167 ; B 35 28 892 664 ;
C 221 ; WX 928 ; N a168 ; B 35 129 891 562 ;
C 222 ; WX 928 ; N a169 ; B 35 129 893 561 ;
C 223 ; WX 834 ; N a170 ; B 35 154 799 537 ;
C 224 ; WX 873 ; N a171 ; B 35 97 838 594 ;
C 225 ; WX 828 ; N a172 ; B 35 104 791 588 ;
C 226 ; WX 924 ; N a173 ; B 35 82 889 610 ;
C 227 ; WX 924 ; N a162 ; B 35 82 889 610 ;
C 228 ; WX 917 ; N a174 ; B 35 4 882 688 ;
C 229 ; WX 930 ; N a175 ; B 35 83 896 608 ;
C 230 ; WX 931 ; N a176 ; B 35 84 896 608 ;
C 231 ; WX 463 ; N a177 ; B 35 -100 429 790 ;
C 232 ; WX 883 ; N a178 ; B 35 70 848 621 ;
C 233 ; WX 836 ; N a179 ; B 35 43 802 648 ;
C 234 ; WX 836 ; N a193 ; B 35 43 802 648 ;
C 235 ; WX 867 ; N a180 ; B 35 101 832 589 ;
C 236 ; WX 867 ; N a199 ; B 35 101 832 591 ;
C 237 ; WX 696 ; N a181 ; B 35 44 661 651 ;
C 238 ; WX 696 ; N a200 ; B 35 44 661 646 ;
C 239 ; WX 874 ; N a182 ; B 35 75 840 613 ;
C 241 ; WX 874 ; N a201 ; B 35 75 840 613 ;
C 242 ; WX 760 ; N a183 ; B 35 1 725 690 ;
C 243 ; WX 946 ; N a184 ; B 35 159 911 532 ;
C 244 ; WX 771 ; N a197 ; B 34 36 736 655 ;
C 245 ; WX 865 ; N a185 ; B 35 209 830 483 ;
C 246 ; WX 771 ; N a194 ; B 34 36 736 655 ;
C 247 ; WX 888 ; N a198 ; B 34 -18 853 711 ;
C 248 ; WX 967 ; N a186 ; B 35 123 932 568 ;
C 249 ; WX 888 ; N a195 ; B 34 -20 853 710 ;
C 250 ; WX 831 ; N a187 ; B 35 113 796 578 ;
C 251 ; WX 873 ; N a188 ; B 36 116 838 576 ;
C 252 ; WX 927 ; N a189 ; B 35 149 891 542 ;
C 253 ; WX 970 ; N a190 ; B 35 75 931 615 ;
C 254 ; WX 918 ; N a191 ; B 34 99 884 592 ;
C -1 ; WX 278 ; N .notdef ; B 0 0 0 0 ;
EndCharMetrics
EndFontMetrics
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
StartFontMetrics 3.0
Comment Copyright URW Software, Copyright 1997 by URW
Comment Creation Date: 10/21/1999
Comment See the file COPYING (GNU General Public License) for license conditions.
Comment Creation Date: 9/8/2005
FontName StandardSymL
FullName Standard Symbols L
FamilyName Standard Symbols L
......@@ -18,7 +17,7 @@ CapHeight 673
XHeight 500
Descender -222
Ascender 673
StartCharMetrics 190
StartCharMetrics 191
C 32 ; WX 250 ; N space ; B 0 0 0 0 ;
C 33 ; WX 333 ; N exclam ; B 128 -13 240 686 ;
C 34 ; WX 713 ; N universal ; B 31 0 681 673 ;
......@@ -41,7 +40,7 @@ C 50 ; WX 500 ; N two ; B 25 0 475 686 ;
C 51 ; WX 500 ; N three ; B 39 -13 435 686 ;
C 52 ; WX 500 ; N four ; B 16 0 469 680 ;
C 53 ; WX 500 ; N five ; B 29 -13 443 699 ;
C 54 ; WX 500 ; N six ; B 36 -13 468 685 ;
C 54 ; WX 500 ; N six ; B 36 -13 467 685 ;
C 55 ; WX 500 ; N seven ; B 24 -7 448 673 ;
C 56 ; WX 500 ; N eight ; B 54 -13 440 686 ;
C 57 ; WX 500 ; N nine ; B 31 -13 460 686 ;
......@@ -114,6 +113,7 @@ C 123 ; WX 480 ; N braceleft ; B 58 -165 397 673 ;
C 124 ; WX 200 ; N bar ; B 65 -177 135 673 ;
C 125 ; WX 480 ; N braceright ; B 79 -165 418 673 ;
C 126 ; WX 549 ; N similar ; B 17 196 529 325 ;
C 128 ; WX 790 ; N apple ; B 56 -4 733 808 ;
C 160 ; WX 762 ; N Euro ; B 53 -4 722 671 ;
C 161 ; WX 620 ; N Upsilon1 ; B -2 0 610 687 ;
C 162 ; WX 247 ; N minute ; B 27 476 228 735 ;
......@@ -146,7 +146,7 @@ C 188 ; WX 1000 ; N ellipsis ; B 111 -13 889 100 ;
C 189 ; WX 603 ; N arrowvertex ; B 280 -120 336 1010 ;
C 190 ; WX 1000 ; N arrowhorizex ; B -60 220 1050 276 ;
C 191 ; WX 658 ; N carriagereturn ; B 15 -16 602 629 ;
C 192 ; WX 823 ; N aleph ; B 175 0 662 689 ;
C 192 ; WX 823 ; N aleph ; B 175 0 661 689 ;
C 193 ; WX 686 ; N Ifraktur ; B 10 -54 578 736 ;
C 194 ; WX 795 ; N Rfraktur ; B 26 -16 759 730 ;
C 195 ; WX 987 ; N weierstrass ; B 159 -211 870 574 ;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -382,20 +382,27 @@ namespace PdfReader
return pCharToUnicode;
}
void GrFont::FindExternalFontFile()
void GrFont::FindExternalFontFile(bool bBuiltin)
{
static wchar_t *c_wsType1Ext[] ={ L".pfa", L".pfb", L".ps", L"", NULL };
static wchar_t *c_wsTTFExts[] ={ L".ttf", NULL };
if (m_pGlobalParams && m_seName)
{
if (m_eType == fontType1)
if (bBuiltin)
{
m_wsExternalFontFilePath = m_pGlobalParams->FindFontFile(m_seName, c_wsType1Ext);
m_wsExternalFontFilePath = m_pGlobalParams->GetBuiltinFontPath(m_seName);
}
else if (m_eType == fontTrueType)
else
{
m_wsExternalFontFilePath = m_pGlobalParams->FindFontFile(m_seName, c_wsTTFExts);
if (m_eType == fontType1)
{
m_wsExternalFontFilePath = m_pGlobalParams->FindFontFile(m_seName, c_wsType1Ext);
}
else if (m_eType == fontTrueType)
{
m_wsExternalFontFilePath = m_pGlobalParams->FindFontFile(m_seName, c_wsTTFExts);
}
}
}
}
......@@ -555,7 +562,7 @@ namespace PdfReader
}
// FontFile
FindExternalFontFile();
FindExternalFontFile(pBuiltinFont ? true : false);
// FontMatrix
m_arrFontMatrix[0] = m_arrFontMatrix[3] = 1;
......@@ -1341,7 +1348,7 @@ namespace PdfReader
ReadFontDescriptor(pXref, pDescendantDict);
// FontFile
FindExternalFontFile();
FindExternalFontFile(false);
//
......
......@@ -208,7 +208,7 @@ namespace PdfReader
void ReadFontDescriptor(XRef *pXref, Dict *pFontDict);
CharCodeToUnicode *ReadToUnicodeCMap(Dict *pFontDict, int nBitsCount, CharCodeToUnicode *pCharToUnicode);
void FindExternalFontFile();
void FindExternalFontFile(bool bBuiltin = false);
protected:
......
......@@ -44,27 +44,27 @@ namespace PdfReader
{
static struct
{
wchar_t* wsName;
char* sName;
wchar_t* wsT1FileName;
wchar_t* wsTTFileName;
const unsigned char* pT1Buffer;
const unsigned int unSize;
} c_arrBase14FontTable[] =
{
{ L"Courier", L"n022003l.pfb", L"cour.ttf", c_arrn022003l, c_nSizen022003l},
{ L"Courier-Bold", L"n022004l.pfb", L"courbd.ttf", c_arrn022004l, c_nSizen022004l},
{ L"Courier-BoldOblique", L"n022024l.pfb", L"courbi.ttf", c_arrn022024l, c_nSizen022024l},
{ L"Courier-Oblique", L"n022023l.pfb", L"couri.ttf", c_arrn022023l, c_nSizen022023l},
{ L"Helvetica", L"n019003l.pfb", L"arial.ttf", c_arrn019003l, c_nSizen019003l},
{ L"Helvetica-Bold", L"n019004l.pfb", L"arialbd.ttf", c_arrn019004l, c_nSizen019004l},
{ L"Helvetica-BoldOblique", L"n019024l.pfb", L"arialbi.ttf", c_arrn019024l, c_nSizen019024l},
{ L"Helvetica-Oblique", L"n019023l.pfb", L"ariali.ttf", c_arrn019023l, c_nSizen019023l},
{ L"Symbol", L"s050000l.pfb", NULL, c_arrs050000l, c_nSizes050000l},
{ L"Times-Bold", L"n021004l.pfb", L"timesbd.ttf", c_arrn021004l, c_nSizen021004l},
{ L"Times-BoldItalic", L"n021024l.pfb", L"timesbi.ttf", c_arrn021024l, c_nSizen021024l},
{ L"Times-Italic", L"n021023l.pfb", L"timesi.ttf", c_arrn021023l, c_nSizen021023l},
{ L"Times-Roman", L"n021003l.pfb", L"times.ttf", c_arrn021003l, c_nSizen021003l},
{ L"ZapfDingbats", L"d050000l.pfb", NULL, c_arrd050000l, c_nSized050000l},
{ "Courier", L"n022003l.pfb", L"cour.ttf", c_arrn022003l, c_nSizen022003l},
{ "Courier-Bold", L"n022004l.pfb", L"courbd.ttf", c_arrn022004l, c_nSizen022004l},
{ "Courier-BoldOblique", L"n022024l.pfb", L"courbi.ttf", c_arrn022024l, c_nSizen022024l},
{ "Courier-Oblique", L"n022023l.pfb", L"couri.ttf", c_arrn022023l, c_nSizen022023l},
{ "Helvetica", L"n019003l.pfb", L"arial.ttf", c_arrn019003l, c_nSizen019003l},
{ "Helvetica-Bold", L"n019004l.pfb", L"arialbd.ttf", c_arrn019004l, c_nSizen019004l},
{ "Helvetica-BoldOblique", L"n019024l.pfb", L"arialbi.ttf", c_arrn019024l, c_nSizen019024l},
{ "Helvetica-Oblique", L"n019023l.pfb", L"ariali.ttf", c_arrn019023l, c_nSizen019023l},
{ "Symbol", L"s050000l.pfb", NULL, c_arrs050000l, c_nSizes050000l},
{ "Times-Bold", L"n021004l.pfb", L"timesbd.ttf", c_arrn021004l, c_nSizen021004l},
{ "Times-BoldItalic", L"n021024l.pfb", L"timesbi.ttf", c_arrn021024l, c_nSizen021024l},
{ "Times-Italic", L"n021023l.pfb", L"timesi.ttf", c_arrn021023l, c_nSizen021023l},
{ "Times-Roman", L"n021003l.pfb", L"times.ttf", c_arrn021003l, c_nSizen021003l},
{ "ZapfDingbats", L"d050000l.pfb", NULL, c_arrd050000l, c_nSized050000l},
{ NULL, NULL, NULL, NULL, 0 }
};
//-------------------------------------------------------------------------------------------------------------------------------
......@@ -173,7 +173,25 @@ namespace PdfReader
void GlobalParams::SetTempFolder(const wchar_t* wsTempFolder)
{
if (wsTempFolder)
{
m_wsTempDirectory = wsTempFolder;
// 14
for (int nIndex = 0; nIndex < 14; nIndex++)
{
std::wstring wsFontPath;
FILE* pFile = NULL;
if (!NSFile::CFileBinary::OpenTempFile(&wsFontPath, &pFile, L"wb", L".base", (wchar_t*)wsTempFolder, NULL))
continue;
fclose(pFile);
NSFile::CFileBinary oFile;
oFile.CreateFileW(wsFontPath);
oFile.WriteFile((BYTE*)c_arrBase14FontTable[nIndex].pT1Buffer, c_arrBase14FontTable[nIndex].unSize);
oFile.CloseFile();
m_arrBuiltinFontsPath[nIndex] = wsFontPath;
}
}
else
m_wsTempDirectory = L"";
}
......@@ -197,4 +215,18 @@ namespace PdfReader
{
return m_pFontManager;
}
std::wstring GlobalParams::GetBuiltinFontPath(StringExt* seFontName) const
{
int nIndex = 0;
for (nIndex = 0; nIndex < 14; nIndex++)
{
if (0 == seFontName->Compare(c_arrBase14FontTable[nIndex].sName))
break;
}
if (nIndex < 14)
return m_arrBuiltinFontsPath[nIndex];
return L"";
}
}
\ No newline at end of file
......@@ -51,6 +51,7 @@ namespace PdfReader
void SetCMapFolder(const wchar_t* wsDir);
void SetFontManager(CFontManager* pFontManager);
CFontManager* GetFontManager() const;
std::wstring GetBuiltinFontPath(StringExt* seFontName) const;
private:
......@@ -65,6 +66,7 @@ namespace PdfReader
std::wstring m_wsTempDirectory;
CFontManager* m_pFontManager;
std::wstring m_arrBuiltinFontsPath[14]; // 14
};
}
......
......@@ -14,16 +14,13 @@
#include "../../DesktopEditor/fontengine/ApplicationFonts.h"
#include "../../DesktopEditor/common/File.h"
#include "../../DesktopEditor/common/Array.h"
#include "../../DesktopEditor/graphics/BaseThread.h"
// TODO: 1. PDF - ,
// 2.
// 3. FontManager->GetFontType
// 4. FontManager->GetNameIndex
// 5. m_pRenderer->SetAdditionalParam(L"TilingHtmlPattern", oWriter.GetXmlString());
// 6. GlobalParams->FindFontFile
// 7. 14
// 8.
// 9.
// TODO: 1. - (Axial Radial)
// 2. m_pRenderer->SetAdditionalParam(L"TilingHtmlPattern", oWriter.GetXmlString());
// 3. GlobalParams->FindFontFile
// 4.
// 5. Jpeg2000
namespace PdfReader
{
......@@ -198,7 +195,7 @@ namespace PdfReader
{
// , ,
while (!pEntry->bAvailable)
Sleep(10);
NSThreads::Sleep(10);
}
RELEASEOBJECT(pCS);
......@@ -215,7 +212,7 @@ namespace PdfReader
{
// , ,
while (!(*ppEntry)->bAvailable)
Sleep(10);
NSThreads::Sleep(10);
}
if (!bResult)
......@@ -835,10 +832,7 @@ namespace PdfReader
return;
}
// TODO: m_pFontManager->GetFontType
std::wstring wsFontType = L"";
//m_pFontManager->GetFontType(&wsFontType);
std::wstring wsFontType = m_pFontManager->GetFontType();
if (L"TrueType" == wsFontType)
{
if (eFontType != fontType1COT && eFontType != fontTrueType
......@@ -1180,9 +1174,7 @@ namespace PdfReader
char* sName = NULL;
if ((sName = ppEncoding[nIndex]))
{
unsigned short ushGID = 0;
// TODO: pFontManager->GetNameIndex
//m_pFontManager->GetNameIndex(AStringToWString(sName), &ushGID);
unsigned short ushGID = m_pFontManager->GetNameIndex(AStringToWString(sName));
pCodeToGID[nIndex] = ushGID;
}
}
......@@ -3025,16 +3017,14 @@ namespace PdfReader
wsSrcCodeText = oWriter.GetXmlString();
}
}
else
{
wsSrcCodeText = L"";
}
// TODO: wsSrcCodeText, PDF, .
float fAscent = pGState->GetFontSize();
if (nRenderMode == 0 || nRenderMode == 2 || nRenderMode == 4 || nRenderMode == 6)
{
m_pRenderer->CommandDrawTextEx(wsUnicodeText, wsGidText, PDFCoordsToMM(0 + dShiftX), PDFCoordsToMM(dShiftY), PDFCoordsToMM(dDx), PDFCoordsToMM(dDy), PDFCoordsToMM(0), 0);
if (c_nPDFWriter == m_lRendererType)
m_pRenderer->CommandDrawTextPdf(wsUnicodeText, wsGidText, wsSrcCodeText, PDFCoordsToMM(0 + dShiftX), PDFCoordsToMM(dShiftY), PDFCoordsToMM(dDx), PDFCoordsToMM(dDy), PDFCoordsToMM(0), 0);
else
m_pRenderer->CommandDrawTextEx(wsUnicodeText, wsGidText, PDFCoordsToMM(0 + dShiftX), PDFCoordsToMM(dShiftY), PDFCoordsToMM(dDx), PDFCoordsToMM(dDy), PDFCoordsToMM(0), 0);
}
if (nRenderMode == 1 || nRenderMode == 2 || nRenderMode == 5 || nRenderMode == 6)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment