diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index ad81cab..cd34d96 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,7 @@ +5.8.011 (2010-08-21) + - Method write1DBarcode() was improved to be backward compatible (check the new example n. 27). + - Support for CSS width and height properties on images were added. + 5.8.010 (2010-08-20) - Documentation of unhtmlentities() was fixed. - The 'fitwidth' option was added and border color problem was fixed on write1DBarcode() method (check the example n. 27). diff --git a/README.TXT b/README.TXT index 9c40e8c..5241f3f 100755 --- a/README.TXT +++ b/README.TXT @@ -8,8 +8,8 @@ http: sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 5.8.010 -Release date: 2010-08-20 +Version: 5.8.011 +Release date: 2010-08-21 Author: Nicola Asuni Copyright (c) 2002-2010: diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html index feec790..ce7f926 100644 --- a/doc/classtrees_com-tecnick-tcpdf.html +++ b/doc/classtrees_com-tecnick-tcpdf.html @@ -60,7 +60,7 @@
- Documentation generated on Fri, 20 Aug 2010 16:32:31 +0200 by phpDocumentor 1.4.3 + Documentation generated on Sat, 21 Aug 2010 12:53:12 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/PDF417.html b/doc/com-tecnick-tcpdf/PDF417.html index 2b5307c..c714779 100644 --- a/doc/com-tecnick-tcpdf/PDF417.html +++ b/doc/com-tecnick-tcpdf/PDF417.html @@ -1003,7 +1003,7 @@ $code)
- Documentation generated on Fri, 20 Aug 2010 16:32:31 +0200 by phpDocumentor 1.4.3 + Documentation generated on Sat, 21 Aug 2010 12:53:12 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/QRcode.html b/doc/com-tecnick-tcpdf/QRcode.html index 2f126fd..955e703 100644 --- a/doc/com-tecnick-tcpdf/QRcode.html +++ b/doc/com-tecnick-tcpdf/QRcode.html @@ -5551,7 +5551,7 @@ $frame)
- Documentation generated on Fri, 20 Aug 2010 16:32:32 +0200 by phpDocumentor 1.4.3 + Documentation generated on Sat, 21 Aug 2010 12:53:13 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html index 1dcdb32..d77820f 100644 --- a/doc/com-tecnick-tcpdf/TCPDF.html +++ b/doc/com-tecnick-tcpdf/TCPDF.html @@ -83,7 +83,7 @@ Source Location: /tcpdf.php

Version:

@@ -741,7 +741,7 @@ This is a PHP class for generating PDF documents without requiring external exte author:  Nicola Asuni - info@tecnick.com - version:  5.8.010 + version:  5.8.011 link:  http://www.tcpdf.org @@ -7105,7 +7105,7 @@ $firstblock = false])
-

method addHTMLTOC [line 21411]

+

method addHTMLTOC [line 21446]

@@ -7168,7 +7168,7 @@ $correct_align = true])
-

method addHTMLVertSpace [line 19905]

+

method addHTMLVertSpace [line 19940]

@@ -7430,7 +7430,7 @@ $k)
-

method addTOC [line 21239]

+

method addTOC [line 21274]

@@ -8457,7 +8457,7 @@ $h)
-

method closeHTMLTagHandler [line 19405]

+

method closeHTMLTagHandler [line 19440]

@@ -8685,7 +8685,7 @@ $js = false])
-

method commitTransaction [line 21523]

+

method commitTransaction [line 21558]

@@ -8839,7 +8839,7 @@ $s)
-

method convertSVGtMatrix [line 22591]

+

method convertSVGtMatrix [line 22626]

@@ -8989,7 +8989,7 @@ $antialias = false])
-

method copyPage [line 21169]

+

method copyPage [line 21204]

@@ -9205,7 +9205,7 @@ $fill_color = array()])
-

method deletePage [line 21026]

+

method deletePage [line 21061]

@@ -9247,7 +9247,7 @@ $page)
-

method drawHTMLTagBorder [line 19942]

+

method drawHTMLTagBorder [line 19977]

@@ -9412,7 +9412,7 @@ $afinish:)
-

method empty_string [line 21577]

+

method empty_string [line 21612]

@@ -9496,7 +9496,7 @@ $tocpage = false])
-

method endSVGElementHandler [line 23619]

+

method endSVGElementHandler [line 23654]

@@ -9614,7 +9614,7 @@ $msg)
-

method extractCSSproperties [line 16408]

+

method extractCSSproperties [line 16443]

@@ -10135,7 +10135,7 @@ $position = 'start'])
-

method getBorderStartPosition [line 19926]

+

method getBorderStartPosition [line 19961]

@@ -10214,7 +10214,7 @@ $pagenum = ''])
-

method getBuffer [line 20702]

+

method getBuffer [line 20737]

@@ -10504,7 +10504,7 @@ $char)
-

method getColumn [line 21728]

+

method getColumn [line 21763]

@@ -10535,7 +10535,7 @@ $char)
-

method getCSSBorderDashStyle [line 16707]

+

method getCSSBorderDashStyle [line 16742]

@@ -10577,7 +10577,7 @@ $style)
-

method getCSSBorderStyle [line 16743]

+

method getCSSBorderStyle [line 16778]

@@ -10619,7 +10619,7 @@ $cssborder)
-

method getCSSBorderWidth [line 16687]

+

method getCSSBorderWidth [line 16722]

@@ -10760,7 +10760,7 @@ $size = 0])
-

method getFontBuffer [line 20866]

+

method getFontBuffer [line 20901]

@@ -10859,7 +10859,7 @@ $size = 0])
-

method getFontFamily [line 16386]

+

method getFontFamily [line 16421]

@@ -10890,7 +10890,7 @@ $size = 0])
-

method getFontFamilyName [line 22148]

+

method getFontFamilyName [line 22183]

@@ -10935,7 +10935,7 @@ $fontfamily)
-

method getFontSize [line 16366]

+

method getFontSize [line 16401]

@@ -10966,7 +10966,7 @@ $fontfamily)
-

method getFontSizePt [line 16376]

+

method getFontSizePt [line 16411]

@@ -11025,7 +11025,7 @@ $fontfamily)
-

method getFontStyle [line 16396]

+

method getFontStyle [line 16431]

@@ -11056,7 +11056,7 @@ $fontfamily)
-

method getFontSubsetting [line 22084]

+

method getFontSubsetting [line 22119]

@@ -11219,7 +11219,7 @@ $v)
-

method getGraphicVars [line 20534]

+

method getGraphicVars [line 20569]

@@ -11396,7 +11396,7 @@ $v)
-

method getHtmlDomArray [line 16791]

+

method getHtmlDomArray [line 16826]

@@ -11435,7 +11435,7 @@ $html)
-

