From 33d2a5e1768f2a733c14dfbc3a2c4cc4c5c849c0 Mon Sep 17 00:00:00 2001 From: Stephen Gaito Date: Mon, 29 Jun 2020 12:23:01 +0000 Subject: [PATCH] tested and corrected issue 68 and 66 --- buildScripts/buildPdf2htmlEX | 4 ++++ buildScripts/versionEnvs | 2 +- pdf2htmlEX/src/HTMLRenderer/font.cc | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/buildScripts/buildPdf2htmlEX b/buildScripts/buildPdf2htmlEX index daa62a3..e5452b6 100755 --- a/buildScripts/buildPdf2htmlEX +++ b/buildScripts/buildPdf2htmlEX @@ -2,9 +2,13 @@ # This shell script builds pdf2htmlEX +# source ./buildScripts/reSourceVersionEnvs +. ./buildScripts/reSourceVersionEnvs + echo "" echo "-------------------------------------------------------------------" echo "BUILDING pdf2htmlEX (using gcc)" +echo " PDF2HTMLEX_VERSION = [$PDF2HTMLEX_VERSION]" echo "-------------------------------------------------------------------" echo "" diff --git a/buildScripts/versionEnvs b/buildScripts/versionEnvs index 00ac4b6..53a58ac 100755 --- a/buildScripts/versionEnvs +++ b/buildScripts/versionEnvs @@ -6,7 +6,7 @@ # see: https://poppler.freedesktop.org/releases.html # current working: 0.83.0 -export PDF2HTMLEX_VERSION=0.18.8.alpha +export PDF2HTMLEX_VERSION=0.18.8.rc1 export POPPLER_VERSION=poppler-0.89.0 #export POPPLER_VERSION=poppler-0.88.0 diff --git a/pdf2htmlEX/src/HTMLRenderer/font.cc b/pdf2htmlEX/src/HTMLRenderer/font.cc index 6f240ba..b93e9be 100644 --- a/pdf2htmlEX/src/HTMLRenderer/font.cc +++ b/pdf2htmlEX/src/HTMLRenderer/font.cc @@ -1003,7 +1003,7 @@ void HTMLRenderer::export_remote_font(const FontInfo & info, const string & form { string css_turn_off_ligatures = ""; if (param.turn_off_ligatures) { - css_turn_off_ligatures = "font-variant-ligatures:none;font-feature-settings: "liga" 0, "clig" 0, "dlig" 0, "hlig" 0, "calt" 0;"; + css_turn_off_ligatures = "font-variant-ligatures:none;font-feature-settings: \"liga\" 0, \"clig\" 0, \"dlig\" 0, \"hlig\" 0, \"calt\" 0;"; } string css_font_format; if(format == "ttf") @@ -1059,7 +1059,6 @@ void HTMLRenderer::export_remote_font(const FontInfo & info, const string & form f_css.fs << ")" << "format(\"" << css_font_format << "\");" - << css_turn_off_ligatures << "}" // end of @font-face << "." << CSS::FONT_FAMILY_CN << info.id << "{" << "font-family:" << CSS::FONT_FAMILY_CN << info.id << ";" @@ -1067,6 +1066,7 @@ void HTMLRenderer::export_remote_font(const FontInfo & info, const string & form << "font-style:normal;" << "font-weight:normal;" << "visibility:visible;" + << css_turn_off_ligatures << "}" << endl; }