Removed error_reporting (#140)

ole · web-flow · commit 45c2a26e162c · 2020-04-05T12:16:32.000+02:00
* Removed error_reporting
* Fixed full justification during line breaks using $pdf-&gt;ezText()
diff --git a/data.txt b/data.txt
@@ -31,6 +31,7 @@ Note that this document was generated using the demo script 'readme.php' which c
 
 3<0.12.61>
 - Fixed issue #139
+- Fixed full justification during line breaks using $pdf->ezText()
 
 3<0.12.60>
 - Compatibility for php 7.4 using PR #136
@@ -52,11 +53,6 @@ Note that this document was generated using the demo script 'readme.php' which c
 - Fixed addTextWrap method
 - Fixed issue #132
 
-3<0.12.55>
-
-- Image quality never greater 75% in addImage method #130
-- Possible fix for infinite loop when a word does not fit cell #129
-
 Please refer to https://github.com/rospdf/pdf-php/releases for all previous changes
 
 #NP
@@ -544,8 +540,7 @@ Note that the code for the example and the actual one shown are not identical fo
 
 2<addText> (x,y,size,text[,width=0][,justification='left'][,angle=0][,wordspace=0][,test=0)
 
-Add the text at a particular location on the page, noting that the origin on the axes in a pdf document is in the lower left corner by default.
-An angle can be supplied as this will do the obvious (in degrees).
+Add the text at a particular location on the page, noting that the origin on the axes in a pdf document is in the lower left corner by default. An angle can be supplied as this will do the obvious (in degrees).
 
 'adjust', gives the value of units to be added to the width of each space within the text. This is used mainly to support the justification options within the ezpdf ezText function.
 
diff --git a/examples/annotations.php b/examples/annotations.php
@@ -1,6 +1,5 @@
 <?php
 
-error_reporting(E_ALL);
 set_time_limit(1800);
 set_include_path('../src/'.PATH_SEPARATOR.get_include_path());
 
diff --git a/examples/barcode.php b/examples/barcode.php
@@ -1,6 +1,4 @@
 <?php
-
-error_reporting(E_ALL);
 set_include_path('../src/'.PATH_SEPARATOR.get_include_path());
 
 include 'Cezpdf.php';
diff --git a/examples/color.php b/examples/color.php
@@ -1,6 +1,4 @@
 <?php
-
-error_reporting(E_ALL);
 set_include_path('../src/'.PATH_SEPARATOR.get_include_path());
 date_default_timezone_set('UTC');
 
diff --git a/examples/encryption.php b/examples/encryption.php
@@ -1,6 +1,4 @@
 <?php
-
-error_reporting(E_ALL);
 set_include_path('../src/'.PATH_SEPARATOR.get_include_path());
 date_default_timezone_set('UTC');
 
diff --git a/examples/fonts.php b/examples/fonts.php
@@ -1,6 +1,4 @@
 <?php
-
-error_reporting(E_ALL);
 set_include_path('../src/'.PATH_SEPARATOR.get_include_path());
 date_default_timezone_set('UTC');
 
diff --git a/examples/image.php b/examples/image.php
@@ -1,6 +1,4 @@
 <?php
-
-error_reporting(E_ALL);
 set_include_path('../src/'.PATH_SEPARATOR.get_include_path());
 date_default_timezone_set('UTC');
 
diff --git a/examples/imageObjectHash.php b/examples/imageObjectHash.php
@@ -1,6 +1,4 @@
 <?php
-
-error_reporting(E_ALL);
 set_include_path('../src/'.PATH_SEPARATOR.get_include_path());
 date_default_timezone_set('UTC');
 
diff --git a/examples/imagetext.php b/examples/imagetext.php
@@ -1,5 +1,4 @@
 <?php
-error_reporting(E_ALL);
 set_include_path('../src/'.PATH_SEPARATOR.get_include_path());
 date_default_timezone_set('UTC');
 
diff --git a/examples/table-enhancements.php b/examples/table-enhancements.php
@@ -1,6 +1,4 @@
 <?php
-
-error_reporting(E_ALL);
 date_default_timezone_set('UTC');
 
 include_once '../src/Cezpdf.php';
diff --git a/examples/unicode-file.php b/examples/unicode-file.php
@@ -1,6 +1,4 @@
 <?php
-
-error_reporting(E_ALL & ~E_NOTICE);
 set_include_path('../src/'.PATH_SEPARATOR.get_include_path());
 
 include 'Cezpdf.php';
@@ -11,31 +9,24 @@ public function __construct($p, $o)
     {
         parent::__construct($p, $o, 'none', []);
         $this->isUnicode = true;
-        // always embed the font for the time being
-        //$this->embedFont = false;
-        // since version 0.11.8 it is required to allow custom callbacks
         $this->allowedTags .= '|uline';
     }
 }
-$pdf = new Creport('a4', 'portrait');
 
-$start = microtime(true);
+$pdf = new Creport('a4', 'portrait');
 
 $pdf->ezSetMargins(20, 20, 20, 20);
-//$pdf->rtl = true; // all text output to "right to left"
-//$pdf->setPreferences('Direction','R2L'); // optional: set the preferences to "Right To Left"
 
-$f = (isset($_GET['font'])) ? $_GET['font'] : 'FreeSerif';
+$mainFont = (isset($_GET['font'])) ? $_GET['font'] : 'FreeSerif';
 
 $tmp = array(
-    'b' => 'FreeSerifBold',
+    'b' => $mainFont .'Bold',
 );
+
 $pdf->setFontFamily('FreeSerif', $tmp);
 
-$mainFont = $f;
-// select a font
+// select a font and fully embed it
 $pdf->selectFont($mainFont);
-$pdf->openHere('Fit');
 
 $content = file_get_contents('utf8.txt');
 
diff --git a/examples/unicode.php b/examples/unicode.php
@@ -1,6 +1,4 @@
 <?php
-
-error_reporting(E_ALL & ~E_NOTICE);
 set_include_path('../src/'.PATH_SEPARATOR.get_include_path());
 
 include 'Cezpdf.php';
@@ -12,10 +10,9 @@ public function __construct($p, $o)
         parent::__construct($p, $o, 'none', []);
         $this->isUnicode = true;
         $this->allowedTags .= '|uline';
-        // always embed the font for the time being
-        //$this->embedFont = false;
     }
 }