method getHTMLUnitToUnits [line 20245]

+

method getHTMLUnitToUnits [line 20280]

@@ -11501,7 +11501,7 @@ $point)
-

method getHyphenPatternsFromTEX [line 21884]

+

method getHyphenPatternsFromTEX [line 21919]

@@ -11546,7 +11546,7 @@ $file)
-

method getImageBuffer [line 20804]

+

method getImageBuffer [line 20839]

@@ -11785,7 +11785,7 @@ $iminfo = array()])
-

method getMargins [line 16329]

+

method getMargins [line 16364]

@@ -11967,7 +11967,7 @@ $lineWidth = ''])
-

method getObjFilename [line 20616]

+

method getObjFilename [line 20651]

@@ -12012,7 +12012,7 @@ $prefix)
-

method getOriginalMargins [line 16352]

+

method getOriginalMargins [line 16387]

@@ -12077,7 +12077,7 @@ $prefix)
-

method getPageBuffer [line 20745]

+

method getPageBuffer [line 20780]

@@ -12364,7 +12364,7 @@ $pagenum = ''])
-

method getPathPaintOperator [line 21996]

+

method getPathPaintOperator [line 22031]

@@ -12533,7 +12533,7 @@ $mode)
-

method getSpaceString [line 17490]

+

method getSpaceString [line 17525]

@@ -12736,7 +12736,7 @@ $getarray = false])
-

method getSVGTransformMatrix [line 22469]

+

method getSVGTransformMatrix [line 22504]

@@ -12781,7 +12781,7 @@ $attribute)
-

method getTagStyleFromCSS [line 16659]

+

method getTagStyleFromCSS [line 16694]

@@ -12835,7 +12835,7 @@ $css)
-

method getTransformationMatrixProduct [line 22573]

+

method getTransformationMatrixProduct [line 22608]

@@ -12934,7 +12934,7 @@ $mode = 0])
-

method getVectorsAngle [line 23205]

+

method getVectorsAngle [line 23240]

@@ -13178,7 +13178,7 @@ $antialias = false])
-

method hyphenateText [line 21923]

+

method hyphenateText [line 21958]

@@ -13259,7 +13259,7 @@ $charmax = 8])
-

method hyphenateWord [line 21814]

+

method hyphenateWord [line 21849]

@@ -13697,7 +13697,7 @@ $palign)
-

method ImageSVG [line 22198]

+

method ImageSVG [line 22233]

@@ -13835,7 +13835,7 @@ $script)
-

method intToRoman [line 20324]

+

method intToRoman [line 20359]

@@ -13905,7 +13905,7 @@ $number)
-

method isUnicodeFont [line 22136]

+

method isUnicodeFont [line 22171]

@@ -13939,7 +13939,7 @@ $number)
-

method isValidCSSSelectorForTag [line 16500]

+

method isValidCSSSelectorForTag [line 16535]

@@ -14575,7 +14575,7 @@ $y = ''])
-

method movePage [line 20883]

+

method movePage [line 20918]

@@ -14761,7 +14761,7 @@ $fitcell = false])
-

method objclone [line 21566]

+

method objclone [line 21601]

@@ -14834,7 +14834,7 @@ $object)
-

method openHTMLTagHandler [line 18804]

+

method openHTMLTagHandler [line 18839]

@@ -15445,7 +15445,7 @@ $closed)
-

method putHtmlListBullet [line 20389]

+

method putHtmlListBullet [line 20424]

@@ -15664,7 +15664,7 @@ $js = false])
-

method readDiskCache [line 20656]

+

method readDiskCache [line 20691]

@@ -16015,7 +16015,7 @@ $txt = ''])
-

method replaceBuffer [line 20684]

+

method replaceBuffer [line 20719]

@@ -16054,7 +16054,7 @@ $data)
-

method revstrpos [line 21590]

+

method revstrpos [line 21625]

@@ -16159,7 +16159,7 @@ $length)
-

method rollbackTransaction [line 21537]

+

method rollbackTransaction [line 21572]

@@ -16657,7 +16657,7 @@ $y = ''])
-

method segSVGContentHandler [line 23658]

+

method segSVGContentHandler [line 23693]

@@ -16705,7 +16705,7 @@ $data)
-

method selectColumn [line 21653]

+

method selectColumn [line 21688]

@@ -16744,7 +16744,7 @@ $col = ''])
-

method serializeTCPDFtagParameters [line 21739]

+

method serializeTCPDFtagParameters [line 21774]

@@ -16957,7 +16957,7 @@ $bc = ''])
-

method SetBooklet [line 20159]

+

method SetBooklet [line 20194]

@@ -17008,7 +17008,7 @@ $outer = -1])
-

method setBuffer [line 20666]

+

method setBuffer [line 20701]

@@ -17128,7 +17128,7 @@ $pad)
-

method setColumnsArray [line 21640]

+

method setColumnsArray [line 21675]

@@ -17584,7 +17584,7 @@ $tint = 100])
-

method setEqualColumns [line 21607]

+

method setEqualColumns [line 21642]

@@ -17893,7 +17893,7 @@ $subset = 'default'])
-

method setFontBuffer [line 20820]

+

method setFontBuffer [line 20855]

@@ -17986,7 +17986,7 @@ $out = true])
-

method setFontSubBuffer [line 20846]

+

method setFontSubBuffer [line 20881]

@@ -18037,7 +18037,7 @@ $data)
-

method setFontSubsetting [line 22073]

+

method setFontSubsetting [line 22108]

@@ -18224,7 +18224,7 @@ $prop = array()])
-

method setGraphicVars [line 20574]

+

method setGraphicVars [line 20609]

@@ -18420,7 +18420,7 @@ $hm = 10])
-

method setHtmlLinksStyle [line 20230]

+

method setHtmlLinksStyle [line 20265]

@@ -18465,7 +18465,7 @@ $fontstyle = 'U'])
-

method setHtmlVSpace [line 20199]

+

method setHtmlVSpace [line 20234]

@@ -18504,7 +18504,7 @@ $tagvs)
-

method setImageBuffer [line 20761]

+

method setImageBuffer [line 20796]

@@ -18591,7 +18591,7 @@ $scale)
-

method setImageSubBuffer [line 20784]

+

method setImageSubBuffer [line 20819]

@@ -18997,7 +18997,7 @@ $page = -1])
-

method setListIndentWidth [line 20209]

+

method setListIndentWidth [line 20244]

@@ -19036,7 +19036,7 @@ $width)
-

method setLIsymbol [line 20120]

+

method setLIsymbol [line 20155]

@@ -19135,7 +19135,7 @@ $keepmargins = false])
-

method setOpenCell [line 20219]

+

method setOpenCell [line 20254]

@@ -19297,7 +19297,7 @@ $points = false])
-

