Merge pull request #31 from rospdf/recovered-addtextwrap

recovered method addTextWrap and corrected windows temp path
rospdf · Jun 1, 2016 · 140b998 · 140b998
2 parents 64123db + 787b7c2
commit 140b998
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 vendor
+/.vscode
diff --git a/data.txt b/data.txt
@@ -29,6 +29,11 @@ Note that this document was generated using the demo script 'readme.php' which c
 
 1<Changes>
 
+2<0.12.22>
+
+- recovered the addTextWrap method
+- corrected temp path for windows systems using php-cgi 
+
 2<0.12.21>
 
 - added image rotation support

diff --git a/examples/encryption.php b/examples/encryption.php
@@ -8,7 +8,7 @@
 $pdf = new Cezpdf('a4','portrait');
 // to test on windows xampp
 if(strpos(PHP_OS, 'WIN') !== false){
-    $pdf->tempPath = 'E:/xampp/xampp/tmp';
+    $pdf->tempPath = 'C:/temp';
 }
 
 if(!isset($_GET['nocrypt'])){

diff --git a/examples/fonts.php b/examples/fonts.php
@@ -12,9 +12,9 @@ function Creport($p,$o){
 }
 $pdf = new Creport('a4','portrait');
 // to test on windows xampp
-  if(strpos(PHP_OS, 'WIN') !== false){
-    $pdf->tempPath = 'E:/xampp/xampp/tmp';
-  }
+if(strpos(PHP_OS, 'WIN') !== false){
+    $pdf->tempPath = 'C:/temp';
+}
 
 $pdf->ezSetMargins(20,20,20,20);
 $pdf->openHere('Fit');

diff --git a/examples/image.php b/examples/image.php
@@ -13,7 +13,7 @@ function Creport($p,$o){
 $pdf = new Creport('a4','portrait');
 // to test on windows xampp
 if(strpos(PHP_OS, 'WIN') !== false){
-    $pdf->tempPath = 'E:/xampp/xampp/tmp';
+    $pdf->tempPath = 'C:/temp';
 }
 
 $pdf -> ezSetMargins(20,20,20,20);

diff --git a/examples/test.php b/examples/test.php
@@ -12,6 +12,10 @@ function Creport($p,$o){
 	}
 }
 $pdf = new Creport('a4','portrait');
+// to test on windows xampp
+if(strpos(PHP_OS, 'WIN') !== false){
+    $pdf->tempPath = 'C:/temp';
+}
 // make sure cache is regenerated
 $pdf->cacheTimeout = 0;
 
@@ -24,10 +28,13 @@ function Creport($p,$o){
 $pdf->openHere('Fit');
 
 $pdf->selectFont('Helvetica');
-for($i = 1; $i <= 1; $i++){
-    $pdf->ezText("Lorem $ £ € ipsum dol $i");
+$result = '';
+for($i = 1; $i <= 50; $i++){
+    $result.='Lorem ipsum dol sit ';
 }
 
+$pdf->addTextWrap(100, 600,10,$result, 250, 'full');
+
 if (isset($_GET['d']) && $_GET['d']){
   $pdfcode = $pdf->ezOutput(1);
   $pdfcode = str_replace("\n","\n<br>",htmlspecialchars($pdfcode));

diff --git a/readme.pdf b/readme.pdf
diff --git a/readme.php b/readme.php
@@ -69,13 +69,14 @@ function dots($info){
 // this code has been modified to use ezpdf.
 
 $project_url = "http://pdf-php.sf.net";
-$project_version = "0.12.21";
+$project_version = "0.12.22";
 
 $pdf = new Creport('a4','portrait', 'none', null);
 // to test on windows xampp
-  if(strpos(PHP_OS, 'WIN') !== false){
-    $pdf->tempPath = 'E:/xampp/xampp/tmp';
-  }
+if(strpos(PHP_OS, 'WIN') !== false){
+    $pdf->tempPath = 'C:/temp';
+}
+
 $start = microtime(true);
 
 // IMPORTANT: To allow custom callbacks being executed

diff --git a/src/Cpdf.php b/src/Cpdf.php
@@ -3078,6 +3078,13 @@ public function addText($x, $y, $size, $text, $width = 0, $justification = 'left
         return '';
     }
 
+    public function addTextWrap($x, $y, $size, $text, $width = 0, $justification = 'left', $angle = 0, $wordSpaceAdjust = 0, $test=0){
+        while($text) {
+            $text = $this->addText($x, $y, $size, $text, $width, $justification, $angle, $wordSpaceAdjust, $test);
+            if($text) $y-= $this->getFontHeight($size);
+        }       
+    }
+
     /*
      * unicode version of php ord to get the decimal of an utf-8 character
      */