5.0.003

CHANGELOG.TXT

@@ -1,3 +1,7 @@
+5.0.003 (2010-05-07)
+	- Horizontal alignment was fixed for images and barcodes. Now the X coordinate is always relative to the left margin. Use GetAbsX() instead of GetX() to get the X relative to left margin.
+	- Header() method was changed to account for new image alignment rules.
+
 5.0.002 (2010-05-06)
 	- Bookmark() and related methods were fixed to accept HTML code.
 	- A problem on HTML links was fixed.

README.TXT

@@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
 ------------------------------------------------------------
 
 Name: TCPDF
-Version: 5.0.002
+Version: 5.0.003
-Release date: 2010-05-06
+Release date: 2010-05-07
 Author:	Nicola Asuni
 	
 Copyright (c) 2001-2010:

doc/classtrees_com-tecnick-tcpdf.html

@@ -55,7 +55,7 @@
 
         <div class="credit">
 		    <hr />
-		    Documentation generated on Thu, 06 May 2010 16:26:32 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
+		    Documentation generated on Fri, 07 May 2010 11:51:48 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
 	      </div>
       </td></tr></table>
     </td>

doc/com-tecnick-tcpdf/QRcode.html

@@ -5548,7 +5548,7 @@ $frame)</code>
 
         <div class="credit">
 		    <hr />
-		    Documentation generated on Thu, 06 May 2010 16:26:32 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
+		    Documentation generated on Fri, 07 May 2010 11:51:48 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
 	      </div>
       </td></tr></table>
     </td>

doc/com-tecnick-tcpdf/TCPDF2DBarcode.html

@@ -296,7 +296,7 @@ $type)</code>
 
         <div class="credit">
 		    <hr />
-		    Documentation generated on Thu, 06 May 2010 16:26:32 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
+		    Documentation generated on Fri, 07 May 2010 11:51:48 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
 	      </div>
       </td></tr></table>
     </td>

doc/com-tecnick-tcpdf/TCPDFBarcode.html

@@ -1374,7 +1374,7 @@ $type)</code>
 
         <div class="credit">
 		    <hr />
-		    Documentation generated on Thu, 06 May 2010 16:26:32 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
+		    Documentation generated on Fri, 07 May 2010 11:51:48 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
 	      </div>
       </td></tr></table>
     </td>

doc/com-tecnick-tcpdf/_2dbarcodes.php.html

@@ -102,7 +102,7 @@ PHP class to creates array representations for 2D barcodes to be used with TCPDF
 
         <div class="credit">
 		    <hr />
-		    Documentation generated on Thu, 06 May 2010 16:26:32 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
+		    Documentation generated on Fri, 07 May 2010 11:51:48 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
 	      </div>
       </td></tr></table>
     </td>

doc/com-tecnick-tcpdf/_barcodes.php.html

@@ -102,7 +102,7 @@ PHP class to creates array representations for common 1D barcodes to be used wit
 
         <div class="credit">
 		    <hr />
-		    Documentation generated on Thu, 06 May 2010 16:26:32 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
+		    Documentation generated on Fri, 07 May 2010 11:51:48 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
 	      </div>
       </td></tr></table>
     </td>

doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html

@@ -539,7 +539,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
 
         <div class="credit">
 		    <hr />
-		    Documentation generated on Thu, 06 May 2010 16:26:36 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
+		    Documentation generated on Fri, 07 May 2010 11:51:52 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
 	      </div>
       </td></tr></table>
     </td>

doc/com-tecnick-tcpdf/_htmlcolors.php.html

@@ -94,7 +94,7 @@ Array of WEB safe colors.<br /><br /><br /><br />
 
         <div class="credit">
 		    <hr />
-		    Documentation generated on Thu, 06 May 2010 16:26:32 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
+		    Documentation generated on Fri, 07 May 2010 11:51:48 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
 	      </div>
       </td></tr></table>
     </td>

doc/com-tecnick-tcpdf/_qrcode.php.html