method setPageBuffer [line 20718]

+

method setPageBuffer [line 20753]

@@ -19697,7 +19697,7 @@ $pubkeys = null])
-

method setRasterizeVectorImages [line 21970]

+

method setRasterizeVectorImages [line 22005]

@@ -20048,7 +20048,7 @@ $subject)
-

method setSVGStyles [line 22630]

+

method setSVGStyles [line 22665]

@@ -20301,7 +20301,7 @@ $color)
-

method setTextRenderingMode [line 21751]

+

method setTextRenderingMode [line 21786]

@@ -21211,7 +21211,7 @@ $page = ''])
-

method startSVGElementHandler [line 23228]

+

method startSVGElementHandler [line 23263]

@@ -21265,7 +21265,7 @@ $attribs)
-

method startTransaction [line 21506]

+

method startTransaction [line 21541]

@@ -21355,7 +21355,7 @@ $attribs)
-

method stringLeftTrim [line 22097]

+

method stringLeftTrim [line 22132]

diff --git a/examples/example_027.php b/examples/example_027.php index 5365f7e..2d864a8 100755 --- a/examples/example_027.php +++ b/examples/example_027.php @@ -2,7 +2,7 @@ //============================================================+ // File name : example_027.php // Begin : 2008-03-04 -// Last Update : 2010-08-20 +// Last Update : 2010-08-21 // // Description : Example 027 for TCPDF class // 1D Barcodes @@ -81,9 +81,9 @@ $pdf->AddPage(); // define barcode style $style = array( 'position' => '', - 'align' => '', - 'fitwidth' => false, - 'stretch' => true, + 'align' => 'C', + 'fitwidth' => true, + 'stretch' => false, 'border' => true, 'padding' => 'auto', 'fgcolor' => array(0,0,0), @@ -98,179 +98,179 @@ $style = array( // CODE 39 - ANSI MH10.8M-1983 - USD-3 - 3 of 9. $pdf->Cell(0, 0, 'CODE 39 - ANSI MH10.8M-1983 - USD-3 - 3 of 9', 0, 1); -$pdf->write1DBarcode('CODE 39', 'C39', '', '', 80, 25, 0.4, $style, 'N'); +$pdf->write1DBarcode('CODE 39', 'C39', '', '', '', 18, 0.4, $style, 'N'); $pdf->Ln(); // CODE 39 + CHECKSUM $pdf->Cell(0, 0, 'CODE 39 + CHECKSUM', 0, 1); -$pdf->write1DBarcode('CODE 39 +', 'C39+', '', '', 80, 25, 0.4, $style, 'N'); +$pdf->write1DBarcode('CODE 39 +', 'C39+', '', '', '', 18, 0.4, $style, 'N'); $pdf->Ln(); // CODE 39 EXTENDED $pdf->Cell(0, 0, 'CODE 39 EXTENDED', 0, 1); -$pdf->write1DBarcode('CODE 39 E', 'C39E', '', '', 80, 25, 0.4, $style, 'N'); +$pdf->write1DBarcode('CODE 39 E', 'C39E', '', '', '', 18, 0.4, $style, 'N'); $pdf->Ln(); // CODE 39 EXTENDED + CHECKSUM $pdf->Cell(0, 0, 'CODE 39 EXTENDED + CHECKSUM', 0, 1); -$pdf->write1DBarcode('CODE 39 E+', 'C39E+', '', '', 80, 25, 0.4, $style, 'N'); +$pdf->write1DBarcode('CODE 39 E+', 'C39E+', '', '', '', 18, 0.4, $style, 'N'); $pdf->Ln(); // CODE 93 - USS-93 $pdf->Cell(0, 0, 'CODE 93 - USS-93', 0, 1); -$pdf->write1DBarcode('TEST93', 'C93', '', '', 80, 25, 0.4, $style, 'N'); +$pdf->write1DBarcode('TEST93', 'C93', '', '', '', 18, 0.4, $style, 'N'); $pdf->Ln(); // Standard 2 of 5 $pdf->Cell(0, 0, 'Standard 2 of 5', 0, 1); -$pdf->write1DBarcode('1234567', 'S25', '', '', 80, 25, 0.4, $style, 'N'); +$pdf->write1DBarcode('1234567', 'S25', '', '', '', 18, 0.4, $style, 'N'); $pdf->Ln(); // Standard 2 of 5 + CHECKSUM $pdf->Cell(0, 0, 'Standard 2 of 5 + CHECKSUM', 0, 1); -$pdf->write1DBarcode('1234567', 'S25+', '', '', 80, 25, 0.4, $style, 'N'); +$pdf->write1DBarcode('1234567', 'S25+', '', '', '', 18, 0.4, $style, 'N'); -// add a page ---------- -$pdf->AddPage(); +$pdf->Ln(); // Interleaved 2 of 5 $pdf->Cell(0, 0, 'Interleaved 2 of 5', 0, 1); -$pdf->write1DBarcode('1234567', 'I25', '', '', 80, 25, 0.4, $style, 'N'); +$pdf->write1DBarcode('1234567', 'I25', '', '', '', 18, 0.4, $style, 'N'); $pdf->Ln(); // Interleaved 2 of 5 + CHECKSUM $pdf->Cell(0, 0, 'Interleaved 2 of 5 + CHECKSUM', 0, 1); -$pdf->write1DBarcode('1234567', 'I25+', '', '', 80, 25, 0.4, $style, 'N'); +$pdf->write1DBarcode('1234567', 'I25+', '', '', '', 18, 0.4, $style, 'N'); -$pdf->Ln(); + +// add a page ---------- +$pdf->AddPage(); // CODE 128 A $pdf->Cell(0, 0, 'CODE 128 A', 0, 1); -$pdf->write1DBarcode('CODE 128 A', 'C128A', '', '', 80, 25, 0.4, $style, 'N'); +$pdf->write1DBarcode('CODE 128 A', 'C128A', '', '', '', 18, 0.4, $style, 'N'); $pdf->Ln(); // CODE 128 B $pdf->Cell(0, 0, 'CODE 128 B', 0, 1); -$pdf->write1DBarcode('CODE 128 B', 'C128B', '', '', 80, 25, 0.4, $style, 'N'); +$pdf->write1DBarcode('CODE 128 B', 'C128B', '', '', '', 18, 0.4, $style, 'N'); $pdf->Ln(); // CODE 128 C $pdf->Cell(0, 0, 'CODE 128 C', 0, 1); -$pdf->write1DBarcode('0123456789', 'C128C', '', '', 80, 25, 0.4, $style, 'N'); +$pdf->write1DBarcode('0123456789', 'C128C', '', '', '', 18, 0.4, $style, 'N'); $pdf->Ln(); // EAN 8 $pdf->Cell(0, 0, 'EAN 8', 0, 1); -$pdf->write1DBarcode('1234567', 'EAN8', '', '', 80, 25, 0.4, $style, 'N'); +$pdf->write1DBarcode('1234567', 'EAN8', '', '', '', 18, 0.4, $style, 'N'); $pdf->Ln(); // EAN 13 $pdf->Cell(0, 0, 'EAN 13', 0, 1); -$pdf->write1DBarcode('1234567890128', 'EAN13', '', '', 80, 25, 0.4, $style, 'N'); - -// add a page ---------- -$pdf->AddPage(); - -// 2-Digits UPC-Based Extention -$pdf->Cell(0, 0, '2-Digits UPC-Based Extention', 0, 1); -$pdf->write1DBarcode('34', 'EAN2', '', '', 20, 25, 0.4, $style, 'N'); - -$pdf->Ln(); - -// 5-Digits UPC-Based Extention -$pdf->Cell(0, 0, '5-Digits UPC-Based Extention', 0, 1); -$pdf->write1DBarcode('51234', 'EAN5', '', '', 40, 25, 0.4, $style, 'N'); +$pdf->write1DBarcode('1234567890128', 'EAN13', '', '', '', 18, 0.4, $style, 'N'); $pdf->Ln(); // UPC-A $pdf->Cell(0, 0, 'UPC-A', 0, 1); -$pdf->write1DBarcode('12345678901', 'UPCA', '', '', 80, 25, 0.4, $style, 'N'); +$pdf->write1DBarcode('12345678901', 'UPCA', '', '', '', 18, 0.4, $style, 'N'); $pdf->Ln(); // UPC-E $pdf->Cell(0, 0, 'UPC-E', 0, 1); -$pdf->write1DBarcode('04210000526', 'UPCE', '', '', 80, 25, 0.4, $style, 'N'); +$pdf->write1DBarcode('04210000526', 'UPCE', '', '', '', 18, 0.4, $style, 'N'); $pdf->Ln(); +// 5-Digits UPC-Based Extention +$pdf->Cell(0, 0, '5-Digits UPC-Based Extention', 0, 1); +$pdf->write1DBarcode('51234', 'EAN5', '', '', '', 18, 0.4, $style, 'N'); + +$pdf->Ln(); + +// 2-Digits UPC-Based Extention +$pdf->Cell(0, 0, '2-Digits UPC-Based Extention', 0, 1); +$pdf->write1DBarcode('34', 'EAN2', '', '', '', 18, 0.4, $style, 'N'); + +// add a page ---------- +$pdf->AddPage(); + // MSI $pdf->Cell(0, 0, 'MSI', 0, 1); -$pdf->write1DBarcode('80523', 'MSI', '', '', 80, 25, 0.4, $style, 'N'); +$pdf->write1DBarcode('80523', 'MSI', '', '', '', 18, 0.4, $style, 'N'); $pdf->Ln(); // MSI + CHECKSUM (module 11) $pdf->Cell(0, 0, 'MSI + CHECKSUM (module 11)', 0, 1); -$pdf->write1DBarcode('80523', 'MSI+', '', '', 80, 25, 0.4, $style, 'N'); +$pdf->write1DBarcode('80523', 'MSI+', '', '', '', 18, 0.4, $style, 'N'); + +$pdf->Ln(); + +// CODABAR +$pdf->Cell(0, 0, 'CODABAR', 0, 1); +$pdf->write1DBarcode('123456789', 'CODABAR', '', '', '', 18, 0.4, $style, 'N'); + +$pdf->Ln(); + +// CODE 11 +$pdf->Cell(0, 0, 'CODE 11', 0, 1); +$pdf->write1DBarcode('123-456-789', 'CODE11', '', '', '', 18, 0.4, $style, 'N'); + +$pdf->Ln(); + +// PHARMACODE +$pdf->Cell(0, 0, 'PHARMACODE', 0, 1); +$pdf->write1DBarcode('789', 'PHARMA', '', '', '', 18, 0.4, $style, 'N'); + +$pdf->Ln(); + +// PHARMACODE TWO-TRACKS +$pdf->Cell(0, 0, 'PHARMACODE TWO-TRACKS', 0, 1); +$pdf->write1DBarcode('105', 'PHARMA2T', '', '', '', 18, 2, $style, 'N'); // add a page ---------- $pdf->AddPage(); // IMB - Intelligent Mail Barcode - Onecode - USPS-B-3200 $pdf->Cell(0, 0, 'IMB - Intelligent Mail Barcode - Onecode - USPS-B-3200', 0, 1); -$pdf->write1DBarcode('01234567094987654321-01234567891', 'IMB', '', '', 130, 25, 0.4, $style, 'N'); +$pdf->write1DBarcode('01234567094987654321-01234567891', 'IMB', '', '', '', 15, 0.6, $style, 'N'); $pdf->Ln(); // POSTNET $pdf->Cell(0, 0, 'POSTNET', 0, 1); -$pdf->write1DBarcode('98000', 'POSTNET', '', '', 80, 25, 0.4, $style, 'N'); +$pdf->write1DBarcode('98000', 'POSTNET', '', '', '', 15, 0.6, $style, 'N'); $pdf->Ln(); // PLANET $pdf->Cell(0, 0, 'PLANET', 0, 1); -$pdf->write1DBarcode('98000', 'PLANET', '', '', 80, 25, 0.4, $style, 'N'); +$pdf->write1DBarcode('98000', 'PLANET', '', '', '', 15, 0.6, $style, 'N'); $pdf->Ln(); // RMS4CC (Royal Mail 4-state Customer Code) - CBC (Customer Bar Code) $pdf->Cell(0, 0, 'RMS4CC (Royal Mail 4-state Customer Code) - CBC (Customer Bar Code)', 0, 1); -$pdf->write1DBarcode('SN34RD1A', 'RMS4CC', '', '', 80, 25, 0.4, $style, 'N'); +$pdf->write1DBarcode('SN34RD1A', 'RMS4CC', '', '', '', 15, 0.6, $style, 'N'); $pdf->Ln(); // KIX (Klant index - Customer index) $pdf->Cell(0, 0, 'KIX (Klant index - Customer index)', 0, 1); -$pdf->write1DBarcode('SN34RDX1A', 'KIX', '', '', 80, 25, 0.4, $style, 'N'); - -// add a page ---------- -$pdf->AddPage(); - -// CODABAR -$pdf->Cell(0, 0, 'CODABAR', 0, 1); -$pdf->write1DBarcode('123456789', 'CODABAR', '', '', 80, 25, 0.4, $style, 'N'); - -$pdf->Ln(); - -// CODE 11 -$pdf->Cell(0, 0, 'CODE 11', 0, 1); -$pdf->write1DBarcode('123-456-789', 'CODE11', '', '', 80, 25, 0.4, $style, 'N'); - -$pdf->Ln(); - -// PHARMACODE -$pdf->Cell(0, 0, 'PHARMACODE', 0, 1); -$pdf->write1DBarcode('789', 'PHARMA', '', '', 30, 25, 0.4, $style, 'N'); - -$pdf->Ln(); - -// PHARMACODE TWO-TRACKS -$pdf->Cell(0, 0, 'PHARMACODE TWO-TRACKS', 0, 1); -$pdf->write1DBarcode('105', 'PHARMA2T', '', '', 20, 25, 0.4, $style, 'N'); +$pdf->write1DBarcode('SN34RDX1A', 'KIX', '', '', '', 15, 0.6, $style, 'N'); // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // TEST BARCODE ALIGNMENTS @@ -284,26 +284,27 @@ $style['fgcolor'] = array(128,0,0); // Left position $style['position'] = 'L'; -$pdf->write1DBarcode('LEFT', 'C128A', '', '', 50, 20, 0.4, $style, 'N'); +$pdf->write1DBarcode('LEFT', 'C128A', '', '', '', 20, 0.4, $style, 'N'); $pdf->Ln(); // Center position $style['position'] = 'C'; -$pdf->write1DBarcode('CENTER', 'C128A', '', '', 50, 20, 0.4, $style, 'N'); +$pdf->write1DBarcode('CENTER', 'C128A', '', '', '', 20, 0.4, $style, 'N'); $pdf->Ln(); // Right position $style['position'] = 'R'; -$pdf->write1DBarcode('RIGHT', 'C128A', '', '', 50, 20, 0.4, $style, 'N'); +$pdf->write1DBarcode('RIGHT', 'C128A', '', '', '', 20, 0.4, $style, 'N'); -$pdf->Ln(10); +$pdf->Ln(); // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . $style['fgcolor'] = array(0,128,0); $style['position'] = ''; $style['stretch'] = false; // disable stretch +$style['fitwidth'] = false; // disable fitwidth // Left alignment $style['align'] = 'L'; @@ -321,7 +322,7 @@ $pdf->Ln(); $style['align'] = 'R'; $pdf->write1DBarcode('RIGHT', 'C128A', '', '', '', 20, 0.4, $style, 'N'); -$pdf->Ln(10); +$pdf->Ln(); // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . $style['fgcolor'] = array(0,0,128); @@ -344,10 +345,7 @@ $style['position'] = 'R'; $pdf->write1DBarcode('RIGHT', 'C128A', '', '', '', 20, 0.4, $style, 'N'); // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -// TEST BARCODE STYLES - -// add a page -$pdf->AddPage(); +// TEST BARCODE STYLE // define barcode style $style = array( diff --git a/tcpdf.php b/tcpdf.php index 7b037ff..44a137a 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -1,9 +1,9 @@ * 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.
* @name TCPDF * @package com.tecnick.tcpdf - * @version 5.8.010 + * @version 5.8.011 * @author Nicola Asuni - info@tecnick.com * @link http://www.tcpdf.org * @license http://www.gnu.org/copyleft/lesser.html LGPL @@ -3765,7 +3765,7 @@ if (!class_exists('TCPDF', false)) { $style = array( 'position' => $this->rtl?'R':'L', 'align' => $this->rtl?'R':'L', - 'fitwidth' => false, + 'fitwidth' => true, 'stretch' => false, 'border' => false, 'padding' => 0, @@ -10321,10 +10321,10 @@ if (!class_exists('TCPDF', false)) { /** * THIS METHOD IS DEPRECATED * Format a text string - * @DEPRECATED * @param string $s string to escape. * @return string escaped string. * @access protected + * @deprecated */ protected function _escapetext($s) { if ($this->isunicode) { @@ -15826,18 +15826,18 @@ if (!class_exists('TCPDF', false)) { * Print a Linear Barcode. * @param string $code code to print * @param string $type type of barcode (see barcodes.php for supported formats). - * @param int $x x position in user units - * @param int $y y position in user units - * @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 int $x x position in user units (empty string = current x position) + * @param int $y y position in user units (empty string = current y position) + * @param int $w width in user units (empty string = remaining page width) + * @param int $h height in user units (empty string = remaining page height) + * @param float $xres width of the smallest bar in user units (empty string = default value = 0.4mm) * @param array $style array of options:
  • boolean $style['border'] if true prints a border
  • int $style['padding'] padding to leave around the barcode in user units (set to 'auto' for automatic padding)
  • array $style['fgcolor'] color array for bars and text
  • mixed $style['bgcolor'] color array for background or false for transparent
  • boolean $style["text"] boolean if true prints text below the barcode
  • string $style['font'] font name for text
  • int $style['fontsize'] font size for text
  • 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
  • string $style['position'] barcode position on the page: L = left margin; C = center; R = right margin.
  • string $style['align'] barcode position on the containing rectangle: L = left; C = center; R = right.
  • string $style['fitwidth'] if true reduce the width to fit the barcode + padding width (stretch doesn't work with this option enabled).
  • string $style['stretch'] if true stretch the barcode to best fit the available width, otherwise uses $xres resolution for a single bar.
* @param string $align Indicates the alignment of the pointer next to barcode insertion relative to barcode height. The value can be:
  • T: top-right for LTR or top-left for RTL
  • M: middle-right for LTR or middle-left for RTL
  • B: bottom-right for LTR or bottom-left for RTL
  • N: next line
* @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='') { + public function write1DBarcode($code, $type, $x='', $y='', $w='', $h='', $xres='', $style='', $align='') { if ($this->empty_string(trim($code))) { return; } @@ -15853,19 +15853,32 @@ if (!class_exists('TCPDF', false)) { // set default values if (!isset($style['position'])) { $style['position'] = ''; + } elseif ($style['position'] == 'S') { + // keep this for backward compatibility + $style['position'] = ''; + $style['stretch'] = true; } if (!isset($style['align'])) { $style['align'] = 'C'; } - if (!isset($style['stretch'])) { - $style['stretch'] = false; - } if (!isset($style['fitwidth'])) { - $style['fitwidth'] = false; - } elseif($style['fitwidth']) { + if (!isset($style['stretch'])) { + $style['fitwidth'] = true; + } else { + $style['fitwidth'] = false; + } + } + if ($style['fitwidth']) { // disable stretch $style['stretch'] = false; } + if (!isset($style['stretch'])) { + if (($w === '') OR ($w <= 0)) { + $style['stretch'] = false; + } else { + $style['stretch'] = true; + } + } if (!isset($style['fgcolor'])) { $style['fgcolor'] = array(0,0,0); // default black } @@ -15901,39 +15914,54 @@ if (!class_exists('TCPDF', false)) { $w = $this->w - $this->rMargin - $this->x; } } - // padding + // horizontal padding if (!isset($style['padding'])) { - $padding = 0; + $hpadding = 0; } elseif ($style['padding'] === 'auto') { - $padding = 5 * ($w / ($arrcode['maxw'] + 10)); + $hpadding = 5 * ($w / ($arrcode['maxw'] + 10)); } else { - $padding = $style['padding']; + $hpadding = $style['padding']; } // calculate xres (single bar width) - $max_xres = ($w - (2 * $padding)) / $arrcode['maxw']; + $max_xres = ($w - (2 * $hpadding)) / $arrcode['maxw']; if ($style['stretch']) { $xres = $max_xres; } else { if ($this->empty_string($xres)) { - $xres = 0.4; // default value + $xres = (0.141 * $this->k); // default bar width = 0.4 mm } if ($xres > $max_xres) { // correct xres to fit on $w $max_xres = $max_xres; } - if ($style['padding'] === 'auto') { - $padding = 5 * $xres; + if (isset($style['padding']) AND ($style['padding'] === 'auto')) { + $hpadding = 5 * $xres; } } if ($style['fitwidth']) { - $w = (($arrcode['maxw'] * $xres) + (2 * $padding)); + $w = (($arrcode['maxw'] * $xres) + (2 * $hpadding)); } + // vertical padding + $vpadding = $hpadding; + $text_height = ($this->cell_height_ratio * $fontsize / $this->k); // height if (($h === '') OR ($h <= 0)) { - // set default horizontal aspect ratio - $h = $w / 3; + // set default height + $h = (($arrcode['maxw'] * $xres) / 3) + (2 * $vpadding) + $text_height; + } + $barh = $h - $text_height - (2 * $vpadding); + if ($barh <=0) { + // try to reduce font or padding to fit barcode on available height + if ($text_height > $h) { + $fontsize = (($h * $this->k) / (4 * $this->cell_height_ratio)); + $text_height = ($this->cell_height_ratio * $fontsize / $this->k); + $this->SetFont($style['font'], '', $fontsize); + } + if ($vpadding > 0) { + $vpadding = (($h - $text_height) / 4); + } + $barh = $h - $text_height - (2 * $vpadding); } - $barh = $h - ($this->cell_height_ratio * $fontsize / $this->k) - (2 * $padding); // fit the barcode on available space $this->fitBlock($w, $h, $x, $y, false); // set alignment @@ -15965,11 +15993,11 @@ if (!class_exists('TCPDF', false)) { $xpos_rect = $xpos; switch ($style['align']) { case 'L': { - $xpos = $xpos_rect + $padding; + $xpos = $xpos_rect + $hpadding; break; } case 'R': { - $xpos = $xpos_rect + ($w - ($arrcode['maxw'] * $xres)) - $padding; + $xpos = $xpos_rect + ($w - ($arrcode['maxw'] * $xres)) - $hpadding; break; } case 'C': @@ -15996,17 +16024,24 @@ if (!class_exists('TCPDF', false)) { $bw = ($v['w'] * $xres); if ($v['t']) { // draw a vertical bar - $ypos = $y + $padding + ($v['p'] * $barh / $arrcode['maxh']); + $ypos = $y + $vpadding + ($v['p'] * $barh / $arrcode['maxh']); $this->Rect($xpos, $ypos, $bw, ($v['h'] * $barh / $arrcode['maxh']), 'F', array(), $style['fgcolor']); } $xpos += $bw; } // print text if ($style['text']) { + $txtwidth = ($arrcode['maxw'] * $xres); + if ($this->GetStringWidth($code) > $txtwidth) { + $style['stretchtext'] = 2; + } // print text $this->x = $xpos_text; - $this->y = $y + $padding + $barh; - $this->Cell(($arrcode['maxw'] * $xres), ($this->cell_height_ratio * $fontsize / $this->k), $code, 0, 0, 'C', 0, '', $style['stretchtext']); + $this->y = $y + $vpadding + $barh; + $cmargin = $this->cMargin; + $this->cMargin = 0; + $this->Cell($txtwidth, '', $code, 0, 0, 'C', 0, '', $style['stretchtext'], false, 'T', 'T'); + $this->cMargin = $cmargin; } // restore original direction $this->rtl = $tempRTL; @@ -16046,7 +16081,7 @@ if (!class_exists('TCPDF', false)) { * @param int $y y position in user units * @param int $w width in user units * @param int $h height position in user units - * @param string $type type of barcode (I25, C128A, C128B, C128C, C39) + * @param string $type type of barcode * @param string $style barcode style * @param string $font font for text * @param int $xres x resolution @@ -16158,8 +16193,6 @@ if (!class_exists('TCPDF', false)) { if (!isset($style['module_height'])) { $style['module_height'] = 1; // height of a single module in points } - // set foreground color - $this->SetDrawColorArray($style['fgcolor']); if ($x === '') { $x = $this->x; } @@ -16265,6 +16298,8 @@ if (!class_exists('TCPDF', false)) { } elseif ($style['border']) { $this->Rect($xpos, $y, $w, $h, 'D'); } + // set foreground color + $this->SetDrawColorArray($style['fgcolor']); // print barcode cells // for each row for ($r = 0; $r < $rows; ++$r) { @@ -17724,13 +17759,13 @@ if (!class_exists('TCPDF', false)) { $dom[$key]['align'] = ($this->rtl) ? 'R' : 'L'; } // vertically align image in line - if ((!$this->newline) AND ($dom[$key]['value'] == 'img') AND (isset($dom[$key]['attribute']['height'])) AND ($dom[$key]['attribute']['height'] > 0)) { + if ((!$this->newline) AND ($dom[$key]['value'] == 'img') AND (isset($dom[$key]['height'])) AND ($dom[$key]['height'] > 0)) { // get image height - $imgh = $this->getHTMLUnitToUnits($dom[$key]['attribute']['height'], $this->lasth, 'px'); + $imgh = $this->getHTMLUnitToUnits($dom[$key]['height'], $this->lasth, 'px'); // check for automatic line break $autolinebreak = false; - if (isset($dom[$key]['attribute']['width']) AND ($dom[$key]['attribute']['width'] > 0)) { - $imgw = $this->getHTMLUnitToUnits($dom[$key]['attribute']['width'], 1, 'px', false); + if (isset($dom[$key]['width']) AND ($dom[$key]['width'] > 0)) { + $imgw = $this->getHTMLUnitToUnits($dom[$key]['width'], 1, 'px', false); if (($this->rtl AND (($this->x - $imgw) < ($this->lMargin + $this->cMargin))) OR (!$this->rtl AND (($this->x + $imgw) > ($this->w - $this->rMargin - $this->cMargin)))) { // add automatic line break @@ -18892,8 +18927,8 @@ if (!class_exists('TCPDF', false)) { if ($cell) { $wtmp -= 2 * $this->cMargin; } - if ((isset($tag['attribute']['width'])) AND ($tag['attribute']['width'] != '')) { - $hrWidth = $this->getHTMLUnitToUnits($tag['attribute']['width'], $wtmp, 'px'); + if ((isset($tag['width'])) AND ($tag['width'] != '')) { + $hrWidth = $this->getHTMLUnitToUnits($tag['width'], $wtmp, 'px'); } else { $hrWidth = $wtmp; } @@ -18926,11 +18961,11 @@ if (!class_exists('TCPDF', false)) { // convert URL to server path $tag['attribute']['src'] = str_replace(K_PATH_URL, K_PATH_MAIN, $tag['attribute']['src']); } - if (!isset($tag['attribute']['width'])) { - $tag['attribute']['width'] = 0; + if (!isset($tag['width'])) { + $tag['width'] = 0; } - if (!isset($tag['attribute']['height'])) { - $tag['attribute']['height'] = 0; + if (!isset($tag['height'])) { + $tag['height'] = 0; } //if (!isset($tag['attribute']['align'])) { // the only alignment supported is "bottom" @@ -18981,12 +19016,12 @@ if (!class_exists('TCPDF', false)) { $border = $tag['border']; } $iw = ''; - if (isset($tag['attribute']['width'])) { - $iw = $this->getHTMLUnitToUnits($tag['attribute']['width'], 1, 'px', false); + if (isset($tag['width'])) { + $iw = $this->getHTMLUnitToUnits($tag['width'], 1, 'px', false); } $ih = ''; - if (isset($tag['attribute']['height'])) { - $ih = $this->getHTMLUnitToUnits($tag['attribute']['height'], 1, 'px', false); + if (isset($tag['height'])) { + $ih = $this->getHTMLUnitToUnits($tag['height'], 1, 'px', false); } if (($type == 'eps') OR ($type == 'ai')) { $this->ImageEps($tag['attribute']['src'], $xpos, $this->y, $iw, $ih, $imglink, true, $align, '', $border, true);
@@ -21406,7 +21406,7 @@ $replace = ''])
-

method stringRightTrim [line 22110]

+

method stringRightTrim [line 22145]

diff --git a/doc/li_com-tecnick-tcpdf.html b/doc/li_com-tecnick-tcpdf.html index 550834e..da4dd0a 100644 --- a/doc/li_com-tecnick-tcpdf.html +++ b/doc/li_com-tecnick-tcpdf.html @@ -67,7 +67,7 @@ This documentation was generated by phpDocumentor v1.4.3
- Documentation generated on Fri, 20 Aug 2010 16:32:31 +0200 by phpDocumentor 1.4.3 + Documentation generated on Sat, 21 Aug 2010 12:53:12 +0200 by phpDocumentor 1.4.3
diff --git a/doc/index.html b/doc/index.html index 550834e..da4dd0a 100644 --- a/doc/index.html +++ b/doc/index.html @@ -67,7 +67,7 @@ This documentation was generated by phpDocumentor v1.4.3
- Documentation generated on Fri, 20 Aug 2010 16:32:31 +0200 by phpDocumentor 1.4.3 + Documentation generated on Sat, 21 Aug 2010 12:53:12 +0200 by phpDocumentor 1.4.3
@@ -21457,7 +21457,7 @@ $replace = ''])
-

