diff --git a/README.md b/README.md index 197f1e7..d404e96 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Not supported yet Dependency ---------------------------- * libpoppler with xpdf header >= 0.20.2 -* boost c++ library (format, program options, gil, filesystem) +* boost c++ library (format, program options, gil, filesystem, serialization) * fontforge **Please use [the lastest version](https://github.com/fontforge/fontforge)** HOW TO COMPILE diff --git a/bin/pdf2htmlEX.in b/bin/pdf2htmlEX.in index 204ecb1..6b17094 100755 --- a/bin/pdf2htmlEX.in +++ b/bin/pdf2htmlEX.in @@ -10,9 +10,9 @@ rm -f $TMPDIR/* 2>/dev/null $LIBDIR/pdf2htmlEX $* -if [ -f $TMPDIR/convert.pe ]; then +if [ -f $TMPDIR/pdf2htmlEX.pe ]; then echo -n "Converting fonts: " - fontforge -script $TMPDIR/convert.pe 2>/dev/null + fontforge -script $TMPDIR/pdf2htmlEX.pe 2>/dev/null echo "." fi diff --git a/src/HTMLRenderer/export.cc b/src/HTMLRenderer/export.cc index 2885cfc..2e030b1 100644 --- a/src/HTMLRenderer/export.cc +++ b/src/HTMLRenderer/export.cc @@ -36,7 +36,23 @@ using boost::algorithm::ifind_first; void HTMLRenderer::export_remote_font(long long fn_id, const string & suffix, const string & fontfileformat, GfxFont * font) { - allcss_fout << format("@font-face{font-family:f%|1$x|;src:url(f%|1$x|%2%)format(\"%3%\");}.f%|1$x|{font-family:f%|1$x|;") % fn_id % suffix % fontfileformat; + + //allcss_fout << format("@font-face{font-family:f%|1$x|;src:url(f%|1$x|%2%)format(\"%3%\");}.f%|1$x|{font-family:f%|1$x|;") % fn_id % suffix % fontfileformat; + + allcss_fout << format("@font-face{font-family:f%|1$x|;src:url(") % fn_id; + + if(param->single_html) + { + allcss_fout << "'data:font/" << fontfileformat << ";base64,"; + //TODO + allcss_fout << "'"; + } + else + { + allcss_fout << format("f%|1$x|%2%") % fn_id % suffix; + } + + allcss_fout << format(")format(\"%1%\");}.f%|2$x|{font-family:f%|2$x|;") % fontfileformat % fn_id; double a = font->getAscent(); double d = font->getDescent(); diff --git a/src/HTMLRenderer/general.cc b/src/HTMLRenderer/general.cc index 0102686..16c2271 100644 --- a/src/HTMLRenderer/general.cc +++ b/src/HTMLRenderer/general.cc @@ -129,7 +129,21 @@ void HTMLRenderer::startPage(int pageNum, GfxState *state) html_fout << format("