@@ -477,7 +477,7 @@ string $string, [int $split_length = 1])</code>
 
         <div class="credit">
 		    <hr />
-		    Documentation generated on Thu, 06 May 2010 16:26:32 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
+		    Documentation generated on Fri, 07 May 2010 11:51:48 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
 	      </div>
       </td></tr></table>
     </td>

doc/com-tecnick-tcpdf/_tcpdf.php.html

@@ -79,7 +79,7 @@ This is a PHP class for generating PDF documents without requiring external exte
     <td><b>author:</b>&nbsp;&nbsp;</td><td>Nicola Asuni</td>
   </tr>
   <tr>
-    <td><b>version:</b>&nbsp;&nbsp;</td><td>5.0.002</td>
+    <td><b>version:</b>&nbsp;&nbsp;</td><td>5.0.003</td>
   </tr>
   <tr>
     <td><b>copyright:</b>&nbsp;&nbsp;</td><td>2002-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com</td>
@@ -110,7 +110,7 @@ unicode data<br /><br /></div>
 	<div class="tags">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
-		<code>PDF_PRODUCER = 'TCPDF 5.0.002 (http://www.tcpdf.org)'</code>
+		<code>PDF_PRODUCER = 'TCPDF 5.0.003 (http://www.tcpdf.org)'</code>
     </td></tr></table>
     </td></tr></table>
 
@@ -121,7 +121,7 @@ unicode data<br /><br /></div>
 
         <div class="credit">
 		    <hr />
-		    Documentation generated on Thu, 06 May 2010 16:26:33 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
+		    Documentation generated on Fri, 07 May 2010 11:51:49 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
 	      </div>
       </td></tr></table>
     </td>

doc/com-tecnick-tcpdf/_unicode_data.php.html

@@ -243,7 +243,7 @@ Unicode Include file for TCPDF.<br /><br /><br /><br />
 
         <div class="credit">
 		    <hr />
-		    Documentation generated on Thu, 06 May 2010 16:26:36 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
+		    Documentation generated on Fri, 07 May 2010 11:51:52 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
 	      </div>
       </td></tr></table>
     </td>

doc/elementindex.html

@@ -1942,7 +1942,7 @@
 	<a href="elementindex.html#top">top</a><br>
         <div class="credit">
 		    <hr />
-		    Documentation generated on Thu, 06 May 2010 16:26:32 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
+		    Documentation generated on Fri, 07 May 2010 11:51:48 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
 	      </div>
       </td></tr></table>
     </td>

doc/elementindex_com-tecnick-tcpdf.html

@@ -1971,7 +1971,7 @@
 	<a href="elementindex_com-tecnick-tcpdf.html#top">top</a><br>
         <div class="credit">
 		    <hr />
-		    Documentation generated on Thu, 06 May 2010 16:26:32 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
+		    Documentation generated on Fri, 07 May 2010 11:51:48 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
 	      </div>
       </td></tr></table>
     </td>

doc/errors.html

@@ -37,14 +37,14 @@
 <a name="tcpdf.php"></a>
 <h1>tcpdf.php</h1>
 <h2>Warnings:</h2><br>
-<b>Warning on line 17703</b> - Unknown tag "@parma" used<br>
+<b>Warning on line 17701</b> - Unknown tag "@parma" used<br>
 <a name="2dbarcodes.php"></a>
 <h1>2dbarcodes.php</h1>
 <h2>Errors:</h2><br>
 <b>Error on line 79</b> - Text cannot be outside of li tag in a DocBlock list, parsing will be incorrect<br>
         <div class="credit">
 		    <hr />
-		    Documentation generated on Thu, 06 May 2010 16:26:36 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
+		    Documentation generated on Fri, 07 May 2010 11:51:52 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
 	      </div>
       </td></tr></table>
     </td>

doc/index.html

@@ -64,7 +64,7 @@
 This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.3</a><br />
         <div class="credit">
 		    <hr />
-		    Documentation generated on Thu, 06 May 2010 16:26:32 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
+		    Documentation generated on Fri, 07 May 2010 11:51:48 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
 	      </div>
       </td></tr></table>
     </td>