method stringTrim [line 22123]

+

method stringTrim [line 22158]

diff --git a/doc/errors.html b/doc/errors.html index 6e5c37f..e6a7b9b 100644 --- a/doc/errors.html +++ b/doc/errors.html @@ -33,13 +33,9 @@
diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html index 7d35a90..c628774 100644 --- a/doc/elementindex_com-tecnick-tcpdf.html +++ b/doc/elementindex_com-tecnick-tcpdf.html @@ -2076,7 +2076,7 @@ top
- Documentation generated on Fri, 20 Aug 2010 16:32:31 +0200 by phpDocumentor 1.4.3 + Documentation generated on Sat, 21 Aug 2010 12:53:12 +0200 by phpDocumentor 1.4.3
@@ -21508,7 +21508,7 @@ $replace = ''])
-

method SVGPath [line 22885]

+

method SVGPath [line 22920]

diff --git a/doc/elementindex.html b/doc/elementindex.html index 5f13383..1b02354 100644 --- a/doc/elementindex.html +++ b/doc/elementindex.html @@ -2044,7 +2044,7 @@ top
- Documentation generated on Fri, 20 Aug 2010 16:32:31 +0200 by phpDocumentor 1.4.3 + Documentation generated on Sat, 21 Aug 2010 12:53:12 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_unicode_data.php.html b/doc/com-tecnick-tcpdf/_unicode_data.php.html index a4254f9..2d0e2a6 100644 --- a/doc/com-tecnick-tcpdf/_unicode_data.php.html +++ b/doc/com-tecnick-tcpdf/_unicode_data.php.html @@ -246,7 +246,7 @@ Unicode data for TCPDF library.



