tested and corrected issue 68 and 66

This commit is contained in:
Stephen Gaito 2020-06-29 12:23:01 +00:00
parent 89c74c7b21
commit 33d2a5e176
3 changed files with 7 additions and 3 deletions

View File

@ -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 ""

View File

@ -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

View File

@ -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;
}