doc/li_com-tecnick-tcpdf.html

@@ -64,7 +64,7 @@
 This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.3</a><br />
         <div class="credit">
 		    <hr />
-		    Documentation generated on Thu, 06 May 2010 16:26:32 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
+		    Documentation generated on Fri, 07 May 2010 11:51:48 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
 	      </div>
       </td></tr></table>
     </td>

tcpdf.php

@@ -2,9 +2,9 @@
 //============================================================+
 // File name   : tcpdf.php
 // Begin       : 2002-08-03
-// Last Update : 2010-05-06
+// Last Update : 2010-05-07
 // Author      : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org
-// Version     : 5.0.002
+// Version     : 5.0.003
 // License     : GNU LGPL (http://www.gnu.org/copyleft/lesser.html)
 // 	----------------------------------------------------------------------------
 //  Copyright (C) 2002-2010  Nicola Asuni - Tecnick.com S.r.l.
@@ -122,7 +122,7 @@
  * @copyright 2002-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
  * @link http://www.tcpdf.org
  * @license http://www.gnu.org/copyleft/lesser.html LGPL
- * @version 5.0.002
+ * @version 5.0.003
  */
 
 /**
@@ -146,14 +146,14 @@ if (!class_exists('TCPDF', false)) {
 	/**
 	 * define default PDF document producer
 	 */