- Documentation generated on Fri, 20 Aug 2010 16:32:37 +0200 by phpDocumentor 1.4.3 + Documentation generated on Sat, 21 Aug 2010 12:53:18 +0200 by phpDocumentor 1.4.3
@@ -21559,7 +21559,7 @@ $style = ''])
-

method SVGTransform [line 22611]

+

method SVGTransform [line 22646]

diff --git a/doc/com-tecnick-tcpdf/_tcpdf.php.html b/doc/com-tecnick-tcpdf/_tcpdf.php.html index 58c9c7d..f895b25 100644 --- a/doc/com-tecnick-tcpdf/_tcpdf.php.html +++ b/doc/com-tecnick-tcpdf/_tcpdf.php.html @@ -82,7 +82,7 @@ This is a PHP class for generating PDF documents without requiring external exte - + @@ -113,7 +113,7 @@ unicode data

@@ -21598,7 +21598,7 @@ $tm)
-

method swapMargins [line 20175]

+

method swapMargins [line 20210]

- + - + - + - + - + @@ -22855,7 +22855,7 @@ $align = ''])
-

method write2DBarcode [line 16112]

+

method write2DBarcode [line 16147]

@@ -22777,7 +22777,7 @@ $x = ''], [int $y = ''], [int $w = ''], [int $h = ''], [float -$xres = 0.4], [array +$xres = ''], [array $style = ''], [string $align = ''])
@@ -22817,27 +22817,27 @@ $align = ''])
int   $x  x position in user unitsx position in user units (empty string = current x position)
int   $y  y position in user unitsy position in user units (empty string = current y position)
int   $w  width in user unitswidth in user units (empty string = remaining page width)
int   $h  height in user unitsheight in user units (empty string = remaining page height)
float   $xres  width of the smallest bar in user unitswidth of the smallest bar in user units (empty string = default value = 0.4mm)
array  
diff --git a/doc/com-tecnick-tcpdf/_qrcode.php.html b/doc/com-tecnick-tcpdf/_qrcode.php.html index e19cf56..87b3639 100644 --- a/doc/com-tecnick-tcpdf/_qrcode.php.html +++ b/doc/com-tecnick-tcpdf/_qrcode.php.html @@ -480,7 +480,7 @@ string $string, [int $split_length = 1])
- Documentation generated on Fri, 20 Aug 2010 16:32:32 +0200 by phpDocumentor 1.4.3 + Documentation generated on Sat, 21 Aug 2010 12:53:13 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_pdf417.php.html b/doc/com-tecnick-tcpdf/_pdf417.php.html index 6c64297..d412bbe 100644 --- a/doc/com-tecnick-tcpdf/_pdf417.php.html +++ b/doc/com-tecnick-tcpdf/_pdf417.php.html @@ -157,7 +157,7 @@ Class to create PDF417 barcode arrays for TCPDF class.

