Update to tFPDF 1.33

Setasign · Dec 20, 2022 · 050de12 · 050de12
1 parent a879b83
commit 050de12
Show file tree

Hide file tree

Showing 3 changed files with 120 additions and 126 deletions.
diff --git a/font/unifont/ttfonts.php b/font/unifont/ttfonts.php
@@ -1,15 +1,13 @@
 <?php
-
-
 /*******************************************************************************
 * TTFontFile class                                                             *
 *                                                                              *
 * This class is based on The ReportLab Open Source PDF library                 *
 * written in Python - http://www.reportlab.com/software/opensource/            *
 * together with ideas from the OpenOffice source code and others.              *
 *                                                                              *
-* Version:  1.05                                                               *
-* Date:     2018-03-19                                                         *
+* Version:  1.06                                                               *
+* Date:     2022-12-20                                                         *
 * Author:   Ian Back <[email protected]>                                           *
 * License:  LGPL                                                               *
 * Copyright (c) Ian Back, 2010                                                 *
@@ -37,37 +35,44 @@
 
 class TTFontFile {
 
-var $maxUni;
-var $_pos;
-var $numTables;
-var $searchRange;
-var $entrySelector;
-var $rangeShift;
-var $tables;
-var $otables;
-var $filename;
-var $fh;
-var $hmetrics;
-var $glyphPos;
-var $charToGlyph;
-var $ascent;
-var $descent;
-var $name;
-var $familyName;
-var $styleName;
-var $fullName;
-var $uniqueFontID;
-var $unitsPerEm;
-var $bbox;
-var $capHeight;
-var $stemV;
-var $italicAngle;
-var $flags;
-var $underlinePosition;
-var $underlineThickness;
-var $charWidths;
-var $defaultWidth;
-var $maxStrLenRead;
+public $maxUni;
+public $maxUniChar;
+public $sFamilyClass;
+public $sFamilySubClass;
+public $_pos;
+public $numTables;
+public $searchRange;
+public $entrySelector;
+public $rangeShift;
+public $tables;
+public $otables;
+public $filename;
+public $fh;
+public $hmetrics;
+public $glyphPos;
+public $charToGlyph;
+public $codeToGlyph;
+public $glyphdata;
+public $ascent;
+public $descent;
+public $TTCFonts;
+public $version;
+public $name;
+public $familyName;
+public $styleName;
+public $fullName;
+public $uniqueFontID;
+public $unitsPerEm;
+public $bbox;
+public $capHeight;
+public $stemV;
+public $italicAngle;
+public $flags;
+public $underlinePosition;
+public $underlineThickness;
+public $charWidths;
+public $defaultWidth;
+public $maxStrLenRead;
 
 	function __construct() {
 		$this->maxStrLenRead = 200000;	// Maximum size of glyf table to read in as string (otherwise reads each glyph from file)
@@ -1080,10 +1085,6 @@ function endTTFile(&$stm) {
 		return $stm ;
 	}
 
-
-
-
 }
 
-
-?>
+?>
diff --git a/info.htm b/info.htm
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>tFPDF</title>
 <style type="text/css">
 body {font-family:"Times New Roman",serif}