| @@ -32,10 +32,10 @@ | ||
| 32 | 32 | else { $ttfdir = _MPDF_TTFONTPATH; } |
| 33 | 33 | |
| 34 | 34 | $mqr=ini_get("magic_quotes_runtime"); |
| 35 | 35 | if ($mqr) { set_magic_quotes_runtime(0); } |
| 36 | -if (!class_exists('TTFontFile_Analysis', false)) { include(_MPDF_PATH .'classes/ttfontsuni_analysis.php'); } | |
| 37 | -$ttf = new TTFontFile_Analysis(); | |
| 36 | +if (!class_exists('TTFontFile', false)) { include(_MPDF_PATH .'classes/ttfontsuni.php'); } | |
| 37 | +$ttf = new TTFontFile(); | |
| 38 | 38 | |
| 39 | 39 | $tempfontdata = array(); |
| 40 | 40 | $tempsansfonts = array(); |
| 41 | 41 | $tempseriffonts = array(); |
| @@ -80,11 +80,9 @@ | ||
| 80 | 80 | //if ($ret[$i][5]) { $tempfontdata[$fname]['rtl'] = true; } |
| 81 | 81 | //if ($ret[$i][7]) { $tempfontdata[$fname]['cjk'] = true; } |
| 82 | 82 | if ($ret[$i][8]) { $tempfontdata[$fname]['sip'] = true; } |
| 83 | 83 | if ($ret[$i][9]) { $tempfontdata[$fname]['smp'] = true; } |
| 84 | - if ($ret[$i][10]) { $tempfontdata[$fname]['puaag'] = true; } | |
| 85 | - if ($ret[$i][11]) { $tempfontdata[$fname]['pua'] = true; } | |
| 86 | - if ($ret[$i][12]) { $tempfontdata[$fname]['unAGlyphs'] = true; } | |
| 84 | + | |
| 87 | 85 | $ftype = $ret[$i][3]; // mono, sans or serif |
| 88 | 86 | if ($ftype=='sans') { $tempsansfonts[] = $fname; } |
| 89 | 87 | else if ($ftype=='serif') { $tempseriffonts[] = $fname; } |
| 90 | 88 | else if ($ftype=='mono') { $tempmonofonts[] = $fname; } |
| @@ -117,17 +115,8 @@ | ||
| 117 | 115 | if (isset($tempfontdata[$fname]['smp']) && $tempfontdata[$fname]['smp']) { |
| 118 | 116 | if (!$pdf) echo 'INFO - Font file '.$fname.' contains characters in Unicode Plane 1 SMP<br />'; |
| 119 | 117 | $tempfontdata[$fname]['smp'] = false; |
| 120 | 118 | } |
| 121 | -// if (isset($tempfontdata[$fname]['pua']) && $tempfontdata[$fname]['pua']) { | |
| 122 | -// if (!$pdf) echo 'INFO - Font file '.$fname.' contains characters in Unicode Private Use Area (U+E000-U+F8FF)<br />'; | |
| 123 | -// } | |
| 124 | - if (isset($tempfontdata[$fname]['unAGlyphs']) && $tempfontdata[$fname]['unAGlyphs']) { | |
| 125 | - if (!$pdf) echo 'INFO - Font file '.$fname.' contains non-indexed Arabic Glyphs "unAGlyphs" (which can be mapped to U+F500-U+F7FF)<br />'; | |
| 126 | - if (isset($tempfontdata[$fname]['puaag']) && $tempfontdata[$fname]['puaag']) { | |
| 127 | - if (!$pdf) echo 'WARNING - Font file '.$fname.' already includes mapped characters in the part of Unicode Private Use Area which mPDF uses for mapping non-indexed Arabic Glyphs "unAGlyphs" (U+F500-U+F7FF)<br />'; | |
| 128 | - } | |
| 129 | - } | |
| 130 | 119 | if (isset($tempfontdata[$fname]['sip']) && $tempfontdata[$fname]['sip']) { |
| 131 | 120 | if (!$pdf) echo 'INFO - Font file '.$fname.' contains characters in Unicode Plane 2 SIP<br />'; |
| 132 | 121 | if (preg_match('/^(.*)-extb/',$fname, $fm)) { |
| 133 | 122 | if (isset($tempfontdata[($fm[1])]) && $tempfontdata[($fm[1])]) { |
| @@ -142,11 +131,8 @@ | ||
| 142 | 131 | // else { unset($tempfontdata[$fname]['sip']); } |
| 143 | 132 | } |
| 144 | 133 | unset($tempfontdata[$fname]['sip']); |
| 145 | 134 | unset($tempfontdata[$fname]['smp']); |
| 146 | - unset($tempfontdata[$fname]['pua']); | |
| 147 | - unset($tempfontdata[$fname]['puaag']); | |
| 148 | - unset($tempfontdata[$fname]['unAGlyphs']); | |
| 149 | 135 | } |
| 150 | 136 | |
| 151 | 137 | $mpdf->fontdata = array_merge($tempfontdata ,$mpdf->fontdata); |
| 152 | 138 | |