PDF417 (ISO

- Documentation generated on Fri, 20 Aug 2010 16:32:31 +0200 by phpDocumentor 1.4.3 + Documentation generated on Sat, 21 Aug 2010 12:53:12 +0200 by phpDocumentor 1.4.3
@@ -22945,7 +22945,7 @@ $distort = false])
-

method writeBarcode [line 16058]

+

method writeBarcode [line 16093]

diff --git a/doc/com-tecnick-tcpdf/_htmlcolors.php.html b/doc/com-tecnick-tcpdf/_htmlcolors.php.html index e070659..088a81b 100644 --- a/doc/com-tecnick-tcpdf/_htmlcolors.php.html +++ b/doc/com-tecnick-tcpdf/_htmlcolors.php.html @@ -97,7 +97,7 @@ Array of WEB safe colors.



- Documentation generated on Fri, 20 Aug 2010 16:32:31 +0200 by phpDocumentor 1.4.3 + Documentation generated on Sat, 21 Aug 2010 12:53:12 +0200 by phpDocumentor 1.4.3
- + @@ -23035,7 +23035,7 @@ $code)
-

method writeDiskCache [line 20628]

+

method writeDiskCache [line 20663]

@@ -23007,7 +23007,7 @@ $code)
string   $type  type of barcode (I25, C128A, C128B, C128C, C39)type of barcode
string  
diff --git a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html index f2d4ae0..b211381 100644 --- a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html +++ b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html @@ -542,7 +542,7 @@ Configuration file for TCPDF.



