DenysMedvid/pdf2htmlEX
1
0
Fork 0
mirror of https://github.com/pdf2htmlEX/pdf2htmlEX.git synced 2024-12-22 13:00:08 +00:00
Code

Merge branch 'devv' into exp

Browse Source
This commit is contained in:
Lu Wang 2012-08-24 09:10:51 +02:00
commit 34b12b774c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/HTMLRenderer/install.cc
View File

@ -135,9 +135,9 @@ void HTMLRenderer::install_embedded_font(GfxFont * font, const string & suffix,
if(!font->isCIDFont()) if(!font->isCIDFont())
{ {
maxcode = 0xff;
if(suffix == ".ttf") if(suffix == ".ttf")
{ {
maxcode = 0xff;
script_fout << "Reencode(\"original\")" << endl; script_fout << "Reencode(\"original\")" << endl;
int buflen; int buflen;
char * buf = nullptr; char * buf = nullptr;
@ -155,8 +155,6 @@ void HTMLRenderer::install_embedded_font(GfxFont * font, const string & suffix,
} }
else else
{ {
// don't reencode non-ttf 8bit fonts with ToUnicode
maxcode = 0;
script_fout << "Reencode(\"unicode\")" << endl; script_fout << "Reencode(\"unicode\")" << endl;
} }
} }

4
src/HTMLRenderer/text.cc
View File

@ -185,7 +185,7 @@ void HTMLRenderer::drawString(GfxState * state, GooString * s)
while (len > 0) { while (len > 0) {
auto n = font->getNextChar(p, len, &code, &u, &uLen, &dx1, &dy1, &ox, &oy); auto n = font->getNextChar(p, len, &code, &u, &uLen, &dx1, &dy1, &ox, &oy);
if(!(_equal(ox, 0) && _equal(oy, 0))) if(!(_equal(ox, 0) && _equal(oy, 0)))
{ {
cerr << "TODO: non-zero origins" << endl; cerr << "TODO: non-zero origins" << endl;
@ -195,6 +195,8 @@ void HTMLRenderer::drawString(GfxState * state, GooString * s)
{ {
++nSpaces; ++nSpaces;
} }
// TODO: don't use ToUnicode Map for nonttf fonts
if((uLen > 0) && (all_of(u, u+uLen, isLegalUnicode))) if((uLen > 0) && (all_of(u, u+uLen, isLegalUnicode)))
{ {