-	define('PDF_PRODUCER', 'TCPDF 5.0.002 (http://www.tcpdf.org)');
+	define('PDF_PRODUCER', 'TCPDF 5.0.003 (http://www.tcpdf.org)');
 
 	/**
 	* This is a PHP class for generating PDF documents without requiring external extensions.<br>
 	* TCPDF project (http://www.tcpdf.org) has been originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.<br>
 	* @name TCPDF
 	* @package com.tecnick.tcpdf
-	* @version 5.0.002
+	* @version 5.0.003
 	* @author Nicola Asuni - info@tecnick.com
 	* @link http://www.tcpdf.org
 	* @license http://www.gnu.org/copyleft/lesser.html LGPL
@@ -2885,7 +2885,7 @@ if (!class_exists('TCPDF', false)) {
 			$headerfont = $this->getHeaderFont();
 			$headerdata = $this->getHeaderData();
 			if (($headerdata['logo']) AND ($headerdata['logo'] != K_BLANK_IMAGE)) {
-				$this->Image(K_PATH_IMAGES.$headerdata['logo'], $this->GetX(), $this->getHeaderMargin(), $headerdata['logo_width']);
+				$this->Image(K_PATH_IMAGES.$headerdata['logo'], '', '', $headerdata['logo_width']);
 				$imgy = $this->getImageRBY();
 			} else {
 				$imgy = $this->GetY();
@@ -5361,9 +5361,12 @@ if (!class_exists('TCPDF', false)) {
 					$h = $this->PageBreakTrigger - $y;
 					$w = $h * $ratio_wh;
 				}
-				if (($x + $w) > ($this->w - $this->rMargin)) {
+				if ((!$this->rtl) AND (($x + $w) > ($this->w - $this->rMargin))) {
 					$w = $this->w - $this->rMargin - $x;
 					$h = $w / $ratio_wh;
+				} elseif (($this->rtl) AND (($x - $w) < ($this->lMargin))) {
+					$w = $x - $this->lMargin;
+					$h = $w / $ratio_wh;
 				}
 			}
 			// calculate new minimum dimensions in pixels
@@ -5500,18 +5503,18 @@ if (!class_exists('TCPDF', false)) {
 				if ($palign == 'L') {
 					$ximg = $this->lMargin;
 				} elseif ($palign == 'C') {
-					$ximg = ($this->w - $w) / 2;
+					$ximg = ($this->w + $this->lMargin - $this->rMargin - $w) / 2;
 				} elseif ($palign == 'R') {
 					$ximg = $this->w - $this->rMargin - $w;
 				} else {
-					$ximg = $this->w - $x - $w;
+					$ximg = $x - $w;
 				}
 				$this->img_rb_x = $ximg;
 			} else {
 				if ($palign == 'L') {
 					$ximg = $this->lMargin;
 				} elseif ($palign == 'C') {
-					$ximg = ($this->w - $w) / 2;
+					$ximg = ($this->w + $this->lMargin - $this->rMargin - $w) / 2;
 				} elseif ($palign == 'R') {
 					$ximg = $this->w - $this->rMargin - $w;
 				} else {
@@ -13021,9 +13024,12 @@ if (!class_exists('TCPDF', false)) {
 					$h = $this->PageBreakTrigger - $y;
 					$w = $h * $ratio_wh;
 				}
-				if (($x + $w) > ($this->w - $this->rMargin)) {
+				if ((!$this->rtl) AND (($x + $w) > ($this->w - $this->rMargin))) {
 					$w = $this->w - $this->rMargin - $x;
 					$h = $w / $ratio_wh;
+				} elseif (($this->rtl) AND (($x - $w) < ($this->lMargin))) {
+					$w = $x - $this->lMargin;
+					$h = $w / $ratio_wh;
 				}
 			}
 			// set scaling factors
@@ -13036,18 +13042,18 @@ if (!class_exists('TCPDF', false)) {
 				if ($palign == 'L') {
 					$ximg = $this->lMargin;
 				} elseif ($palign == 'C') {
-					$ximg = ($this->w - $w) / 2;
+					$ximg = ($this->w + $this->lMargin - $this->rMargin - $w) / 2;
 				} elseif ($palign == 'R') {
 					$ximg = $this->w - $this->rMargin - $w;
 				} else {
-					$ximg = $this->w - $x - $w;
+					$ximg = $x - $w;
 				}
 				$this->img_rb_x = $ximg;
 			} else {
 				if ($palign == 'L') {
 					$ximg = $this->lMargin;
 				} elseif ($palign == 'C') {
-					$ximg = ($this->w - $w) / 2;
+					$ximg = ($this->w + $this->lMargin - $this->rMargin - $w) / 2;
 				} elseif ($palign == 'R') {
 					$ximg = $this->w - $this->rMargin - $w;
 				} else {
@@ -13235,14 +13241,14 @@ if (!class_exists('TCPDF', false)) {
 		 * @param int $w width in user units
 		 * @param int $h height in user units
 		 * @param float $xres width of the smallest bar in user units
-		 * @param array $style array of options:<ul><li>string $style['position'] barcode position inside the specified width: L = left (default for LTR); C = center; R = right (default for RTL); S = stretch</li><li>boolean $style['border'] if true prints a border around the barcode</li><li>int $style['padding'] padding to leave around the barcode in user units (set to 'auto' for automatic padding)</li><li>array $style['fgcolor'] color array for bars and text</li><li>mixed $style['bgcolor'] color array for background or false for transparent</li><li>boolean $style["text"] boolean if true prints text below the barcode</li><li>string $style['font'] font name for text</li><li>int $style['fontsize'] font size for text</li><li>int $style['stretchtext']: 0 = disabled; 1 = horizontal scaling only if necessary; 2 = forced horizontal scaling; 3 = character spacing only if necessary; 4 = forced character spacing</li></ul>
+		 * @param array $style array of options:<ul><li>boolean $style['border'] if true prints a border around the barcode</li><li>int $style['padding'] padding to leave around the barcode in user units (set to 'auto' for automatic padding)</li><li>array $style['fgcolor'] color array for bars and text</li><li>mixed $style['bgcolor'] color array for background or false for transparent</li><li>boolean $style["text"] boolean if true prints text below the barcode</li><li>string $style['font'] font name for text</li><li>int $style['fontsize'] font size for text</li><li>int $style['stretchtext']: 0 = disabled; 1 = horizontal scaling only if necessary; 2 = forced horizontal scaling; 3 = character spacing only if necessary; 4 = forced character spacing</li><li>string $style['position'] barcode position on the page: L = left margin; C = center; R = right margin; S = stretch</li></ul>
 		 * @param string $align Indicates the alignment of the pointer next to barcode insertion relative to barcode height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul>
 		 * @author Nicola Asuni
 		 * @since 3.1.000 (2008-06-09)
 		 * @access public
 		 */
 		public function write1DBarcode($code, $type, $x='', $y='', $w='', $h='', $xres=0.4, $style='', $align='') {
-			if ($this->empty_string($code)) {
+			if ($this->empty_string(trim($code))) {
 				return;
 			}
 			require_once(dirname(__FILE__).'/barcodes.php');
@@ -13287,28 +13293,25 @@ if (!class_exists('TCPDF', false)) {
 			// set foreground color
 			$this->SetDrawColorArray($style['fgcolor']);
 			$this->SetTextColorArray($style['fgcolor']);
-			if ($this->empty_string($w) OR ($w <= 0)) {
+			if ($x === '') {
+				$x = $this->x;
+			}
+			if ($y === '') {
+				$y = $this->y;
+			}
+			if (($w === '') OR ($w <= 0)) {
 				if ($this->rtl) {
 					$w = $this->x - $this->lMargin;
 				} else {
 					$w = $this->w - $this->rMargin - $this->x;
 				}
 			}
-			if ($this->empty_string($x)) {
+			if (($h === '') OR ($h <= 0)) {
-				$x = $this->GetX();
+				$h = $w / 3;
-			}
-			if ($this->rtl) {
-				$x = $this->w - $x;
-			}
-			if ($this->empty_string($y)) {
-				$y = $this->GetY();
 			}
 			if ($this->empty_string($xres)) {
 				$xres = 0.4;
 			}
-			if ($this->empty_string($h) OR ($h <= 0)) {
-				$h = $w / 3;
-			}
 			// padding
 			if (!isset($style['padding'])) {
 				$style['padding'] = 0;
@@ -13317,54 +13320,52 @@ if (!class_exists('TCPDF', false)) {
 			}
 			$fbw = ($arrcode['maxw'] * $xres) + (2 * $style['padding']);
 			$extraspace = ($this->cell_height_ratio * $fontsize / $this->k) + (2 * $style['padding']);
-			$prev_x = $this->x;
 			// maximum bar height
 			$barh = $h;
 			$h += $extraspace;
+			// Check whether we need a new page first as this does not fit
+			$prev_x = $this->x;
 			if ($this->checkPageBreak($h, $y)) {
-				$y = $this->GetY() + $this->cMargin;
+				$y = $this->y;
 				if ($this->rtl) {
 					$x += ($prev_x - $this->x);
 				} else {
 					$x += ($this->x - $prev_x);
 				}
 			}
-			switch ($style['position']) {
+			// set alignment
-				case 'L': { // left
+			$this->img_rb_y = $y + $h;
+			// set alignment
 			if ($this->rtl) {
-						$xpos = $x - $w;
+				if ($style['position'] == 'L') {
-					} else {
+					$xpos = $this->lMargin;
-						$xpos = $x;
+				} elseif ($style['position'] == 'C') {
-					}
+					$xpos = ($this->w + $this->lMargin - $this->rMargin - $fbw) / 2;
-					break;
+				} elseif ($style['position'] == 'R') {
-				}
+					$xpos = $this->w - $this->rMargin - $fbw;
-				case 'C': { // center
+				} elseif ($style['position'] == 'S') {
-					$xdiff = (($w - $fbw) / 2);
-					if ($this->rtl) {
-						$xpos = $x - $w + $xdiff;
-					} else {
-						$xpos = $x + $xdiff;
-					}
-					break;
-				}
-				case 'R': { // right
-					if ($this->rtl) {
-						$xpos = $x - $fbw;
-					} else {
-						$xpos = $x + $w - $fbw;
-					}
-					break;
-				}
-				case 'S': { // stretch
 					$fbw = $w;
 					$xres = ($w - (2 * $style['padding'])) / $arrcode['maxw'];
-					if ($this->rtl) {
 					$xpos = $x - $w;
+				} else {
+					$xpos = $x - $fbw;
+				}
+				$this->img_rb_x = $xpos;
+			} else {
+				if ($style['position'] == 'L') {
+					$xpos = $this->lMargin;
+				} elseif ($style['position'] == 'C') {
+					$xpos = ($this->w + $this->lMargin - $this->rMargin - $fbw) / 2;
+				} elseif ($style['position'] == 'R') {
+					$xpos = $this->w - $this->rMargin - $fbw;
+				} elseif ($style['position'] == 'S') {
+					$fbw = $w;
+					$xres = ($w - (2 * $style['padding'])) / $arrcode['maxw'];
+					$xpos = $x;
 				} else {
 					$xpos = $x;
 				}
-					break;
+				$this->img_rb_x = $xpos + $fbw;
-				}
 			}
 			$xpos_rect = $xpos;
 			$xpos = $xpos_rect + $style['padding'];
@@ -13379,7 +13380,6 @@ if (!class_exists('TCPDF', false)) {
 				$this->Rect($xpos_rect, $y, $fbw, $h, 'D');
 			}
 			// print bars
-			if ($arrcode !== false) {
 			foreach ($arrcode['bcode'] as $k => $v) {
 				$bw = ($v['w'] * $xres);
 				if ($v['t']) {
@@ -13389,7 +13389,6 @@ if (!class_exists('TCPDF', false)) {
 				}
 				$xpos += $bw;
 			}
-			}
 			// print text
 			if ($style['text']) {
 				// print text
@@ -13401,15 +13400,6 @@ if (!class_exists('TCPDF', false)) {
 			$this->rtl = $tempRTL;
 			// restore previous settings
 			$this->setGraphicVars($gvars);
-			// set bottomcoordinates
-			$this->img_rb_y = $y + $h;
-			if ($this->rtl) {
-				// set left side coordinate
-				$this->img_rb_x = ($this->w - $x - $w);
-			} else {
-				// set right side coordinate
-				$this->img_rb_x = $x + $w;
-			}
 			// set pointer to align the successive text/objects
 			switch($align) {
 				case 'T':{
@@ -13435,6 +13425,7 @@ if (!class_exists('TCPDF', false)) {
 					break;
 				}
 			}
+			$this->endlinex = $this->img_rb_x;
 		}
 
 		/**
@@ -13496,14 +13487,14 @@ if (!class_exists('TCPDF', false)) {
 		 * @param int $y y position in user units
 		 * @param int $w width in user units
 		 * @param int $h height in user units
-		 * @param array $style array of options:<ul><li>boolean $style['border'] if true prints a border around the barcode</li><li>int $style['padding'] padding to leave around the barcode in user units (set to 'auto' for automatic padding)</li><li>array $style['fgcolor'] color array for bars and text</li><li>mixed $style['bgcolor'] color array for background or false for transparent</li></ul>
+		 * @param array $style array of options:<ul><li>boolean $style['border'] if true prints a border around the barcode</li><li>int $style['padding'] padding to leave around the barcode in user units (set to 'auto' for automatic padding)</li><li>array $style['fgcolor'] color array for bars and text</li><li>mixed $style['bgcolor'] color array for background or false for transparent</li><li>string $style['position'] barcode position on the page: L = left margin; C = center; R = right margin; S = stretch</li></ul>
 		 * @param string $align Indicates the alignment of the pointer next to barcode insertion relative to barcode height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul>
 		 * @author Nicola Asuni
 		 * @since 4.5.037 (2009-04-07)
 		 * @access public
 		 */
 		public function write2DBarcode($code, $type, $x='', $y='', $w='', $h='', $style='', $align='') {
-			if ($this->empty_string($code)) {
+			if ($this->empty_string(trim($code))) {
 				return;
 			}
 			require_once(dirname(__FILE__).'/2dbarcodes.php');
@@ -13527,35 +13518,22 @@ if (!class_exists('TCPDF', false)) {
 			}
 			// set foreground color
 			$this->SetDrawColorArray($style['fgcolor']);
-			if ($this->empty_string($x)) {
+			if ($x === '') {
-				$x = $this->GetX();
+				$x = $this->x;
 			}
+			if ($y === '') {
+				$y = $this->y;
+			}
+			if (($w === '') OR ($w <= 0)) {
 				if ($this->rtl) {
-				$x = $this->w - $x;
+					$w = $this->x - $this->lMargin;
-			}
-			if ($this->empty_string($y)) {
-				$y = $this->GetY();
-			}
-			if ($this->empty_string($w) OR ($w <= 0)) {
-				if ($this->rtl) {
-					$w = $x - $this->lMargin;
 				} else {
-					$w = $this->w - $this->rMargin - $x;
+					$w = $this->w - $this->rMargin - $this->x;
 				}
 			}
-			if ($this->empty_string($h) OR ($h <= 0)) {
+			if (($h === '') OR ($h <= 0)) {
-				// 2d barcodes are square by default
 				$h = $w;
 			}
-			$prev_x = $this->x;
-			if ($this->checkPageBreak($h, $y)) {
-				$y = $this->GetY() + $this->cMargin;
-				if ($this->rtl) {
-					$x += ($prev_x - $this->x);
-				} else {
-					$x += ($this->x - $prev_x);
-				}
-			}
 			// padding
 			if (!isset($style['padding'])) {
 				$style['padding'] = 0;
@@ -13565,57 +13543,76 @@ if (!class_exists('TCPDF', false)) {
 			// calculate barcode size (excluding padding)
 			$bw = $w - (2 * $style['padding']);
 			$bh = $h - (2 * $style['padding']);
-			// calculate starting coordinates
+			// Check whether we need a new page first as this does not fit
+			$prev_x = $this->x;
+			if ($this->checkPageBreak($h, $y)) {
+				$y = $this->y;
 				if ($this->rtl) {
+					$x += ($prev_x - $this->x);
+				} else {
+					$x += ($this->x - $prev_x);
+				}
+			}
+			// set alignment
+			$this->img_rb_y = $y + $h;
+			// set alignment
+			if ($this->rtl) {
+				if ($style['position'] == 'L') {
+					$xpos = $this->lMargin;
+				} elseif ($style['position'] == 'C') {
+					$xpos = ($this->w + $this->lMargin - $this->rMargin - $w) / 2;
+				} elseif ($style['position'] == 'R') {
+					$xpos = $this->w - $this->rMargin - $w;
+				} else {
 					$xpos = $x - $w;
+				}
+				$this->img_rb_x = $xpos;
+			} else {
+				if ($style['position'] == 'L') {
+					$xpos = $this->lMargin;
+				} elseif ($style['position'] == 'C') {
+					$xpos = ($this->w + $this->lMargin - $this->rMargin - $w) / 2;
+				} elseif ($style['position'] == 'R') {
+					$xpos = $this->w - $this->rMargin - $w;
 				} else {
 					$xpos = $x;
 				}
-			$xpos += $style['padding'];
+				$this->img_rb_x = $xpos + $w;
-			$ypos = $y + $style['padding'];
+			}
+			$xstart = $xpos + $style['padding'];
+			$ystart = $y + $style['padding'];
 			// barcode is always printed in LTR direction
 			$tempRTL = $this->rtl;
 			$this->rtl = false;
 			// print background color
 			if ($style['bgcolor']) {
-				$this->Rect($x, $y, $w, $h, $style['border'] ? 'DF' : 'F', '', $style['bgcolor']);
+				$this->Rect($xpos, $y, $w, $h, $style['border'] ? 'DF' : 'F', '', $style['bgcolor']);
 			} elseif ($style['border']) {
-				$this->Rect($x, $y, $w, $h, 'D');
+				$this->Rect($xpos, $y, $w, $h, 'D');
 			}
 			// print barcode cells
-			if ($arrcode !== false) {
 			$rows = $arrcode['num_rows'];
 			$cols = $arrcode['num_cols'];
-				// calculate dimension of single barcode cell
+			// calculate dimension of single barcode cell unit
 			$cw = $bw / $cols;
 			$ch = $bh / $rows;
 			// for each row
 			for ($r = 0; $r < $rows; ++$r) {
-					$xr = $xpos;
+				$xr = $xstart;
 				// for each column
 				for ($c = 0; $c < $cols; ++$c) {
 					if ($arrcode['bcode'][$r][$c] == 1) {
 						// draw a single barcode cell
-							$this->Rect($xr, $ypos, $cw, $ch, 'F', array(), $style['fgcolor']);
+						$this->Rect($xr, $ystart, $cw, $ch, 'F', array(), $style['fgcolor']);
 					}
 					$xr += $cw;
 				}
-					$ypos += $ch;
+				$ystart += $ch;
-				}
 			}
 			// restore original direction
 			$this->rtl = $tempRTL;
 			// restore previous settings
 			$this->setGraphicVars($gvars);
-			// set bottomcoordinates
-			$this->img_rb_y = $y + $h;
-			if ($this->rtl) {
-				// set left side coordinate
-				$this->img_rb_x = ($this->w - $x - $w);
-			} else {
-				// set right side coordinate
-				$this->img_rb_x = $x + $w;
-			}
 			// set pointer to align the successive text/objects
 			switch($align) {
 				case 'T':{
@@ -13641,6 +13638,7 @@ if (!class_exists('TCPDF', false)) {
 					break;
 				}
 			}
+			$this->endlinex = $this->img_rb_x;
 		}
 
 		/**
@@ -15648,13 +15646,13 @@ if (!class_exists('TCPDF', false)) {
 							}
 						}
 						$prevy = $this->y;
-						$xpos = $this->GetX();
+						$xpos = $this->x;
 						// eliminate marker spaces
 						if (isset($dom[($key - 1)])) {
 							if (($dom[($key - 1)]['value'] == ' ') OR (isset($dom[($key - 1)]['trimmed_space']))) {
 								$xpos -= $this->GetStringWidth(chr(32));
 							} elseif ($this->rtl AND $dom[($key - 1)]['value'] == '  ') {
-								$xpos -= (2 * $this->GetStringWidth(chr(32)));
+								$xpos += (2 * $this->GetStringWidth(chr(32)));
 							}
 						}
 						$imglink = '';
@@ -18443,9 +18441,12 @@ if (!class_exists('TCPDF', false)) {
 					$h = $this->PageBreakTrigger - $y;
 					$w = $h * $ratio_wh;
 				}
-				if (($x + $w) > ($this->w - $this->rMargin)) {
+				if ((!$this->rtl) AND (($x + $w) > ($this->w - $this->rMargin))) {
 					$w = $this->w - $this->rMargin - $x;
 					$h = $w / $ratio_wh;
+				} elseif (($this->rtl) AND (($x - $w) < ($this->lMargin))) {
+					$w = $x - $this->lMargin;
+					$h = $w / $ratio_wh;
 				}
 			}
 			// set alignment
@@ -18455,18 +18456,18 @@ if (!class_exists('TCPDF', false)) {
 				if ($palign == 'L') {
 					$ximg = $this->lMargin;
 				} elseif ($palign == 'C') {
-					$ximg = ($this->w - $w) / 2;
+					$ximg = ($this->w + $this->lMargin - $this->rMargin - $w) / 2;
 				} elseif ($palign == 'R') {
 					$ximg = $this->w - $this->rMargin - $w;
 				} else {
-					$ximg = $this->w - $x - $w;
+					$ximg = $x - $w;
 				}
 				$this->img_rb_x = $ximg;
 			} else {
 				if ($palign == 'L') {
 					$ximg = $this->lMargin;
 				} elseif ($palign == 'C') {
-					$ximg = ($this->w - $w) / 2;
+					$ximg = ($this->w + $this->lMargin - $this->rMargin - $w) / 2;
 				} elseif ($palign == 'R') {
 					$ximg = $this->w - $this->rMargin - $w;
 				} else {