- Documentation generated on Fri, 20 Aug 2010 16:32:37 +0200 by phpDocumentor 1.4.3 + Documentation generated on Sat, 21 Aug 2010 12:53:18 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/_barcodes.php.html b/doc/com-tecnick-tcpdf/_barcodes.php.html index 99164d8..04e161b 100644 --- a/doc/com-tecnick-tcpdf/_barcodes.php.html +++ b/doc/com-tecnick-tcpdf/_barcodes.php.html @@ -105,7 +105,7 @@ PHP class to creates array representations for common 1D barcodes to be used wit
- Documentation generated on Fri, 20 Aug 2010 16:32:31 +0200 by phpDocumentor 1.4.3 + Documentation generated on Sat, 21 Aug 2010 12:53:12 +0200 by phpDocumentor 1.4.3
@@ -23092,7 +23092,7 @@ $file)
-

method writeHTML [line 17534]

+

method writeHTML [line 17569]

diff --git a/doc/com-tecnick-tcpdf/_2dbarcodes.php.html b/doc/com-tecnick-tcpdf/_2dbarcodes.php.html index 007e263..df65134 100644 --- a/doc/com-tecnick-tcpdf/_2dbarcodes.php.html +++ b/doc/com-tecnick-tcpdf/_2dbarcodes.php.html @@ -105,7 +105,7 @@ PHP class to creates array representations for 2D barcodes to be used with TCPDF
- Documentation generated on Fri, 20 Aug 2010 16:32:31 +0200 by phpDocumentor 1.4.3 + Documentation generated on Sat, 21 Aug 2010 12:53:12 +0200 by phpDocumentor 1.4.3
diff --git a/doc/com-tecnick-tcpdf/TCPDFBarcode.html b/doc/com-tecnick-tcpdf/TCPDFBarcode.html index f08c416..c8c5faf 100644 --- a/doc/com-tecnick-tcpdf/TCPDFBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDFBarcode.html @@ -1377,7 +1377,7 @@ $type)
- Documentation generated on Fri, 20 Aug 2010 16:32:31 +0200 by phpDocumentor 1.4.3 + Documentation generated on Sat, 21 Aug 2010 12:53:12 +0200 by phpDocumentor 1.4.3
@@ -23158,7 +23158,7 @@ $align = ''])
-