+
 $pdf = new Creport('a4', 'portrait');
 
 $pdf->ezSetMargins(20, 20, 20, 20);
@@ -30,6 +27,7 @@ public function __construct($p, $o)
 
 // select a font and use font subsetting
 $pdf->selectFont($mainFont, '', 1, true);
+
 $pdf->ezText('Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidfgfdgdfgdfgdfg ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur. et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur', 10, ['justification' => 'full']);
 $pdf->ezText("\n<b>Greek: (full justified)</b>");
 $pdf->ezText('Νες εα ελεστραμ σορρυμπιθ ινστρυσθιορ, υσυ διαμ ωπωρθεαθ τεμποριβυς ετ. Προμπτα βλανδιτ μωδερατιυς ευμ ευ, σεθερο ρεπυδιαρε αν φελ, φιξ πυρθο ρεγιονε φολυπθυα ατ. Σιθ δυις σωνσυλ ιρασυνδια ατ, νε νιηιλ φενιαμ φεριθυς ιυς, συ μελιορε ερροριβυς δισπυθανδο εσθ. Ηις εσεντ σοπιωσαε ιδ. Εξ εως μεις αυγυε ρεσυσαβο, φιξ φοσεντ μαλορυμ ινσιδεριντ ιν. Δισο ναθυμ σοντεντιωνες ευ μει.', 10, ['justification' => 'full']);
diff --git a/examples/utf8.txt b/examples/utf8.txt
@@ -8,4 +8,3 @@ Cyrillic
 
 Hebrew
 שתי ב משחקים מועמדים. מה ארץ כדור אחרות המלחמה, אנא ב רפואה העזרה. אתה בה חינוך והנדסה הנאמנים, אל זכר שדרות מוסיקה שימושי. של המזנון צרפתית היא, שתי של והוא ביוני בגרסה, סטטיסטיקה בויקיפדיה אחד דת. מה ברית מחליטה רשימות מדע, או אנגלית הקנאים טכנולוגיה עוד.
-
diff --git a/extensions/CezDummy.php b/extensions/CezDummy.php
@@ -4,7 +4,6 @@
  *
  * This template file is an example on how to use extensions for Cezpdf or Cpdf
  */
-error_reporting(E_ALL);
 set_time_limit(1800);
 set_include_path('../src/'.PATH_SEPARATOR.get_include_path());
 include 'Cezpdf.php';
diff --git a/extensions/CezTableImage.php b/extensions/CezTableImage.php
@@ -27,7 +27,6 @@
  *
  * @version 1.11 fix for problems with big pictures (pictures with width > 2000px were not shown in the table)
  */
-error_reporting(E_ALL);
 set_time_limit(1800);
 set_include_path('../src/'.PATH_SEPARATOR.get_include_path());
 include 'Cezpdf.php';
diff --git a/readme.php b/readme.php
@@ -13,8 +13,6 @@
 //===================================================================================================
 
 // don't want any warnings turning up in the pdf code if the server is set to 'anal' mode.
-//error_reporting(7);
-//error_reporting(E_ALL);
 date_default_timezone_set('UTC');
 
 include './src/Cezpdf.php';
diff --git a/src/Cezpdf.php b/src/Cezpdf.php
@@ -1974,15 +1974,21 @@ public function ezText($text, $size = 0, $options = [], $test = 0)
                 } else {
                     $right = $this->ez['pageWidth'] - $this->ez['rightMargin'] - ((is_array($options) && isset($options['right'])) ? $options['right'] : 0);
                 }
-
-                if ($just == 'full' && $c == $i + 1) {
+                
+                if ($just == 'full' && (empty($lines[$i + 1]) || $c == $i + 1)) {
+                    // do not fully justify if its the absolute last line (taking line breaks into account)
                     $tmp = $this->addText($left, $this->y, $size, $line, $right - $left, $just, 0, 0, 1);
                     if (!strlen($tmp)) {
                         $just = "left";
                     }
                 }
 
                 $line = $this->addText($left, $this->y, $size, $line, $right - $left, $just, 0, 0, $test);
+
+                if (is_array($options) && isset($options['justification'])) {
+                    // recover justification
+                    $just = $options['justification'];
+                }
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`<?php`
`2`		`-error_reporting(E_ALL);`
`3`	`2`	`set_include_path('../src/'.PATH_SEPARATOR.get_include_path());`
`4`	`3`	`date_default_timezone_set('UTC');`
`5`	`4`