method writeHTMLCell [line 17518]

+

method writeHTMLCell [line 17553]

diff --git a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html index acf85f3..4e88416 100644 --- a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html +++ b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html @@ -299,7 +299,7 @@ $type)
- Documentation generated on Fri, 20 Aug 2010 16:32:31 +0200 by phpDocumentor 1.4.3 + Documentation generated on Sat, 21 Aug 2010 12:53:12 +0200 by phpDocumentor 1.4.3
+ + + @@ -26599,7 +26602,7 @@ $file)
- Documentation generated on Fri, 20 Aug 2010 16:32:33 +0200 by phpDocumentor 1.4.3 + Documentation generated on Sat, 21 Aug 2010 12:53:14 +0200 by phpDocumentor 1.4.3
@@ -24051,6 +24051,9 @@ $s)
return:  escaped string.
deprecated:  
access:  protected
author:  Nicola Asuni
version:  5.8.010version:  5.8.011
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
- PDF_PRODUCER = 'TCPDF 5.8.010 (http://www.tcpdf.org)' + PDF_PRODUCER = 'TCPDF 5.8.011 (http://www.tcpdf.org)'
@@ -124,7 +124,7 @@ unicode data

- Documentation generated on Fri, 20 Aug 2010 16:32:33 +0200 by phpDocumentor 1.4.3 + Documentation generated on Sat, 21 Aug 2010 12:53:14 +0200 by phpDocumentor 1.4.3
Post-parsing
- -

tcpdf.php

-

Warnings:


-Warning on line 10328 - Unknown tag "@DEPRECATED" used
- Documentation generated on Fri, 20 Aug 2010 16:32:37 +0200 by phpDocumentor 1.4.3 + Documentation generated on Sat, 21 Aug 2010 12:53:18 +0200 by phpDocumentor 1.4.3