diff --git a/COPYRIGHT b/COPYRIGHT
index c838353b740..cf0dd033af4 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -18,7 +18,7 @@ GeoIP 2004 LGPL 2.1 Yes Sample code to m
NuSoap 0.9.5 LGPL 2.1 Yes Library to develop SOAP Web services (not into rpm and deb package)
OdtPHP 1.0.1 GPL 2.0 Yes Library to build/edit ODT files
PHPExcel 1.7.6 LGPL 2.1 Yes Read/Write XLS files, read ODS files
-TCPDF 5.9.098 LGPL 3.0 Yes PDF generation
+TCPDF 5.9.156 LGPL 3.0 Yes PDF generation
JS libraries:
jQuery 1.7.1 GPL and MIT Licence Yes JS library
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index ca97e97f2e2..aed99fdae8e 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -156,7 +156,6 @@ if (is_resource($handle))
// Info
$htmltooltip='';
$htmltooltip.=''.$langs->trans("Version").': '.$module->getVersion().' ';
- $facture->type=0;
$nextval=$module->getNextValue($mysoc,$contract);
if ("$nextval" != $langs->trans("NotAvailable")) // Keep " on nextval
{
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index a8b0325dc5d..2d0fdf18218 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -387,7 +387,6 @@ foreach ($dirmodels as $reldir)
// Info
$htmltooltip='';
$htmltooltip.=''.$langs->trans("Version").': '.$module->getVersion().' ';
- $facture->type=0;
$nextval=$module->getNextValue($mysoc,$expedition);
if ("$nextval" != $langs->trans("NotAvailable")) // Keep " on nextval
{
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index 3878d025edc..f0c857a7ca2 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -4,7 +4,7 @@
* Copyright (C) 2004 Sebastien Di Cintio
* Copyright (C) 2004 Benoit Mortier
* Copyright (C) 2004 Eric Seigne
- * Copyright (C) 2005-2011 Regis Houssin
+ * Copyright (C) 2005-2012 Regis Houssin
* Copyright (C) 2011-2012 Juanjo Menent
*
* This program is free software; you can redistribute it and/or modify
@@ -292,7 +292,6 @@ foreach ($conf->file->dol_document_root as $dirroot)
// Info
$htmltooltip='';
$htmltooltip.=''.$langs->trans("Version").': '.$module->getVersion().' ';
- $facture->type=0;
$nextval=$module->getNextValue($mysoc,$livraison);
if ("$nextval" != $langs->trans("NotAvailable")) // Keep " on nextval
{
diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php
index 2132a059926..18e0fa495be 100755
--- a/htdocs/admin/workflow.php
+++ b/htdocs/admin/workflow.php
@@ -87,7 +87,8 @@ $workflow=array(
//, 'propal' => array('WORKFLOW_PROPAL_AUTOCREATE_INVOICE')
)
);
-$workflow = array_merge($workflow, $conf->modules_parts['workflow']);
+
+if (! empty($conf->modules_parts['workflow'])) $workflow = array_merge($workflow, $conf->modules_parts['workflow']);
foreach($workflow as $child => $parents)
{
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 99686eed40d..ad11b066e8b 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -55,14 +55,10 @@ class Categorie
* Constructor
*
* @param DoliDB $db Database handler
- * @param int $id Id of category to fetch during init
*/
- function Categorie($db, $id=-1)
+ function __construct($db)
{
$this->db = $db;
- $this->id = $id;
-
- if ($id != -1) $this->fetch($this->id);
}
/**
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 252200cf6df..465c565cd37 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -106,10 +106,8 @@ class Commande extends CommonObject
*
* @param DoliDB $db Database handler
*/
- function Commande($db)
+ function __construct($db)
{
- global $langs;
- $langs->load('orders');
$this->db = $db;
$this->remise = 0;
diff --git a/htdocs/core/modules/contract/modules_contract.php b/htdocs/core/modules/contract/modules_contract.php
index 9b501f4529c..114bcc77b61 100755
--- a/htdocs/core/modules/contract/modules_contract.php
+++ b/htdocs/core/modules/contract/modules_contract.php
@@ -71,7 +71,7 @@ class ModelNumRefContracts
/**
* Test if existing numbers make problems with numbering
*
- * @return boolean false if conflit, true if ok
+ * @return boolean false if conflit, true if ok
*/
function canBeActivated()
{
@@ -81,9 +81,11 @@ class ModelNumRefContracts
/**
* Return next value
*
- * @return string Value
+ * @param Societe $objsoc third party object
+ * @param Object $contract contract object
+ * @return string Value
*/
- function getNextValue()
+ function getNextValue($objsoc, $contrat)
{
global $langs;
return $langs->trans("NotAvailable");
diff --git a/htdocs/core/modules/expedition/modules_expedition.php b/htdocs/core/modules/expedition/modules_expedition.php
index 8215ca19aaa..f239178236e 100644
--- a/htdocs/core/modules/expedition/modules_expedition.php
+++ b/htdocs/core/modules/expedition/modules_expedition.php
@@ -114,9 +114,11 @@ abstract class ModelNumRefExpedition
/**
* Return next value
*
- * @return string Value
+ * @param Societe $objsoc Third party object
+ * @param Object $shipment Shipment object
+ * @return string Value
*/
- function getNextValue()
+ function getNextValue($objsoc, $shipment)
{
global $langs;
return $langs->trans("NotAvailable");
diff --git a/htdocs/core/modules/livraison/mod_livraison_jade.php b/htdocs/core/modules/livraison/mod_livraison_jade.php
index 6e8dad3afc2..b69dd6d61cb 100644
--- a/htdocs/core/modules/livraison/mod_livraison_jade.php
+++ b/htdocs/core/modules/livraison/mod_livraison_jade.php
@@ -106,7 +106,7 @@ class mod_livraison_jade extends ModeleNumRefDeliveryOrder
* @param Object $object Object we need next value for
* @return string Value if KO, <0 if KO
*/
- function getNextValue($objsoc=0,$object='')
+ function getNextValue($objsoc,$object)
{
global $db,$conf;
diff --git a/htdocs/core/modules/livraison/mod_livraison_saphir.php b/htdocs/core/modules/livraison/mod_livraison_saphir.php
index 357f814ceaa..89d9faf5781 100644
--- a/htdocs/core/modules/livraison/mod_livraison_saphir.php
+++ b/htdocs/core/modules/livraison/mod_livraison_saphir.php
@@ -102,16 +102,16 @@ class mod_livraison_saphir extends ModeleNumRefDeliveryOrder
* Return next value
*
* @param Societe $objsoc Object third party
- * @param Object $livraison Object delivery
+ * @param Object $object Object delivery
* @return string Value if OK, 0 if KO
*/
- function getNextValue($objsoc=0,$livraison='')
+ function getNextValue($objsoc,$object)
{
global $db,$conf;
require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php");
- // On d�fini critere recherche compteur
+ // On defini critere recherche compteur
$mask=$conf->global->LIVRAISON_SAPHIR_MASK;
if (! $mask)
diff --git a/htdocs/core/modules/livraison/modules_livraison.php b/htdocs/core/modules/livraison/modules_livraison.php
index 906b26d1e94..1454421b1fb 100644
--- a/htdocs/core/modules/livraison/modules_livraison.php
+++ b/htdocs/core/modules/livraison/modules_livraison.php
@@ -116,9 +116,11 @@ abstract class ModeleNumRefDeliveryOrder
/**
* Renvoi prochaine valeur attribuee
*
- * @return string Valeur
+ * @param Societe $objsoc Object third party
+ * @param Object $object Object delivery
+ * @return string Valeur
*/
- function getNextValue()
+ function getNextValue($objsoc, $object)
{
global $langs;
return $langs->trans("NotAvailable");
diff --git a/htdocs/core/modules/project/mod_project_simple.php b/htdocs/core/modules/project/mod_project_simple.php
index 3f0cc82c91b..345ac2ef6e3 100644
--- a/htdocs/core/modules/project/mod_project_simple.php
+++ b/htdocs/core/modules/project/mod_project_simple.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2010 Laurent Destailleur
+/* Copyright (C) 2010-2012 Regis Houssin
+ * Copyright (C) 2010 Laurent Destailleur
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -102,7 +102,7 @@ class mod_project_simple extends ModeleNumRefProjects
* @param Project $project Object project
* @return string Value if OK, 0 if KO
*/
- function getNextValue($objsoc=0,$project='')
+ function getNextValue($objsoc,$project)
{
global $db,$conf;
diff --git a/htdocs/core/modules/project/mod_project_universal.php b/htdocs/core/modules/project/mod_project_universal.php
index 72d235cb3e1..fa7c78978da 100644
--- a/htdocs/core/modules/project/mod_project_universal.php
+++ b/htdocs/core/modules/project/mod_project_universal.php
@@ -104,7 +104,7 @@ class mod_project_universal extends ModeleNumRefProjects
* @param Project $project Object project
* @return string Value if OK, 0 if KO
*/
- function getNextValue($objsoc=0,$project='')
+ function getNextValue($objsoc,$project)
{
global $db,$conf;
diff --git a/htdocs/core/modules/project/modules_project.php b/htdocs/core/modules/project/modules_project.php
index 9a3403c449c..ce03f694eb8 100644
--- a/htdocs/core/modules/project/modules_project.php
+++ b/htdocs/core/modules/project/modules_project.php
@@ -110,10 +110,12 @@ abstract class ModeleNumRefProjects
/**
* Renvoi prochaine valeur attribuee
- *
- * @return string Valeur
+ *
+ * @param Societe $objsoc Object third party
+ * @param Project $project Object project
+ * @return string Valeur
*/
- function getNextValue()
+ function getNextValue($objsoc, $project)
{
global $langs;
return $langs->trans("NotAvailable");
diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php
index 654f8a9aefa..e2cb076b2b7 100644
--- a/htdocs/fourn/class/fournisseur.class.php
+++ b/htdocs/fourn/class/fournisseur.class.php
@@ -41,17 +41,13 @@ class Fournisseur extends Societe
*
* @param DoliDB $db Database handler
*/
- function Fournisseur($db)
+ function __construct($db)
{
- global $config;
-
$this->db = $db;
$this->client = 0;
$this->fournisseur = 0;
$this->effectif_id = 0;
$this->forme_juridique_code = 0;
-
- return 0;
}
diff --git a/htdocs/includes/tcpdf/2dbarcodes.php b/htdocs/includes/tcpdf/2dbarcodes.php
index 47b0bed75bc..e04b3073ce1 100644
--- a/htdocs/includes/tcpdf/2dbarcodes.php
+++ b/htdocs/includes/tcpdf/2dbarcodes.php
@@ -1,13 +1,13 @@
$arrcode['num_cols'] required number of columns
*
$arrcode['bcode'][$r][$c] value of the cell is $r row and $c column (0 = transparent, 1 = black)
* @param $code (string) code to print
- * @param $type (string) type of barcode:
RAW: raw mode - comma-separad list of array rows
RAW2: raw mode - array rows are surrounded by square parenthesis.
QRCODE : QR-CODE Low error correction
QRCODE,L : QR-CODE Low error correction
QRCODE,M : QR-CODE Medium error correction
QRCODE,Q : QR-CODE Better error correction
QRCODE,H : QR-CODE Best error correction
PDF417 : PDF417 (ISO/IEC 15438:2006)
PDF417,a,e,t,s,f,o0,o1,o2,o3,o4,o5,o6 : PDF417 with parameters: a = aspect ratio (width/height); e = error correction level (0-8); t = total number of macro segments; s = macro segment index (0-99998); f = file ID; o0 = File Name (text); o1 = Segment Count (numeric); o2 = Time Stamp (numeric); o3 = Sender (text); o4 = Addressee (text); o5 = File Size (numeric); o6 = Checksum (numeric). NOTES: Parameters t, s and f are required for a Macro Control Block, all other parametrs are optional. To use a comma character ',' on text options, replace it with the character 255: "\xff".
+ * @param $type (string) type of barcode:
DATAMATRIX : Datamatrix (ISO/IEC 16022)
PDF417 : PDF417 (ISO/IEC 15438:2006)
PDF417,a,e,t,s,f,o0,o1,o2,o3,o4,o5,o6 : PDF417 with parameters: a = aspect ratio (width/height); e = error correction level (0-8); t = total number of macro segments; s = macro segment index (0-99998); f = file ID; o0 = File Name (text); o1 = Segment Count (numeric); o2 = Time Stamp (numeric); o3 = Sender (text); o4 = Addressee (text); o5 = File Size (numeric); o6 = Checksum (numeric). NOTES: Parameters t, s and f are required for a Macro Control Block, all other parametrs are optional. To use a comma character ',' on text options, replace it with the character 255: "\xff".
QRCODE : QRcode Low error correction
QRCODE,L : QRcode Low error correction
QRCODE,M : QRcode Medium error correction
QRCODE,Q : QRcode Better error correction
QRCODE,H : QR-CODE Best error correction
RAW: raw mode - comma-separad list of array rows
RAW2: raw mode - array rows are surrounded by square parenthesis.
TEST : Test matrix
*/
public function __construct($code, $type) {
$this->setBarcode($code, $type);
@@ -84,8 +84,8 @@ class TCPDF2DBarcode {
* @param $color (string) Foreground color (in SVG format) for bar elements (background is transparent).
* @public
*/
- public function getBarcodeSVG($w=2, $h=3, $color='black') {
- // send XML headers
+ public function getBarcodeSVG($w=3, $h=3, $color='black') {
+ // send headers
$code = $this->getBarcodeSVGcode($w, $h, $color);
header('Content-Type: application/svg+xml');
header('Cache-Control: public, must-revalidate, max-age=0'); // HTTP/1.1
@@ -114,11 +114,10 @@ class TCPDF2DBarcode {
$svg .= "\t".''.strtr($this->barcode_array['code'], $repstr).''."\n";
$svg .= "\t".''."\n";
// print barcode elements
- $xstart = 0;
$y = 0;
// for each row
for ($r = 0; $r < $this->barcode_array['num_rows']; ++$r) {
- $x = $xstart;
+ $x = 0;
// for each column
for ($c = 0; $c < $this->barcode_array['num_cols']; ++$c) {
if ($this->barcode_array['bcode'][$r][$c] == 1) {
@@ -134,22 +133,112 @@ class TCPDF2DBarcode {
return $svg;
}
+ /**
+ * Return an HTML representation of barcode.
+ * @param $w (int) Width of a single rectangle element in pixels.
+ * @param $h (int) Height of a single rectangle element in pixels.
+ * @param $color (string) Foreground color for bar elements (background is transparent).
+ * @return string HTML code.
+ * @public
+ */
+ public function getBarcodeHTML($w=10, $h=10, $color='black') {
+ $html = '
'."\n";
+ // print barcode elements
+ $y = 0;
+ // for each row
+ for ($r = 0; $r < $this->barcode_array['num_rows']; ++$r) {
+ $x = 0;
+ // for each column
+ for ($c = 0; $c < $this->barcode_array['num_cols']; ++$c) {
+ if ($this->barcode_array['bcode'][$r][$c] == 1) {
+ // draw a single barcode cell
+ $html .= '
'."\n";
+ return $html;
+ }
+
+ /**
+ * Return a PNG image representation of barcode (requires GD or Imagick library).
+ * @param $w (int) Width of a single rectangle element in pixels.
+ * @param $h (int) Height of a single rectangle element in pixels.
+ * @param $color (array) RGB (0-255) foreground color for bar elements (background is transparent).
+ * @return image or false in case of error.
+ * @public
+ */
+ public function getBarcodePNG($w=3, $h=3, $color=array(0,0,0)) {
+ // calculate image size
+ $width = ($this->barcode_array['num_cols'] * $w);
+ $height = ($this->barcode_array['num_rows'] * $h);
+ if (function_exists('imagecreate')) {
+ // GD library
+ $imagick = false;
+ $png = imagecreate($width, $height);
+ $bgcol = imagecolorallocate($png, 255, 255, 255);
+ imagecolortransparent($png, $bgcol);
+ $fgcol = imagecolorallocate($png, $color[0], $color[1], $color[2]);
+ } elseif (extension_loaded('imagick')) {
+ $imagick = true;
+ $bgcol = new imagickpixel('rgb(255,255,255');
+ $fgcol = new imagickpixel('rgb('.$color[0].','.$color[1].','.$color[2].')');
+ $png = new Imagick();
+ $png->newImage($width, $height, 'none', 'png');
+ $bar = new imagickdraw();
+ $bar->setfillcolor($fgcol);
+ } else {
+ return false;
+ }
+ // print barcode elements
+ $y = 0;
+ // for each row
+ for ($r = 0; $r < $this->barcode_array['num_rows']; ++$r) {
+ $x = 0;
+ // for each column
+ for ($c = 0; $c < $this->barcode_array['num_cols']; ++$c) {
+ if ($this->barcode_array['bcode'][$r][$c] == 1) {
+ // draw a single barcode cell
+ if ($imagick) {
+ $bar->rectangle($x, $y, ($x + $w), ($y + $h));
+ } else {
+ imagefilledrectangle($png, $x, $y, ($x + $w), ($y + $h), $fgcol);
+ }
+ }
+ $x += $w;
+ }
+ $y += $h;
+ }
+ // send headers
+ header('Content-Type: image/png');
+ header('Cache-Control: public, must-revalidate, max-age=0'); // HTTP/1.1
+ header('Pragma: public');
+ header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past
+ header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+ if ($imagick) {
+ $png->drawimage($bar);
+ echo $png;
+ } else {
+ imagepng($png);
+ imagedestroy($png);
+ }
+ }
+
/**
* Set the barcode.
* @param $code (string) code to print
- * @param $type (string) type of barcode:
RAW: raw mode - comma-separad list of array rows
RAW2: raw mode - array rows are surrounded by square parenthesis.
QRCODE : QR-CODE Low error correction
QRCODE,L : QR-CODE Low error correction
QRCODE,M : QR-CODE Medium error correction
QRCODE,Q : QR-CODE Better error correction
QRCODE,H : QR-CODE Best error correction
PDF417 : PDF417 (ISO/IEC 15438:2006)
PDF417,a,e,t,s,f,o0,o1,o2,o3,o4,o5,o6 : PDF417 with parameters: a = aspect ratio (width/height); e = error correction level (0-8); t = total number of macro segments; s = macro segment index (0-99998); f = file ID; o0 = File Name (text); o1 = Segment Count (numeric); o2 = Time Stamp (numeric); o3 = Sender (text); o4 = Addressee (text); o5 = File Size (numeric); o6 = Checksum (numeric). NOTES: Parameters t, s and f are required for a Macro Control Block, all other parametrs are optional. To use a comma character ',' on text options, replace it with the character 255: "\xff".
+ * @param $type (string) type of barcode:
DATAMATRIX : Datamatrix (ISO/IEC 16022)
PDF417 : PDF417 (ISO/IEC 15438:2006)
PDF417,a,e,t,s,f,o0,o1,o2,o3,o4,o5,o6 : PDF417 with parameters: a = aspect ratio (width/height); e = error correction level (0-8); t = total number of macro segments; s = macro segment index (0-99998); f = file ID; o0 = File Name (text); o1 = Segment Count (numeric); o2 = Time Stamp (numeric); o3 = Sender (text); o4 = Addressee (text); o5 = File Size (numeric); o6 = Checksum (numeric). NOTES: Parameters t, s and f are required for a Macro Control Block, all other parametrs are optional. To use a comma character ',' on text options, replace it with the character 255: "\xff".
QRCODE : QRcode Low error correction
QRCODE,L : QRcode Low error correction
QRCODE,M : QRcode Medium error correction
QRCODE,Q : QRcode Better error correction
QRCODE,H : QR-CODE Best error correction
RAW: raw mode - comma-separad list of array rows
RAW2: raw mode - array rows are surrounded by square parenthesis.
TEST : Test matrix
* @return array
*/
public function setBarcode($code, $type) {
$mode = explode(',', $type);
$qrtype = strtoupper($mode[0]);
switch ($qrtype) {
- case 'QRCODE': { // QR-CODE
- require_once(dirname(__FILE__).'/qrcode.php');
- if (!isset($mode[1]) OR (!in_array($mode[1],array('L','M','Q','H')))) {
- $mode[1] = 'L'; // Ddefault: Low error correction
- }
- $qrcode = new QRcode($code, strtoupper($mode[1]));
+ case 'DATAMATRIX': { // DATAMATRIX (ISO/IEC 16022)
+ require_once(dirname(__FILE__).'/datamatrix.php');
+ $qrcode = new Datamatrix($code);
$this->barcode_array = $qrcode->getBarcodeArray();
$this->barcode_array['code'] = $code;
break;
@@ -185,6 +274,16 @@ class TCPDF2DBarcode {
$this->barcode_array['code'] = $code;
break;
}
+ case 'QRCODE': { // QR-CODE
+ require_once(dirname(__FILE__).'/qrcode.php');
+ if (!isset($mode[1]) OR (!in_array($mode[1],array('L','M','Q','H')))) {
+ $mode[1] = 'L'; // Ddefault: Low error correction
+ }
+ $qrcode = new QRcode($code, strtoupper($mode[1]));
+ $this->barcode_array = $qrcode->getBarcodeArray();
+ $this->barcode_array['code'] = $code;
+ break;
+ }
case 'RAW':
case 'RAW2': { // RAW MODE
// remove spaces
diff --git a/htdocs/includes/tcpdf/CHANGELOG.TXT b/htdocs/includes/tcpdf/CHANGELOG.TXT
index 6e85bbee82c..23a14f9991d 100644
--- a/htdocs/includes/tcpdf/CHANGELOG.TXT
+++ b/htdocs/includes/tcpdf/CHANGELOG.TXT
@@ -1,3 +1,227 @@
+5.9.156 (2012-04-10)
+ - Bug item #3515885 "TOC and booklet: left and right page exchanged".
+ - SetAutoPageBreak(false) now works also in multicolumn mode.
+
+5.9.155 (2012-04-02)
+ - Bug item #3512596 "font import problems" was fixed.
+ - Method addTTFfont() was modified to extract only specified Platform ID and Encoding ID (check the source code documentation).
+ - All fonts were updated.
+ - Bug item #3513867 "booklet and setHeaderTemplateAutoreset: header shifted left" was fixed.
+ - Bug item #3513749 "TCPDF Superscript/Subscript" was fixed.
+
+5.9.154 (2012-03-29)
+ - A debug echo was removed.
+
+5.9.153 (2012-03-28)
+ - A bug on font conversion was fixed.
+ - All fonts were updated.
+ - Method isCharDefined() was added to find if a character is defined on the selected font.
+ - Method replaceMissingChars() was added to automatically replace missing chars on selected font.
+ - SetFont() method was fixed.
+
+5.9.152 (2012-03-23)
+ - The following overprint methods were added: setOverprint(), getOverprint().
+ - Signature of setAlpha() method was changed and method getAlpha() was added.
+ - stroke-opacity support was added on SVG.
+ - The following date methods were added: setDocCreationTimestamp(), setDocModificationTimestamp(), getDocCreationTimestamp(), getDocModificationTimestamp(), getFormattedDate(), getTimestamp().
+ - Signature of _datestring() method was changed.
+ - Method getFontBBox() was added.
+ - Method setPageBoxTypes() was aded.
+
+5.9.151 (2012-03-22)
+ - Bug item #3509889 "Transform() distorts PDF" was fixed.
+ - Precision of real number were extended.
+ - ComboBox and ListBox methods were fixed.
+ - Bulgarian language file was added.
+ - addTOC() method was improved to include bookmark color and font style.
+
+5.9.150 (2012-03-16)
+ - A bug related to form fields in PDF/A mode was fixed.
+
+5.9.149 (2012-02-21)
+ - Bug item #3489933 "SVG Parser treats tspan like text" was fixed.
+
+5.9.148 (2012-02-17)
+ - Bug item #3488600 "Multiple radiobutton sets get first set value" was fixed.
+
+5.9.147 (2012-02-14)
+ - A problem with SVG gradients has been fixed.
+
+5.9.146 (2012-02-12)
+ - Bug item #3486880 "$filehash undefine error" was fixed.
+ - The default font is now the one specified at PDF_FONT_NAME_MAIN constant.
+
+5.9.145 (2012-01-28)
+ - Japanese language file was added.
+ - TCPDF license and README.TXT files were updated.
+
+5.9.144 (2012-01-12)
+ - HTML output on barcode classes was improved.
+
+5.9.143 (2012-01-08)
+ - Bug item #3471057 "setCreator() has no effect" was fixed.
+
+5.9.142 (2011-12-23)
+ - Source code documentation was updated.
+
+5.9.141 (2011-12-14)
+ - Some minor bugs were fixed.
+
+5.9.140 (2011-12-13)
+ - SVG now supports embedded images encoded as base64.
+
+5.9.139 (2011-12-11)
+ - Spot color methods were fixed.
+
+5.9.138 (2011-12-10)
+ - cropMark() method was improved (check source code documentation).
+ - Example n. 56 was updated.
+ - Bug item #3452390 "Check Box still not ticked when set to true" was fixed.
+
+5.9.137 (2011-12-01)
+ - Bug item #3447005 "Background color and border of Form Elements is printed" was fixed.
+ - Color support for Form elements was improved.
+
+5.9.136 (2011-11-27)
+ - Bug item #3443387 "SetMargins with keep option does not work for top margin" was fixed.
+
+5.9.135 (2011-11-04)
+ - Bug item #3433406 "Double keywords in description" was fixed.
+
+5.9.134 (2011-10-29)
+ - The default value for $defcol parameter on convertHTMLColorToDec() method was fixed.
+ - Deafult HTTP headers were changed to avoid browser caching.
+ - Some deprecated syntax were replaced.
+
+5.9.133 (2011-10-26)
+ - Bug item #3428446 "copyPage method not working when diskcache enabled" was fixed.
+
+5.9.132 (2011-10-20)
+ - Bug item #3426167 "bug in function convertHTMLColorToDec()" was fixed.
+
+5.9.131 (2011-10-13)
+ - An error message was added to ImagePngAlpha() method.
+
+5.9.130 (2011-10-12)
+ - Now you can set image data strings on HTML img tag by encoding the image binary data in this way: $imgsrc = '@'.base64_encode($imgdata);
+
+5.9.129 (2011-10-07)
+ - Core fonts metrics was fixed (replace all helvetica and times php files on fonts folder).
+ - Form fields support was improved and some problems were fixed (check the example n. 14).
+ - Bug item #3420249 "Issue with booklet and MultiCell" was fixed.
+
+5.9.128 (2011-10-06)
+ - Method addTTFfont() was improved (check the source code documentation).
+ - Method setExtraXMP() to set custom XMP data was added.
+
+5.9.127 (2011-10-04)
+ - Readonly mode option was activated for radiobuttons.
+
+5.9.126 (2011-10-03)
+ - Bug item #3417989 "Graphics State operator in form XObject fails to render" was fixed.
+ - Xobjects problems with transparency, gradients and spot colors were fixed.
+
+5.9.125 (2011-10-03)
+ - Support for 8-digit CMYK hexadecimal color representation was added (to be used with XHTML and SVG).
+ - Spot colors support was improved (check example n. 37).
+ - Color methods were improved.
+
+5.9.124 (2011-10-02)
+ - Core fonts were updated.
+
+5.9.123 (2011-10-02)
+ - The method addTTFfont() wad added to automatically convert TTF fonts (check the new fonts guide at http://www.tcpdf.org).
+ - Old font utils were removed.
+ - All fonts were updated and new arabic fonts were added (almohanad were removed and replaced by aefurat and aealarabiya).
+ - The file unicode_data.php was updated.
+ - The file encodings_maps.php was added.
+ - PDF/A files are now compressed to save space.
+ - XHTML input form fields now support text-alignment attribute.
+
+5.9.122 (2011-09-29)
+ - PDF/A-1b compliance was improved to pass some online testing.
+
+5.9.121 (2011-09-28)
+ - This version includes support for PDF/A-1b format (the class constructor signature was changed - see example n. 65).
+ - Method setSRGBmode() was added to force sRGB_IEC61966-2.1 black scaled ICC color profile for the whole document (file sRGB.icc was added).
+ - 14 new fonts were added to allow embedding core fonts (for PDF/A compliance).
+ - Font utils were fixed.
+
+5.9.120 (2011-09-22)
+ - This version includes a fix for _getTrueTypeFontSubset() method.
+
+5.9.119 (2011-09-19)
+ - This version includes a fix for extra page numbering on TOC.
+
+5.9.118 (2011-09-17)
+ - This version includes some changes that allows you to add a bookmark for a page that do not exist.
+
+5.9.117 (2011-09-15)
+ - TCPDFBarcode and TCPDF2DBarcode classes were extended to include a method for exporting barcodes as PNG images.
+
+5.9.116 (2011-09-14)
+ - Datamatrix class was improved and documentation was fixed.
+
+5.9.115 (2011-09-13)
+ - Datamatrix ECC200 barcode support was added (a new datamatrix.php file was added) - check example n. 50.
+ - getBarcodeHTML() method was added on TCPDFBarcode and TCPDF2DBarcode classes to return an HTML representation of the barcode.
+ - cURL options on Image() method were improved.
+ - A bug on write2DBarcode() was fixed.
+
+5.9.114 (2011-09-04)
+ - A bug related to column position was fixed.
+
+5.9.113 (2011-08-24)
+ - This release include two new experimental files for parsing an existing PDF document (the integration with TCPDF is under development).
+
+5.9.112 (2011-08-18)
+ - A newline character was added after the 'trailer' keyword for compatibility with some parsers.
+ - Support for layers was improved.
+
+5.9.111 (2011-08-17)
+ - Barcode CODE 39 default gap was restored at 1.
+
+5.9.110 (2011-08-17)
+ - Barcode CODE 39 was fixed.
+
+5.9.109 (2011-08-12)
+ - Method getNumLines() was fixed.
+ - A bug related to page break in multi-column mode was fixed.
+
+5.9.108 (2011-08-09)
+ - A bug on PHP4 version was fixed.
+
+5.9.107 (2011-08-08)
+ - This version includes a minor bugfix.
+
+5.9.106 (2011-08-04)
+ - This version includes transparency groups: check the new parameter on startTemplate() method and example 62.
+
+5.9.105 (2011-08-04)
+ - Bug item #3386153 "Check Box not ticked when set to true" was fixed.
+
+5.9.104 (2011-08-01)
+ - Bug item #3383698 "imagemagick, resize and dpi" was fixed.
+
+5.9.103 (2011-07-16)
+ - Alignment of XHTML lines was improved.
+ - Spell of the "length" word was fixed.
+
+5.9.102 (2011-07-13)
+ - Methods startLayer() and endLayer() were added to support arbitrary PDF layers.
+ - Some improvements/fixes for images were added (thanks to Brendan Abbott).
+
+5.9.101 (2011-07-07)
+ - Support for JPEG and PNG ICC Color Profiles was added.
+ - Method addEmptySignatureAppearance() was added to add empty signature fields (see example n. 52).
+ - Bug item #3354332 "Strange line spacing with reduced font-size in writeHTML" was fixed.
+
+5.9.100 (2011-06-29)
+ - An SVG bug has been fixed.
+
+5.9.099 (2011-06-27)
+ - Bug item #3335045 "Font freesans seems somehow corrupted in footer" was fixed.
+
5.9.098 (2011-06-23)
- The Named Destination feature was fixed.
@@ -13,7 +237,7 @@
- Font subsetting was fixed to include all parts of composite fonts.
5.9.094 (2011-06-17)
- - Bug item #3317898 "Page Group numbering broken in 5.9.093" was fixed.
+ - Bug item #3317898 "Page Group numbering broken in 5.9.093" was fixed.
5.9.093 (2011-06-16)
- Method setStartingPageNumber() was added to set starting page number (for automatic page numbering).
diff --git a/htdocs/includes/tcpdf/LICENSE.TXT b/htdocs/includes/tcpdf/LICENSE.TXT
index 26adda0b39f..daf21f7d3eb 100644
--- a/htdocs/includes/tcpdf/LICENSE.TXT
+++ b/htdocs/includes/tcpdf/LICENSE.TXT
@@ -5,9 +5,7 @@
TCPDF is free software: you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation, either version 3 of the
- License, or (at your option) any later version. Additionally,
- YOU CAN'T REMOVE ANY TCPDF COPYRIGHT NOTICE OR LINK FROM THE
- GENERATED PDF DOCUMENTS.
+ License, or (at your option) any later version.
**********************************************************************
**********************************************************************
diff --git a/htdocs/includes/tcpdf/README.TXT b/htdocs/includes/tcpdf/README.TXT
index 5b5c94f7771..83520bb1272 100644
--- a/htdocs/includes/tcpdf/README.TXT
+++ b/htdocs/includes/tcpdf/README.TXT
@@ -8,16 +8,16 @@ http://sourceforge.net/donate/index.php?group_id=128076
------------------------------------------------------------
Name: TCPDF
-Version: 5.9.098
-Release date: 2011-06-23
+Version: 5.9.156
+Release date: 2012-04-10
Author: Nicola Asuni
-Copyright (c) 2002-2011:
+Copyright (c) 2002-2012:
Nicola Asuni
- Tecnick.com s.r.l.
- Via Della Pace, 11
- 09044 Quartucciu (CA)
- ITALY
+ Tecnick.com LTD
+ Manor Coach House, Church Hill
+ Aldershot, Hants, GU12 4RQ
+ UK
www.tecnick.com
URLs:
@@ -31,13 +31,13 @@ Main Features:
* no external libraries are required for the basic functions;
* all standard page formats, custom page formats, custom margins and units of measure;
* UTF-8 Unicode and Right-To-Left languages;
- * TrueTypeUnicode, OpenTypeUnicode, TrueType, OpenType, Type1 and CID-0 fonts;
+ * TrueTypeUnicode, OpenTypeUnicode v1, TrueType, OpenType v1, Type1 and CID-0 fonts;
* font subsetting;
* methods to publish some XHTML + CSS code, Javascript and Forms;
* images, graphic (geometric figures) and transformation methods;
* supports JPEG, PNG and SVG images natively, all images supported by GD (GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM) and all images supported via ImagMagick (http: www.imagemagick.org/www/formats.html)
- * 1D and 2D barcodes: CODE 39, ANSI MH10.8M-1983, USD-3, 3 of 9, CODE 93, USS-93, Standard 2 of 5, Interleaved 2 of 5, CODE 128 A/B/C, 2 and 5 Digits UPC-Based Extention, EAN 8, EAN 13, UPC-A, UPC-E, MSI, POSTNET, PLANET, RMS4CC (Royal Mail 4-state Customer Code), CBC (Customer Bar Code), KIX (Klant index - Customer index), Intelligent Mail Barcode, Onecode, USPS-B-3200, CODABAR, CODE 11, PHARMACODE, PHARMACODE TWO-TRACKS, QR-Code, PDF417;
- * Grayscale, RGB, CMYK, Spot Colors and Transparencies;
+ * 1D and 2D barcodes: CODE 39, ANSI MH10.8M-1983, USD-3, 3 of 9, CODE 93, USS-93, Standard 2 of 5, Interleaved 2 of 5, CODE 128 A/B/C, 2 and 5 Digits UPC-Based Extention, EAN 8, EAN 13, UPC-A, UPC-E, MSI, POSTNET, PLANET, RMS4CC (Royal Mail 4-state Customer Code), CBC (Customer Bar Code), KIX (Klant index - Customer index), Intelligent Mail Barcode, Onecode, USPS-B-3200, CODABAR, CODE 11, PHARMACODE, PHARMACODE TWO-TRACKS, Datamatrix, QR-Code, PDF417;
+ * JPEG and PNG ICC profiles, Grayscale, RGB, CMYK, Spot Colors and Transparencies;
* automatic page header and footer management;
* document encryption up to 256 bit and digital signature certifications;
* transactions to UNDO commands;
@@ -53,6 +53,8 @@ Main Features:
* move and delete pages;
* page compression (requires php-zlib extension);
* XOBject Templates;
+ * Layers and object visibility.
+ * PDF/A-1b support.
Installation (full instructions on http: www.tcpdf.org):
1. copy the folder on your Web server
@@ -60,21 +62,18 @@ Installation (full instructions on http: www.tcpdf.org):
3. call the examples/example_001.php page with your browser to see an example
Source Code Documentation:
- doc/index.html
- http://www.tcpdf.org/doc/
+ http://www.tcpdf.org
-For Additional Documentation:
+Additional Documentation:
http://www.tcpdf.org
License
- Copyright (C) 2002-2011 Nicola Asuni - Tecnick.com S.r.l.
+ Copyright (C) 2002-2012 Nicola Asuni - Tecnick.com LTD
TCPDF is free software: you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation, either version 3 of the
- License, or (at your option) any later version. Additionally,
- YOU CAN'T REMOVE ANY TCPDF COPYRIGHT NOTICE OR LINK FROM THE
- GENERATED PDF DOCUMENTS.
+ License, or (at your option) any later version.
TCPDF is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -87,4 +86,12 @@ License
See LICENSE.TXT file for more information.
+Third party fonts
+ This library includes third party font files released with different licenses.
+ These fonts are not required by TCPDF but have been included as you convenience.
+ The original TTF font files have been renamed for compatibility with TCPDF and compressed using the gzcompress PHP function that uses the ZLIB data format (.z files).
+ To get the original distribution archives please check the information on fonts subfolders:
+ - DejaVu fonts 2.33 (Bitstream) - Copyright, License and other info: fonts/dejavu-fonts-ttf-2.33
+ - GNU FreeFont (GNU-GPLv3) - Copyright, License and other info: fonts/freefont-20100919
+
============================================================
diff --git a/htdocs/includes/tcpdf/barcodes.php b/htdocs/includes/tcpdf/barcodes.php
index 5409ae5cda4..4027aa7109a 100644
--- a/htdocs/includes/tcpdf/barcodes.php
+++ b/htdocs/includes/tcpdf/barcodes.php
@@ -1,13 +1,13 @@
* @package com.tecnick.tcpdf
- * @version 1.0.017
+ * @version 1.0.023
* @author Nicola Asuni
*/
class TCPDFBarcode {
@@ -91,7 +91,7 @@ class TCPDFBarcode {
* @public
*/
public function getBarcodeSVG($w=2, $h=30, $color='black') {
- // send XML headers
+ // send headers
$code = $this->getBarcodeSVGcode($w, $h, $color);
header('Content-Type: application/svg+xml');
header('Cache-Control: public, must-revalidate, max-age=0'); // HTTP/1.1
@@ -136,6 +136,93 @@ class TCPDFBarcode {
return $svg;
}
+ /**
+ * Return an HTML representation of barcode.
+ * @param $w (int) Width of a single bar element in pixels.
+ * @param $h (int) Height of a single bar element in pixels.
+ * @param $color (string) Foreground color for bar elements (background is transparent).
+ * @return string HTML code.
+ * @public
+ */
+ public function getBarcodeHTML($w=2, $h=30, $color='black') {
+ $html = '
no external libraries are required for the basic functions;
*
all standard page formats, custom page formats, custom margins and units of measure;
*
UTF-8 Unicode and Right-To-Left languages;
- *
TrueTypeUnicode, OpenTypeUnicode, TrueType, OpenType, Type1 and CID-0 fonts;
+ *
TrueTypeUnicode, TrueType, Type1 and CID-0 fonts;
*
font subsetting;
*
methods to publish some XHTML + CSS code, Javascript and Forms;
*
images, graphic (geometric figures) and transformation methods;
*
supports JPEG, PNG and SVG images natively, all images supported by GD (GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM) and all images supported via ImagMagick (http://www.imagemagick.org/www/formats.html)
- *
1D and 2D barcodes: CODE 39, ANSI MH10.8M-1983, USD-3, 3 of 9, CODE 93, USS-93, Standard 2 of 5, Interleaved 2 of 5, CODE 128 A/B/C, 2 and 5 Digits UPC-Based Extention, EAN 8, EAN 13, UPC-A, UPC-E, MSI, POSTNET, PLANET, RMS4CC (Royal Mail 4-state Customer Code), CBC (Customer Bar Code), KIX (Klant index - Customer index), Intelligent Mail Barcode, Onecode, USPS-B-3200, CODABAR, CODE 11, PHARMACODE, PHARMACODE TWO-TRACKS, QR-Code, PDF417;
- *
Grayscale, RGB, CMYK, Spot Colors and Transparencies;
+ *
1D and 2D barcodes: CODE 39, ANSI MH10.8M-1983, USD-3, 3 of 9, CODE 93, USS-93, Standard 2 of 5, Interleaved 2 of 5, CODE 128 A/B/C, 2 and 5 Digits UPC-Based Extention, EAN 8, EAN 13, UPC-A, UPC-E, MSI, POSTNET, PLANET, RMS4CC (Royal Mail 4-state Customer Code), CBC (Customer Bar Code), KIX (Klant index - Customer index), Intelligent Mail Barcode, Onecode, USPS-B-3200, CODABAR, CODE 11, PHARMACODE, PHARMACODE TWO-TRACKS, Datamatrix, QR-Code, PDF417;
+ *
JPEG and PNG ICC profiles, Grayscale, RGB, CMYK, Spot Colors and Transparencies;
*
automatic page header and footer management;
*
document encryption up to 256 bit and digital signature certifications;
*
transactions to UNDO commands;
@@ -130,11 +131,13 @@
*
move and delete pages;
*
page compression (requires php-zlib extension);
*
XOBject Templates;
+ *
Layers and object visibility;
+ *
PDF/A-1b support.
*
* Tools to encode your unicode fonts are on fonts/utils directory.
* @package com.tecnick.tcpdf
* @author Nicola Asuni
- * @version 5.9.098
+ * @version 5.9.156
*/
// Main configuration file. Define the K_TCPDF_EXTERNAL_CONFIG constant to skip this file.
@@ -146,7 +149,7 @@ require_once(dirname(__FILE__).'/config/tcpdf_config.php');
* 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.
* @package com.tecnick.tcpdf
* @brief PHP class for generating PDF documents without requiring external extensions.
- * @version 5.9.098
+ * @version 5.9.156
* @author Nicola Asuni - info@tecnick.com
*/
class TCPDF {
@@ -157,7 +160,7 @@ class TCPDF {
* Current TCPDF version.
* @private
*/
- private $tcpdf_version = '5.9.098';
+ private $tcpdf_version = '5.9.156';
// Protected properties
@@ -547,7 +550,7 @@ class TCPDF {
* String alias for right shift compensation used to correctly align page numbers on the right.
* @protected
*/
- protected $alias_right_shift = '{:rsc:}';
+ protected $alias_right_shift = '{rsc:';
/**
* The right-bottom (or left-bottom for RTL) corner X coordinate of last inserted image.
@@ -589,6 +592,14 @@ class TCPDF {
*/
protected $unicode;
+ /**
+ * Object containing font encoding maps.
+ * @since 5.9.123 (2011-10-01)
+ * @author Nicola Asuni
+ * @protected
+ */
+ protected $encmaps;
+
/**
* PDF version.
* @since 1.5.3
@@ -913,27 +924,6 @@ class TCPDF {
*/
protected $currpagegroup = 0;
- /**
- * Restrict the rendering of some elements to screen or printout.
- * @protected
- * @since 3.0.000 (2008-03-27)
- */
- protected $visibility = 'all';
-
- /**
- * Print visibility.
- * @protected
- * @since 3.0.000 (2008-03-27)
- */
- protected $n_ocg_print;
-
- /**
- * View visibility.
- * @protected
- * @since 3.0.000 (2008-03-27)
- */
- protected $n_ocg_view;
-
/**
* Array of transparency objects and parameters.
* @protected
@@ -1072,7 +1062,7 @@ class TCPDF {
* @protected
* @since 4.0.021 (2008-08-24)
*/
- protected $formvspace = 0;
+ protected $htmlvspace = 0;
/**
* Array of Spot colors.
@@ -1171,14 +1161,14 @@ class TCPDF {
* @protected
* @since 4.4.003 (2008-12-09)
*/
- protected $formLinkColorArray = array(0, 0, 255);
+ protected $htmlLinkColorArray = array(0, 0, 255);
/**
* Default font style to add to html links.
* @protected
* @since 4.4.003 (2008-12-09)
*/
- protected $formLinkFontStyle = 'U';
+ protected $htmlLinkFontStyle = 'U';
/**
* Counts the number of pages.
@@ -1334,6 +1324,13 @@ class TCPDF {
*/
protected $signature_appearance = array('page' => 1, 'rect' => '0 0 0 0');
+ /**
+ * Array of empty digital signature appearances.
+ * @protected
+ * @since 5.9.101 (2011-07-06)
+ */
+ protected $empty_signature_appearance = array();
+
/**
* Regular expression used to find blank characters (required for word-wrapping).
* @protected
@@ -1622,11 +1619,11 @@ class TCPDF {
protected $spotcolor = array();
/**
- * Boolean value true when PDF layers are used.
+ * Array of PDF layers data.
* @protected
- * @since 5.9.046 (2011-01-18)
+ * @since 5.9.102 (2011-07-13)
*/
- protected $pdflayers = false;
+ protected $pdflayers = array();
/**
* A dictionary of names and corresponding destinations (Dests key on document Catalog).
@@ -1804,6 +1801,78 @@ class TCPDF {
'transfmatrix' => array(1, 0, 0, 1, 0, 0)
));
+ /**
+ * If true force sRGB color profile for all document.
+ * @protected
+ * @since 5.9.121 (2011-09-28)
+ */
+ protected $force_srgb = false;
+
+ /**
+ * If true set the document to PDF/A mode.
+ * @protected
+ * @since 5.9.121 (2011-09-27)
+ */
+ protected $pdfa_mode = false;
+
+ /**
+ * Document creation date-time
+ * @protected
+ * @since 5.9.152 (2012-03-22)
+ */
+ protected $doc_creation_timestamp;
+
+ /**
+ * Document modification date-time
+ * @protected
+ * @since 5.9.152 (2012-03-22)
+ */
+ protected $doc_modification_timestamp;
+
+ /**
+ * Custom XMP data.
+ * @protected
+ * @since 5.9.128 (2011-10-06)
+ */
+ protected $custom_xmp = '';
+
+ /**
+ * Overprint mode array.
+ * (Check the "Entries in a Graphics State Parameter Dictionary" on PDF 32000-1:2008).
+ * @protected
+ * @since 5.9.152 (2012-03-23)
+ */
+ protected $overprint = array('OP' => false, 'op' => false, 'OPM' => 0);
+
+ /**
+ * Alpha mode array.
+ * (Check the "Entries in a Graphics State Parameter Dictionary" on PDF 32000-1:2008).
+ * @protected
+ * @since 5.9.152 (2012-03-23)
+ */
+ protected $alpha = array('CA' => 1, 'ca' => 1, 'BM' => '/Normal', 'AIS' => false);
+
+ /**
+ * Define the page boundaries boxes to be set on document.
+ * @protected
+ * @since 5.9.152 (2012-03-23)
+ */
+ protected $page_boxes = array('MediaBox', 'CropBox', 'BleedBox', 'TrimBox', 'ArtBox');
+
+ /**
+ * Set the document producer metadata.
+ * @protected
+ * @since 5.9.152 (2012-03-23)
+ */
+ protected $pdfproducer;
+
+ /**
+ * If true print TCPDF meta link.
+ * @protected
+ * @since 5.9.152 (2012-03-23)
+ */
+ protected $tcpdflink = true;
+
//------------------------------------------------------------
// METHODS
//------------------------------------------------------------
@@ -1815,12 +1884,13 @@ class TCPDF {
* @param $unit (string) User measure unit. Possible values are:
pt: point
mm: millimeter (default)
cm: centimeter
in: inch
A point equals 1/72 of inch, that is to say about 0.35 mm (an inch being 2.54 cm). This is a very common unit in typography; font sizes are expressed in that unit.
* @param $format (mixed) The format used for pages. It can be either: one of the string values specified at getPageSizeFromFormat() or an array of parameters specified at setPageFormat().
* @param $unicode (boolean) TRUE means that the input text is unicode (default = true)
- * @param $diskcache (boolean) if TRUE reduce the RAM memory usage by caching temporary data on filesystem (slower).
- * @param $encoding (string) charset encoding; default is UTF-8
+ * @param $encoding (string) Charset encoding; default is UTF-8.
+ * @param $diskcache (boolean) If TRUE reduce the RAM memory usage by caching temporary data on filesystem (slower).
+ * @param $pdfa (boolean) If TRUE set the document to PDF/A mode.
* @public
* @see getPageSizeFromFormat(), setPageFormat()
*/
- public function __construct($orientation='P', $unit='mm', $format='A4', $unicode=true, $encoding='UTF-8', $diskcache=false) {
+ public function __construct($orientation='P', $unit='mm', $format='A4', $unicode=true, $encoding='UTF-8', $diskcache=false, $pdfa=false) {
/* Set internal character encoding to ASCII */
if (function_exists('mb_internal_encoding') AND mb_internal_encoding()) {
$this->internal_encoding = mb_internal_encoding();
@@ -1838,9 +1908,14 @@ class TCPDF {
}
require_once(dirname(__FILE__).'/unicode_data.php');
$this->unicode = new TCPDF_UNICODE_DATA();
+ require_once(dirname(__FILE__).'/encodings_maps.php');
+ $this->encmaps = new TCPDF_ENCODING_MAPS();
$this->font_obj_ids = array();
$this->page_obj_id = array();
$this->form_obj_id = array();
+ // set pdf/a mode
+ $this->pdfa_mode = $pdfa;
+ $this->force_srgb = false;
// set disk caching
$this->diskcache = $diskcache ? true : false;
// set language direction
@@ -1865,7 +1940,7 @@ class TCPDF {
$this->gradients = array();
$this->InFooter = false;
$this->lasth = 0;
- $this->FontFamily = 'helvetica';
+ $this->FontFamily = defined('PDF_FONT_NAME_MAIN')?PDF_FONT_NAME_MAIN:'helvetica';
$this->FontStyle = '';
$this->FontSizePt = 12;
$this->underline = false;
@@ -1875,7 +1950,7 @@ class TCPDF {
$this->FillColor = '0 g';
$this->TextColor = '0 g';
$this->ColorFlag = false;
- $this->pdflayers = false;
+ $this->pdflayers = array();
// encryption values
$this->encrypted = false;
$this->last_enc_key = '';
@@ -1910,7 +1985,7 @@ class TCPDF {
$this->setCellMargins(0, 0, 0, 0);
// line width (0.2 mm)
$this->LineWidth = 0.57 / $this->k;
- $this->linestyleWidth = sprintf('%.2F w', ($this->LineWidth * $this->k));
+ $this->linestyleWidth = sprintf('%F w', ($this->LineWidth * $this->k));
$this->linestyleCap = '0 J';
$this->linestyleJoin = '0 j';
$this->linestyleDash = '[] 0 d';
@@ -1919,9 +1994,11 @@ class TCPDF {
// full width display mode
$this->SetDisplayMode('fullwidth');
// compression
- $this->SetCompression(true);
+ $this->SetCompression();
// set default PDF version number
- $this->PDFVersion = '1.7';
+ $this->setPDFVersion();
+ $this->pdfproducer = "\x54\x43\x50\x44\x46\x20".$this->tcpdf_version."\x20\x28\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x74\x63\x70\x64\x66\x2e\x6f\x72\x67\x29";
+ $this->tcpdflink = true;
$this->encoding = $encoding;
$this->HREF = array();
$this->getFontsList();
@@ -1939,6 +2016,7 @@ class TCPDF {
$this->ur['ef'] = '/Create/Delete/Modify/Import';
$this->ur['formex'] = '';
$this->signature_appearance = array('page' => 1, 'rect' => '0 0 0 0');
+ $this->empty_signature_appearance = array();
// set default JPEG quality
$this->jpeg_quality = 75;
// initialize some settings
@@ -1960,9 +2038,13 @@ class TCPDF {
$this->default_form_prop = array('lineWidth'=>1, 'borderStyle'=>'solid', 'fillColor'=>array(255, 255, 255), 'strokeColor'=>array(128, 128, 128));
// set file ID for trailer
$this->file_id = md5($this->getRandomSeed('TCPDF'.$orientation.$unit.$format.$encoding));
+ // set document creation and modification timestamp
+ $this->doc_creation_timestamp = time();
+ $this->doc_modification_timestamp = $this->doc_creation_timestamp;
// get default graphic vars
$this->default_graphic_vars = $this->getGraphicVars();
$this->header_xobj_autoreset = false;
+ $this->custom_xmp = '';
}
/**
@@ -3414,7 +3496,7 @@ class TCPDF {
$slen = strlen($brd);
$newbrd = array();
for ($i = 0; $i < $slen; ++$i) {
- $newbrd[$brd{$i}] = true;
+ $newbrd[$brd[$i]] = true;
}
$brd = $newbrd;
} elseif (($brd === 1) OR ($brd === true) OR (is_numeric($brd) AND (intval($brd) > 0))) {
@@ -3481,7 +3563,7 @@ class TCPDF {
* @see Cell(), MultiCell(), AcceptPageBreak()
*/
public function SetAutoPageBreak($auto, $margin=0) {
- $this->AutoPageBreak = $auto;
+ $this->AutoPageBreak = $auto ? true : false;
$this->bMargin = $margin;
$this->PageBreakTrigger = $this->h - $margin;
}
@@ -3581,7 +3663,7 @@ class TCPDF {
* @public
* @since 1.4
*/
- public function SetCompression($compress) {
+ public function SetCompression($compress=true) {
if (function_exists('gzcompress')) {
$this->compress = $compress ? true : false;
} else {
@@ -3589,6 +3671,16 @@ class TCPDF {
}
}
+ /**
+ * Set flag to force sRGB_IEC61966-2.1 black scaled ICC color profile for the whole document.
+ * @param $mode (boolean) If true force sRGB output intent.
+ * @public
+ * @since 5.9.121 (2011-09-28)
+ */
+ public function setSRGBmode($mode=false) {
+ $this->force_srgb = $mode ? true : false;
+ }
+
/**
* Turn on/off Unicode mode for document information dictionary (meta tags).
* This has effect only when unicode mode is set to false.
@@ -3696,23 +3788,27 @@ class TCPDF {
if ($this->page == 0) {
$this->AddPage();
}
- // save current graphic settings
- $gvars = $this->getGraphicVars();
- $this->setEqualColumns();
- $this->lastpage(true);
- $this->SetAutoPageBreak(false);
- $this->x = 0;
- $this->y = $this->h - (1 / $this->k);
- $this->lMargin = 0;
- $this->_out('q');
- $this->SetFont('helvetica', '', 1);
- $this->setTextRenderingMode(0, false, false);
- $msg = "\x50\x6f\x77\x65\x72\x65\x64\x20\x62\x79\x20\x54\x43\x50\x44\x46\x20\x28\x77\x77\x77\x2e\x74\x63\x70\x64\x66\x2e\x6f\x72\x67\x29";
- $lnk = "\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x74\x63\x70\x64\x66\x2e\x6f\x72\x67";
- $this->Cell(0, 0, $msg, 0, 0, 'L', 0, $lnk, 0, false, 'D', 'B');
- $this->_out('Q');
- // restore graphic settings
- $this->setGraphicVars($gvars);
+ $this->endLayer();
+ if ($this->tcpdflink) {
+ // save current graphic settings
+ $gvars = $this->getGraphicVars();
+ $this->setEqualColumns();
+ $this->lastpage(true);
+ $this->SetAutoPageBreak(false);
+ $this->x = 0;
+ $this->y = $this->h - (1 / $this->k);
+ $this->lMargin = 0;
+ $this->_out('q');
+ $font = defined('PDF_FONT_NAME_MAIN')?PDF_FONT_NAME_MAIN:'helvetica';
+ $this->SetFont($font, '', 1);
+ $this->setTextRenderingMode(0, false, false);
+ $msg = "\x50\x6f\x77\x65\x72\x65\x64\x20\x62\x79\x20\x54\x43\x50\x44\x46\x20\x28\x77\x77\x77\x2e\x74\x63\x70\x64\x66\x2e\x6f\x72\x67\x29";
+ $lnk = "\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x74\x63\x70\x64\x66\x2e\x6f\x72\x67";
+ $this->Cell(0, 0, $msg, 0, 0, 'L', 0, $lnk, 0, false, 'D', 'B');
+ $this->_out('Q');
+ // restore graphic settings
+ $this->setGraphicVars($gvars);
+ }
// close page
$this->endPage();
// close document
@@ -3890,6 +3986,31 @@ class TCPDF {
if ($tocpage) {
$this->tocpage = true;
}
+ // move page numbers of documents to be attached
+ if ($this->tocpage) {
+ // move reference to unexistent pages (used for page attachments)
+ // adjust outlines
+ $tmpoutlines = $this->outlines;
+ foreach ($tmpoutlines as $key => $outline) {
+ if ($outline['p'] > $this->numpages) {
+ $this->outlines[$key]['p'] = ($outline['p'] + 1);
+ }
+ }
+ // adjust dests
+ $tmpdests = $this->dests;
+ foreach ($tmpdests as $key => $dest) {
+ if ($dest['p'] > $this->numpages) {
+ $this->dests[$key]['p'] = ($dest['p'] + 1);
+ }
+ }
+ // adjust links
+ $tmplinks = $this->links;
+ foreach ($tmplinks as $key => $link) {
+ if ($link[0] > $this->numpages) {
+ $this->links[$key][0] = ($link[0] + 1);
+ }
+ }
+ }
if ($this->numpages > $this->page) {
// this page has been already added
$this->setPage($this->page + 1);
@@ -4032,7 +4153,7 @@ class TCPDF {
* @public
*/
public function setPrintHeader($val=true) {
- $this->print_header = $val;
+ $this->print_header = $val ? true : false;
}
/**
@@ -4041,7 +4162,7 @@ class TCPDF {
* @public
*/
public function setPrintFooter($val=true) {
- $this->print_footer = $val;
+ $this->print_footer = $val ? true : false;
}
/**
@@ -4076,7 +4197,7 @@ class TCPDF {
* @public
*/
public function setHeaderTemplateAutoreset($val=true) {
- $this->header_xobj_autoreset = $val;
+ $this->header_xobj_autoreset = $val ? true : false;
}
/**
@@ -4140,7 +4261,7 @@ class TCPDF {
// print header template
$x = 0;
$dx = 0;
- if ($this->booklet AND (($this->page % 2) == 0)) {
+ if (!$this->header_xobj_autoreset AND $this->booklet AND (($this->page % 2) == 0)) {
// adjust margins for booklet mode
$dx = ($this->original_lMargin - $this->original_rMargin);
}
@@ -4198,7 +4319,7 @@ class TCPDF {
$this->Cell(0, 0, $pagenumtxt, 'T', 0, 'L');
} else {
$this->SetX($this->original_lMargin);
- $this->Cell(0, 0, $this->alias_right_shift.$pagenumtxt, 'T', 0, 'R');
+ $this->Cell(0, 0, $this->getAliasRightShift().$pagenumtxt, 'T', 0, 'R');
}
}
@@ -4377,60 +4498,326 @@ class TCPDF {
* Defines a new spot color.
* It can be expressed in RGB components or gray scale.
* The method can be called before the first page is created and the value is retained from page to page.
- * @param $name (string) name of the spot color
- * @param $c (int) Cyan color for CMYK. Value between 0 and 100
- * @param $m (int) Magenta color for CMYK. Value between 0 and 100
- * @param $y (int) Yellow color for CMYK. Value between 0 and 100
- * @param $k (int) Key (Black) color for CMYK. Value between 0 and 100
+ * @param $name (string) Full name of the spot color.
+ * @param $c (float) Cyan color for CMYK. Value between 0 and 100.
+ * @param $m (float) Magenta color for CMYK. Value between 0 and 100.
+ * @param $y (float) Yellow color for CMYK. Value between 0 and 100.
+ * @param $k (float) Key (Black) color for CMYK. Value between 0 and 100.
* @public
* @since 4.0.024 (2008-09-12)
* @see SetDrawSpotColor(), SetFillSpotColor(), SetTextSpotColor()
*/
public function AddSpotColor($name, $c, $m, $y, $k) {
if (!isset($this->spot_colors[$name])) {
- $i = 1 + count($this->spot_colors);
- $this->spot_colors[$name] = array('i' => $i, 'c' => $c, 'm' => $m, 'y' => $y, 'k' => $k);
- }
- $color = preg_replace('/[\s]*/', '', $name); // remove extra spaces
- $color = strtolower($color);
- if (!isset($this->spotcolor[$color])) {
- $this->spotcolor[$color] = array($c, $m, $y, $k, $name);
+ $i = (1 + count($this->spot_colors));
+ $this->spot_colors[$name] = array('C' => $c, 'M' => $m, 'Y' => $y, 'K' => $k, 'name' => $name, 'i' => $i);
}
}
/**
- * Defines the color used for all drawing operations (lines, rectangles and cell borders).
+ * Return the Spot color array.
+ * @param $name (string) Name of the spot color.
+ * @return (array) Spot color array or false if not defined.
+ * @public
+ * @since 5.9.125 (2011-10-03)
+ */
+ public function getSpotColor($name) {
+ if (isset($this->spot_colors[$name])) {
+ return $this->spot_colors[$name];
+ }
+ $color = preg_replace('/[\s]*/', '', $name); // remove extra spaces
+ $color = strtolower($color);
+ if (isset($this->spotcolor[$color])) {
+ $this->AddSpotColor($this->spotcolor[$color][4], $this->spotcolor[$color][0], $this->spotcolor[$color][1], $this->spotcolor[$color][2], $this->spotcolor[$color][3]);
+ return $this->spot_colors[$this->spotcolor[$color][4]];
+ }
+ return false;
+ }
+
+ /**
+ * Set the spot color for the specified type ('draw', 'fill', 'text').
+ * @param $type (string) Type of object affected by this color: ('draw', 'fill', 'text').
+ * @param $name (string) Name of the spot color.
+ * @param $tint (float) Intensity of the color (from 0 to 100 ; 100 = full intensity by default).
+ * @return (string) PDF color command.
+ * @public
+ * @since 5.9.125 (2011-10-03)
+ */
+ public function setSpotColor($type, $name, $tint=100) {
+ $spotcolor = $this->getSpotColor($name);
+ if ($spotcolor === false) {
+ $this->Error('Undefined spot color: '.$name.', you must add it on the spotcolors.php file.');
+ }
+ $tint = (max(0, min(100, $tint)) / 100);
+ $pdfcolor = sprintf('/CS%d ', $this->spot_colors[$name]['i']);
+ switch ($type) {
+ case 'draw': {
+ $pdfcolor .= sprintf('CS %F SCN', $tint);
+ $this->DrawColor = $pdfcolor;
+ $this->strokecolor = $spotcolor;
+ break;
+ }
+ case 'fill': {
+ $pdfcolor .= sprintf('cs %F scn', $tint);
+ $this->FillColor = $pdfcolor;
+ $this->bgcolor = $spotcolor;
+ break;
+ }
+ case 'text': {
+ $pdfcolor .= sprintf('cs %F scn', $tint);
+ $this->TextColor = $pdfcolor;
+ $this->fgcolor = $spotcolor;
+ break;
+ }
+ }
+ $this->ColorFlag = ($this->FillColor != $this->TextColor);
+ if ($this->page > 0) {
+ $this->_out($pdfcolor);
+ }
+ if ($this->inxobj) {
+ // we are inside an XObject template
+ $this->xobjects[$this->xobjid]['spot_colors'][$name] = $this->spot_colors[$name];
+ }
+ return $pdfcolor;
+ }
+
+ /**
+ * Defines the spot color used for all drawing operations (lines, rectangles and cell borders).
+ * @param $name (string) Name of the spot color.
+ * @param $tint (float) Intensity of the color (from 0 to 100 ; 100 = full intensity by default).
+ * @public
+ * @since 4.0.024 (2008-09-12)
+ * @see AddSpotColor(), SetFillSpotColor(), SetTextSpotColor()
+ */
+ public function SetDrawSpotColor($name, $tint=100) {
+ $this->setSpotColor('draw', $name, $tint);
+ }
+
+ /**
+ * Defines the spot color used for all filling operations (filled rectangles and cell backgrounds).
+ * @param $name (string) Name of the spot color.
+ * @param $tint (float) Intensity of the color (from 0 to 100 ; 100 = full intensity by default).
+ * @public
+ * @since 4.0.024 (2008-09-12)
+ * @see AddSpotColor(), SetDrawSpotColor(), SetTextSpotColor()
+ */
+ public function SetFillSpotColor($name, $tint=100) {
+ $this->setSpotColor('fill', $name, $tint);
+ }
+
+ /**
+ * Defines the spot color used for text.
+ * @param $name (string) Name of the spot color.
+ * @param $tint (int) Intensity of the color (from 0 to 100 ; 100 = full intensity by default).
+ * @public
+ * @since 4.0.024 (2008-09-12)
+ * @see AddSpotColor(), SetDrawSpotColor(), SetFillSpotColor()
+ */
+ public function SetTextSpotColor($name, $tint=100) {
+ $this->setSpotColor('text', $name, $tint);
+ }
+
+ /**
+ * Set the color array for the specified type ('draw', 'fill', 'text').
* It can be expressed in RGB, CMYK or GRAY SCALE components.
* The method can be called before the first page is created and the value is retained from page to page.
- * @param $color (array) array of colors
- * @param $ret (boolean) if true do not send the PDF command.
- * @return string the PDF command
+ * @param $type (string) Type of object affected by this color: ('draw', 'fill', 'text').
+ * @param $color (array) Array of colors (1=gray, 3=RGB, 4=CMYK or 5=spotcolor=CMYK+name values).
+ * @param $ret (boolean) If true do not send the PDF command.
+ * @return (string) The PDF command or empty string.
* @public
* @since 3.1.000 (2008-06-11)
- * @see SetDrawColor()
*/
- public function SetDrawColorArray($color, $ret=false) {
+ public function setColorArray($type, $color, $ret=false) {
if (is_array($color)) {
$color = array_values($color);
- $r = isset($color[0]) ? $color[0] : -1;
- $g = isset($color[1]) ? $color[1] : -1;
- $b = isset($color[2]) ? $color[2] : -1;
+ // component: grey, RGB red or CMYK cyan
+ $c = isset($color[0]) ? $color[0] : -1;
+ // component: RGB green or CMYK magenta
+ $m = isset($color[1]) ? $color[1] : -1;
+ // component: RGB blue or CMYK yellow
+ $y = isset($color[2]) ? $color[2] : -1;
+ // component: CMYK black
$k = isset($color[3]) ? $color[3] : -1;
- $name = isset($color[4]) ? $color[4] : ''; // spot color name
- if ($r >= 0) {
- return $this->SetDrawColor($r, $g, $b, $k, $ret, $name);
+ // color name
+ $name = isset($color[4]) ? $color[4] : '';
+ if ($c >= 0) {
+ return $this->setColor($type, $c, $m, $y, $k, $ret, $name);
}
}
return '';
}
+ /**
+ * Defines the color used for all drawing operations (lines, rectangles and cell borders).
+ * It can be expressed in RGB, CMYK or GRAY SCALE components.
+ * The method can be called before the first page is created and the value is retained from page to page.
+ * @param $color (array) Array of colors (1, 3 or 4 values).
+ * @param $ret (boolean) If true do not send the PDF command.
+ * @return string the PDF command
+ * @public
+ * @since 3.1.000 (2008-06-11)
+ * @see SetDrawColor()
+ */
+ public function SetDrawColorArray($color, $ret=false) {
+ return $this->setColorArray('draw', $color, $ret);
+ }
+
+ /**
+ * Defines the color used for all filling operations (filled rectangles and cell backgrounds).
+ * It can be expressed in RGB, CMYK or GRAY SCALE components.
+ * The method can be called before the first page is created and the value is retained from page to page.
+ * @param $color (array) Array of colors (1, 3 or 4 values).
+ * @param $ret (boolean) If true do not send the PDF command.
+ * @public
+ * @since 3.1.000 (2008-6-11)
+ * @see SetFillColor()
+ */
+ public function SetFillColorArray($color, $ret=false) {
+ return $this->setColorArray('fill', $color, $ret);
+ }
+
+ /**
+ * Defines the color used for text. It can be expressed in RGB components or gray scale.
+ * The method can be called before the first page is created and the value is retained from page to page.
+ * @param $color (array) Array of colors (1, 3 or 4 values).
+ * @param $ret (boolean) If true do not send the PDF command.
+ * @public
+ * @since 3.1.000 (2008-6-11)
+ * @see SetFillColor()
+ */
+ public function SetTextColorArray($color, $ret=false) {
+ return $this->setColorArray('text', $color, $ret);
+ }
+
+ /**
+ * Defines the color used by the specified type ('draw', 'fill', 'text').
+ * @param $type (string) Type of object affected by this color: ('draw', 'fill', 'text').
+ * @param $col1 (float) GRAY level for single color, or Red color for RGB (0-255), or CYAN color for CMYK (0-100).
+ * @param $col2 (float) GREEN color for RGB (0-255), or MAGENTA color for CMYK (0-100).
+ * @param $col3 (float) BLUE color for RGB (0-255), or YELLOW color for CMYK (0-100).
+ * @param $col4 (float) KEY (BLACK) color for CMYK (0-100).
+ * @param $ret (boolean) If true do not send the command.
+ * @param $name (string) spot color name (if any)
+ * @return (string) The PDF command or empty string.
+ * @public
+ * @since 5.9.125 (2011-10-03)
+ */
+ public function setColor($type, $col1=0, $col2=-1, $col3=-1, $col4=-1, $ret=false, $name='') {
+ // set default values
+ if (!is_numeric($col1)) {
+ $col1 = 0;
+ }
+ if (!is_numeric($col2)) {
+ $col2 = -1;
+ }
+ if (!is_numeric($col3)) {
+ $col3 = -1;
+ }
+ if (!is_numeric($col4)) {
+ $col4 = -1;
+ }
+ // set color by case
+ $suffix = '';
+ if (($col2 == -1) AND ($col3 == -1) AND ($col4 == -1)) {
+ // Grey scale
+ $col1 = max(0, min(255, $col1));
+ $intcolor = array('G' => $col1);
+ $pdfcolor = sprintf('%F ', ($col1 / 255));
+ $suffix = 'g';
+ } elseif ($col4 == -1) {
+ // RGB
+ $col1 = max(0, min(255, $col1));
+ $col2 = max(0, min(255, $col2));
+ $col3 = max(0, min(255, $col3));
+ $intcolor = array('R' => $col1, 'G' => $col2, 'B' => $col3);
+ $pdfcolor = sprintf('%F %F %F ', ($col1 / 255), ($col2 / 255), ($col3 / 255));
+ $suffix = 'rg';
+ } else {
+ $col1 = max(0, min(100, $col1));
+ $col2 = max(0, min(100, $col2));
+ $col3 = max(0, min(100, $col3));
+ $col4 = max(0, min(100, $col4));
+ if (empty($name)) {
+ // CMYK
+ $intcolor = array('C' => $col1, 'M' => $col2, 'Y' => $col3, 'K' => $col4);
+ $pdfcolor = sprintf('%F %F %F %F ', ($col1 / 100), ($col2 / 100), ($col3 / 100), ($col4 / 100));
+ $suffix = 'k';
+ } else {
+ // SPOT COLOR
+ $intcolor = array('C' => $col1, 'M' => $col2, 'Y' => $col3, 'K' => $col4, 'name' => $name);
+ $this->AddSpotColor($name, $col1, $col2, $col3, $col4);
+ $pdfcolor = $this->setSpotColor($type, $name, 100);
+ }
+ }
+ switch ($type) {
+ case 'draw': {
+ $pdfcolor .= strtoupper($suffix);
+ $this->DrawColor = $pdfcolor;
+ $this->strokecolor = $intcolor;
+ break;
+ }
+ case 'fill': {
+ $pdfcolor .= $suffix;
+ $this->FillColor = $pdfcolor;
+ $this->bgcolor = $intcolor;
+ break;
+ }
+ case 'text': {
+ $pdfcolor .= $suffix;
+ $this->TextColor = $pdfcolor;
+ $this->fgcolor = $intcolor;
+ break;
+ }
+ }
+ $this->ColorFlag = ($this->FillColor != $this->TextColor);
+ if (($type != 'text') AND ($this->page > 0)) {
+ if (!$ret) {
+ $this->_out($pdfcolor);
+ }
+ return $pdfcolor;
+ }
+ return '';
+ }
+
+ /**
+ * Convert a color array into a string representation.
+ * @param $c (array) Array of colors.
+ * @return (string) The color array representation.
+ * @protected
+ * @since 5.9.137 (2011-12-01)
+ */
+ protected function getColorStringFromArray($c) {
+ $c = array_values($c);
+ $color = '[';
+ switch (count($c)) {
+ case 4: {
+ // CMYK
+ $color .= sprintf('%F %F %F %F', (max(0, min(100, floatval($c[0]))) / 100), (max(0, min(100, floatval($c[1]))) / 100), (max(0, min(100, floatval($c[2]))) / 100), (max(0, min(100, floatval($c[3]))) / 100));
+ break;
+ }
+ case 3: {
+ // RGB
+ $color .= sprintf('%F %F %F', (max(0, min(255, floatval($c[0]))) / 255), (max(0, min(255, floatval($c[1]))) / 255), (max(0, min(255, floatval($c[2]))) / 255));
+ break;
+ }
+ case 1: {
+ // grayscale
+ $color .= sprintf('%F', (max(0, min(255, floatval($c[0]))) / 255));
+ break;
+ }
+ }
+ $color .= ']';
+ return $color;
+ }
+
/**
* Defines the color used for all drawing operations (lines, rectangles and cell borders). It can be expressed in RGB components or gray scale. The method can be called before the first page is created and the value is retained from page to page.
- * @param $col1 (int) GRAY level for single color, or Red color for RGB (0-255), or CYAN color for CMYK (0-100).
- * @param $col2 (int) GREEN color for RGB (0-255), or MAGENTA color for CMYK (0-100).
- * @param $col3 (int) BLUE color for RGB (0-255), or YELLOW color for CMYK (0-100).
- * @param $col4 (int) KEY (BLACK) color for CMYK (0-100).
- * @param $ret (boolean) if true do not send the command.
+ * @param $col1 (float) GRAY level for single color, or Red color for RGB (0-255), or CYAN color for CMYK (0-100).
+ * @param $col2 (float) GREEN color for RGB (0-255), or MAGENTA color for CMYK (0-100).
+ * @param $col3 (float) BLUE color for RGB (0-255), or YELLOW color for CMYK (0-100).
+ * @param $col4 (float) KEY (BLACK) color for CMYK (0-100).
+ * @param $ret (boolean) If true do not send the command.
* @param $name (string) spot color name (if any)
* @return string the PDF command
* @public
@@ -4438,255 +4825,41 @@ class TCPDF {
* @see SetDrawColorArray(), SetFillColor(), SetTextColor(), Line(), Rect(), Cell(), MultiCell()
*/
public function SetDrawColor($col1=0, $col2=-1, $col3=-1, $col4=-1, $ret=false, $name='') {
- // set default values
- if (!is_numeric($col1)) {
- $col1 = 0;
- }
- if (!is_numeric($col2)) {
- $col2 = -1;
- }
- if (!is_numeric($col3)) {
- $col3 = -1;
- }
- if (!is_numeric($col4)) {
- $col4 = -1;
- }
- //Set color for all stroking operations
- if (($col2 == -1) AND ($col3 == -1) AND ($col4 == -1)) {
- // Grey scale
- $this->DrawColor = sprintf('%.3F G', ($col1 / 255));
- $this->strokecolor = array('G' => $col1);
- } elseif ($col4 == -1) {
- // RGB
- $this->DrawColor = sprintf('%.3F %.3F %.3F RG', ($col1 / 255), ($col2 / 255), ($col3 / 255));
- $this->strokecolor = array('R' => $col1, 'G' => $col2, 'B' => $col3);
- } elseif (empty($name)) {
- // CMYK
- $this->DrawColor = sprintf('%.3F %.3F %.3F %.3F K', ($col1 / 100), ($col2 / 100), ($col3 / 100), ($col4 / 100));
- $this->strokecolor = array('C' => $col1, 'M' => $col2, 'Y' => $col3, 'K' => $col4);
- } else {
- // SPOT COLOR
- $this->AddSpotColor($name, $col1, $col2, $col3, $col4);
- $this->DrawColor = sprintf('/CS%d CS %.3F SCN', $this->spot_colors[$name]['i'], 1);
- $this->strokecolor = array('C' => $col1, 'M' => $col2, 'Y' => $col3, 'K' => $col4, 'name' => $name);
- }
- if ($this->page > 0) {
- if (!$ret) {
- $this->_out($this->DrawColor);
- }
- return $this->DrawColor;
- }
- return '';
- }
-
- /**
- * Defines the spot color used for all drawing operations (lines, rectangles and cell borders).
- * @param $name (string) name of the spot color
- * @param $tint (int) the intensity of the color (from 0 to 100 ; 100 = full intensity by default).
- * @public
- * @since 4.0.024 (2008-09-12)
- * @see AddSpotColor(), SetFillSpotColor(), SetTextSpotColor()
- */
- public function SetDrawSpotColor($name, $tint=100) {
- if (!isset($this->spot_colors[$name])) {
- $this->Error('Undefined spot color: '.$name);
- }
- $this->DrawColor = sprintf('/CS%d CS %.3F SCN', $this->spot_colors[$name]['i'], ($tint / 100));
- $this->strokecolor = array('C' => $this->spot_colors[$name]['c'], 'M' => $this->spot_colors[$name]['m'], 'Y' => $this->spot_colors[$name]['y'], 'K' => $this->spot_colors[$name]['k'], 'name' => $name);
- if ($this->page > 0) {
- $this->_out($this->DrawColor);
- }
- }
-
- /**
- * Defines the color used for all filling operations (filled rectangles and cell backgrounds).
- * It can be expressed in RGB, CMYK or GRAY SCALE components.
- * The method can be called before the first page is created and the value is retained from page to page.
- * @param $color (array) array of colors
- * @param $ret (boolean) if true do not send the PDF command.
- * @public
- * @since 3.1.000 (2008-6-11)
- * @see SetFillColor()
- */
- public function SetFillColorArray($color, $ret=false) {
- if (is_array($color)) {
- $color = array_values($color);
- $r = isset($color[0]) ? $color[0] : -1;
- $g = isset($color[1]) ? $color[1] : -1;
- $b = isset($color[2]) ? $color[2] : -1;
- $k = isset($color[3]) ? $color[3] : -1;
- $name = isset($color[4]) ? $color[4] : ''; // spot color name
- if ($r >= 0) {
- $this->SetFillColor($r, $g, $b, $k, $ret, $name);
- }
- }
+ return $this->setColor('draw', $col1, $col2, $col3, $col4, $ret, $name);
}
/**
* Defines the color used for all filling operations (filled rectangles and cell backgrounds). It can be expressed in RGB components or gray scale. The method can be called before the first page is created and the value is retained from page to page.
- * @param $col1 (int) GRAY level for single color, or Red color for RGB (0-255), or CYAN color for CMYK (0-100).
- * @param $col2 (int) GREEN color for RGB (0-255), or MAGENTA color for CMYK (0-100).
- * @param $col3 (int) BLUE color for RGB (0-255), or YELLOW color for CMYK (0-100).
- * @param $col4 (int) KEY (BLACK) color for CMYK (0-100).
- * @param $ret (boolean) if true do not send the command.
- * @param $name (string) spot color name (if any)
- * @return string the PDF command
+ * @param $col1 (float) GRAY level for single color, or Red color for RGB (0-255), or CYAN color for CMYK (0-100).
+ * @param $col2 (float) GREEN color for RGB (0-255), or MAGENTA color for CMYK (0-100).
+ * @param $col3 (float) BLUE color for RGB (0-255), or YELLOW color for CMYK (0-100).
+ * @param $col4 (float) KEY (BLACK) color for CMYK (0-100).
+ * @param $ret (boolean) If true do not send the command.
+ * @param $name (string) Spot color name (if any).
+ * @return (string) The PDF command.
* @public
* @since 1.3
* @see SetFillColorArray(), SetDrawColor(), SetTextColor(), Rect(), Cell(), MultiCell()
*/
public function SetFillColor($col1=0, $col2=-1, $col3=-1, $col4=-1, $ret=false, $name='') {
- // set default values
- if (!is_numeric($col1)) {
- $col1 = 0;
- }
- if (!is_numeric($col2)) {
- $col2 = -1;
- }
- if (!is_numeric($col3)) {
- $col3 = -1;
- }
- if (!is_numeric($col4)) {
- $col4 = -1;
- }
- //Set color for all filling operations
- if (($col2 == -1) AND ($col3 == -1) AND ($col4 == -1)) {
- // Grey scale
- $this->FillColor = sprintf('%.3F g', ($col1 / 255));
- $this->bgcolor = array('G' => $col1);
- } elseif ($col4 == -1) {
- // RGB
- $this->FillColor = sprintf('%.3F %.3F %.3F rg', ($col1 / 255), ($col2 / 255), ($col3 / 255));
- $this->bgcolor = array('R' => $col1, 'G' => $col2, 'B' => $col3);
- } elseif (empty($name)) {
- // CMYK
- $this->FillColor = sprintf('%.3F %.3F %.3F %.3F k', ($col1 / 100), ($col2 / 100), ($col3 / 100), ($col4 / 100));
- $this->bgcolor = array('C' => $col1, 'M' => $col2, 'Y' => $col3, 'K' => $col4);
- } else {
- // SPOT COLOR
- $this->AddSpotColor($name, $col1, $col2, $col3, $col4);
- $this->FillColor = sprintf('/CS%d cs %.3F scn', $this->spot_colors[$name]['i'], 1);
- $this->bgcolor = array('C' => $col1, 'M' => $col2, 'Y' => $col3, 'K' => $col4, 'name' => $name);
- }
- $this->ColorFlag = ($this->FillColor != $this->TextColor);
- if ($this->page > 0) {
- if (!$ret) {
- $this->_out($this->FillColor);
- }
- return $this->FillColor;
- }
- return '';
- }
-
- /**
- * Defines the spot color used for all filling operations (filled rectangles and cell backgrounds).
- * @param $name (string) name of the spot color
- * @param $tint (int) the intensity of the color (from 0 to 100 ; 100 = full intensity by default).
- * @public
- * @since 4.0.024 (2008-09-12)
- * @see AddSpotColor(), SetDrawSpotColor(), SetTextSpotColor()
- */
- public function SetFillSpotColor($name, $tint=100) {
- if (!isset($this->spot_colors[$name])) {
- $this->Error('Undefined spot color: '.$name);
- }
- $this->FillColor = sprintf('/CS%d cs %.3F scn', $this->spot_colors[$name]['i'], ($tint / 100));
- $this->bgcolor = array('C' => $this->spot_colors[$name]['c'], 'M' => $this->spot_colors[$name]['m'], 'Y' => $this->spot_colors[$name]['y'], 'K' => $this->spot_colors[$name]['k'], 'name' => $name);
- $this->ColorFlag = ($this->FillColor != $this->TextColor);
- if ($this->page > 0) {
- $this->_out($this->FillColor);
- }
- }
-
- /**
- * Defines the color used for text. It can be expressed in RGB components or gray scale.
- * The method can be called before the first page is created and the value is retained from page to page.
- * @param $color (array) array of colors
- * @param $ret (boolean) if true do not send the PDF command.
- * @public
- * @since 3.1.000 (2008-6-11)
- * @see SetFillColor()
- */
- public function SetTextColorArray($color, $ret=false) {
- if (is_array($color)) {
- $color = array_values($color);
- $r = isset($color[0]) ? $color[0] : -1;
- $g = isset($color[1]) ? $color[1] : -1;
- $b = isset($color[2]) ? $color[2] : -1;
- $k = isset($color[3]) ? $color[3] : -1;
- $name = isset($color[4]) ? $color[4] : ''; // spot color name
- if ($r >= 0) {
- $this->SetTextColor($r, $g, $b, $k, $ret, $name);
- }
- }
+ return $this->setColor('fill', $col1, $col2, $col3, $col4, $ret, $name);
}
/**
* Defines the color used for text. It can be expressed in RGB components or gray scale. The method can be called before the first page is created and the value is retained from page to page.
- * @param $col1 (int) GRAY level for single color, or Red color for RGB (0-255), or CYAN color for CMYK (0-100).
- * @param $col2 (int) GREEN color for RGB (0-255), or MAGENTA color for CMYK (0-100).
- * @param $col3 (int) BLUE color for RGB (0-255), or YELLOW color for CMYK (0-100).
- * @param $col4 (int) KEY (BLACK) color for CMYK (0-100).
- * @param $ret (boolean) if true do not send the command.
- * @param $name (string) spot color name (if any)
+ * @param $col1 (float) GRAY level for single color, or Red color for RGB (0-255), or CYAN color for CMYK (0-100).
+ * @param $col2 (float) GREEN color for RGB (0-255), or MAGENTA color for CMYK (0-100).
+ * @param $col3 (float) BLUE color for RGB (0-255), or YELLOW color for CMYK (0-100).
+ * @param $col4 (float) KEY (BLACK) color for CMYK (0-100).
+ * @param $ret (boolean) If true do not send the command.
+ * @param $name (string) Spot color name (if any).
+ * @return (string) Empty string.
* @public
* @since 1.3
* @see SetTextColorArray(), SetDrawColor(), SetFillColor(), Text(), Cell(), MultiCell()
*/
public function SetTextColor($col1=0, $col2=-1, $col3=-1, $col4=-1, $ret=false, $name='') {
- // set default values
- if (!is_numeric($col1)) {
- $col1 = 0;
- }
- if (!is_numeric($col2)) {
- $col2 = -1;
- }
- if (!is_numeric($col3)) {
- $col3 = -1;
- }
- if (!is_numeric($col4)) {
- $col4 = -1;
- }
- //Set color for text
- if (($col2 == -1) AND ($col3 == -1) AND ($col4 == -1)) {
- // Grey scale
- $this->TextColor = sprintf('%.3F g', ($col1 / 255));
- $this->fgcolor = array('G' => $col1);
- } elseif ($col4 == -1) {
- // RGB
- $this->TextColor = sprintf('%.3F %.3F %.3F rg', ($col1 / 255), ($col2 / 255), ($col3 / 255));
- $this->fgcolor = array('R' => $col1, 'G' => $col2, 'B' => $col3);
- } elseif (empty($name)) {
- // CMYK
- $this->TextColor = sprintf('%.3F %.3F %.3F %.3F k', ($col1 / 100), ($col2 / 100), ($col3 / 100), ($col4 / 100));
- $this->fgcolor = array('C' => $col1, 'M' => $col2, 'Y' => $col3, 'K' => $col4);
- } else {
- // SPOT COLOR
- $this->AddSpotColor($name, $col1, $col2, $col3, $col4);
- $this->TextColor = sprintf('/CS%d cs %.3F scn', $this->spot_colors[$name]['i'], 1);
- $this->fgcolor = array('C' => $col1, 'M' => $col2, 'Y' => $col3, 'K' => $col4, 'name' => $name);
- }
- $this->ColorFlag = ($this->FillColor != $this->TextColor);
- }
-
- /**
- * Defines the spot color used for text.
- * @param $name (string) name of the spot color
- * @param $tint (int) the intensity of the color (from 0 to 100 ; 100 = full intensity by default).
- * @public
- * @since 4.0.024 (2008-09-12)
- * @see AddSpotColor(), SetDrawSpotColor(), SetFillSpotColor()
- */
- public function SetTextSpotColor($name, $tint=100) {
- if (!isset($this->spot_colors[$name])) {
- $this->Error('Undefined spot color: '.$name);
- }
- $this->TextColor = sprintf('/CS%d cs %.3F scn', $this->spot_colors[$name]['i'], ($tint / 100));
- $this->fgcolor = array('C' => $this->spot_colors[$name]['c'], 'M' => $this->spot_colors[$name]['m'], 'Y' => $this->spot_colors[$name]['y'], 'K' => $this->spot_colors[$name]['k'], 'name' => $name);
- $this->ColorFlag = ($this->FillColor != $this->TextColor);
- if ($this->page > 0) {
- $this->_out($this->TextColor);
- }
+ return $this->setColor('text', $col1, $col2, $col3, $col4, $ret, $name);
}
/**
@@ -4723,7 +4896,7 @@ class TCPDF {
$prev_FontFamily = $this->FontFamily;
$prev_FontStyle = $this->FontStyle;
$prev_FontSizePt = $this->FontSizePt;
- $this->SetFont($fontname, $fontstyle, $fontsize);
+ $this->SetFont($fontname, $fontstyle, $fontsize, '', 'default', false);
}
// convert UTF-8 array to Latin1 if required
$sa = $this->UTF8ArrToLatin1($sa);
@@ -4737,7 +4910,7 @@ class TCPDF {
}
// restore previous values
if (!$this->empty_string($fontname)) {
- $this->SetFont($prev_FontFamily, $prev_FontStyle, $prev_FontSizePt);
+ $this->SetFont($prev_FontFamily, $prev_FontStyle, $prev_FontSizePt, '', 'default', false);
}
if ($getarray) {
return $wa;
@@ -4841,6 +5014,9 @@ class TCPDF {
if ($subset === 'default') {
$subset = $this->font_subsetting;
}
+ if ($this->pdfa_mode) {
+ $subset = false;
+ }
if ($this->empty_string($family)) {
if (!$this->empty_string($this->FontFamily)) {
$family = $this->FontFamily;
@@ -4865,6 +5041,10 @@ class TCPDF {
if (($family == 'symbol') OR ($family == 'zapfdingbats')) {
$style = '';
}
+ if ($this->pdfa_mode AND (isset($this->CoreFonts[$family]))) {
+ // all fonts must be embedded
+ $family = 'pdfa'.$family;
+ }
$tempstyle = strtoupper($style);
$style = '';
// underline
@@ -5001,7 +5181,11 @@ class TCPDF {
$subset = false;
} elseif ($type == 'TrueTypeUnicode') {
$enc = 'Identity-H';
- } elseif ($type != 'cidfont0') {
+ } elseif ($type == 'cidfont0') {
+ if ($this->pdfa_mode) {
+ $this->Error('All fonts must be embedded in PDF/A mode!');
+ }
+ } else {
$this->Error('Unknow font type: '.$type.'');
}
// set name if unset
@@ -5016,9 +5200,11 @@ class TCPDF {
// artificial bold
if (strpos($bistyle, 'B') !== false) {
if (isset($desc['StemV'])) {
- $desc['StemV'] *= 2;
+ // from normal to bold
+ $desc['StemV'] = round($desc['StemV'] * 1.75);
} else {
- $desc['StemV'] = 120;
+ // bold
+ $desc['StemV'] = 123;
}
}
// artificial italic
@@ -5029,9 +5215,9 @@ class TCPDF {
$desc['ItalicAngle'] = -11;
}
if (isset($desc['Flags'])) {
- $desc['Flags'] |= 128; //bit 7
+ $desc['Flags'] |= 64; //bit 7
} else {
- $desc['Flags'] = 128;
+ $desc['Flags'] = 64;
}
}
}
@@ -5087,27 +5273,31 @@ class TCPDF {
* @param $size (float) Font size in points. The default value is the current size. If no size has been specified since the beginning of the document, the value taken is 12
* @param $fontfile (string) The font definition file. By default, the name is built from the family and style, in lower case with no spaces.
* @param $subset (mixed) if true embedd only a subset of the font (stores only the information related to the used characters); if false embedd full font; if 'default' uses the default value set using setFontSubsetting(). This option is valid only for TrueTypeUnicode fonts. If you want to enable users to change the document, set this parameter to false. If you subset the font, the person who receives your PDF would need to have your same font in order to make changes to your PDF. The file size of the PDF would also be smaller because you are embedding only part of a font.
+ * @param $out (boolean) if true output the font size command, otherwise only set the font properties.
* @author Nicola Asuni
* @public
* @since 1.0
* @see AddFont(), SetFontSize()
*/
- public function SetFont($family, $style='', $size=0, $fontfile='', $subset='default') {
+ public function SetFont($family, $style='', $size=null, $fontfile='', $subset='default', $out=true) {
//Select a font; size given in points
- if ($size == 0) {
+ if ($size === null) {
$size = $this->FontSizePt;
}
+ if ($size < 0) {
+ $size = 0;
+ }
// try to add font (if not already added)
$fontdata = $this->AddFont($family, $style, $fontfile, $subset);
$this->FontFamily = $fontdata['family'];
$this->FontStyle = $fontdata['style'];
$this->CurrentFont = $this->getFontBuffer($fontdata['fontkey']);
- $this->SetFontSize($size);
+ $this->SetFontSize($size, $out);
}
/**
* Defines the size of the current font.
- * @param $size (float) The size (in points)
+ * @param $size (float) The font size in points.
* @param $out (boolean) if true output the font size command, otherwise only set the font properties.
* @public
* @since 1.0
@@ -5140,13 +5330,54 @@ class TCPDF {
} elseif (!isset($font_ascent)) {
$font_ascent = $font_height - $font_descent;
}
- $this->FontAscent = $font_ascent / $this->k;
- $this->FontDescent = $font_descent / $this->k;
+ $this->FontAscent = ($font_ascent / $this->k);
+ $this->FontDescent = ($font_descent / $this->k);
if ($out AND ($this->page > 0) AND (isset($this->CurrentFont['i']))) {
- $this->_out(sprintf('BT /F%d %.2F Tf ET', $this->CurrentFont['i'], $this->FontSizePt));
+ $this->_out(sprintf('BT /F%d %F Tf ET', $this->CurrentFont['i'], $this->FontSizePt));
}
}
+ /**
+ * Returns the bounding box of the current font in user units.
+ * @return array
+ * @public
+ * @since 5.9.152 (2012-03-23)
+ */
+ public function getFontBBox() {
+ $result = array();
+ if (isset($this->CurrentFont['desc']['FontBBox'])) {
+ $bbox = explode(' ', substr($this->CurrentFont['desc']['FontBBox'], 1, -1));
+ foreach ($bbox as $v) {
+ $result[] = (intval($v) * $this->FontSize / 1000);
+ }
+ } else {
+ // Find max width
+ if (isset($this->CurrentFont['desc']['MaxWidth'])) {
+ $maxw = (intval($this->CurrentFont['desc']['MaxWidth']) * $this->FontSize / 1000);
+ } else {
+ $maxw = 0;
+ if (isset($this->CurrentFont['desc']['MissingWidth'])) {
+ $maxw = max($maxw, $this->CurrentFont['desc']['MissingWidth']);
+ }
+ if (isset($this->CurrentFont['desc']['AvgWidth'])) {
+ $maxw = max($maxw, $this->CurrentFont['desc']['AvgWidth']);
+ }
+ if (isset($this->CurrentFont['dw'])) {
+ $maxw = max($maxw, $this->CurrentFont['dw']);
+ }
+ foreach ($this->CurrentFont['cw'] as $char => $w) {
+ $maxw = max($maxw, $w);
+ }
+ if ($maxw == 0) {
+ $maxw = 600;
+ }
+ $maxw = ($maxw * $this->FontSize / 1000);
+ }
+ $result = array(0, -$this->FontDescent, $maxw, $this->FontAscent);
+ }
+ return $result;
+ }
+
/**
* Return the font descent value
* @param $font (string) font name
@@ -5189,6 +5420,70 @@ class TCPDF {
return ($ascent / $this->k);
}
+ /**
+ * Return the font descent value
+ * @param $char (mixed) Character to check (integer value or string)
+ * @param $font (string) Font name (family name).
+ * @param $style (string) Font style.
+ * @return (boolean) true if the char is defined, false otherwise.
+ * @public
+ * @since 5.9.153 (2012-03-28)
+ */
+ public function isCharDefined($char, $font='', $style='') {
+ if (is_string($char)) {
+ // get character code
+ $char = $this->UTF8StringToArray($char);
+ $char = $char[0];
+ }
+ if ($this->empty_string($font)) {
+ $font = $this->FontFamily;
+ }
+ $fontdata = $this->AddFont($font, $style);
+ $fontinfo = $this->getFontBuffer($fontdata['fontkey']);
+ return (isset($fontinfo['cw'][intval($char)]));
+ }
+
+ /**
+ * Replace missing font characters on selected font with specified substitutions.
+ * @param $text (string) Text to process.
+ * @param $font (string) Font name (family name).
+ * @param $style (string) Font style.
+ * @param $subs (array) Array of possible character substitutions. The key is the character to check (integer value) and the value is a single intege value or an array of possible substitutes.
+ * @return (string) Processed text.
+ * @public
+ * @since 5.9.153 (2012-03-28)
+ */
+ public function replaceMissingChars($text, $font='', $style='', $subs=array()) {
+ if (empty($subs)) {
+ return $text;
+ }
+ if ($this->empty_string($font)) {
+ $font = $this->FontFamily;
+ }
+ $fontdata = $this->AddFont($font, $style);
+ $fontinfo = $this->getFontBuffer($fontdata['fontkey']);
+ $uniarr = $this->UTF8StringToArray($text);
+ foreach ($uniarr as $k => $chr) {
+ if (!isset($fontinfo['cw'][$chr])) {
+ // this character is missing on the selected font
+ if (isset($subs[$chr])) {
+ // we have available substitutions
+ if (is_array($subs[$chr])) {
+ foreach($subs[$chr] as $s) {
+ if (isset($fontinfo['cw'][$s])) {
+ $uniarr[$k] = $s;
+ break;
+ }
+ }
+ } elseif (isset($fontinfo['cw'][$subs[$chr]])) {
+ $uniarr[$k] = $subs[$chr];
+ }
+ }
+ }
+ }
+ return $this->UniArrSubString($this->UTF8ArrayToUniArray($uniarr));
+ }
+
/**
* Defines the default monospaced font.
* @param $font (string) Font name.
@@ -5328,9 +5623,11 @@ class TCPDF {
}
++$this->n;
$this->PageAnnots[$page][] = array('n' => $this->n, 'x' => $x, 'y' => $y, 'w' => $w, 'h' => $h, 'txt' => $text, 'opt' => $opt, 'numspaces' => $spaces);
- if ((($opt['Subtype'] == 'FileAttachment') OR ($opt['Subtype'] == 'Sound')) AND (!$this->empty_string($opt['FS'])) AND file_exists($opt['FS']) AND (!isset($this->embeddedfiles[basename($opt['FS'])]))) {
- ++$this->n;
- $this->embeddedfiles[basename($opt['FS'])] = array('n' => $this->n, 'file' => $opt['FS']);
+ if (!$this->pdfa_mode) {
+ if ((($opt['Subtype'] == 'FileAttachment') OR ($opt['Subtype'] == 'Sound')) AND (!$this->empty_string($opt['FS'])) AND file_exists($opt['FS']) AND (!isset($this->embeddedfiles[basename($opt['FS'])]))) {
+ ++$this->n;
+ $this->embeddedfiles[basename($opt['FS'])] = array('n' => $this->n, 'file' => $opt['FS']);
+ }
}
// Add widgets annotation's icons
if (isset($opt['mk']['i']) AND file_exists($opt['mk']['i'])) {
@@ -5351,6 +5648,10 @@ class TCPDF {
* @see Annotation()
*/
protected function _putEmbeddedFiles() {
+ if ($this->pdfa_mode) {
+ // embedded files are not allowed in PDF/A mode
+ return;
+ }
reset($this->embeddedfiles);
foreach ($this->embeddedfiles as $filename => $filedata) {
$data = file_get_contents($filedata['file']);
@@ -5417,7 +5718,7 @@ class TCPDF {
if ($this->current_column < ($this->num_columns - 1)) {
// go to next column
$this->selectColumn($this->current_column + 1);
- } else {
+ } elseif ($this->AutoPageBreak) {
// add a new page
$this->AddPage();
// set first column
@@ -5710,7 +6011,7 @@ class TCPDF {
} else {
$xk = ($x * $k);
}
- $s .= sprintf('%.2F %.2F %.2F %.2F re %s ', $xk, (($this->h - $y) * $k), ($w * $k), (-$h * $k), $op);
+ $s .= sprintf('%F %F %F %F re %s ', $xk, (($this->h - $y) * $k), ($w * $k), (-$h * $k), $op);
}
// draw borders
$s .= $this->getCellBorder($x, $y, $w, $h, $border);
@@ -5783,17 +6084,17 @@ class TCPDF {
}
if ($this->font_stretching != 100) {
// apply font stretching
- $rs .= sprintf('BT %.2F Tz ET ', $this->font_stretching);
+ $rs .= sprintf('BT %F Tz ET ', $this->font_stretching);
}
if ($this->font_spacing != 0) {
// increase/decrease font spacing
- $rs .= sprintf('BT %.2F Tc ET ', ($this->font_spacing * $this->k));
+ $rs .= sprintf('BT %F Tc ET ', ($this->font_spacing * $this->k));
}
if ($this->ColorFlag AND ($this->textrendermode < 4)) {
$s .= 'q '.$this->TextColor.' ';
}
// rendering mode
- $s .= sprintf('BT %d Tr %.2F w ET ', $this->textrendermode, $this->textstrokewidth);
+ $s .= sprintf('BT %d Tr %F w ET ', $this->textrendermode, $this->textstrokewidth);
// count number of spaces
$ns = substr_count($txt, chr(32));
// Justification
@@ -5809,7 +6110,7 @@ class TCPDF {
$spacewidth /= ($this->font_stretching / 100);
}
// set word position to be used with TJ operator
- $txt2 = str_replace(chr(0).chr(32), ') '.sprintf('%.3F', $spacewidth).' (', $txt2);
+ $txt2 = str_replace(chr(0).chr(32), ') '.sprintf('%F', $spacewidth).' (', $txt2);
$unicode_justification = true;
} else {
// get string width
@@ -5821,7 +6122,7 @@ class TCPDF {
$spacewidth /= ($this->font_stretching / 100);
}
// set word spacing
- $rs .= sprintf('BT %.3F Tw ET ', $spacewidth);
+ $rs .= sprintf('BT %F Tw ET ', $spacewidth);
}
$width = $w - $this->cell_padding['L'] - $this->cell_padding['R'];
}
@@ -5865,7 +6166,7 @@ class TCPDF {
}
$xdk = $xdx * $k;
// print text
- $s .= sprintf('BT %.2F %.2F Td [(%s)] TJ ET', $xdk, (($this->h - $basefonty) * $k), $txt2);
+ $s .= sprintf('BT %F %F Td [(%s)] TJ ET', $xdk, (($this->h - $basefonty) * $k), $txt2);
if (isset($uniblock)) {
// print overlapping characters as separate string
$xshift = 0; // horizontal shift
@@ -5883,7 +6184,7 @@ class TCPDF {
// character to print
$topchr = $this->arrUTF8ToUTF16BE($uniarr, false);
$topchr = $this->_escape($topchr);
- $s .= sprintf(' BT %.2F %.2F Td [(%s)] TJ ET', ($xdk + ($xshift * $k)), $ty, $topchr);
+ $s .= sprintf(' BT %F %F Td [(%s)] TJ ET', ($xdk + ($xshift * $k)), $ty, $topchr);
}
}
}
@@ -5989,7 +6290,7 @@ class TCPDF {
$slen = strlen($brd);
$newbrd = array();
for ($i = 0; $i < $slen; ++$i) {
- $newbrd[$brd{$i}] = array('cap' => 'square', 'join' => 'miter');
+ $newbrd[$brd[$i]] = array('cap' => 'square', 'join' => 'miter');
}
$brd = $newbrd;
}
@@ -6049,85 +6350,85 @@ class TCPDF {
}
// draw borders by case
if (strlen($border) == 4) {
- $s .= sprintf('%.2F %.2F %.2F %.2F re S ', $xT, $yT, ($w * $k), (-$h * $k));
+ $s .= sprintf('%F %F %F %F re S ', $xT, $yT, ($w * $k), (-$h * $k));
} elseif (strlen($border) == 3) {
if (strpos($border,'B') === false) { // LTR
- $s .= sprintf('%.2F %.2F m ', $xL, $yL);
- $s .= sprintf('%.2F %.2F l ', $xT, $yT);
- $s .= sprintf('%.2F %.2F l ', $xR, $yR);
- $s .= sprintf('%.2F %.2F l ', $xB, $yB);
+ $s .= sprintf('%F %F m ', $xL, $yL);
+ $s .= sprintf('%F %F l ', $xT, $yT);
+ $s .= sprintf('%F %F l ', $xR, $yR);
+ $s .= sprintf('%F %F l ', $xB, $yB);
$s .= 'S ';
} elseif (strpos($border,'L') === false) { // TRB
- $s .= sprintf('%.2F %.2F m ', $xT, $yT);
- $s .= sprintf('%.2F %.2F l ', $xR, $yR);
- $s .= sprintf('%.2F %.2F l ', $xB, $yB);
- $s .= sprintf('%.2F %.2F l ', $xL, $yL);
+ $s .= sprintf('%F %F m ', $xT, $yT);
+ $s .= sprintf('%F %F l ', $xR, $yR);
+ $s .= sprintf('%F %F l ', $xB, $yB);
+ $s .= sprintf('%F %F l ', $xL, $yL);
$s .= 'S ';
} elseif (strpos($border,'T') === false) { // RBL
- $s .= sprintf('%.2F %.2F m ', $xR, $yR);
- $s .= sprintf('%.2F %.2F l ', $xB, $yB);
- $s .= sprintf('%.2F %.2F l ', $xL, $yL);
- $s .= sprintf('%.2F %.2F l ', $xT, $yT);
+ $s .= sprintf('%F %F m ', $xR, $yR);
+ $s .= sprintf('%F %F l ', $xB, $yB);
+ $s .= sprintf('%F %F l ', $xL, $yL);
+ $s .= sprintf('%F %F l ', $xT, $yT);
$s .= 'S ';
} elseif (strpos($border,'R') === false) { // BLT
- $s .= sprintf('%.2F %.2F m ', $xB, $yB);
- $s .= sprintf('%.2F %.2F l ', $xL, $yL);
- $s .= sprintf('%.2F %.2F l ', $xT, $yT);
- $s .= sprintf('%.2F %.2F l ', $xR, $yR);
+ $s .= sprintf('%F %F m ', $xB, $yB);
+ $s .= sprintf('%F %F l ', $xL, $yL);
+ $s .= sprintf('%F %F l ', $xT, $yT);
+ $s .= sprintf('%F %F l ', $xR, $yR);
$s .= 'S ';
}
} elseif (strlen($border) == 2) {
if ((strpos($border,'L') !== false) AND (strpos($border,'T') !== false)) { // LT
- $s .= sprintf('%.2F %.2F m ', $xL, $yL);
- $s .= sprintf('%.2F %.2F l ', $xT, $yT);
- $s .= sprintf('%.2F %.2F l ', $xR, $yR);
+ $s .= sprintf('%F %F m ', $xL, $yL);
+ $s .= sprintf('%F %F l ', $xT, $yT);
+ $s .= sprintf('%F %F l ', $xR, $yR);
$s .= 'S ';
} elseif ((strpos($border,'T') !== false) AND (strpos($border,'R') !== false)) { // TR
- $s .= sprintf('%.2F %.2F m ', $xT, $yT);
- $s .= sprintf('%.2F %.2F l ', $xR, $yR);
- $s .= sprintf('%.2F %.2F l ', $xB, $yB);
+ $s .= sprintf('%F %F m ', $xT, $yT);
+ $s .= sprintf('%F %F l ', $xR, $yR);
+ $s .= sprintf('%F %F l ', $xB, $yB);
$s .= 'S ';
} elseif ((strpos($border,'R') !== false) AND (strpos($border,'B') !== false)) { // RB
- $s .= sprintf('%.2F %.2F m ', $xR, $yR);
- $s .= sprintf('%.2F %.2F l ', $xB, $yB);
- $s .= sprintf('%.2F %.2F l ', $xL, $yL);
+ $s .= sprintf('%F %F m ', $xR, $yR);
+ $s .= sprintf('%F %F l ', $xB, $yB);
+ $s .= sprintf('%F %F l ', $xL, $yL);
$s .= 'S ';
} elseif ((strpos($border,'B') !== false) AND (strpos($border,'L') !== false)) { // BL
- $s .= sprintf('%.2F %.2F m ', $xB, $yB);
- $s .= sprintf('%.2F %.2F l ', $xL, $yL);
- $s .= sprintf('%.2F %.2F l ', $xT, $yT);
+ $s .= sprintf('%F %F m ', $xB, $yB);
+ $s .= sprintf('%F %F l ', $xL, $yL);
+ $s .= sprintf('%F %F l ', $xT, $yT);
$s .= 'S ';
} elseif ((strpos($border,'L') !== false) AND (strpos($border,'R') !== false)) { // LR
- $s .= sprintf('%.2F %.2F m ', $xL, $yL);
- $s .= sprintf('%.2F %.2F l ', $xT, $yT);
+ $s .= sprintf('%F %F m ', $xL, $yL);
+ $s .= sprintf('%F %F l ', $xT, $yT);
$s .= 'S ';
- $s .= sprintf('%.2F %.2F m ', $xR, $yR);
- $s .= sprintf('%.2F %.2F l ', $xB, $yB);
+ $s .= sprintf('%F %F m ', $xR, $yR);
+ $s .= sprintf('%F %F l ', $xB, $yB);
$s .= 'S ';
} elseif ((strpos($border,'T') !== false) AND (strpos($border,'B') !== false)) { // TB
- $s .= sprintf('%.2F %.2F m ', $xT, $yT);
- $s .= sprintf('%.2F %.2F l ', $xR, $yR);
+ $s .= sprintf('%F %F m ', $xT, $yT);
+ $s .= sprintf('%F %F l ', $xR, $yR);
$s .= 'S ';
- $s .= sprintf('%.2F %.2F m ', $xB, $yB);
- $s .= sprintf('%.2F %.2F l ', $xL, $yL);
+ $s .= sprintf('%F %F m ', $xB, $yB);
+ $s .= sprintf('%F %F l ', $xL, $yL);
$s .= 'S ';
}
} else { // strlen($border) == 1
if (strpos($border,'L') !== false) { // L
- $s .= sprintf('%.2F %.2F m ', $xL, $yL);
- $s .= sprintf('%.2F %.2F l ', $xT, $yT);
+ $s .= sprintf('%F %F m ', $xL, $yL);
+ $s .= sprintf('%F %F l ', $xT, $yT);
$s .= 'S ';
} elseif (strpos($border,'T') !== false) { // T
- $s .= sprintf('%.2F %.2F m ', $xT, $yT);
- $s .= sprintf('%.2F %.2F l ', $xR, $yR);
+ $s .= sprintf('%F %F m ', $xT, $yT);
+ $s .= sprintf('%F %F l ', $xR, $yR);
$s .= 'S ';
} elseif (strpos($border,'R') !== false) { // R
- $s .= sprintf('%.2F %.2F m ', $xR, $yR);
- $s .= sprintf('%.2F %.2F l ', $xB, $yB);
+ $s .= sprintf('%F %F m ', $xR, $yR);
+ $s .= sprintf('%F %F l ', $xB, $yB);
$s .= 'S ';
} elseif (strpos($border,'B') !== false) { // B
- $s .= sprintf('%.2F %.2F m ', $xB, $yB);
- $s .= sprintf('%.2F %.2F l ', $xL, $yL);
+ $s .= sprintf('%F %F m ', $xB, $yB);
+ $s .= sprintf('%F %F l ', $xL, $yL);
$s .= 'S ';
}
}
@@ -6154,17 +6455,17 @@ class TCPDF {
* @param $y (float) y position in user units
* @param $reseth (boolean) if true reset the last cell height (default true).
* @param $stretch (int) font stretch mode:
0 = disabled
1 = horizontal scaling only if text is larger than cell width
2 = forced horizontal scaling to fit cell width
3 = character spacing only if text is larger than cell width
4 = forced character spacing to fit cell width
General font stretching and scaling values will be preserved when possible.
- * @param $ishtml (boolean) set to true if $txt is HTML content (default = false).
+ * @param $ishtml (boolean) INTERNAL USE ONLY -- set to true if $txt is HTML content (default = false). Never set this parameter to true, use instead writeHTMLCell() or writeHTML() methods.
* @param $autopadding (boolean) if true, uses internal padding and automatically adjust it to account for line width.
* @param $maxh (float) maximum height. It should be >= $h and less then remaining space to the bottom of the page, or 0 for disable this feature. This feature works only when $ishtml=false.
- * @param $valign (string) Vertical alignment of text (requires $maxh = $h > 0). Possible values are:
T: TOP
M: middle
B: bottom
. This feature works only when $ishtml=false.
- * @param $fitcell (boolean) if true attempt to fit all the text within the cell by reducing the font size.
+ * @param $valign (string) Vertical alignment of text (requires $maxh = $h > 0). Possible values are:
T: TOP
M: middle
B: bottom
. This feature works only when $ishtml=false and the cell must fit in a single page.
+ * @param $fitcell (boolean) if true attempt to fit all the text within the cell by reducing the font size (do not work in HTML mode).
* @return int Return the number of cells or 1 for html mode.
* @public
* @since 1.3
* @see SetFont(), SetDrawColor(), SetFillColor(), SetTextColor(), SetLineWidth(), Cell(), Write(), SetAutoPageBreak()
*/
- public function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false, $ln=1, $x='', $y='', $reseth=true, $stretch=0, $ishtml=false, $autopadding=false, $maxh=0, $valign='T', $fitcell=false) {
+ public function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false, $ln=1, $x='', $y='', $reseth=true, $stretch=0, $ishtml=false, $autopadding=true, $maxh=0, $valign='T', $fitcell=false) {
$prev_cell_margin = $this->cell_margin;
$prev_cell_padding = $this->cell_padding;
// adjust internal padding
@@ -6184,10 +6485,10 @@ class TCPDF {
$y = $this->GetY();
}
$resth = 0;
- if (($this->inPageBody()) AND (($y + $h + $mc_margin['T'] + $mc_margin['B']) > $this->PageBreakTrigger)) {
+ if (($h > 0) AND $this->inPageBody() AND (($y + $h + $mc_margin['T'] + $mc_margin['B']) > $this->PageBreakTrigger)) {
// spit cell in more pages/columns
- $newh = $this->PageBreakTrigger - $y;
- $resth = $h - $newh; // cell to be printed on the next page/column
+ $newh = ($this->PageBreakTrigger - $y);
+ $resth = ($h - $newh); // cell to be printed on the next page/column
$h = $newh;
}
// get current page number
@@ -6455,9 +6756,23 @@ class TCPDF {
} // end for each page
// Get end-of-cell Y position
$currentY = $this->GetY();
- // restore original margin values
- $this->SetLeftMargin($lMargin);
- $this->SetRightMargin($rMargin);
+ // restore previous values
+ if ($this->num_columns > 1) {
+ $this->selectColumn();
+ } else {
+ // restore original margins
+ $this->lMargin = $lMargin;
+ $this->rMargin = $rMargin;
+ if ($this->page > $startpage) {
+ // check for margin variations between pages (i.e. booklet mode)
+ $dl = ($this->pagedim[$this->page]['olm'] - $this->pagedim[$startpage]['olm']);
+ $dr = ($this->pagedim[$this->page]['orm'] - $this->pagedim[$startpage]['orm']);
+ if (($dl != 0) OR ($dr != 0)) {
+ $this->lMargin += $dl;
+ $this->rMargin += $dr;
+ }
+ }
+ }
if ($ln > 0) {
//Go to the beginning of the next line
$this->SetY($currentY + $mc_margin['B']);
@@ -6496,7 +6811,7 @@ class TCPDF {
$slen = strlen($brd);
$newbrd = array();
for ($i = 0; $i < $slen; ++$i) {
- $newbrd[$brd{$i}] = array('cap' => 'square', 'join' => 'miter');
+ $newbrd[$brd[$i]] = array('cap' => 'square', 'join' => 'miter');
}
$brd = $newbrd;
}
@@ -6558,7 +6873,7 @@ class TCPDF {
* @param $cellpadding (float) Internal cell padding, if empty uses default cell padding.
* @param $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:
0: no border (default)
1: frame
or a string containing some or all of the following characters (in any order):
L: left
T: top
R: right
B: bottom
or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
* @return float Return the minimal height needed for multicell method for printing the $txt param.
- * @author Alexander Escalona Fern�ndez, Nicola Asuni
+ * @author Alexander Escalona Fernndez, Nicola Asuni
* @public
* @since 4.5.011
*/
@@ -6599,7 +6914,10 @@ class TCPDF {
}
if ((($sum + $charWidth) > $wmax) OR ($chars[$i] == 10)) {
++$lines;
- if ($lastSeparator != -1) {
+ if ($chars[$i] == 10) {
+ $lastSeparator = -1;
+ $sum = 0;
+ } elseif ($lastSeparator != -1) {
$i = $lastSeparator;
$lastSeparator = -1;
$sum = 0;
@@ -6619,7 +6937,7 @@ class TCPDF {
}
/**
- * This method return the estimated needed height for print a simple text string in Multicell() method.
+ * This method return the estimated height needed for printing a simple text string using the Multicell() method.
* Generally, if you want to know the exact height for a block of content you can use the following alternative technique:
* @pre
* // store current object
@@ -6662,7 +6980,7 @@ class TCPDF {
* @param $cellpadding (float) Internal cell padding, if empty uses default cell padding.
* @param $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:
0: no border (default)
1: frame
or a string containing some or all of the following characters (in any order):
L: left
T: top
R: right
B: bottom
or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
* @return float Return the minimal height needed for multicell method for printing the $txt param.
- * @author Nicola Asuni, Alexander Escalona Fern�ndez
+ * @author Nicola Asuni, Alexander Escalona Fernndez
* @public
*/
public function getStringHeight($w, $txt, $reseth=false, $autopadding=true, $cellpadding='', $border=0) {
@@ -6922,7 +7240,7 @@ class TCPDF {
} else {
$endspace = 0;
}
- // check the lenght of the next string
+ // check the length of the next string
$strrest = $this->UniArrSubString($uchars, ($sep + $endspace));
$nextstr = preg_split('/'.$this->re_space['p'].'/'.$this->re_space['m'], $this->stringTrim($strrest));
if (isset($nextstr[0]) AND ($this->GetStringWidth($nextstr[0]) > $pw)) {
@@ -7340,7 +7658,7 @@ class TCPDF {
$cached_file = false; // true when the file is cached
$exurl = ''; // external streams
// check if we are passing an image as file or string
- if ($file{0} === '@') {
+ if ($file[0] === '@') {
// image from string
$imgdata = substr($file, 1);
$file = K_PATH_CACHE.'img_'.md5($imgdata);
@@ -7379,8 +7697,12 @@ class TCPDF {
curl_setopt($cs, CURLOPT_BINARYTRANSFER, true);
curl_setopt($cs, CURLOPT_FAILONERROR, true);
curl_setopt($cs, CURLOPT_RETURNTRANSFER, true);
+ curl_setopt($cs, CURLOPT_FOLLOWLOCATION, true);
curl_setopt($cs, CURLOPT_CONNECTTIMEOUT, 5);
curl_setopt($cs, CURLOPT_TIMEOUT, 30);
+ curl_setopt($cs, CURLOPT_SSL_VERIFYPEER, false);
+ curl_setopt($cs, CURLOPT_SSL_VERIFYHOST, false);
+ curl_setopt($cs, CURLOPT_USERAGENT, 'TCPDF');
$imgdata = curl_exec($cs);
curl_close($cs);
if ($imgdata !== FALSE) {
@@ -7415,6 +7737,8 @@ class TCPDF {
$this->Error('[Image] Unable to get image: '.$file);
}
}
+ // file hash
+ $filehash = md5($file);
// get original image width and height in pixels
list($pixw, $pixh) = $imsize;
// calculate image width and height on document
@@ -7513,7 +7837,6 @@ class TCPDF {
}
} elseif (substr($file, 0, -34) != K_PATH_CACHE.'msk') {
// check for cached images with alpha channel
- $filehash = md5($file);
$tempfile_plain = K_PATH_CACHE.'mskp_'.$filehash;
$tempfile_alpha = K_PATH_CACHE.'mska_'.$filehash;
if (in_array($tempfile_plain, $this->imagekeys)) {
@@ -7547,7 +7870,7 @@ class TCPDF {
// GD image handler function
$gdfunction = 'imagecreatefrom'.$type;
$info = false;
- if ((method_exists($this, $mtd)) AND (!($resize AND function_exists($gdfunction)))) {
+ if ((method_exists($this, $mtd)) AND (!($resize AND (function_exists($gdfunction) OR extension_loaded('imagick'))))) {
// TCPDF image functions
$info = $this->$mtd($file);
if ($info == 'pngalpha') {
@@ -7589,7 +7912,7 @@ class TCPDF {
$tmp = array();
if (preg_match('/[\s]+width[\s]*=[\s]*"([^"]*)"/si', $svgtag, $tmp)) {
$ow = $this->getHTMLUnitToUnits($tmp[1], 1, $this->svgunit, false);
- $owu = sprintf('%.3F', ($ow * $dpi / 72)).$this->pdfunit;
+ $owu = sprintf('%F', ($ow * $dpi / 72)).$this->pdfunit;
$svgtag = preg_replace('/[\s]+width[\s]*=[\s]*"[^"]*"/si', ' width="'.$owu.'"', $svgtag, 1);
} else {
$ow = $w;
@@ -7597,7 +7920,7 @@ class TCPDF {
$tmp = array();
if (preg_match('/[\s]+height[\s]*=[\s]*"([^"]*)"/si', $svgtag, $tmp)) {
$oh = $this->getHTMLUnitToUnits($tmp[1], 1, $this->svgunit, false);
- $ohu = sprintf('%.3F', ($oh * $dpi / 72)).$this->pdfunit;
+ $ohu = sprintf('%F', ($oh * $dpi / 72)).$this->pdfunit;
$svgtag = preg_replace('/[\s]+height[\s]*=[\s]*"[^"]*"/si', ' height="'.$ohu.'"', $svgtag, 1);
} else {
$oh = $h;
@@ -7606,7 +7929,7 @@ class TCPDF {
if (!preg_match('/[\s]+viewBox[\s]*=[\s]*"[\s]*([0-9\.]+)[\s]+([0-9\.]+)[\s]+([0-9\.]+)[\s]+([0-9\.]+)[\s]*"/si', $svgtag, $tmp)) {
$vbw = ($ow * $this->imgscale * $this->k);
$vbh = ($oh * $this->imgscale * $this->k);
- $vbox = sprintf(' viewBox="0 0 %.3F %.3F" ', $vbw, $vbh);
+ $vbox = sprintf(' viewBox="0 0 %F %F" ', $vbw, $vbh);
$svgtag = $vbox.$svgtag;
}
$svgimg = preg_replace('/]*)>/si', '', $svgimg, 1);
@@ -7690,7 +8013,7 @@ class TCPDF {
$xkimg = $ximg * $this->k;
if (!$alt) {
// only non-alternative immages will be set
- $this->_out(sprintf('q %.2F 0 0 %.2F %.2F %.2F cm /I%u Do Q', ($w * $this->k), ($h * $this->k), $xkimg, (($this->h - ($y + $h)) * $this->k), $info['i']));
+ $this->_out(sprintf('q %F 0 0 %F %F %F cm /I%u Do Q', ($w * $this->k), ($h * $this->k), $xkimg, (($this->h - ($y + $h)) * $this->k), $info['i']));
}
if (!empty($border)) {
$bx = $this->x;
@@ -7849,16 +8172,63 @@ class TCPDF {
if ($a[2] != 2) {
$this->Error('Not a JPEG file: '.$file);
}
- if ((!isset($a['channels'])) OR ($a['channels'] == 3)) {
- $colspace = 'DeviceRGB';
- } elseif ($a['channels'] == 4) {
- $colspace = 'DeviceCMYK';
+ // bits per pixel
+ $bpc = isset($a['bits']) ? intval($a['bits']) : 8;
+ // number of image channels
+ if (!isset($a['channels'])) {
+ $channels = 3;
} else {
- $colspace = 'DeviceGray';
+ $channels = intval($a['channels']);
}
- $bpc = isset($a['bits']) ? $a['bits'] : 8;
+ // default colour space
+ switch ($channels) {
+ case 1: {
+ $colspace = 'DeviceGray';
+ break;
+ }
+ case 3: {
+ $colspace = 'DeviceRGB';
+ break;
+ }
+ case 4: {
+ $colspace = 'DeviceCMYK';
+ break;
+ }
+ default: {
+ $channels = 3;
+ $colspace = 'DeviceRGB';
+ break;
+ }
+ }
+ // get file content
$data = file_get_contents($file);
- return array('w' => $a[0], 'h' => $a[1], 'cs' => $colspace, 'bpc' => $bpc, 'f' => 'DCTDecode', 'data' => $data);
+ // check for embedded ICC profile
+ $icc = array();
+ $offset = 0;
+ while (($pos = strpos($data, "ICC_PROFILE\0", $offset)) !== false) {
+ // get ICC sequence length
+ $length = ($this->_getUSHORT($data, ($pos - 2)) - 16);
+ // marker sequence number
+ $msn = max(1, ord($data[($pos + 12)]));
+ // number of markers (total of APP2 used)
+ $nom = max(1, ord($data[($pos + 13)]));
+ // get sequence segment
+ $icc[($msn - 1)] = substr($data, ($pos + 14), $length);
+ // move forward to next sequence
+ $offset = ($pos + 14 + $length);
+ }
+ // order and compact ICC segments
+ if (count($icc) > 0) {
+ ksort($icc);
+ $icc = implode('', $icc);
+ if ((ord($icc{36}) != 0x61) OR (ord($icc{37}) != 0x63) OR (ord($icc{38}) != 0x73) OR (ord($icc{39}) != 0x70)) {
+ // invalid ICC profile
+ $icc = false;
+ }
+ } else {
+ $icc = false;
+ }
+ return array('w' => $a[0], 'h' => $a[1], 'ch' => $channels, 'icc' => $icc, 'cs' => $colspace, 'bpc' => $bpc, 'f' => 'DCTDecode', 'data' => $data);
}
/**
@@ -7917,25 +8287,27 @@ class TCPDF {
return false;
}
fread($f, 4);
- $parms = '/DecodeParms << /Predictor 15 /Colors '.($ct == 2 ? 3 : 1).' /BitsPerComponent '.$bpc.' /Columns '.$w.' >>';
+ $channels = ($ct == 2 ? 3 : 1);
+ $parms = '/DecodeParms << /Predictor 15 /Colors '.$channels.' /BitsPerComponent '.$bpc.' /Columns '.$w.' >>';
//Scan chunks looking for palette, transparency and image data
$pal = '';
$trns = '';
$data = '';
+ $icc = false;
do {
$n = $this->_freadint($f);
$type = fread($f, 4);
if ($type == 'PLTE') {
- //Read palette
+ // read palette
$pal = $this->rfread($f, $n);
fread($f, 4);
} elseif ($type == 'tRNS') {
- //Read transparency info
+ // read transparency info
$t = $this->rfread($f, $n);
if ($ct == 0) {
- $trns = array(ord(substr($t, 1, 1)));
+ $trns = array(ord($t{1}));
} elseif ($ct == 2) {
- $trns = array(ord(substr($t, 1, 1)), ord(substr($t, 3, 1)), ord(substr($t, 5, 1)));
+ $trns = array(ord($t{1}), ord($t{3}), ord($t{5}));
} else {
$pos = strpos($t, chr(0));
if ($pos !== false) {
@@ -7944,9 +8316,26 @@ class TCPDF {
}
fread($f, 4);
} elseif ($type == 'IDAT') {
- //Read image data block
+ // read image data block
$data .= $this->rfread($f, $n);
fread($f, 4);
+ } elseif ($type == 'iCCP') {
+ // skip profile name and null separator
+ $len = 0;
+ while ((ord(fread($f, 1)) > 0) AND ($len < 80)) {
+ ++$len;
+ }
+ // get compression method
+ if (ord(fread($f, 1)) != 0) {
+ //$this->Error('Unknown filter method: '.$file);
+ fclose($f);
+ return false;
+ }
+ // read ICC Color Profile
+ $icc = $this->rfread($f, ($n - $len - 2));
+ // decompress profile
+ $icc = gzuncompress($icc);
+ fread($f, 4);
} elseif ($type == 'IEND') {
break;
} else {
@@ -7959,7 +8348,7 @@ class TCPDF {
return false;
}
fclose($f);
- return array('w' => $w, 'h' => $h, 'cs' => $colspace, 'bpc' => $bpc, 'f' => 'FlateDecode', 'parms' => $parms, 'pal' => $pal, 'trns' => $trns, 'data' => $data);
+ return array('w' => $w, 'h' => $h, 'ch' => $channels, 'icc' => $icc, 'cs' => $colspace, 'bpc' => $bpc, 'f' => 'FlateDecode', 'parms' => $parms, 'pal' => $pal, 'trns' => $trns, 'data' => $data);
}
/**
@@ -8013,7 +8402,7 @@ class TCPDF {
$tempfile_plain = K_PATH_CACHE.'mskp_'.$filehash;
// create temp alpha file
$tempfile_alpha = K_PATH_CACHE.'mska_'.$filehash;
- if (extension_loaded('imagick')) { // ImageMagick
+ if (extension_loaded('imagick')) { // ImageMagick extension
// ImageMagick library
$img = new Imagick();
$img->readImage($file);
@@ -8028,7 +8417,7 @@ class TCPDF {
$imga->separateImageChannel(39); // 39 = (imagick::CHANNEL_ALL & ~(imagick::CHANNEL_ALPHA | imagick::CHANNEL_OPACITY | imagick::CHANNEL_MATTE));
$imga->setImageFormat('png');
$imga->writeImage($tempfile_plain);
- } else { // GD library
+ } elseif (function_exists('imagecreatefrompng')) { // GD extension
// generate images
$img = imagecreatefrompng($file);
$imgalpha = imagecreate($wpx, $hpx);
@@ -8053,6 +8442,8 @@ class TCPDF {
imagecopy($imgplain, $img, 0, 0, 0, 0, $wpx, $hpx);
imagepng($imgplain, $tempfile_plain);
imagedestroy($imgplain);
+ } else {
+ $this->Error('TCPDF requires the Imagick or GD extension to handle PNG images with alpha channel.');
}
// embed mask image
$imgmask = $this->Image($tempfile_alpha, $x, $y, $w, $h, 'PNG', '', '', $resize, $dpi, '', true, false);
@@ -8229,14 +8620,14 @@ class TCPDF {
/**
* Ouput input data and compress it if possible.
* @param $data (string) Data to output.
- * @param $lenght (int) Data lenght in bytes.
+ * @param $length (int) Data length in bytes.
* @protected
* @since 5.9.086
*/
- protected function sendOutputData($data, $lenght) {
+ protected function sendOutputData($data, $length) {
if (!isset($_SERVER['HTTP_ACCEPT_ENCODING']) OR empty($_SERVER['HTTP_ACCEPT_ENCODING'])) {
// the content length may vary if the server is using compression
- header('Content-Length: '.$lenght);
+ header('Content-Length: '.$length);
}
echo $data;
}
@@ -8340,7 +8731,8 @@ class TCPDF {
if (headers_sent()) {
$this->Error('Some data has already been output to browser, can\'t send PDF file');
}
- header('Cache-Control: public, must-revalidate, max-age=0'); // HTTP/1.1
+ header('Cache-Control: private, must-revalidate, post-check=0, pre-check=0, max-age=1');
+ //header('Cache-Control: public, must-revalidate, max-age=0'); // HTTP/1.1
header('Pragma: public');
header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past
header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
@@ -8360,7 +8752,8 @@ class TCPDF {
if (headers_sent()) {
$this->Error('Some data has already been output to browser, can\'t send PDF file');
}
- header('Cache-Control: public, must-revalidate, max-age=0'); // HTTP/1.1
+ header('Cache-Control: private, must-revalidate, post-check=0, pre-check=0, max-age=1');
+ //header('Cache-Control: public, must-revalidate, max-age=0'); // HTTP/1.1
header('Pragma: public');
header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past
header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
@@ -8396,7 +8789,8 @@ class TCPDF {
if ($dest == 'FI') {
// send headers to browser
header('Content-Type: application/pdf');
- header('Cache-Control: public, must-revalidate, max-age=0'); // HTTP/1.1
+ header('Cache-Control: private, must-revalidate, post-check=0, pre-check=0, max-age=1');
+ //header('Cache-Control: public, must-revalidate, max-age=0'); // HTTP/1.1
header('Pragma: public');
header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past
header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
@@ -8411,7 +8805,7 @@ class TCPDF {
if (headers_sent()) {
$this->Error('Some data has already been output to browser, can\'t send PDF file');
}
- header('Cache-Control: public, must-revalidate, max-age=0'); // HTTP/1.1
+ header('Cache-Control: private, must-revalidate, post-check=0, pre-check=0, max-age=1');
header('Pragma: public');
header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past
header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
@@ -8521,14 +8915,14 @@ class TCPDF {
// build array of Unicode + ASCII variants (the order is important)
$alias = array('u' => array(), 'a' => array());
$u = '{'.$a.'}';
- $alias['u'][] = $u;
+ $alias['u'][] = $this->_escape($u);
if ($this->isunicode) {
$alias['u'][] = $this->_escape($this->UTF8ToLatin1($u));
$alias['u'][] = $this->_escape($this->utf8StrRev($u, false, $this->tmprtl));
$alias['a'][] = $this->_escape($this->UTF8ToLatin1($a));
$alias['a'][] = $this->_escape($this->utf8StrRev($a, false, $this->tmprtl));
}
- $alias['a'][] = $a;
+ $alias['a'][] = $this->_escape($a);
return $alias;
}
@@ -8546,6 +8940,80 @@ class TCPDF {
return $pnalias;
}
+ /**
+ * Replace page number aliases with number.
+ * @param $page (string) Page content.
+ * @param $replace (array) Array of replacements (array keys are replacement strings, values are alias arrays).
+ * @param $diff (int) If passed, this will be set to the total char number difference between alias and replacements.
+ * @return replaced page content and updated $diff parameter as array.
+ * @protected
+ */
+ protected function replacePageNumAliases($page, $replace, $diff=0) {
+ foreach ($replace as $rep) {
+ foreach ($rep[3] as $a) {
+ if (strpos($page, $a) !== false) {
+ $page = str_replace($a, $rep[0], $page);
+ $diff += ($rep[2] - $rep[1]);
+ }
+ }
+ }
+ return array($page, $diff);
+ }
+
+ /**
+ * Replace right shift page number aliases with spaces to correct right alignment.
+ * This works perfectly only when using monospaced fonts.
+ * @param $page (string) Page content.
+ * @param $aliases (array) Array of page aliases.
+ * @param $diff (int) initial difference to add.
+ * @return replaced page content.
+ * @protected
+ */
+ protected function replaceRightShiftPageNumAliases($page, $aliases, $diff) {
+ foreach ($aliases as $type => $alias) {
+ foreach ($alias as $a) {
+ // find position of compensation factor
+ $startnum = (strpos($a, ':') + 1);
+ $a = substr($a, 0, $startnum);
+ if (($pos = strpos($page, $a)) !== false) {
+ // end of alias
+ $endnum = strpos($page, '}', $pos);
+ // string to be replaced
+ $aa = substr($page, $pos, ($endnum - $pos + 1));
+ // get compensation factor
+ $ratio = substr($page, ($pos + $startnum), ($endnum - $pos - $startnum));
+ $ratio = preg_replace('/[^0-9\.]/', '', $ratio);
+ $ratio = floatval($ratio);
+ if ($type == 'u') {
+ $chrdiff = floor(($diff + 12) * $ratio);
+ $shift = str_repeat(' ', $chrdiff);
+ $shift = $this->UTF8ToUTF16BE($shift, false);
+ } else {
+ $chrdiff = floor(($diff + 11) * $ratio);
+ $shift = str_repeat(' ', $chrdiff);
+ }
+ $page = str_replace($aa, $shift, $page);
+ }
+ }
+ }
+ return $page;
+ }
+
+ /**
+ * Set page boxes to be included on page descriptions.
+ * @param $boxes (array) Array of page boxes to set on document: ('MediaBox', 'CropBox', 'BleedBox', 'TrimBox', 'ArtBox').
+ * @protected
+ */
+ protected function setPageBoxTypes($boxes) {
+ $validboxes = array('MediaBox', 'CropBox', 'BleedBox', 'TrimBox', 'ArtBox');
+ $this->page_boxes = array();
+ foreach ($boxes as $box) {
+ if (in_array($box, $validboxes)) {
+ $this->page_boxes[] = $box;
+ }
+ }
+ }
+
/**
* Output pages (and replace page number aliases).
* @protected
@@ -8557,6 +9025,7 @@ class TCPDF {
$num_pages = $this->numpages;
$ptpa = $this->formatPageNumber(($this->starting_page_number + $num_pages - 1));
$ptpu = $this->UTF8ToUTF16BE($ptpa, false);
+ $ptp_num_chars = $this->GetNumChars($ptpa);
$pagegroupnum = 0;
$groupnum = 0;
$ptgu = 1;
@@ -8568,56 +9037,38 @@ class TCPDF {
// set replacements for total pages number
$pnpa = $this->formatPageNumber(($this->starting_page_number + $n - 1));
$pnpu = $this->UTF8ToUTF16BE($pnpa, false);
+ $pnp_num_chars = $this->GetNumChars($pnpa);
+ $pdiff = 0; // difference used for right shift alignment of page numbers
+ $gdiff = 0; // difference used for right shift alignment of page group numbers
if (!empty($this->pagegroups)) {
if (isset($this->newpagegroup[$n])) {
$pagegroupnum = 0;
++$groupnum;
$ptga = $this->formatPageNumber($this->pagegroups[$groupnum]);
$ptgu = $this->UTF8ToUTF16BE($ptga, false);
+ $ptg_num_chars = $this->GetNumChars($ptga);
}
++$pagegroupnum;
$pnga = $this->formatPageNumber($pagegroupnum);
$pngu = $this->UTF8ToUTF16BE($pnga, false);
- // replace total page group number
- foreach ($pnalias[2]['u'] as $a) {
- $temppage = str_replace($a, $ptgu, $temppage);
- }
- foreach ($pnalias[2]['a'] as $a) {
- $temppage = str_replace($a, $ptga, $temppage);
- }
- // replace page group number
- foreach ($pnalias[3]['u'] as $a) {
- $temppage = str_replace($a, $pngu, $temppage);
- }
- foreach ($pnalias[3]['a'] as $a) {
- $temppage = str_replace($a, $pnga, $temppage);
- }
+ $png_num_chars = $this->GetNumChars($pnga);
+ // replace page numbers
+ $replace = array();
+ $replace[] = array($ptgu, $ptg_num_chars, 9, $pnalias[2]['u']);
+ $replace[] = array($ptga, $ptg_num_chars, 7, $pnalias[2]['a']);
+ $replace[] = array($pngu, $png_num_chars, 9, $pnalias[3]['u']);
+ $replace[] = array($pnga, $png_num_chars, 7, $pnalias[3]['a']);
+ list($temppage, $gdiff) = $this->replacePageNumAliases($temppage, $replace, $gdiff);
}
- // replace total page number
- foreach ($pnalias[0]['u'] as $a) {
- $temppage = str_replace($a, $ptpu, $temppage);
- }
- foreach ($pnalias[0]['a'] as $a) {
- $temppage = str_replace($a, $ptpa, $temppage);
- }
- // replace page number
- foreach ($pnalias[1]['u'] as $a) {
- $temppage = str_replace($a, $pnpu, $temppage);
- }
- foreach ($pnalias[1]['a'] as $a) {
- $temppage = str_replace($a, $pnpa, $temppage);
- }
- // adjust right alignment of page numbers
- $pagelendiff = max(0,(7 + $pagelen - strlen($temppage)));
- $shifta = str_repeat(' ', $pagelendiff);
- $shiftu = $this->UTF8ToUTF16BE($shifta, false);
+ // replace page numbers
+ $replace = array();
+ $replace[] = array($ptpu, $ptp_num_chars, 9, $pnalias[0]['u']);
+ $replace[] = array($ptpa, $ptp_num_chars, 7, $pnalias[0]['a']);
+ $replace[] = array($pnpu, $pnp_num_chars, 9, $pnalias[1]['u']);
+ $replace[] = array($pnpa, $pnp_num_chars, 7, $pnalias[1]['a']);
+ list($temppage, $pdiff) = $this->replacePageNumAliases($temppage, $replace, $pdiff);
// replace right shift alias
- foreach ($pnalias[4]['u'] as $a) {
- $temppage = str_replace($a, $shiftu, $temppage);
- }
- foreach ($pnalias[4]['a'] as $a) {
- $temppage = str_replace($a, $shifta, $temppage);
- }
+ $temppage = $this->replaceRightShiftPageNumAliases($temppage, $pnalias[4], max($pdiff, $gdiff));
// replace EPS marker
$temppage = str_replace($this->epsmarker, '', $temppage);
//Page
@@ -8625,22 +9076,21 @@ class TCPDF {
$out = '<<';
$out .= ' /Type /Page';
$out .= ' /Parent 1 0 R';
- $out .= ' /LastModified '.$this->_datestring();
+ $out .= ' /LastModified '.$this->_datestring(0, $this->doc_modification_timestamp);
$out .= ' /Resources 2 0 R';
- $boxes = array('MediaBox', 'CropBox', 'BleedBox', 'TrimBox', 'ArtBox');
- foreach ($boxes as $box) {
+ foreach ($this->page_boxes as $box) {
$out .= ' /'.$box;
- $out .= sprintf(' [%.2F %.2F %.2F %.2F]', $this->pagedim[$n][$box]['llx'], $this->pagedim[$n][$box]['lly'], $this->pagedim[$n][$box]['urx'], $this->pagedim[$n][$box]['ury']);
+ $out .= sprintf(' [%F %F %F %F]', $this->pagedim[$n][$box]['llx'], $this->pagedim[$n][$box]['lly'], $this->pagedim[$n][$box]['urx'], $this->pagedim[$n][$box]['ury']);
}
if (isset($this->pagedim[$n]['BoxColorInfo']) AND !empty($this->pagedim[$n]['BoxColorInfo'])) {
$out .= ' /BoxColorInfo <<';
- foreach ($boxes as $box) {
+ foreach ($this->page_boxes as $box) {
if (isset($this->pagedim[$n]['BoxColorInfo'][$box])) {
$out .= ' /'.$box.' <<';
if (isset($this->pagedim[$n]['BoxColorInfo'][$box]['C'])) {
$color = $this->pagedim[$n]['BoxColorInfo'][$box]['C'];
$out .= ' /C [';
- $out .= sprintf(' %.3F %.3F %.3F', $color[0]/255, $color[1]/255, $color[2]/255);
+ $out .= sprintf(' %F %F %F', ($color[0] / 255), ($color[1] / 255), ($color[2] / 255));
$out .= ' ]';
}
if (isset($this->pagedim[$n]['BoxColorInfo'][$box]['W'])) {
@@ -8653,7 +9103,7 @@ class TCPDF {
$dashes = $this->pagedim[$n]['BoxColorInfo'][$box]['D'];
$out .= ' /D [';
foreach ($dashes as $dash) {
- $out .= sprintf(' %.3F', ($dash * $this->k));
+ $out .= sprintf(' %F', ($dash * $this->k));
}
$out .= ' ]';
}
@@ -8664,7 +9114,9 @@ class TCPDF {
}
$out .= ' /Contents '.($this->n + 1).' 0 R';
$out .= ' /Rotate '.$this->pagedim[$n]['Rotate'];
- $out .= ' /Group << /Type /Group /S /Transparency /CS /DeviceRGB >>';
+ if (!$this->pdfa_mode) {
+ $out .= ' /Group << /Type /Group /S /Transparency /CS /DeviceRGB >>';
+ }
if (isset($this->pagedim[$n]['trans']) AND !empty($this->pagedim[$n]['trans'])) {
// page transitions
if (isset($this->pagedim[$n]['trans']['Dur'])) {
@@ -8765,6 +9217,14 @@ class TCPDF {
// set reference for signature object
$out .= ' '.$this->sig_obj_id.' 0 R';
}
+ if (!empty($this->empty_signature_appearance)) {
+ foreach ($this->empty_signature_appearance as $esa) {
+ if ($esa['page'] == $n) {
+ // set reference for empty signature objects
+ $out .= ' '.$esa['objid'].' 0 R';
+ }
+ }
+ }
$out .= ' ]';
return $out;
}
@@ -8791,12 +9251,20 @@ class TCPDF {
$annots .= ' /Type /Annot';
$annots .= ' /Subtype /Widget';
$annots .= ' /Rect [0 0 0 0]';
+ if ($this->radiobutton_groups[$n][$pl['txt']]['#readonly#']) {
+ // read only
+ $annots .= ' /F 68';
+ $annots .= ' /Ff 49153';
+ } else {
+ $annots .= ' /F 4'; // default print for PDF/A
+ $annots .= ' /Ff 49152';
+ }
$annots .= ' /T '.$this->_datastring($pl['txt'], $radio_button_obj_id);
$annots .= ' /FT /Btn';
- $annots .= ' /Ff 49152';
$annots .= ' /Kids [';
+ $defval = '';
foreach ($this->radiobutton_groups[$n][$pl['txt']] as $key => $data) {
- if ($key !== 'n') {
+ if (isset($data['kid'])) {
$annots .= ' '.$data['kid'].' 0 R';
if ($data['def'] !== 'Off') {
$defval = $data['def'];
@@ -8804,7 +9272,7 @@ class TCPDF {
}
}
$annots .= ' ]';
- if (isset($defval)) {
+ if (!empty($defval)) {
$annots .= ' /V /'.$defval;
}
$annots .= ' >>';
@@ -8819,7 +9287,7 @@ class TCPDF {
$b = $this->pagedim[$n]['h'] - (($pl['y'] + $pl['h']) * $this->k);
$c = $pl['w'] * $this->k;
$d = $pl['h'] * $this->k;
- $rect = sprintf('%.2F %.2F %.2F %.2F', $a, $b, $a+$c, $b+$d);
+ $rect = sprintf('%F %F %F %F', $a, $b, $a+$c, $b+$d);
// create new annotation object
$annots = '<_textstring($pl['txt'], $annot_obj_id);
$annots .= ' /P '.$this->page_obj_id[$n].' 0 R';
$annots .= ' /NM '.$this->_datastring(sprintf('%04u-%04u', $n, $key), $annot_obj_id);
- $annots .= ' /M '.$this->_datestring($annot_obj_id);
+ $annots .= ' /M '.$this->_datestring($annot_obj_id, $this->doc_modification_timestamp);
if (isset($pl['opt']['f'])) {
- $val = 0;
+ $fval = 0;
if (is_array($pl['opt']['f'])) {
foreach ($pl['opt']['f'] as $f) {
switch (strtolower($f)) {
case 'invisible': {
- $val += 1 << 0;
+ $fval += 1 << 0;
break;
}
case 'hidden': {
- $val += 1 << 1;
+ $fval += 1 << 1;
break;
}
case 'print': {
- $val += 1 << 2;
+ $fval += 1 << 2;
break;
}
case 'nozoom': {
- $val += 1 << 3;
+ $fval += 1 << 3;
break;
}
case 'norotate': {
- $val += 1 << 4;
+ $fval += 1 << 4;
break;
}
case 'noview': {
- $val += 1 << 5;
+ $fval += 1 << 5;
break;
}
case 'readonly': {
- $val += 1 << 6;
+ $fval += 1 << 6;
break;
}
case 'locked': {
- $val += 1 << 8;
+ $fval += 1 << 8;
break;
}
case 'togglenoview': {
- $val += 1 << 9;
+ $fval += 1 << 9;
break;
}
case 'lockedcontents': {
- $val += 1 << 10;
+ $fval += 1 << 10;
break;
}
default: {
@@ -8884,10 +9352,16 @@ class TCPDF {
}
}
} else {
- $val = intval($pl['opt']['f']);
+ $fval = intval($pl['opt']['f']);
}
- $annots .= ' /F '.intval($val);
+ } else {
+ $fval = 4;
}
+ if ($this->pdfa_mode) {
+ // force print flag for PDF/A mode
+ $fval |= 4;
+ }
+ $annots .= ' /F '.intval($fval);
if (isset($pl['opt']['as']) AND is_string($pl['opt']['as'])) {
$annots .= ' /AS /'.$pl['opt']['as'];
}
@@ -8962,18 +9436,12 @@ class TCPDF {
$annots .= ' /S /S';
}
if (isset($pl['opt']['be']['i']) AND ($pl['opt']['be']['i'] >= 0) AND ($pl['opt']['be']['i'] <= 2)) {
- $annots .= ' /I '.sprintf(' %.4F', $pl['opt']['be']['i']);
+ $annots .= ' /I '.sprintf(' %F', $pl['opt']['be']['i']);
}
$annots .= '>>';
}
if (isset($pl['opt']['c']) AND (is_array($pl['opt']['c'])) AND !empty($pl['opt']['c'])) {
- $annots .= ' /C [';
- foreach ($pl['opt']['c'] as $col) {
- $col = intval($col);
- $color = $col <= 0 ? 0 : ($col >= 255 ? 1 : $col / 255);
- $annots .= sprintf(' %.4F', $color);
- }
- $annots .= ']';
+ $annots .= ' /C '.$this->getColorStringFromArray($pl['opt']['c']);
}
//$annots .= ' /StructParent ';
//$annots .= ' /OC ';
@@ -8985,12 +9453,12 @@ class TCPDF {
}
//$annots .= ' /Popup ';
if (isset($pl['opt']['ca'])) {
- $annots .= ' /CA '.sprintf('%.4F', floatval($pl['opt']['ca']));
+ $annots .= ' /CA '.sprintf('%F', floatval($pl['opt']['ca']));
}
if (isset($pl['opt']['rc'])) {
$annots .= ' /RC '.$this->_textstring($pl['opt']['rc'], $annot_obj_id);
}
- $annots .= ' /CreationDate '.$this->_datestring($annot_obj_id);
+ $annots .= ' /CreationDate '.$this->_datestring($annot_obj_id, $this->doc_creation_timestamp);
//$annots .= ' /IRT ';
if (isset($pl['opt']['subj'])) {
$annots .= ' /Subj '.$this->_textstring($pl['opt']['subj'], $annot_obj_id);
@@ -9042,7 +9510,9 @@ class TCPDF {
} else {
// internal link
$l = $this->links[$pl['txt']];
- $annots .= sprintf(' /Dest [%u 0 R /XYZ 0 %.2F null]', $this->page_obj_id[($l[0])], ($this->pagedim[$l[0]]['h'] - ($l[1] * $this->k)));
+ if (isset($this->page_obj_id[($l[0])])) {
+ $annots .= sprintf(' /Dest [%u 0 R /XYZ 0 %F null]', $this->page_obj_id[($l[0])], ($this->pagedim[$l[0]]['h'] - ($l[1] * $this->k)));
+ }
}
$hmodes = array('N', 'I', 'O', 'P');
if (isset($pl['opt']['h']) AND in_array($pl['opt']['h'], $hmodes)) {
@@ -9070,7 +9540,7 @@ class TCPDF {
if (isset($pl['opt']['cl']) AND is_array($pl['opt']['cl'])) {
$annots .= ' /CL [';
foreach ($pl['opt']['cl'] as $cl) {
- $annots .= sprintf('%.4F ', $cl * $this->k);
+ $annots .= sprintf('%F ', $cl * $this->k);
}
$annots .= ']';
}
@@ -9083,7 +9553,7 @@ class TCPDF {
$r = $pl['opt']['rd'][1] * $this->k;
$t = $pl['opt']['rd'][2] * $this->k;
$b = $pl['opt']['rd'][3] * $this->k;
- $annots .= ' /RD ['.sprintf('%.2F %.2F %.2F %.2F', $l, $r, $t, $b).']';
+ $annots .= ' /RD ['.sprintf('%F %F %F %F', $l, $r, $t, $b).']';
}
if (isset($pl['opt']['le']) AND in_array($pl['opt']['le'], $lineendings)) {
$annots .= ' /LE /'.$pl['opt']['le'];
@@ -9130,6 +9600,10 @@ class TCPDF {
break;
}
case 'fileattachment': {
+ if ($this->pdfa_mode) {
+ // embedded files are not allowed in PDF/A mode
+ break;
+ }
if (!isset($pl['opt']['fs'])) {
break;
}
@@ -9177,22 +9651,10 @@ class TCPDF {
$annots .= ' /R '.$pl['opt']['mk']['r'];
}
if (isset($pl['opt']['mk']['bc']) AND (is_array($pl['opt']['mk']['bc']))) {
- $annots .= ' /BC [';
- foreach($pl['opt']['mk']['bc'] AS $col) {
- $col = intval($col);
- $color = $col <= 0 ? 0 : ($col >= 255 ? 1 : $col / 255);
- $annots .= sprintf(' %.2F', $color);
- }
- $annots .= ']';
+ $annots .= ' /BC '.$this->getColorStringFromArray($pl['opt']['mk']['bc']);
}
if (isset($pl['opt']['mk']['bg']) AND (is_array($pl['opt']['mk']['bg']))) {
- $annots .= ' /BG [';
- foreach($pl['opt']['mk']['bg'] AS $col) {
- $col = intval($col);
- $color = $col <= 0 ? 0 : ($col >= 255 ? 1 : $col / 255);
- $annots .= sprintf(' %.2F', $color);
- }
- $annots .= ']';
+ $annots .= ' /BG '.$this->getColorStringFromArray($pl['opt']['mk']['bg']);
}
if (isset($pl['opt']['mk']['ca'])) {
$annots .= ' /CA '.$pl['opt']['mk']['ca'];
@@ -9232,7 +9694,7 @@ class TCPDF {
$annots .= ' /S /'.$pl['opt']['mk']['if']['s'];
}
if (isset($pl['opt']['mk']['if']['a']) AND (is_array($pl['opt']['mk']['if']['a'])) AND !empty($pl['opt']['mk']['if']['a'])) {
- $annots .= sprintf(' /A [%.2F %.2F]', $pl['opt']['mk']['if']['a'][0], $pl['opt']['mk']['if']['a'][1]);
+ $annots .= sprintf(' /A [%F %F]', $pl['opt']['mk']['if']['a'][0], $pl['opt']['mk']['if']['a'][1]);
}
if (isset($pl['opt']['mk']['if']['fb']) AND ($pl['opt']['mk']['if']['fb'])) {
$annots .= ' /FB true';
@@ -9241,8 +9703,6 @@ class TCPDF {
}
if (isset($pl['opt']['mk']['tp']) AND ($pl['opt']['mk']['tp'] >= 0) AND ($pl['opt']['mk']['tp'] <= 6)) {
$annots .= ' /TP '.intval($pl['opt']['mk']['tp']);
- } else {
- $annots .= ' /TP 0';
}
$annots .= '>>';
} // end MK
@@ -9280,7 +9740,7 @@ class TCPDF {
if (is_array($pl['opt']['v'])) {
foreach ($pl['opt']['v'] AS $optval) {
if (is_float($optval)) {
- $optval = sprintf('%.2F', $optval);
+ $optval = sprintf('%F', $optval);
}
$annots .= ' '.$optval;
}
@@ -9293,7 +9753,7 @@ class TCPDF {
if (is_array($pl['opt']['dv'])) {
foreach ($pl['opt']['dv'] AS $optval) {
if (is_float($optval)) {
- $optval = sprintf('%.2F', $optval);
+ $optval = sprintf('%F', $optval);
}
$annots .= ' '.$optval;
}
@@ -9306,7 +9766,7 @@ class TCPDF {
if (is_array($pl['opt']['rv'])) {
foreach ($pl['opt']['rv'] AS $optval) {
if (is_float($optval)) {
- $optval = sprintf('%.2F', $optval);
+ $optval = sprintf('%F', $optval);
}
$annots .= ' '.$optval;
}
@@ -9381,7 +9841,7 @@ class TCPDF {
}
/**
- * Put appearance streams XObject used to define annotation's appearance states
+ * Put appearance streams XObject used to define annotation's appearance states.
* @param $w (int) annotation width
* @param $h (int) annotation height
* @param $stream (string) appearance stream
@@ -9401,17 +9861,10 @@ class TCPDF {
$stream = gzcompress($stream);
$out .= ' /Filter /FlateDecode';
}
- $rect = sprintf('%.2F %.2F', $w, $h);
+ $rect = sprintf('%F %F', $w, $h);
$out .= ' /BBox [0 0 '.$rect.']';
$out .= ' /Matrix [1 0 0 1 0 0]';
- $out .= ' /Resources <<';
- $out .= ' /ProcSet [/PDF /Text]';
- $out .= ' /Font <<';
- foreach ($this->annotation_fonts as $fontkey => $fontid) {
- $out .= ' /F'.$fontid.' '.$this->font_obj_ids[$fontkey].' 0 R';
- }
- $out .= ' >>';
- $out .= ' >>';
+ $out .= ' /Resources 2 0 R';
$stream = $this->_getrawstream($stream);
$out .= ' /Length '.strlen($stream);
$out .= ' >>';
@@ -9451,8 +9904,8 @@ class TCPDF {
/**
* Get SHORT from string (Big Endian 16-bit signed integer).
- * @param $str (string) string from where to extract value
- * @param $offset (int) point from where to read the data
+ * @param $str (string) String from where to extract value.
+ * @param $offset (int) Point from where to read the data.
* @return int 16 bit value
* @author Nicola Asuni
* @protected
@@ -9464,9 +9917,58 @@ class TCPDF {
}
/**
- * Get BYTE from string (8-bit unsigned integer).
+ * Get FWORD from string (Big Endian 16-bit signed integer).
+ * @param $str (string) String from where to extract value.
+ * @param $offset (int) Point from where to read the data.
+ * @return int 16 bit value
+ * @author Nicola Asuni
+ * @protected
+ * @since 5.9.123 (2011-09-30)
+ */
+ protected function _getFWORD($str, $offset) {
+ $v = $this->_getUSHORT($str, $offset);
+ if ($v > 0x7fff) {
+ $v -= 0x10000;
+ }
+ return $v;
+ }
+
+ /**
+ * Get UFWORD from string (Big Endian 16-bit unsigned integer).
* @param $str (string) string from where to extract value
* @param $offset (int) point from where to read the data
+ * @return int 16 bit value
+ * @author Nicola Asuni
+ * @protected
+ * @since 5.9.123 (2011-09-30)
+ */
+ protected function _getUFWORD($str, $offset) {
+ $v = $this->_getUSHORT($str, $offset);
+ return $v;
+ }
+
+ /**
+ * Get FIXED from string (32-bit signed fixed-point number (16.16).
+ * @param $str (string) string from where to extract value
+ * @param $offset (int) point from where to read the data
+ * @return int 16 bit value
+ * @author Nicola Asuni
+ * @protected
+ * @since 5.9.123 (2011-09-30)
+ */
+ protected function _getFIXED($str, $offset) {
+ // mantissa
+ $m = $this->_getFWORD($str, $offset);
+ // fraction
+ $f = $this->_getUSHORT($str, ($offset + 2));
+ $v = floatval(''.$m.'.'.$f.'');
+ return $v;
+ }
+
+ /**
+ * Get BYTE from string (8-bit unsigned integer).
+ * @param $str (string) String from where to extract value.
+ * @param $offset (int) Point from where to read the data.
* @return int 8 bit value
* @author Nicola Asuni
* @protected
@@ -9476,12 +9978,861 @@ class TCPDF {
$v = unpack('Ci', substr($str, $offset, 1));
return $v['i'];
}
+ /**
+ * Update the CIDToGIDMap string with a new value.
+ * @param $map (string) CIDToGIDMap.
+ * @param $cid (int) CID value.
+ * @param $gid (int) GID value.
+ * @return (string) CIDToGIDMap.
+ * @author Nicola Asuni
+ * @protected
+ * @since 5.9.123 (2011-09-29)
+ */
+ protected function updateCIDtoGIDmap($map, $cid, $gid) {
+ if (($cid >= 0) AND ($cid <= 0xFFFF) AND ($gid >= 0)) {
+ if ($gid > 0xFFFF) {
+ $gid -= 0x10000;
+ }
+ $map[($cid * 2)] = chr($gid >> 8);
+ $map[(($cid * 2) + 1)] = chr($gid & 0xFF);
+ }
+ return $map;
+ }
+
+ /**
+ * Convert and add the selected TrueType or Type1 font to the fonts folder (that must be writeable).
+ * @param $fontfile (string) Font file (full path).
+ * @param $fonttype (string) Font type. Leave empty for autodetect mode. Valid values are: TrueTypeUnicode, TrueType, Type1, CID0JP = CID-0 Japanese, CID0KR = CID-0 Korean, CID0CS = CID-0 Chinese Simplified, CID0CT = CID-0 Chinese Traditional.
+ * @param $enc (string) Name of the encoding table to use. Leave empty for default mode. Omit this parameter for TrueType Unicode and symbolic fonts like Symbol or ZapfDingBats.
+ * @param $flags (int) Unsigned 32-bit integer containing flags specifying various characteristics of the font (PDF32000:2008 - 9.8.2 Font Descriptor Flags): +1 for fixed font; +4 for symbol or +32 for non-symbol; +64 for italic. Fixed and Italic mode are generally autodetected so you have to set it to 32 = non-symbolic font (default) or 4 = symbolic font.
+ * @param $outpath (string) Output path for generated font files (must be writeable by the web server). Leave empty for default font folder.
+ * @param $platid (int) Platform ID for CMAP table to extract (when building a Unicode font for Windows this value should be 3, for Macintosh should be 1).
+ * @param $encid (int) Encoding ID for CMAP table to extract (when building a Unicode font for Windows this value should be 1, for Macintosh should be 0). When Platform ID is 3, legal values for Encoding ID are: 0=Symbol, 1=Unicode, 2=ShiftJIS, 3=PRC, 4=Big5, 5=Wansung, 6=Johab, 7=Reserved, 8=Reserved, 9=Reserved, 10=UCS-4.
+ * @return (string) TCPDF font name.
+ * @author Nicola Asuni
+ * @public
+ * @since 5.9.123 (2010-09-30)
+ */
+ public function addTTFfont($fontfile, $fonttype='', $enc='', $flags=32, $outpath='', $platid=3, $encid=1) {
+ if (!file_exists($fontfile)) {
+ $this->Error('Could not find file: '.$fontfile.'');
+ }
+ // font metrics
+ $fmetric = array();
+ // build new font name for TCPDF compatibility
+ $font_path_parts = pathinfo($fontfile);
+ if (!isset($font_path_parts['filename'])) {
+ $font_path_parts['filename'] = substr($font_path_parts['basename'], 0, -(strlen($font_path_parts['extension']) + 1));
+ }
+ $font_name = strtolower($font_path_parts['filename']);
+ $font_name = preg_replace('/[^a-z0-9_]/', '', $font_name);
+ $search = array('bold', 'oblique', 'italic', 'regular');
+ $replace = array('b', 'i', 'i', '');
+ $font_name = str_replace($search, $replace, $font_name);
+ if (empty($font_name)) {
+ // set generic name
+ $font_name = 'tcpdffont';
+ }
+ // set output path
+ if (empty($outpath)) {
+ $outpath = $this->_getfontpath();
+ }
+ // check if this font already exist
+ if (file_exists($outpath.$font_name.'.php')) {
+ // this font already exist (delete it from fonts folder to rebuild it)
+ return $font_name;
+ }
+ $fmetric['file'] = $font_name.'.z';
+ $fmetric['ctg'] = $font_name.'.ctg.z';
+ // get font data
+ $font = file_get_contents($fontfile);
+ $fmetric['originalsize'] = strlen($font);
+ // autodetect font type
+ if (empty($fonttype)) {
+ if ($this->_getULONG($font, 0) == 0x10000) {
+ // True Type (Unicode or not)
+ $fonttype = 'TrueTypeUnicode';
+ } elseif (substr($font, 0, 4) == 'OTTO') {
+ // Open Type (Unicode or not)
+ $this->Error('Unsupported font format: OpenType with CFF data.');
+ } else {
+ // Type 1
+ $fonttype = 'Type1';
+ }
+ }
+ // set font type
+ switch ($fonttype) {
+ case 'CID0CT':
+ case 'CID0CS':
+ case 'CID0KR':
+ case 'CID0JP': {
+ $fmetric['type'] = 'cidfont0';
+ break;
+ }
+ case 'Type1': {
+ $fmetric['type'] = 'Type1';
+ if (empty($enc) AND (($flags & 4) == 0)) {
+ $enc = 'cp1252';
+ }
+ break;
+ }
+ case 'TrueType': {
+ $fmetric['type'] = 'TrueType';
+ break;
+ }
+ case 'TrueTypeUnicode':
+ default: {
+ $fmetric['type'] = 'TrueTypeUnicode';
+ break;
+ }
+ }
+ // set encoding maps (if any)
+ $fmetric['enc'] = preg_replace('/[^A-Za-z0-9_\-]/', '', $enc);
+ $fmetric['diff'] = '';
+ if (($fmetric['type'] == 'TrueType') OR ($fmetric['type'] == 'Type1')) {
+ if (!empty($enc) AND ($enc != 'cp1252') AND isset($this->encmaps->encmap[$enc])) {
+ // build differences from reference encoding
+ $enc_ref = $this->encmaps->encmap['cp1252'];
+ $enc_target = $this->encmaps->encmap[$enc];
+ $last = 0;
+ for ($i = 32; $i <= 255; ++$i) {
+ if ($enc_target != $enc_ref[$i]) {
+ if ($i != ($last + 1)) {
+ $fmetric['diff'] .= $i.' ';
+ }
+ $last = $i;
+ $fmetric['diff'] .= '/'.$enc_target[$i].' ';
+ }
+ }
+ }
+ }
+ // parse the font by type
+ if ($fmetric['type'] == 'Type1') {
+ // ---------- TYPE 1 ----------
+ // read first segment
+ $a = unpack('Cmarker/Ctype/Vsize', substr($font, 0, 6));
+ if ($a['marker'] != 128) {
+ $this->Error('Font file is not a valid binary Type1');
+ }
+ $fmetric['size1'] = $a['size'];
+ $data = substr($font, 6, $fmetric['size1']);
+ // read second segment
+ $a = unpack('Cmarker/Ctype/Vsize', substr($font, (6 + $fmetric['size1']), 6));
+ if ($a['marker'] != 128) {
+ $this->Error('Font file is not a valid binary Type1');
+ }
+ $fmetric['size2'] = $a['size'];
+ $encrypted = substr($font, (12 + $fmetric['size1']), $fmetric['size2']);
+ $data .= $encrypted;
+ // store compressed font
+ $fp = fopen($outpath.$fmetric['file'], 'wb');
+ fwrite($fp, gzcompress($data));
+ fclose($fp);
+ // get font info
+ $fmetric['Flags'] = $flags;
+ preg_match ('#/FullName[\s]*\(([^\)]*)#', $font, $matches);
+ $fmetric['name'] = preg_replace('/[^a-zA-Z0-9_\-]/', '', $matches[1]);
+ preg_match('#/FontBBox[\s]*{([^}]*)#', $font, $matches);
+ $fmetric['bbox'] = trim($matches[1]);
+ $bv = explode(' ', $fmetric['bbox']);
+ $fmetric['Ascent'] = intval($bv[3]);
+ $fmetric['Descent'] = intval($bv[1]);
+ preg_match('#/ItalicAngle[\s]*([0-9\+\-]*)#', $font, $matches);
+ $fmetric['italicAngle'] = intval($matches[1]);
+ if ($fmetric['italicAngle'] != 0) {
+ $fmetric['Flags'] |= 64;
+ }
+ preg_match('#/UnderlinePosition[\s]*([0-9\+\-]*)#', $font, $matches);
+ $fmetric['underlinePosition'] = intval($matches[1]);
+ preg_match('#/UnderlineThickness[\s]*([0-9\+\-]*)#', $font, $matches);
+ $fmetric['underlineThickness'] = intval($matches[1]);
+ preg_match('#/isFixedPitch[\s]*([^\s]*)#', $font, $matches);
+ if ($matches[1] == 'true') {
+ $fmetric['Flags'] |= 1;
+ }
+ // get internal map
+ $imap = array();
+ if (preg_match_all('#dup[\s]([0-9]+)[\s]*/([^\s]*)[\s]put#sU', $font, $fmap, PREG_SET_ORDER) > 0) {
+ foreach ($fmap as $v) {
+ $imap[$v[2]] = $v[1];
+ }
+ }
+ // decrypt eexec encrypted part
+ $r = 55665; // eexec encryption constant
+ $c1 = 52845;
+ $c2 = 22719;
+ $elen = strlen($encrypted);
+ $eplain = '';
+ for ($i = 0; $i < $elen; ++$i) {
+ $chr = ord($encrypted[$i]);
+ $eplain .= chr($chr ^ ($r >> 8));
+ $r = ((($chr + $r) * $c1 + $c2) % 65536);
+ }
+ if (preg_match('#/ForceBold[\s]*([^\s]*)#', $eplain, $matches) > 0) {
+ if ($matches[1] == 'true') {
+ $fmetric['Flags'] |= 0x40000;
+ }
+ }
+ if (preg_match('#/StdVW[\s]*\[([^\]]*)#', $eplain, $matches) > 0) {
+ $fmetric['StemV'] = intval($matches[1]);
+ } else {
+ $fmetric['StemV'] = 70;
+ }
+ if (preg_match('#/StdHW[\s]*\[([^\]]*)#', $eplain, $matches) > 0) {
+ $fmetric['StemH'] = intval($matches[1]);
+ } else {
+ $fmetric['StemH'] = 30;
+ }
+ if (preg_match('#/BlueValues[\s]*\[([^\]]*)#', $eplain, $matches) > 0) {
+ $bv = explode(' ', $matches[1]);
+ if (count($bv) >= 6) {
+ $v1 = intval($bv[2]);
+ $v2 = intval($bv[4]);
+ if ($v1 <= $v2) {
+ $fmetric['XHeight'] = $v1;
+ $fmetric['CapHeight'] = $v2;
+ } else {
+ $fmetric['XHeight'] = $v2;
+ $fmetric['CapHeight'] = $v1;
+ }
+ } else {
+ $fmetric['XHeight'] = 450;
+ $fmetric['CapHeight'] = 700;
+ }
+ } else {
+ $fmetric['XHeight'] = 450;
+ $fmetric['CapHeight'] = 700;
+ }
+ // get the number of random bytes at the beginning of charstrings
+ if (preg_match('#/lenIV[\s]*([0-9]*)#', $eplain, $matches) > 0) {
+ $lenIV = intval($matches[1]);
+ } else {
+ $lenIV = 4;
+ }
+ $fmetric['Leading'] = 0;
+ // get charstring data
+ $eplain = substr($eplain, (strpos($eplain, '/CharStrings') + 1));
+ preg_match_all('#/([A-Za-z0-9\.]*)[\s][0-9]+[\s]RD[\s](.*)[\s]ND#sU', $eplain, $matches, PREG_SET_ORDER);
+ if (!empty($enc) AND isset($this->encmaps->encmap[$enc])) {
+ $enc_map = $this->encmaps->encmap[$enc];
+ } else {
+ $enc_map = false;
+ }
+ $fmetric['cw'] = '';
+ $fmetric['MaxWidth'] = 0;
+ $cwidths = array();
+ foreach ($matches as $k => $v) {
+ $cid = 0;
+ if (isset($imap[$v[1]])) {
+ $cid = $imap[$v[1]];
+ } elseif ($enc_map !== false) {
+ $cid = array_search($v[1], $enc_map);
+ if ($cid === false) {
+ $cid = 0;
+ } elseif ($cid > 1000) {
+ $cid -= 1000;
+ }
+ }
+ // decrypt charstring encrypted part
+ $r = 4330; // charstring encryption constant
+ $c1 = 52845;
+ $c2 = 22719;
+ $cd = $v[2];
+ $clen = strlen($cd);
+ $ccom = array();
+ for ($i = 0; $i < $clen; ++$i) {
+ $chr = ord($cd[$i]);
+ $ccom[] = ($chr ^ ($r >> 8));
+ $r = ((($chr + $r) * $c1 + $c2) % 65536);
+ }
+ // decode numbers
+ $cdec = array();
+ $ck = 0;
+ $i = $lenIV;
+ while ($i < $clen) {
+ if ($ccom[$i] < 32) {
+ $cdec[$ck] = $ccom[$i];
+ if (($ck > 0) AND ($cdec[$ck] == 13)) {
+ // hsbw command: update width
+ $cwidths[$cid] = $cdec[($ck - 1)];
+ }
+ ++$i;
+ } elseif (($ccom[$i] >= 32) AND ($ccom[$i] <= 246)) {
+ $cdec[$ck] = ($ccom[$i] - 139);
+ ++$i;
+ } elseif (($ccom[$i] >= 247) AND ($ccom[$i] <= 250)) {
+ $cdec[$ck] = ((($ccom[$i] - 247) * 256) + $ccom[($i + 1)] + 108);
+ $i += 2;
+ } elseif (($ccom[$i] >= 251) AND ($ccom[$i] <= 254)) {
+ $cdec[$ck] = ((-($ccom[$i] - 251) * 256) - $ccom[($i + 1)] - 108);
+ $i += 2;
+ } elseif ($ccom[$i] == 255) {
+ $sval = chr($ccom[($i + 1)]).chr($ccom[($i + 2)]).chr($ccom[($i + 3)]).chr($ccom[($i + 4)]);
+ $vsval = unpack('li', $sval);
+ $cdec[$ck] = $vsval['i'];
+ $i += 5;
+ }
+ ++$ck;
+ }
+ } // end for each matches
+ $fmetric['MissingWidth'] = $cwidths[0];
+ $fmetric['MaxWidth'] = $fmetric['MissingWidth'];
+ $fmetric['AvgWidth'] = 0;
+ // set chars widths
+ for ($cid = 0; $cid <= 255; ++$cid) {
+ if (isset($cwidths[$cid])) {
+ if ($cwidths[$cid] > $fmetric['MaxWidth']) {
+ $fmetric['MaxWidth'] = $cwidths[$cid];
+ }
+ $fmetric['AvgWidth'] += $cwidths[$cid];
+ $fmetric['cw'] .= ','.$cid.'=>'.$cwidths[$cid];
+ } else {
+ $fmetric['cw'] .= ','.$cid.'=>'.$fmetric['MissingWidth'];
+ }
+ }
+ $fmetric['AvgWidth'] = round($fmetric['AvgWidth'] / count($cwidths));
+ } else {
+ // ---------- TRUE TYPE ----------
+ if ($fmetric['type'] != 'cidfont0') {
+ // store compressed font
+ $fp = fopen($outpath.$fmetric['file'], 'wb');
+ fwrite($fp, gzcompress($font));
+ fclose($fp);
+ }
+ $offset = 0; // offset position of the font data
+ if ($this->_getULONG($font, $offset) != 0x10000) {
+ // sfnt version must be 0x00010000 for TrueType version 1.0.
+ return $font;
+ }
+ $offset += 4;
+ // get number of tables
+ $numTables = $this->_getUSHORT($font, $offset);
+ $offset += 2;
+ // skip searchRange, entrySelector and rangeShift
+ $offset += 6;
+ // tables array
+ $table = array();
+ // ---------- get tables ----------
+ for ($i = 0; $i < $numTables; ++$i) {
+ // get table info
+ $tag = substr($font, $offset, 4);
+ $offset += 4;
+ $table[$tag] = array();
+ $table[$tag]['checkSum'] = $this->_getULONG($font, $offset);
+ $offset += 4;
+ $table[$tag]['offset'] = $this->_getULONG($font, $offset);
+ $offset += 4;
+ $table[$tag]['length'] = $this->_getULONG($font, $offset);
+ $offset += 4;
+ }
+ // check magicNumber
+ $offset = $table['head']['offset'] + 12;
+ if ($this->_getULONG($font, $offset) != 0x5F0F3CF5) {
+ // magicNumber must be 0x5F0F3CF5
+ return $font;
+ }
+ $offset += 4;
+ $offset += 2; // skip flags
+ // get FUnits
+ $fmetric['unitsPerEm'] = $this->_getUSHORT($font, $offset);
+ $offset += 2;
+ // units ratio constant
+ $urk = (1000 / $fmetric['unitsPerEm']);
+ $offset += 16; // skip created, modified
+ $xMin = round($this->_getFWORD($font, $offset) * $urk);
+ $offset += 2;
+ $yMin = round($this->_getFWORD($font, $offset) * $urk);
+ $offset += 2;
+ $xMax = round($this->_getFWORD($font, $offset) * $urk);
+ $offset += 2;
+ $yMax = round($this->_getFWORD($font, $offset) * $urk);
+ $offset += 2;
+ $fmetric['bbox'] = ''.$xMin.' '.$yMin.' '.$xMax.' '.$yMax.'';
+ $macStyle = $this->_getUSHORT($font, $offset);
+ $offset += 2;
+ // PDF font flags
+ $fmetric['Flags'] = $flags;
+ if (($macStyle & 2) == 2) {
+ // italic flag
+ $fmetric['Flags'] |= 64;
+ }
+ // get offset mode (indexToLocFormat : 0 = short, 1 = long)
+ $offset = $table['head']['offset'] + 50;
+ $short_offset = ($this->_getSHORT($font, $offset) == 0);
+ $offset += 2;
+ // get the offsets to the locations of the glyphs in the font, relative to the beginning of the glyphData table
+ $indexToLoc = array();
+ $offset = $table['loca']['offset'];
+ if ($short_offset) {
+ // short version
+ $tot_num_glyphs = ($table['loca']['length'] / 2); // numGlyphs + 1
+ for ($i = 0; $i < $tot_num_glyphs; ++$i) {
+ $indexToLoc[$i] = $this->_getUSHORT($font, $offset) * 2;
+ $offset += 2;
+ }
+ } else {
+ // long version
+ $tot_num_glyphs = ($table['loca']['length'] / 4); // numGlyphs + 1
+ for ($i = 0; $i < $tot_num_glyphs; ++$i) {
+ $indexToLoc[$i] = $this->_getULONG($font, $offset);
+ $offset += 4;
+ }
+ }
+ // get glyphs indexes of chars from cmap table
+ $offset = $table['cmap']['offset'] + 2;
+ $numEncodingTables = $this->_getUSHORT($font, $offset);
+ $offset += 2;
+ $encodingTables = array();
+ for ($i = 0; $i < $numEncodingTables; ++$i) {
+ $encodingTables[$i]['platformID'] = $this->_getUSHORT($font, $offset);
+ $offset += 2;
+ $encodingTables[$i]['encodingID'] = $this->_getUSHORT($font, $offset);
+ $offset += 2;
+ $encodingTables[$i]['offset'] = $this->_getULONG($font, $offset);
+ $offset += 4;
+ }
+ // ---------- get os/2 metrics ----------
+ $offset = $table['OS/2']['offset'];
+ $offset += 2; // skip version
+ // xAvgCharWidth
+ $fmetric['AvgWidth'] = round($this->_getFWORD($font, $offset) * $urk);
+ $offset += 2;
+ // usWeightClass
+ $usWeightClass = round($this->_getUFWORD($font, $offset) * $urk);
+ // estimate StemV and StemH (400 = usWeightClass for Normal - Regular font)
+ $fmetric['StemV'] = round((70 * $usWeightClass) / 400);
+ $fmetric['StemH'] = round((30 * $usWeightClass) / 400);
+ $offset += 2;
+ $offset += 2; // usWidthClass
+ $fsType = $this->_getSHORT($font, $offset);
+ $offset += 2;
+ if ($fsType == 2) {
+ $this->Error('This Font cannot be modified, embedded or exchanged in any manner without first obtaining permission of the legal owner.');
+ }
+ // ---------- get font name ----------
+ $fmetric['name'] = '';
+ $offset = $table['name']['offset'];
+ $offset += 2; // skip Format selector (=0).
+ // Number of NameRecords that follow n.
+ $numNameRecords = $this->_getUSHORT($font, $offset);
+ $offset += 2;
+ // Offset to start of string storage (from start of table).
+ $stringStorageOffset = $this->_getUSHORT($font, $offset);
+ $offset += 2;
+ for ($i = 0; $i < $numNameRecords; ++$i) {
+ $offset += 6; // skip Platform ID, Platform-specific encoding ID, Language ID.
+ // Name ID.
+ $nameID = $this->_getUSHORT($font, $offset);
+ $offset += 2;
+ if ($nameID == 6) {
+ // String length (in bytes).
+ $stringLength = $this->_getUSHORT($font, $offset);
+ $offset += 2;
+ // String offset from start of storage area (in bytes).
+ $stringOffset = $this->_getUSHORT($font, $offset);
+ $offset += 2;
+ $offset = ($table['name']['offset'] + $stringStorageOffset + $stringOffset);
+ $fmetric['name'] = substr($font, $offset, $stringLength);
+ $fmetric['name'] = preg_replace('/[^a-zA-Z0-9_\-]/', '', $fmetric['name']);
+ break;
+ } else {
+ $offset += 4; // skip String length, String offset
+ }
+ }
+ if (empty($fmetric['name'])) {
+ $fmetric['name'] = $font_name;
+ }
+ // ---------- get post data ----------
+ $offset = $table['post']['offset'];
+ $offset += 4; // skip Format Type
+ $fmetric['italicAngle'] = $this->_getFIXED($font, $offset);
+ $offset += 4;
+ $fmetric['underlinePosition'] = round($this->_getFWORD($font, $offset) * $urk);
+ $offset += 2;
+ $fmetric['underlineThickness'] = round($this->_getFWORD($font, $offset) * $urk);
+ $offset += 2;
+ $isFixedPitch = ($this->_getULONG($font, $offset) == 0) ? false : true;
+ $offset += 2;
+ if ($isFixedPitch) {
+ $fmetric['Flags'] |= 1;
+ }
+ // ---------- get hhea data ----------
+ $offset = $table['hhea']['offset'];
+ $offset += 4; // skip Table version number
+ // Ascender
+ $fmetric['Ascent'] = round($this->_getFWORD($font, $offset) * $urk);
+ $offset += 2;
+ // Descender
+ $fmetric['Descent'] = round($this->_getFWORD($font, $offset) * $urk);
+ $offset += 2;
+ // LineGap
+ $fmetric['Leading'] = round($this->_getFWORD($font, $offset) * $urk);
+ $offset += 2;
+ // advanceWidthMax
+ $fmetric['MaxWidth'] = round($this->_getUFWORD($font, $offset) * $urk);
+ $offset += 2;
+ $offset += 22; // skip some values
+ // get the number of hMetric entries in hmtx table
+ $numberOfHMetrics = $this->_getUSHORT($font, $offset);
+ // ---------- get maxp data ----------
+ $offset = $table['maxp']['offset'];
+ $offset += 4; // skip Table version number
+ // get the the number of glyphs in the font.
+ $numGlyphs = $this->_getUSHORT($font, $offset);
+ // ---------- get CIDToGIDMap ----------
+ $ctg = array();
+ foreach ($encodingTables as $enctable) {
+ // get only specified Platform ID and Encoding ID
+ if (($enctable['platformID'] == $platid) AND ($enctable['encodingID'] == $encid)) {
+ $offset = $table['cmap']['offset'] + $enctable['offset'];
+ $format = $this->_getUSHORT($font, $offset);
+ $offset += 2;
+ switch ($format) {
+ case 0: { // Format 0: Byte encoding table
+ $offset += 4; // skip length and version/language
+ for ($c = 0; $c < 256; ++$c) {
+ $g = $this->_getBYTE($font, $offset);
+ $ctg[$c] = $g;
+ ++$offset;
+ }
+ break;
+ }
+ case 2: { // Format 2: High-byte mapping through table
+ $offset += 4; // skip length and version/language
+ $numSubHeaders = 0;
+ for ($i = 0; $i < 256; ++$i) {
+ // Array that maps high bytes to subHeaders: value is subHeader index * 8.
+ $subHeaderKeys[$i] = ($this->_getUSHORT($font, $offset) / 8);
+ $offset += 2;
+ if ($numSubHeaders < $subHeaderKeys[$i]) {
+ $numSubHeaders = $subHeaderKeys[$i];
+ }
+ }
+ // the number of subHeaders is equal to the max of subHeaderKeys + 1
+ ++$numSubHeaders;
+ // read subHeader structures
+ $subHeaders = array();
+ $numGlyphIndexArray = 0;
+ for ($k = 0; $k < $numSubHeaders; ++$k) {
+ $subHeaders[$k]['firstCode'] = $this->_getUSHORT($font, $offset);
+ $offset += 2;
+ $subHeaders[$k]['entryCount'] = $this->_getUSHORT($font, $offset);
+ $offset += 2;
+ $subHeaders[$k]['idDelta'] = $this->_getUSHORT($font, $offset);
+ $offset += 2;
+ $subHeaders[$k]['idRangeOffset'] = $this->_getUSHORT($font, $offset);
+ $offset += 2;
+ $subHeaders[$k]['idRangeOffset'] -= (2 + (($numSubHeaders - $k - 1) * 8));
+ $subHeaders[$k]['idRangeOffset'] /= 2;
+ $numGlyphIndexArray += $subHeaders[$k]['entryCount'];
+ }
+ for ($k = 0; $k < $numGlyphIndexArray; ++$k) {
+ $glyphIndexArray[$k] = $this->_getUSHORT($font, $offset);
+ $offset += 2;
+ }
+ for ($i = 0; $i < 256; ++$i) {
+ $k = $subHeaderKeys[$i];
+ if ($k == 0) {
+ // one byte code
+ $c = $i;
+ $g = $glyphIndexArray[0];
+ $ctg[$c] = $g;
+ } else {
+ // two bytes code
+ $start_byte = $subHeaders[$k]['firstCode'];
+ $end_byte = $start_byte + $subHeaders[$k]['entryCount'];
+ for ($j = $start_byte; $j < $end_byte; ++$j) {
+ // combine high and low bytes
+ $c = (($i << 8) + $j);
+ $idRangeOffset = ($subHeaders[$k]['idRangeOffset'] + $j - $subHeaders[$k]['firstCode']);
+ $g = ($glyphIndexArray[$idRangeOffset] + $idDelta[$k]) % 65536;
+ if ($g < 0) {
+ $g = 0;
+ }
+ $ctg[$c] = $g;
+ }
+ }
+ }
+ break;
+ }
+ case 4: { // Format 4: Segment mapping to delta values
+ $length = $this->_getUSHORT($font, $offset);
+ $offset += 2;
+ $offset += 2; // skip version/language
+ $segCount = ($this->_getUSHORT($font, $offset) / 2);
+ $offset += 2;
+ $offset += 6; // skip searchRange, entrySelector, rangeShift
+ $endCount = array(); // array of end character codes for each segment
+ for ($k = 0; $k < $segCount; ++$k) {
+ $endCount[$k] = $this->_getUSHORT($font, $offset);
+ $offset += 2;
+ }
+ $offset += 2; // skip reservedPad
+ $startCount = array(); // array of start character codes for each segment
+ for ($k = 0; $k < $segCount; ++$k) {
+ $startCount[$k] = $this->_getUSHORT($font, $offset);
+ $offset += 2;
+ }
+ $idDelta = array(); // delta for all character codes in segment
+ for ($k = 0; $k < $segCount; ++$k) {
+ $idDelta[$k] = $this->_getUSHORT($font, $offset);
+ $offset += 2;
+ }
+ $idRangeOffset = array(); // Offsets into glyphIdArray or 0
+ for ($k = 0; $k < $segCount; ++$k) {
+ $idRangeOffset[$k] = $this->_getUSHORT($font, $offset);
+ $offset += 2;
+ }
+ $gidlen = ($length / 2) - 8 - (4 * $segCount);
+ $glyphIdArray = array(); // glyph index array
+ for ($k = 0; $k < $gidlen; ++$k) {
+ $glyphIdArray[$k] = $this->_getUSHORT($font, $offset);
+ $offset += 2;
+ }
+ for ($k = 0; $k < $segCount; ++$k) {
+ for ($c = $startCount[$k]; $c <= $endCount[$k]; ++$c) {
+ if ($idRangeOffset[$k] == 0) {
+ $g = ($idDelta[$k] + $c) % 65536;
+ } else {
+ $gid = (($idRangeOffset[$k] / 2) + ($c - $startCount[$k]) - ($segCount - $k));
+ $g = ($glyphIdArray[$gid] + $idDelta[$k]) % 65536;
+ }
+ if ($g < 0) {
+ $g = 0;
+ }
+ $ctg[$c] = $g;
+ }
+ }
+ break;
+ }
+ case 6: { // Format 6: Trimmed table mapping
+ $offset += 4; // skip length and version/language
+ $firstCode = $this->_getUSHORT($font, $offset);
+ $offset += 2;
+ $entryCount = $this->_getUSHORT($font, $offset);
+ $offset += 2;
+ for ($k = 0; $k < $entryCount; ++$k) {
+ $c = ($k + $firstCode);
+ $g = $this->_getUSHORT($font, $offset);
+ $offset += 2;
+ $ctg[$c] = $g;
+ }
+ break;
+ }
+ case 8: { // Format 8: Mixed 16-bit and 32-bit coverage
+ $offset += 10; // skip reserved, length and version/language
+ for ($k = 0; $k < 8192; ++$k) {
+ $is32[$k] = $this->_getBYTE($font, $offset);
+ ++$offset;
+ }
+ $nGroups = $this->_getULONG($font, $offset);
+ $offset += 4;
+ for ($i = 0; $i < $nGroups; ++$i) {
+ $startCharCode = $this->_getULONG($font, $offset);
+ $offset += 4;
+ $endCharCode = $this->_getULONG($font, $offset);
+ $offset += 4;
+ $startGlyphID = $this->_getULONG($font, $offset);
+ $offset += 4;
+ for ($k = $startCharCode; $k <= $endCharCode; ++$k) {
+ $is32idx = floor($c / 8);
+ if ((isset($is32[$is32idx])) AND (($is32[$is32idx] & (1 << (7 - ($c % 8)))) == 0)) {
+ $c = $k;
+ } else {
+ // 32 bit format
+ // convert to decimal (http://www.unicode.org/faq//utf_bom.html#utf16-4)
+ //LEAD_OFFSET = (0xD800 - (0x10000 >> 10)) = 55232
+ //SURROGATE_OFFSET = (0x10000 - (0xD800 << 10) - 0xDC00) = -56613888
+ $c = ((55232 + ($k >> 10)) << 10) + (0xDC00 + ($k & 0x3FF)) -56613888;
+ }
+ $ctg[$c] = 0;
+ ++$startGlyphID;
+ }
+ }
+ break;
+ }
+ case 10: { // Format 10: Trimmed array
+ $offset += 10; // skip reserved, length and version/language
+ $startCharCode = $this->_getULONG($font, $offset);
+ $offset += 4;
+ $numChars = $this->_getULONG($font, $offset);
+ $offset += 4;
+ for ($k = 0; $k < $numChars; ++$k) {
+ $c = ($k + $startCharCode);
+ $g = $this->_getUSHORT($font, $offset);
+ $ctg[$c] = $g;
+ $offset += 2;
+ }
+ break;
+ }
+ case 12: { // Format 12: Segmented coverage
+ $offset += 10; // skip length and version/language
+ $nGroups = $this->_getULONG($font, $offset);
+ $offset += 4;
+ for ($k = 0; $k < $nGroups; ++$k) {
+ $startCharCode = $this->_getULONG($font, $offset);
+ $offset += 4;
+ $endCharCode = $this->_getULONG($font, $offset);
+ $offset += 4;
+ $startGlyphCode = $this->_getULONG($font, $offset);
+ $offset += 4;
+ for ($c = $startCharCode; $c <= $endCharCode; ++$c) {
+ $ctg[$c] = $startGlyphCode;
+ ++$startGlyphCode;
+ }
+ }
+ break;
+ }
+ case 13: { // Format 13: Many-to-one range mappings
+ // to be implemented ...
+ break;
+ }
+ case 14: { // Format 14: Unicode Variation Sequences
+ // to be implemented ...
+ break;
+ }
+ }
+ }
+ }
+ if (!isset($ctg[0])) {
+ $ctg[0] = 0;
+ }
+ // get xHeight (height of x)
+ $offset = ($table['glyf']['offset'] + $indexToLoc[$ctg[120]] + 4);
+ $yMin = $this->_getFWORD($font, $offset);
+ $offset += 4;
+ $yMax = $this->_getFWORD($font, $offset);
+ $offset += 2;
+ $fmetric['XHeight'] = round(($yMax - $yMin) * $urk);
+ // get CapHeight (height of H)
+ $offset = ($table['glyf']['offset'] + $indexToLoc[$ctg[72]] + 4);
+ $yMin = $this->_getFWORD($font, $offset);
+ $offset += 4;
+ $yMax = $this->_getFWORD($font, $offset);
+ $offset += 2;
+ $fmetric['CapHeight'] = round(($yMax - $yMin) * $urk);
+ // ceate widths array
+ $cw = array();
+ $offset = $table['hmtx']['offset'];
+ for ($i = 0 ; $i < $numberOfHMetrics; ++$i) {
+ $cw[$i] = round($this->_getUFWORD($font, $offset) * $urk);
+ $offset += 4; // skip lsb
+ }
+ if ($numberOfHMetrics < $numGlyphs) {
+ // fill missing widths with the last value
+ $cw = array_pad($cw, $numGlyphs, $cw[($numberOfHMetrics - 1)]);
+ }
+ $fmetric['MissingWidth'] = $cw[0];
+ $fmetric['cw'] = '';
+ for ($cid = 0; $cid <= 65535; ++$cid) {
+ if (isset($ctg[$cid]) AND isset($cw[$ctg[$cid]])) {
+ $fmetric['cw'] .= ','.$cid.'=>'.$cw[$ctg[$cid]];
+ }
+ }
+ } // end of true type
+ if (($fmetric['type'] == 'TrueTypeUnicode') AND (count($ctg) == 256)) {
+ $fmetric['type'] == 'TrueType';
+ }
+ // ---------- create php font file ----------
+ $pfile = '<'.'?'.'php'."\n";
+ $pfile .= '// TCPDF FONT FILE DESCRIPTION'."\n";
+ $pfile .= '$type=\''.$fmetric['type'].'\';'."\n";
+ $pfile .= '$name=\''.$fmetric['name'].'\';'."\n";
+ $pfile .= '$up='.$fmetric['underlinePosition'].';'."\n";
+ $pfile .= '$ut='.$fmetric['underlineThickness'].';'."\n";
+ if ($fmetric['MissingWidth'] > 0) {
+ $pfile .= '$dw='.$fmetric['MissingWidth'].';'."\n";
+ } else {
+ $pfile .= '$dw='.$fmetric['AvgWidth'].';'."\n";
+ }
+ $pfile .= '$diff=\''.$fmetric['diff'].'\';'."\n";
+ if ($fmetric['type'] == 'Type1') {
+ // Type 1
+ $pfile .= '$enc=\''.$fmetric['enc'].'\';'."\n";
+ $pfile .= '$file=\''.$fmetric['file'].'\';'."\n";
+ $pfile .= '$size1='.$fmetric['size1'].';'."\n";
+ $pfile .= '$size2='.$fmetric['size2'].';'."\n";
+ } else {
+ $pfile .= '$originalsize='.$fmetric['originalsize'].';'."\n";
+ if ($fmetric['type'] == 'cidfont0') {
+ // CID-0
+ switch ($fonttype) {
+ case 'CID0JP': {
+ $pfile .= '// Japanese'."\n";
+ $pfile .= '$enc=\'UniJIS-UTF16-H\';'."\n";
+ $pfile .= '$cidinfo=array(\'Registry\'=>\'Adobe\', \'Ordering\'=>\'Japan1\',\'Supplement\'=>5);'."\n";
+ $pfile .= 'include(dirname(__FILE__).\'/uni2cid_aj16.php\');'."\n";
+ break;
+ }
+ case 'CID0KR': {
+ $pfile .= '// Korean'."\n";
+ $pfile .= '$enc=\'UniKS-UTF16-H\';'."\n";
+ $pfile .= '$cidinfo=array(\'Registry\'=>\'Adobe\', \'Ordering\'=>\'Korea1\',\'Supplement\'=>0);'."\n";
+ $pfile .= 'include(dirname(__FILE__).\'/uni2cid_ak12.php\');'."\n";
+ break;
+ }
+ case 'CID0CS': {
+ $pfile .= '// Chinese Simplified'."\n";
+ $pfile .= '$enc=\'UniGB-UTF16-H\';'."\n";
+ $pfile .= '$cidinfo=array(\'Registry\'=>\'Adobe\', \'Ordering\'=>\'GB1\',\'Supplement\'=>2);'."\n";
+ $pfile .= 'include(dirname(__FILE__).\'/uni2cid_ag15.php\');'."\n";
+ break;
+ }
+ case 'CID0CT':
+ default: {
+ $pfile .= '// Chinese Traditional'."\n";
+ $pfile .= '$enc=\'UniCNS-UTF16-H\';'."\n";
+ $pfile .= '$cidinfo=array(\'Registry\'=>\'Adobe\', \'Ordering\'=>\'CNS1\',\'Supplement\'=>0);'."\n";
+ $pfile .= 'include(dirname(__FILE__).\'/uni2cid_aj16.php\');'."\n";
+ break;
+ }
+ }
+ } else {
+ // TrueType
+ $pfile .= '$enc=\''.$fmetric['enc'].'\';'."\n";
+ $pfile .= '$file=\''.$fmetric['file'].'\';'."\n";
+ $pfile .= '$ctg=\''.$fmetric['ctg'].'\';'."\n";
+ // create CIDToGIDMap
+ $cidtogidmap = str_pad('', 131072, "\x00"); // (256 * 256 * 2) = 131072
+ foreach ($ctg as $cid => $gid) {
+ $cidtogidmap = $this->updateCIDtoGIDmap($cidtogidmap, $cid, $ctg[$cid]);
+ }
+ // store compressed CIDToGIDMap
+ $fp = fopen($outpath.$fmetric['ctg'], 'wb');
+ fwrite($fp, gzcompress($cidtogidmap));
+ fclose($fp);
+ }
+ }
+ $pfile .= '$desc=array(';
+ $pfile .= '\'Flags\'=>'.$fmetric['Flags'].',';
+ $pfile .= '\'FontBBox\'=>\'['.$fmetric['bbox'].']\',';
+ $pfile .= '\'ItalicAngle\'=>'.$fmetric['italicAngle'].',';
+ $pfile .= '\'Ascent\'=>'.$fmetric['Ascent'].',';
+ $pfile .= '\'Descent\'=>'.$fmetric['Descent'].',';
+ $pfile .= '\'Leading\'=>'.$fmetric['Leading'].',';
+ $pfile .= '\'CapHeight\'=>'.$fmetric['CapHeight'].',';
+ $pfile .= '\'XHeight\'=>'.$fmetric['XHeight'].',';
+ $pfile .= '\'StemV\'=>'.$fmetric['StemV'].',';
+ $pfile .= '\'StemH\'=>'.$fmetric['StemH'].',';
+ $pfile .= '\'AvgWidth\'=>'.$fmetric['AvgWidth'].',';
+ $pfile .= '\'MaxWidth\'=>'.$fmetric['MaxWidth'].',';
+ $pfile .= '\'MissingWidth\'=>'.$fmetric['MissingWidth'].'';
+ $pfile .= ');'."\n";
+ $pfile .= '$cw=array('.substr($fmetric['cw'], 1).');'."\n";
+ $pfile .= '// --- EOF ---'."\n";
+ // store file
+ $fp = fopen($outpath.$font_name.'.php', 'w');
+ fwrite($fp, $pfile);
+ fclose($fp);
+ // return TCPDF font name
+ return $font_name;
+ }
/**
* Returns a subset of the TrueType font data without the unused glyphs.
* @param $font (string) TrueType font data.
* @param $subsetchars (array) Array of used characters (the glyphs to keep).
- * @return string a subset of TrueType font data without the unused glyphs
+ * @return (string) A subset of TrueType font data without the unused glyphs.
* @author Nicola Asuni
* @protected
* @since 5.2.000 (2010-06-02)
@@ -9559,11 +10910,7 @@ class TCPDF {
$offset += 4;
}
foreach ($encodingTables as $enctable) {
- if (($enctable['platformID'] == 3) AND ($enctable['encodingID'] == 0)) {
- $modesymbol = true;
- } else {
- $modesymbol = false;
- }
+ // get all platforms and encodings
$offset = $table['cmap']['offset'] + $enctable['offset'];
$format = $this->_getUSHORT($font, $offset);
$offset += 2;
@@ -9594,12 +10941,13 @@ class TCPDF {
++$numSubHeaders;
// read subHeader structures
$subHeaders = array();
+ $numGlyphIndexArray = 0;
for ($k = 0; $k < $numSubHeaders; ++$k) {
$subHeaders[$k]['firstCode'] = $this->_getUSHORT($font, $offset);
$offset += 2;
$subHeaders[$k]['entryCount'] = $this->_getUSHORT($font, $offset);
$offset += 2;
- $subHeaders[$k]['idDelta'] = $this->_getSHORT($font, $offset);
+ $subHeaders[$k]['idDelta'] = $this->_getUSHORT($font, $offset);
$offset += 2;
$subHeaders[$k]['idRangeOffset'] = $this->_getUSHORT($font, $offset);
$offset += 2;
@@ -9629,8 +10977,7 @@ class TCPDF {
$c = (($i << 8) + $j);
if (isset($subsetchars[$c])) {
$idRangeOffset = ($subHeaders[$k]['idRangeOffset'] + $j - $subHeaders[$k]['firstCode']);
- $g = $glyphIndexArray[$idRangeOffset];
- $g += ($idDelta[$k] - 65536);
+ $g = ($glyphIndexArray[$idRangeOffset] + $idDelta[$k]) % 65536;
if ($g < 0) {
$g = 0;
}
@@ -9679,12 +11026,11 @@ class TCPDF {
for ($c = $startCount[$k]; $c <= $endCount[$k]; ++$c) {
if (isset($subsetchars[$c])) {
if ($idRangeOffset[$k] == 0) {
- $g = $c;
+ $g = ($idDelta[$k] + $c) % 65536;
} else {
$gid = (($idRangeOffset[$k] / 2) + ($c - $startCount[$k]) - ($segCount - $k));
- $g = $glyphIdArray[$gid];
+ $g = ($glyphIdArray[$gid] + $idDelta[$k]) % 65536;
}
- $g += ($idDelta[$k] - 65536);
if ($g < 0) {
$g = 0;
}
@@ -9930,7 +11276,7 @@ class TCPDF {
/**
* Returs the checksum of a TTF table.
* @param $table (string) table to check
- * @param $length (int) lenght of table in bytes
+ * @param $length (int) length of table in bytes
* @return int checksum
* @author Nicola Asuni
* @protected
@@ -10088,7 +11434,7 @@ class TCPDF {
// strip first binary header
$font = substr($font, 6);
}
- if ($header AND (ord($font{$info['length1']}) == 128)) {
+ if ($header AND (ord($font[$info['length1']]) == 128)) {
// strip second binary header
$font = substr($font, 0, $info['length1']).substr($font, ($info['length1'] + 6));
}
@@ -10105,7 +11451,7 @@ class TCPDF {
}
// rebuild a font subset
$font = $this->_getTrueTypeFontSubset($font, $subsetchars);
- // calculate new font lenght
+ // calculate new font length
$info['length1'] = strlen($font);
if ($compressed) {
// recompress font
@@ -10186,7 +11532,7 @@ class TCPDF {
$s = '< $fdv) {
if (is_float($fdv)) {
- $fdv = sprintf('%.3F', $fdv);
+ $fdv = sprintf('%F', $fdv);
}
$s .= ' /'.$fdk.' '.$fdv.'';
}
@@ -10547,7 +11893,7 @@ class TCPDF {
$out .= ' /FontName /'.$fontname;
foreach ($font['desc'] as $key => $value) {
if (is_float($value)) {
- $value = sprintf('%.3F', $value);
+ $value = sprintf('%F', $value);
}
$out .= ' /'.$key.' '.$value;
}
@@ -10658,7 +12004,7 @@ class TCPDF {
foreach ($font['desc'] as $k => $v) {
if ($k != 'Style') {
if (is_float($v)) {
- $v = sprintf('%.3F', $v);
+ $v = sprintf('%F', $v);
}
$s .= ' /'.$k.' '.$v.'';
}
@@ -10677,7 +12023,7 @@ class TCPDF {
foreach ($this->imagekeys as $file) {
$info = $this->getImageBuffer($file);
// set object for alternate images array
- if (!empty($info['altimgs'])) {
+ if ((!$this->pdfa_mode) AND isset($info['altimgs']) AND !empty($info['altimgs'])) {
$altoid = $this->_newobj();
$out = '[';
foreach ($info['altimgs'] as $altimage) {
@@ -10707,13 +12053,21 @@ class TCPDF {
if (array_key_exists('masked', $info)) {
$out .= ' /SMask '.($this->n - 1).' 0 R';
}
- if ($info['cs'] == 'Indexed') {
+ // set color space
+ $icc = false;
+ if (isset($info['icc']) AND ($info['icc'] !== false)) {
+ // ICC Colour Space
+ $icc = true;
+ $out .= ' /ColorSpace [/ICCBased '.($this->n + 1).' 0 R]';
+ } elseif ($info['cs'] == 'Indexed') {
+ // Indexed Colour Space
$out .= ' /ColorSpace [/Indexed /DeviceRGB '.((strlen($info['pal']) / 3) - 1).' '.($this->n + 1).' 0 R]';
} else {
+ // Device Colour Space
$out .= ' /ColorSpace /'.$info['cs'];
- if ($info['cs'] == 'DeviceCMYK') {
- $out .= ' /Decode [1 0 1 0 1 0 1 0]';
- }
+ }
+ if ($info['cs'] == 'DeviceCMYK') {
+ $out .= ' /Decode [1 0 1 0 1 0 1 0]';
}
$out .= ' /BitsPerComponent '.$info['bpc'];
if (isset($altoid) AND ($altoid > 0)) {
@@ -10737,7 +12091,7 @@ class TCPDF {
$out .= ' '.$info['parms'];
}
if (isset($info['trns']) AND is_array($info['trns'])) {
- $trns='';
+ $trns = '';
$count_info = count($info['trns']);
for ($i=0; $i < $count_info; ++$i) {
$trns .= $info['trns'][$i].' '.$info['trns'][$i].' ';
@@ -10750,8 +12104,14 @@ class TCPDF {
}
$out .= "\n".'endobj';
$this->_out($out);
- //Palette
- if ($info['cs'] == 'Indexed') {
+ if ($icc) {
+ // ICC colour profile
+ $this->_newobj();
+ $icc = ($this->compress) ? gzcompress($info['icc']) : $info['icc'];
+ $icc = $this->_getrawstream($icc);
+ $this->_out('<> stream'."\n".$icc."\n".'endstream'."\n".'endobj');
+ } elseif ($info['cs'] == 'Indexed') {
+ // colour palette
$this->_newobj();
$pal = ($this->compress) ? gzcompress($info['pal']) : $info['pal'];
$pal = $this->_getrawstream($pal);
@@ -10780,10 +12140,45 @@ class TCPDF {
$stream = gzcompress($stream);
$out .= ' /Filter /FlateDecode';
}
- $out .= sprintf(' /BBox [%.2F %.2F %.2F %.2F]', ($data['x'] * $this->k), (-$data['y'] * $this->k), (($data['w'] + $data['x']) * $this->k), (($data['h'] - $data['y']) * $this->k));
+ $out .= sprintf(' /BBox [%F %F %F %F]', ($data['x'] * $this->k), (-$data['y'] * $this->k), (($data['w'] + $data['x']) * $this->k), (($data['h'] - $data['y']) * $this->k));
$out .= ' /Matrix [1 0 0 1 0 0]';
$out .= ' /Resources <<';
$out .= ' /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]';
+ if (!$this->pdfa_mode) {
+ // transparency
+ if (isset($data['extgstates']) AND !empty($data['extgstates'])) {
+ $out .= ' /ExtGState <<';
+ foreach ($data['extgstates'] as $k => $extgstate) {
+ if (isset($this->extgstates[$k]['name'])) {
+ $out .= ' /'.$this->extgstates[$k]['name'];
+ } else {
+ $out .= ' /GS'.$k;
+ }
+ $out .= ' '.$this->extgstates[$k]['n'].' 0 R';
+ }
+ $out .= ' >>';
+ }
+ if (isset($data['gradients']) AND !empty($data['gradients'])) {
+ $gp = '';
+ $gs = '';
+ foreach ($data['gradients'] as $id => $grad) {
+ // gradient patterns
+ $gp .= ' /p'.$id.' '.$this->gradients[$id]['pattern'].' 0 R';
+ // gradient shadings
+ $gs .= ' /Sh'.$id.' '.$this->gradients[$id]['id'].' 0 R';
+ }
+ $out .= ' /Pattern <<'.$gp.' >>';
+ $out .= ' /Shading <<'.$gs.' >>';
+ }
+ }
+ // spot colors
+ if (isset($data['spot_colors']) AND !empty($data['spot_colors'])) {
+ $out .= ' /ColorSpace <<';
+ foreach ($data['spot_colors'] as $name => $color) {
+ $out .= ' /CS'.$color['i'].' '.$this->spot_colors[$name]['n'].' 0 R';
+ }
+ $out .= ' >>';
+ }
// fonts
if (!empty($data['fonts'])) {
$out .= ' /Font <<';
@@ -10803,7 +12198,23 @@ class TCPDF {
}
$out .= ' >>';
}
- $out .= ' >>';
+ $out .= ' >>'; //end resources
+ if (isset($data['group']) AND ($data['group'] !== false)) {
+ // set transparency group
+ $out .= ' /Group << /Type /Group /S /Transparency';
+ if (is_array($data['group'])) {
+ if (isset($data['group']['CS']) AND !empty($data['group']['CS'])) {
+ $out .= ' /CS /'.$data['group']['CS'];
+ }
+ if (isset($data['group']['I'])) {
+ $out .= ' /I /'.($data['group']['I']===true?'true':'false');
+ }
+ if (isset($data['group']['K'])) {
+ $out .= ' /K /'.($data['group']['K']===true?'true':'false');
+ }
+ }
+ $out .= ' >>';
+ }
$stream = $this->_getrawstream($stream, $data['n']);
$out .= ' /Length '.strlen($stream);
$out .= ' >>';
@@ -10826,7 +12237,7 @@ class TCPDF {
$out = '[/Separation /'.str_replace(' ', '#20', $name);
$out .= ' /DeviceCMYK <<';
$out .= ' /Range [0 1 0 1 0 1 0 1] /C0 [0 0 0 0]';
- $out .= ' '.sprintf('/C1 [%.4F %.4F %.4F %.4F] ', ($color['c'] / 100), ($color['m'] / 100), ($color['y'] / 100), ($color['k'] / 100));
+ $out .= ' '.sprintf('/C1 [%F %F %F %F] ', ($color['C'] / 100), ($color['M'] / 100), ($color['Y'] / 100), ($color['K'] / 100));
$out .= ' /FunctionType 2 /Domain [0 1] /N 1>>]';
$out .= "\n".'endobj';
$this->_out($out);
@@ -10863,39 +12274,43 @@ class TCPDF {
$out .= ' /XObject <<';
$out .= $this->_getxobjectdict();
$out .= ' >>';
- // visibility
- if ($this->pdflayers) {
- $out .= ' /Properties <n_ocg_print.' 0 R /OC2 '.$this->n_ocg_view.' 0 R>>';
- }
- // transparency
- $out .= ' /ExtGState <<';
- foreach ($this->extgstates as $k => $extgstate) {
- if (isset($extgstate['name'])) {
- $out .= ' /'.$extgstate['name'];
- } else {
- $out .= ' /GS'.$k;
- }
- $out .= ' '.$extgstate['n'].' 0 R';
- }
- $out .= ' >>';
- // gradient patterns
- if (isset($this->gradients) AND (count($this->gradients) > 0)) {
- $out .= ' /Pattern <<';
- foreach ($this->gradients as $id => $grad) {
- $out .= ' /p'.$id.' '.$grad['pattern'].' 0 R';
+ // layers
+ if (!empty($this->pdflayers)) {
+ $out .= ' /Properties <<';
+ foreach ($this->pdflayers as $layer) {
+ $out .= ' /'.$layer['layer'].' '.$layer['objid'].' 0 R';
}
$out .= ' >>';
}
- // gradient shadings
- if (isset($this->gradients) AND (count($this->gradients) > 0)) {
- $out .= ' /Shading <<';
- foreach ($this->gradients as $id => $grad) {
- $out .= ' /Sh'.$id.' '.$grad['id'].' 0 R';
+ if (!$this->pdfa_mode) {
+ // transparency
+ if (isset($this->extgstates) AND !empty($this->extgstates)) {
+ $out .= ' /ExtGState <<';
+ foreach ($this->extgstates as $k => $extgstate) {
+ if (isset($extgstate['name'])) {
+ $out .= ' /'.$extgstate['name'];
+ } else {
+ $out .= ' /GS'.$k;
+ }
+ $out .= ' '.$extgstate['n'].' 0 R';
+ }
+ $out .= ' >>';
+ }
+ if (isset($this->gradients) AND !empty($this->gradients)) {
+ $gp = '';
+ $gs = '';
+ foreach ($this->gradients as $id => $grad) {
+ // gradient patterns
+ $gp .= ' /p'.$id.' '.$grad['pattern'].' 0 R';
+ // gradient shadings
+ $gs .= ' /Sh'.$id.' '.$grad['id'].' 0 R';
+ }
+ $out .= ' /Pattern <<'.$gp.' >>';
+ $out .= ' /Shading <<'.$gs.' >>';
}
- $out .= ' >>';
}
// spot colors
- if (isset($this->spot_colors) AND (count($this->spot_colors) > 0)) {
+ if (isset($this->spot_colors) AND !empty($this->spot_colors)) {
$out .= ' /ColorSpace <<';
foreach ($this->spot_colors as $color) {
$out .= ' /CS'.$color['i'].' '.$color['n'].' 0 R';
@@ -10916,9 +12331,9 @@ class TCPDF {
$this->_putocg();
$this->_putfonts();
$this->_putimages();
- $this->_putxobjects();
$this->_putspotcolors();
$this->_putshaders();
+ $this->_putxobjects();
$this->_putresourcedict();
$this->_putdests();
$this->_putbookmarks();
@@ -10965,11 +12380,11 @@ class TCPDF {
// restore previous isunicode value
$this->isunicode = $prev_isunicode;
// default producer
- $out .= ' /Producer '.$this->_textstring("\x54\x43\x50\x44\x46\x20".$this->tcpdf_version."\x20\x28\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x74\x63\x70\x64\x66\x2e\x6f\x72\x67\x29", $oid);
+ $out .= ' /Producer '.$this->_textstring($this->pdfproducer, $oid);
// The date and time the document was created, in human-readable form
- $out .= ' /CreationDate '.$this->_datestring();
+ $out .= ' /CreationDate '.$this->_datestring(0, $this->doc_creation_timestamp);
// The date and time the document was most recently modified, in human-readable form
- $out .= ' /ModDate '.$this->_datestring();
+ $out .= ' /ModDate '.$this->_datestring(0, $this->doc_modification_timestamp);
// A name object indicating whether the document has been modified to include trapping information
$out .= ' /Trapped /False';
$out .= ' >>';
@@ -10978,12 +12393,177 @@ class TCPDF {
return $oid;
}
+ /**
+ * Set additional XMP data to be added on the default XMP data just before the end of "x:xmpmeta" tag.
+ * IMPORTANT: This data is added as-is without controls, so you have to validate your data before using this method!
+ * @param $xmp (string) Custom XMP data.
+ * @since 5.9.128 (2011-10-06)
+ * @public
+ */
+ public function setExtraXMP($xmp) {
+ $this->custom_xmp = $xmp;
+ }
+
+ /**
+ * Put XMP data object and return ID.
+ * @return (int) The object ID.
+ * @since 5.9.121 (2011-09-28)
+ * @protected
+ */
+ protected function _putXMP() {
+ $oid = $this->_newobj();
+ // store current isunicode value
+ $prev_isunicode = $this->isunicode;
+ $this->isunicode = true;
+ $prev_encrypted = $this->encrypted;
+ $this->encrypted = false;
+ // set XMP data
+ $xmp = 'unichr(0xfeff).'" id="W5M0MpCehiHzreSzNTczkc9d"?>'."\n";
+ $xmp .= ''."\n";
+ $xmp .= "\t".''."\n";
+ $xmp .= "\t\t".''."\n";
+ $xmp .= "\t\t\t".'application/pdf'."\n";
+ $xmp .= "\t\t\t".''."\n";
+ $xmp .= "\t\t\t\t".''."\n";
+ $xmp .= "\t\t\t\t\t".''.$this->_escapeXML($this->title).''."\n";
+ $xmp .= "\t\t\t\t".''."\n";
+ $xmp .= "\t\t\t".''."\n";
+ $xmp .= "\t\t\t".''."\n";
+ $xmp .= "\t\t\t\t".''."\n";
+ $xmp .= "\t\t\t\t\t".''.$this->_escapeXML($this->author).''."\n";
+ $xmp .= "\t\t\t\t".''."\n";
+ $xmp .= "\t\t\t".''."\n";
+ $xmp .= "\t\t\t".''."\n";
+ $xmp .= "\t\t\t\t".''."\n";
+ $xmp .= "\t\t\t\t\t".''.$this->_escapeXML($this->subject).''."\n";
+ $xmp .= "\t\t\t\t".''."\n";
+ $xmp .= "\t\t\t".''."\n";
+ $xmp .= "\t\t\t".''."\n";
+ $xmp .= "\t\t\t\t".''."\n";
+ $xmp .= "\t\t\t\t\t".''.$this->_escapeXML($this->keywords).''."\n";
+ $xmp .= "\t\t\t\t".''."\n";
+ $xmp .= "\t\t\t".''."\n";
+ $xmp .= "\t\t".''."\n";
+ // convert doc creation date format
+ $dcdate = $this->getFormattedDate($this->doc_creation_timestamp);
+ $doccreationdate = substr($dcdate, 0, 4).'-'.substr($dcdate, 4, 2).'-'.substr($dcdate, 6, 2);
+ $doccreationdate .= 'T'.substr($dcdate, 8, 2).':'.substr($dcdate, 10, 2).':'.substr($dcdate, 12, 2);
+ $doccreationdate .= '+'.substr($dcdate, 15, 2).':'.substr($dcdate, 18, 2);
+ $doccreationdate = $this->_escapeXML($doccreationdate);
+ // convert doc modification date format
+ $dmdate = $this->getFormattedDate($this->doc_modification_timestamp);
+ $docmoddate = substr($dmdate, 0, 4).'-'.substr($dmdate, 4, 2).'-'.substr($dmdate, 6, 2);
+ $docmoddate .= 'T'.substr($dmdate, 8, 2).':'.substr($dmdate, 10, 2).':'.substr($dmdate, 12, 2);
+ $docmoddate .= '+'.substr($dmdate, 15, 2).':'.substr($dmdate, 18, 2);
+ $docmoddate = $this->_escapeXML($docmoddate);
+ $xmp .= "\t\t".''."\n";
+ $xmp .= "\t\t\t".''.$doccreationdate.''."\n";
+ $xmp .= "\t\t\t".''.$this->creator.''."\n";
+ $xmp .= "\t\t\t".''.$docmoddate.''."\n";
+ $xmp .= "\t\t\t".''.$doccreationdate.''."\n";
+ $xmp .= "\t\t".''."\n";
+ $xmp .= "\t\t".''."\n";
+ $xmp .= "\t\t\t".''.$this->_escapeXML($this->keywords).' TCPDF'."\n";
+ $xmp .= "\t\t\t".''.$this->_escapeXML($this->pdfproducer).''."\n";
+ $xmp .= "\t\t".''."\n";
+ $xmp .= "\t\t".''."\n";
+ $uuid = 'uuid:'.substr($this->file_id, 0, 8).'-'.substr($this->file_id, 8, 4).'-'.substr($this->file_id, 12, 4).'-'.substr($this->file_id, 16, 4).'-'.substr($this->file_id, 20, 12);
+ $xmp .= "\t\t\t".''.$uuid.''."\n";
+ $xmp .= "\t\t\t".''.$uuid.''."\n";
+ $xmp .= "\t\t".''."\n";
+ if ($this->pdfa_mode) {
+ $xmp .= "\t\t".''."\n";
+ $xmp .= "\t\t\t".'1'."\n";
+ $xmp .= "\t\t\t".'B'."\n";
+ $xmp .= "\t\t".''."\n";
+ }
+ // XMP extension schemas
+ $xmp .= "\t\t".''."\n";
+ $xmp .= "\t\t\t".''."\n";
+ $xmp .= "\t\t\t\t".''."\n";
+ $xmp .= "\t\t\t\t\t".''."\n";
+ $xmp .= "\t\t\t\t\t\t".'http://ns.adobe.com/pdf/1.3/'."\n";
+ $xmp .= "\t\t\t\t\t\t".'pdf'."\n";
+ $xmp .= "\t\t\t\t\t\t".'Adobe PDF Schema'."\n";
+ $xmp .= "\t\t\t\t\t".''."\n";
+ $xmp .= "\t\t\t\t\t".''."\n";
+ $xmp .= "\t\t\t\t\t\t".'http://ns.adobe.com/xap/1.0/mm/'."\n";
+ $xmp .= "\t\t\t\t\t\t".'xmpMM'."\n";
+ $xmp .= "\t\t\t\t\t\t".'XMP Media Management Schema'."\n";
+ $xmp .= "\t\t\t\t\t\t".''."\n";
+ $xmp .= "\t\t\t\t\t\t\t".''."\n";
+ $xmp .= "\t\t\t\t\t\t\t\t".''."\n";
+ $xmp .= "\t\t\t\t\t\t\t\t\t".'internal'."\n";
+ $xmp .= "\t\t\t\t\t\t\t\t\t".'UUID based identifier for specific incarnation of a document'."\n";
+ $xmp .= "\t\t\t\t\t\t\t\t\t".'InstanceID'."\n";
+ $xmp .= "\t\t\t\t\t\t\t\t\t".'URI'."\n";
+ $xmp .= "\t\t\t\t\t\t\t\t".''."\n";
+ $xmp .= "\t\t\t\t\t\t\t".''."\n";
+ $xmp .= "\t\t\t\t\t\t".''."\n";
+ $xmp .= "\t\t\t\t\t".''."\n";
+ $xmp .= "\t\t\t\t\t".''."\n";
+ $xmp .= "\t\t\t\t\t\t".'http://www.aiim.org/pdfa/ns/id/'."\n";
+ $xmp .= "\t\t\t\t\t\t".'pdfaid'."\n";
+ $xmp .= "\t\t\t\t\t\t".'PDF/A ID Schema'."\n";
+ $xmp .= "\t\t\t\t\t\t".''."\n";
+ $xmp .= "\t\t\t\t\t\t\t".''."\n";
+ $xmp .= "\t\t\t\t\t\t\t\t".''."\n";
+ $xmp .= "\t\t\t\t\t\t\t\t\t".'internal'."\n";
+ $xmp .= "\t\t\t\t\t\t\t\t\t".'Part of PDF/A standard'."\n";
+ $xmp .= "\t\t\t\t\t\t\t\t\t".'part'."\n";
+ $xmp .= "\t\t\t\t\t\t\t\t\t".'Integer'."\n";
+ $xmp .= "\t\t\t\t\t\t\t\t".''."\n";
+ $xmp .= "\t\t\t\t\t\t\t\t".''."\n";
+ $xmp .= "\t\t\t\t\t\t\t\t\t".'internal'."\n";
+ $xmp .= "\t\t\t\t\t\t\t\t\t".'Amendment of PDF/A standard'."\n";
+ $xmp .= "\t\t\t\t\t\t\t\t\t".'amd'."\n";
+ $xmp .= "\t\t\t\t\t\t\t\t\t".'Text'."\n";
+ $xmp .= "\t\t\t\t\t\t\t\t".''."\n";
+ $xmp .= "\t\t\t\t\t\t\t\t".''."\n";
+ $xmp .= "\t\t\t\t\t\t\t\t\t".'internal'."\n";
+ $xmp .= "\t\t\t\t\t\t\t\t\t".'Conformance level of PDF/A standard'."\n";
+ $xmp .= "\t\t\t\t\t\t\t\t\t".'conformance'."\n";
+ $xmp .= "\t\t\t\t\t\t\t\t\t".'Text'."\n";
+ $xmp .= "\t\t\t\t\t\t\t\t".''."\n";
+ $xmp .= "\t\t\t\t\t\t\t".''."\n";
+ $xmp .= "\t\t\t\t\t\t".''."\n";
+ $xmp .= "\t\t\t\t\t".''."\n";
+ $xmp .= "\t\t\t\t".''."\n";
+ $xmp .= "\t\t\t".''."\n";
+ $xmp .= "\t\t".''."\n";
+ $xmp .= "\t".''."\n";
+ $xmp .= $this->custom_xmp;
+ $xmp .= ''."\n";
+ $xmp .= '';
+ $out = '<< /Type /Metadata /Subtype /XML /Length '.strlen($xmp).' >> stream'."\n".$xmp."\n".'endstream'."\n".'endobj';
+ // restore previous isunicode value
+ $this->isunicode = $prev_isunicode;
+ $this->encrypted = $prev_encrypted;
+ $this->_out($out);
+ return $oid;
+ }
+
/**
* Output Catalog.
* @return int object id
* @protected
*/
protected function _putcatalog() {
+ // put XMP
+ $xmpobj = $this->_putXMP();
+ // if required, add standard sRGB_IEC61966-2.1 blackscaled ICC colour profile
+ if ($this->pdfa_mode OR $this->force_srgb) {
+ $iccobj = $this->_newobj();
+ $icc = file_get_contents(dirname(__FILE__).'/sRGB.icc');
+ $filter = '';
+ if ($this->compress) {
+ $filter = ' /Filter /FlateDecode';
+ $icc = gzcompress($icc);
+ }
+ $icc = $this->_getrawstream($icc);
+ $this->_out('<> stream'."\n".$icc."\n".'endstream'."\n".'endobj');
+ }
+ // start catalog
$oid = $this->_newobj();
$out = '<< /Type /Catalog';
$out .= ' /Version /'.$this->PDFVersion;
@@ -10991,7 +12571,7 @@ class TCPDF {
$out .= ' /Pages 1 0 R';
//$out .= ' /PageLabels ' //...;
$out .= ' /Names <<';
- if ((!empty($this->javascript)) OR (!empty($this->js_objects))) {
+ if ((!$this->pdfa_mode) AND ((!empty($this->javascript)) OR (!empty($this->js_objects)))) {
$out .= ' /JavaScript '.($this->n_js).' 0 R';
}
$out .= ' >>';
@@ -11017,42 +12597,84 @@ class TCPDF {
} elseif ($this->ZoomMode == 'real') {
$out .= ' /OpenAction ['.$this->page_obj_id[1].' 0 R /XYZ null null 1]';
} elseif (!is_string($this->ZoomMode)) {
- $out .= sprintf(' /OpenAction ['.$this->page_obj_id[1].' 0 R /XYZ null null %.2F]', ($this->ZoomMode / 100));
+ $out .= sprintf(' /OpenAction ['.$this->page_obj_id[1].' 0 R /XYZ null null %F]', ($this->ZoomMode / 100));
}
//$out .= ' /AA <<>>';
//$out .= ' /URI <<>>';
- //$out .= ' /Metadata X Y R';
+ $out .= ' /Metadata '.$xmpobj.' 0 R';
//$out .= ' /StructTreeRoot <<>>';
//$out .= ' /MarkInfo <<>>';
if (isset($this->l['a_meta_language'])) {
$out .= ' /Lang '.$this->_textstring($this->l['a_meta_language'], $oid);
}
//$out .= ' /SpiderInfo <<>>';
- //$out .= ' /OutputIntents []';
+ // set OutputIntent to sRGB IEC61966-2.1 if required
+ if ($this->pdfa_mode OR $this->force_srgb) {
+ $out .= ' /OutputIntents [<<';
+ $out .= ' /Type /OutputIntent';
+ $out .= ' /S /GTS_PDFA1';
+ $out .= ' /OutputCondition '.$this->_textstring('sRGB IEC61966-2.1', $oid);
+ $out .= ' /OutputConditionIdentifier '.$this->_textstring('sRGB IEC61966-2.1', $oid);
+ $out .= ' /RegistryName '.$this->_textstring('http://www.color.org', $oid);
+ $out .= ' /Info '.$this->_textstring('sRGB IEC61966-2.1', $oid);
+ $out .= ' /DestOutputProfile '.$iccobj.' 0 R';
+ $out .= ' >>]';
+ }
//$out .= ' /PieceInfo <<>>';
- if ($this->pdflayers) {
- $p = $this->n_ocg_print.' 0 R';
- $v = $this->n_ocg_view.' 0 R';
- $as = '<< /Event /Print /OCGs ['.$p.' '.$v.'] /Category [/Print] >> << /Event /View /OCGs ['.$p.' '.$v.'] /Category [/View] >>';
- $out .= ' /OCProperties << /OCGs ['.$p.' '.$v.'] /D << /ON ['.$p.'] /OFF ['.$v.'] /AS ['.$as.'] >> >>';
+ if (!empty($this->pdflayers)) {
+ $lyrobjs = '';
+ $lyrobjs_print = '';
+ $lyrobjs_view = '';
+ foreach ($this->pdflayers as $layer) {
+ $lyrobjs .= ' '.$layer['objid'].' 0 R';
+ if ($layer['print']) {
+ $lyrobjs_print .= ' '.$layer['objid'].' 0 R';
+ }
+ if ($layer['view']) {
+ $lyrobjs_view .= ' '.$layer['objid'].' 0 R';
+ }
+ }
+ $out .= ' /OCProperties << /OCGs ['.$lyrobjs.']';
+ $out .= ' /D <<';
+ $out .= ' /Name '.$this->_textstring('Layers', $oid);
+ $out .= ' /Creator '.$this->_textstring('TCPDF', $oid);
+ $out .= ' /BaseState /ON';
+ $out .= ' /ON ['.$lyrobjs_print.']';
+ $out .= ' /OFF ['.$lyrobjs_view.']';
+ $out .= ' /Intent /View';
+ $out .= ' /AS [';
+ $out .= ' << /Event /Print /OCGs ['.$lyrobjs.'] /Category [/Print] >>';
+ $out .= ' << /Event /View /OCGs ['.$lyrobjs.'] /Category [/View] >>';
+ $out .= ' ]';
+ $out .= ' /Order ['.$lyrobjs.']';
+ $out .= ' /ListMode /AllPages';
+ //$out .= ' /RBGroups ['..']';
+ //$out .= ' /Locked ['..']';
+ $out .= ' >>';
+ $out .= ' >>';
}
// AcroForm
if (!empty($this->form_obj_id) OR ($this->sign AND isset($this->signature_data['cert_type']))) {
$out .= ' /AcroForm <<';
$objrefs = '';
if ($this->sign AND isset($this->signature_data['cert_type'])) {
+ // set reference for signature object
$objrefs .= $this->sig_obj_id.' 0 R';
}
+ if (!empty($this->empty_signature_appearance)) {
+ foreach ($this->empty_signature_appearance as $esa) {
+ // set reference for empty signature objects
+ $objrefs .= ' '.$esa['objid'].' 0 R';
+ }
+ }
if (!empty($this->form_obj_id)) {
foreach($this->form_obj_id as $objid) {
$objrefs .= ' '.$objid.' 0 R';
}
}
$out .= ' /Fields ['.$objrefs.']';
- if (!empty($this->form_obj_id) AND !$this->sign) {
- // It's better to turn off this value and set the appearance stream for each annotation (/AP) to avoid conflicts with signature fields.
- $out .= ' /NeedAppearances true';
- }
+ // It's better to turn off this value and set the appearance stream for each annotation (/AP) to avoid conflicts with signature fields.
+ $out .= ' /NeedAppearances false';
if ($this->sign AND isset($this->signature_data['cert_type'])) {
if ($this->signature_data['cert_type'] > 0) {
$out .= ' /SigFlags 3';
@@ -11168,11 +12790,12 @@ class TCPDF {
}
/**
- * Output PDF header.
+ * Output PDF File Header (7.5.2).
* @protected
*/
protected function _putheader() {
$this->_out('%PDF-'.$this->PDFVersion);
+ $this->_out('%'.chr(0xe2).chr(0xe3).chr(0xcf).chr(0xd3));
}
/**
@@ -11184,6 +12807,25 @@ class TCPDF {
$this->_putheader();
$this->_putpages();
$this->_putresources();
+ // empty signature fields
+ if (!empty($this->empty_signature_appearance)) {
+ foreach ($this->empty_signature_appearance as $key => $esa) {
+ // widget annotation for empty signature
+ $out = $this->_getobj($esa['objid'])."\n";
+ $out .= '<< /Type /Annot';
+ $out .= ' /Subtype /Widget';
+ $out .= ' /Rect ['.$esa['rect'].']';
+ $out .= ' /P '.$this->page_obj_id[($esa['page'])].' 0 R'; // link to signature appearance page
+ $out .= ' /F 4';
+ $out .= ' /FT /Sig';
+ $signame = sprintf('Signature_%03d', ($key + 1));
+ $out .= ' /T '.$this->_textstring($signame, $esa['objid']);
+ $out .= ' /Ff 0';
+ $out .= ' >>';
+ $out .= "\n".'endobj';
+ $this->_out($out);
+ }
+ }
// Signature
if ($this->sign AND isset($this->signature_data['cert_type'])) {
// widget annotation for signature
@@ -11194,7 +12836,7 @@ class TCPDF {
$out .= ' /P '.$this->page_obj_id[($this->signature_appearance['page'])].' 0 R'; // link to signature appearance page
$out .= ' /F 4';
$out .= ' /FT /Sig';
- $out .= ' /T '.$this->_textstring('Signature', $this->sig_obj_id);
+ $out .= ' /T '.$this->_textstring('Signature_000', $this->sig_obj_id);
$out .= ' /Ff 0';
$out .= ' /V '.($this->sig_obj_id + 1).' 0 R';
$out .= ' >>';
@@ -11220,7 +12862,8 @@ class TCPDF {
$this->_out(sprintf('%010d 00000 n ', $this->offsets[$i]));
}
// TRAILER
- $out = 'trailer <<';
+ $out = 'trailer'."\n";
+ $out .= '<<';
$out .= ' /Size '.($this->n + 1);
$out .= ' /Root '.$objid_catalog.' 0 R';
$out .= ' /Info '.$objid_info.' 0 R';
@@ -11349,7 +12992,7 @@ class TCPDF {
*/
protected function _dounderlinew($x, $y, $w) {
$linew = - $this->CurrentFont['ut'] / 1000 * $this->FontSizePt;
- return sprintf('%.2F %.2F %.2F %.2F re f', $x * $this->k, ((($this->h - $y) * $this->k) + $linew), $w * $this->k, $linew);
+ return sprintf('%F %F %F %F re f', $x * $this->k, ((($this->h - $y) * $this->k) + $linew), $w * $this->k, $linew);
}
/**
@@ -11368,13 +13011,13 @@ class TCPDF {
* Line through for rectangular text area.
* @param $x (int) X coordinate
* @param $y (int) Y coordinate
- * @param $w (int) line lenght (width)
+ * @param $w (int) line length (width)
* @protected
* @since 4.9.008 (2009-09-29)
*/
protected function _dolinethroughw($x, $y, $w) {
$linew = - $this->CurrentFont['ut'] / 1000 * $this->FontSizePt;
- return sprintf('%.2F %.2F %.2F %.2F re f', $x * $this->k, ((($this->h - $y) * $this->k) + $linew + ($this->FontSizePt / 3)), $w * $this->k, $linew);
+ return sprintf('%F %F %F %F re f', $x * $this->k, ((($this->h - $y) * $this->k) + $linew + ($this->FontSizePt / 3)), $w * $this->k, $linew);
}
/**
@@ -11400,7 +13043,7 @@ class TCPDF {
*/
protected function _dooverlinew($x, $y, $w) {
$linew = - $this->CurrentFont['ut'] / 1000 * $this->FontSizePt;
- return sprintf('%.2F %.2F %.2F %.2F re f', $x * $this->k, (($this->h - $y + $this->FontAscent) * $this->k) - $linew, $w * $this->k, $linew);
+ return sprintf('%F %F %F %F re f', $x * $this->k, (($this->h - $y + $this->FontAscent) * $this->k) - $linew, $w * $this->k, $linew);
}
@@ -11441,16 +13084,91 @@ class TCPDF {
return '('. $this->_escape($s).')';
}
+ /**
+ * Set the document creation timestamp
+ * @param $time (mixed) Document creation timestamp in seconds or date-time string.
+ * @public
+ * @since 5.9.152 (2012-03-23)
+ */
+ public function setDocCreationTimestamp($time) {
+ if (is_string($time)) {
+ $time = getTimestamp($time);
+ }
+ $this->doc_creation_timestamp = intval($time);
+ }
+
+ /**
+ * Set the document modification timestamp
+ * @param $time (mixed) Document modification timestamp in seconds or date-time string.
+ * @public
+ * @since 5.9.152 (2012-03-23)
+ */
+ public function setDocModificationTimestamp($time) {
+ if (is_string($time)) {
+ $time = getTimestamp($time);
+ }
+ $this->doc_modification_timestamp = intval($time);
+ }
+
+ /**
+ * Returns document creation timestamp in seconds.
+ * @return (int) Creation timestamp in seconds.
+ * @public
+ * @since 5.9.152 (2012-03-23)
+ */
+ public function getDocCreationTimestamp() {
+ return $this->doc_creation_timestamp;
+ }
+
+ /**
+ * Returns document modification timestamp in seconds.
+ * @return (int) Modfication timestamp in seconds.
+ * @public
+ * @since 5.9.152 (2012-03-23)
+ */
+ public function getDocModificationTimestamp() {
+ return $this->doc_modification_timestamp;
+ }
+
+ /**
+ * Returns timestamp in seconds from formatted date-time.
+ * @param $date (string) Formatted date-time.
+ * @return int seconds.
+ * @public
+ * @since 5.9.152 (2012-03-23)
+ */
+ public function getTimestamp($date) {
+ if (($date[0] == 'D') AND ($date[1] == ':')) {
+ // remove date prefix if present
+ $date = substr($date, 2);
+ }
+ return strtotime($date);
+ }
+
+ /**
+ * Returns a formatted date-time.
+ * @param $time (int) Time in seconds.
+ * @return string escaped date string.
+ * @public
+ * @since 5.9.152 (2012-03-23)
+ */
+ public function getFormattedDate($time) {
+ return substr_replace(date('YmdHisO', intval($time)), '\'', (0 - 2), 0).'\'';
+ }
+
/**
* Returns a formatted date for meta information
- * @param $n (int) object ID
+ * @param $n (int) Object ID.
+ * @param $timestamp (int) Timestamp to convert.
* @return string escaped date string.
* @protected
* @since 4.6.028 (2009-08-25)
*/
- protected function _datestring($n=0) {
- $current_time = substr_replace(date('YmdHisO'), '\'', (0 - 2), 0).'\'';
- return $this->_datastring('D:'.$current_time, $n);
+ protected function _datestring($n=0, $timestamp=0) {
+ if ((empty($timestamp)) OR ($timestamp < 0)) {
+ $timestamp = $this->doc_creation_timestamp;
+ }
+ return $this->_datastring('D:'.$this->getFormattedDate($timestamp), $n);
}
/**
@@ -11488,6 +13206,19 @@ class TCPDF {
return $this->_escape($s);
}
+ /**
+ * Escape some special characters (< > &) for XML output.
+ * @param $str (string) Input string to convert.
+ * @return converted string
+ * @since 5.9.121 (2011-09-28)
+ * @protected
+ */
+ protected function _escapeXML($str) {
+ $replaceTable = array("\0" => '', '&' => '&', '<' => '<', '>' => '>');
+ $str = strtr($str, $replaceTable);
+ return $str;
+ }
+
/**
* get raw output stream.
* @param $s (string) string to output.
@@ -11618,7 +13349,7 @@ class TCPDF {
$strarr = array();
$strlen = strlen($str);
for ($i=0; $i < $strlen; ++$i) {
- $strarr[] = ord($str{$i});
+ $strarr[] = ord($str[$i]);
}
// insert new value on cache
$this->cache_UTF8StringToArray[$strkey]['s'] = $strarr;
@@ -11632,7 +13363,7 @@ class TCPDF {
$str .= ''; // force $str to be a string
$length = strlen($str);
for ($i = 0; $i < $length; ++$i) {
- $char = ord($str{$i}); // get one string character at time
+ $char = ord($str[$i]); // get one string character at time
if (count($bytes) == 0) { // get starting octect
if ($char <= 0x7F) {
$unichar = $char; // use the character "as is" because is ASCII
@@ -11952,21 +13683,58 @@ class TCPDF {
}
/**
- * Returns an array (RGB or CMYK) from an html color name or a six-digit (i.e. #3FE5AA) or three-digit (i.e. #7FF) hexadecimal color representation.
- * @param $hcolor (string) html color
+ * Returns an array (RGB or CMYK) from an html color name, or a six-digit (i.e. #3FE5AA), or three-digit (i.e. #7FF) hexadecimal color, or a javascript color array, or javascript color name.
+ * @param $hcolor (string) HTML color.
+ * @param $defcol (array) Color to return in case of error.
* @return array RGB or CMYK color, or false in case of error.
* @public
*/
- public function convertHTMLColorToDec($hcolor='#FFFFFF') {
- $returncolor = false;
+ public function convertHTMLColorToDec($hcolor='#FFFFFF', $defcol=array('R'=>128,'G'=>128,'B'=>128)) {
$color = preg_replace('/[\s]*/', '', $hcolor); // remove extra spaces
$color = strtolower($color);
- if (($dotpos = strpos($color, '.')) !== false) {
+ // check for javascript color array syntax
+ if (strpos($color, '[') !== false) {
+ if (preg_match('/[\[][\"\'](t|g|rgb|cmyk)[\"\'][\,]?([0-9\.]*)[\,]?([0-9\.]*)[\,]?([0-9\.]*)[\,]?([0-9\.]*)[\]]/', $color, $m) > 0) {
+ $returncolor = array();
+ switch ($m[1]) {
+ case 'cmyk': {
+ // RGB
+ $returncolor['C'] = max(0, min(100, (floatval($m[2]) * 100)));
+ $returncolor['M'] = max(0, min(100, (floatval($m[3]) * 100)));
+ $returncolor['Y'] = max(0, min(100, (floatval($m[4]) * 100)));
+ $returncolor['K'] = max(0, min(100, (floatval($m[5]) * 100)));
+ break;
+ }
+ case 'rgb': {
+ // RGB
+ $returncolor['R'] = max(0, min(255, (floatval($m[2]) * 255)));
+ $returncolor['G'] = max(0, min(255, (floatval($m[3]) * 255)));
+ $returncolor['B'] = max(0, min(255, (floatval($m[4]) * 255)));
+ break;
+ }
+ case 'g': {
+ // grayscale
+ $returncolor['G'] = max(0, min(255, (floatval($m[2]) * 255)));
+ break;
+ }
+ case 't':
+ default: {
+ // transparent (empty array)
+ break;
+ }
+ }
+ return $returncolor;
+ }
+ } elseif (($dotpos = strpos($color, '.')) !== false) {
// remove class parent (i.e.: color.red)
$color = substr($color, ($dotpos + 1));
+ if ($color == 'transparent') {
+ // transparent (empty array)
+ return array();
+ }
}
if (strlen($color) == 0) {
- return false;
+ return $defcol;
}
// RGB ARRAY
if (substr($color, 0, 3) == 'rgb') {
@@ -12002,28 +13770,26 @@ class TCPDF {
}
return $returncolor;
}
- // COLOR NAME
- if (substr($color, 0, 1) != '#') {
- // decode color name
+ if ($color{0} != '#') {
+ // COLOR NAME
if (isset($this->webcolor[$color])) {
// web color
$color_code = $this->webcolor[$color];
- } elseif (isset($this->spot_colors[$hcolor])) {
- // custom defined spot color
- return array($this->spot_colors[$hcolor]['c'], $this->spot_colors[$hcolor]['m'], $this->spot_colors[$hcolor]['y'], $this->spot_colors[$hcolor]['k'], $hcolor);
- } elseif (isset($this->spotcolor[$color])) {
- // spot color from configuration file
- return $this->spotcolor[$color];
} else {
- return false;
+ // spot color
+ $returncolor = $this->getSpotColor($color);
+ if ($returncolor === false) {
+ $returncolor = $defcol;
+ }
+ return $returncolor;
}
} else {
$color_code = substr($color, 1);
}
- // RGB VALUE
+ // HEXADECIMAL REPRESENTATION
switch (strlen($color_code)) {
case 3: {
- // three-digit hexadecimal representation
+ // 3-digit RGB hexadecimal representation
$r = substr($color_code, 0, 1);
$g = substr($color_code, 1, 1);
$b = substr($color_code, 2, 1);
@@ -12034,13 +13800,26 @@ class TCPDF {
break;
}
case 6: {
- // six-digit hexadecimal representation
+ // 6-digit RGB hexadecimal representation
$returncolor = array();
$returncolor['R'] = max(0, min(255, hexdec(substr($color_code, 0, 2))));
$returncolor['G'] = max(0, min(255, hexdec(substr($color_code, 2, 2))));
$returncolor['B'] = max(0, min(255, hexdec(substr($color_code, 4, 2))));
break;
}
+ case 8: {
+ // 8-digit CMYK hexadecimal representation
+ $returncolor = array();
+ $returncolor['C'] = max(0, min(100, round(hexdec(substr($color_code, 0, 2)) / 2.55)));
+ $returncolor['M'] = max(0, min(100, round(hexdec(substr($color_code, 2, 2)) / 2.55)));
+ $returncolor['Y'] = max(0, min(100, round(hexdec(substr($color_code, 4, 2)) / 2.55)));
+ $returncolor['K'] = max(0, min(100, round(hexdec(substr($color_code, 6, 2)) / 2.55)));
+ break;
+ }
+ default: {
+ $returncolor = $defcol;
+ break;
+ }
}
return $returncolor;
}
@@ -12307,7 +14086,7 @@ class TCPDF {
$j = 0;
for ($i = 0; $i < 256; ++$i) {
$t = $rc4[$i];
- $j = ($j + $t + ord($k{$i})) % 256;
+ $j = ($j + $t + ord($k[$i])) % 256;
$rc4[$i] = $rc4[$j];
$rc4[$j] = $t;
}
@@ -12327,7 +14106,7 @@ class TCPDF {
$rc4[$a] = $rc4[$b];
$rc4[$b] = $t;
$k = $rc4[($rc4[$a] + $rc4[$b]) % 256];
- $out .= chr(ord($text{$i}) ^ $k);
+ $out .= chr(ord($text[$i]) ^ $k);
}
return $out;
}
@@ -12381,7 +14160,7 @@ class TCPDF {
for ($i = 1; $i <= 19; ++$i) {
$ek = '';
for ($j = 0; $j < $len; ++$j) {
- $ek .= chr(ord($this->encryptdata['key']{$j}) ^ $i);
+ $ek .= chr(ord($this->encryptdata['key'][$j]) ^ $i);
}
$enc = $this->_RC4($ek, $enc);
}
@@ -12432,7 +14211,7 @@ class TCPDF {
for ($i = 1; $i <= 19; ++$i) {
$ek = '';
for ($j = 0; $j < $len; ++$j) {
- $ek .= chr(ord($owner_key{$j}) ^ $i);
+ $ek .= chr(ord($owner_key[$j]) ^ $i);
}
$enc = $this->_RC4($ek, $enc);
}
@@ -12557,16 +14336,16 @@ class TCPDF {
if (!$f) {
$this->Error('Unable to create temporary key file: '.$tempkeyfile);
}
- $envelope_lenght = strlen($envelope);
- fwrite($f, $envelope, $envelope_lenght);
+ $envelope_length = strlen($envelope);
+ fwrite($f, $envelope, $envelope_length);
fclose($f);
$tempencfile = tempnam(K_PATH_CACHE, 'tmpenc_');
- if (!openssl_pkcs7_encrypt($tempkeyfile, $tempencfile, $pubkey['c'], array(), PKCS7_DETACHED | PKCS7_BINARY)) {
+ if (!openssl_pkcs7_encrypt($tempkeyfile, $tempencfile, $pubkey['c'], array(), PKCS7_BINARY | PKCS7_DETACHED)) {
$this->Error('Unable to encrypt the file: '.$tempkeyfile);
}
unlink($tempkeyfile);
// read encryption signature
- $signature = file_get_contents($tempencfile, false, null, $envelope_lenght);
+ $signature = file_get_contents($tempencfile, false, null, $envelope_length);
unlink($tempencfile);
// extract signature
$signature = substr($signature, strpos($signature, 'Content-Disposition'));
@@ -12644,6 +14423,10 @@ class TCPDF {
* @author Nicola Asuni
*/
public function SetProtection($permissions=array('print', 'modify', 'copy', 'annot-forms', 'fill-forms', 'extract', 'assemble', 'print-high'), $user_pass='', $owner_pass=null, $mode=0, $pubkeys=null) {
+ if ($this->pdfa_mode) {
+ // encryption is not allowed in PDF/A mode
+ return;
+ }
$this->encryptdata['protection'] = $this->getUserPermissionCode($permissions, $mode);
if (($pubkeys !== null) AND (is_array($pubkeys))) {
// public-key mode
@@ -12740,14 +14523,14 @@ class TCPDF {
*/
protected function convertHexStringToString($bs) {
$string = ''; // string to be returned
- $bslenght = strlen($bs);
- if (($bslenght % 2) != 0) {
+ $bslength = strlen($bs);
+ if (($bslength % 2) != 0) {
// padding
$bs .= '0';
- ++$bslenght;
+ ++$bslength;
}
- for ($i = 0; $i < $bslenght; $i += 2) {
- $string .= chr(hexdec($bs{$i}.$bs{($i + 1)}));
+ for ($i = 0; $i < $bslength; $i += 2) {
+ $string .= chr(hexdec($bs[$i].$bs[($i + 1)]));
}
return $string;
}
@@ -13095,7 +14878,7 @@ class TCPDF {
* @see StartTransform(), StopTransform()
*/
protected function Transform($tm) {
- $this->_out(sprintf('%.3F %.3F %.3F %.3F %.3F %.3F cm', $tm[0], $tm[1], $tm[2], $tm[3], $tm[4], $tm[5]));
+ $this->_out(sprintf('%F %F %F %F %F %F cm', $tm[0], $tm[1], $tm[2], $tm[3], $tm[4], $tm[5]));
// add tranformation matrix
$this->transfmatrix[$this->transfmatrix_key][] = array('a' => $tm[0], 'b' => $tm[1], 'c' => $tm[2], 'd' => $tm[3], 'e' => $tm[4], 'f' => $tm[5]);
// update transformation mark
@@ -13126,7 +14909,7 @@ class TCPDF {
public function SetLineWidth($width) {
//Set line width
$this->LineWidth = $width;
- $this->linestyleWidth = sprintf('%.2F w', ($width * $this->k));
+ $this->linestyleWidth = sprintf('%F w', ($width * $this->k));
if ($this->page > 0) {
$this->_out($this->linestyleWidth);
}
@@ -13173,7 +14956,7 @@ class TCPDF {
}
if (isset($style['width'])) {
$this->LineWidth = $style['width'];
- $this->linestyleWidth = sprintf('%.2F w', ($style['width'] * $this->k));
+ $this->linestyleWidth = sprintf('%F w', ($style['width'] * $this->k));
$s .= $this->linestyleWidth.' ';
}
if (isset($style['cap'])) {
@@ -13203,13 +14986,13 @@ class TCPDF {
if ($i) {
$dash_string .= ' ';
}
- $dash_string .= sprintf('%.2F', $v);
+ $dash_string .= sprintf('%F', $v);
}
}
if (!isset($style['phase']) OR !$style['dash']) {
$style['phase'] = 0;
}
- $this->linestyleDash = sprintf('[%s] %.2F d', $dash_string, $style['phase']);
+ $this->linestyleDash = sprintf('[%s] %F d', $dash_string, $style['phase']);
$s .= $this->linestyleDash.' ';
}
if (isset($style['color'])) {
@@ -13229,7 +15012,7 @@ class TCPDF {
* @since 2.1.000 (2008-01-08)
*/
protected function _outPoint($x, $y) {
- $this->_out(sprintf('%.2F %.2F m', $x * $this->k, ($this->h - $y) * $this->k));
+ $this->_out(sprintf('%F %F m', $x * $this->k, ($this->h - $y) * $this->k));
}
/**
@@ -13241,7 +15024,7 @@ class TCPDF {
* @since 2.1.000 (2008-01-08)
*/
protected function _outLine($x, $y) {
- $this->_out(sprintf('%.2F %.2F l', $x * $this->k, ($this->h - $y) * $this->k));
+ $this->_out(sprintf('%F %F l', $x * $this->k, ($this->h - $y) * $this->k));
}
/**
@@ -13255,11 +15038,11 @@ class TCPDF {
* @since 2.1.000 (2008-01-08)
*/
protected function _outRect($x, $y, $w, $h, $op) {
- $this->_out(sprintf('%.2F %.2F %.2F %.2F re %s', $x * $this->k, ($this->h - $y) * $this->k, $w * $this->k, -$h * $this->k, $op));
+ $this->_out(sprintf('%F %F %F %F re %s', $x * $this->k, ($this->h - $y) * $this->k, $w * $this->k, -$h * $this->k, $op));
}
/**
- * Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x2, y2) as the B�zier control points.
+ * Append a cubic Bzier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x2, y2) as the Bzier control points.
* The new current point shall be (x3, y3).
* @param $x1 (float) Abscissa of control point 1.
* @param $y1 (float) Ordinate of control point 1.
@@ -13271,11 +15054,11 @@ class TCPDF {
* @since 2.1.000 (2008-01-08)
*/
protected function _outCurve($x1, $y1, $x2, $y2, $x3, $y3) {
- $this->_out(sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c', $x1 * $this->k, ($this->h - $y1) * $this->k, $x2 * $this->k, ($this->h - $y2) * $this->k, $x3 * $this->k, ($this->h - $y3) * $this->k));
+ $this->_out(sprintf('%F %F %F %F %F %F c', $x1 * $this->k, ($this->h - $y1) * $this->k, $x2 * $this->k, ($this->h - $y2) * $this->k, $x3 * $this->k, ($this->h - $y3) * $this->k));
}
/**
- * Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using the current point and (x2, y2) as the B�zier control points.
+ * Append a cubic Bzier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using the current point and (x2, y2) as the Bzier control points.
* The new current point shall be (x3, y3).
* @param $x2 (float) Abscissa of control point 2.
* @param $y2 (float) Ordinate of control point 2.
@@ -13285,11 +15068,11 @@ class TCPDF {
* @since 4.9.019 (2010-04-26)
*/
protected function _outCurveV($x2, $y2, $x3, $y3) {
- $this->_out(sprintf('%.2F %.2F %.2F %.2F v', $x2 * $this->k, ($this->h - $y2) * $this->k, $x3 * $this->k, ($this->h - $y3) * $this->k));
+ $this->_out(sprintf('%F %F %F %F v', $x2 * $this->k, ($this->h - $y2) * $this->k, $x3 * $this->k, ($this->h - $y3) * $this->k));
}
/**
- * Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x3, y3) as the B�zier control points.
+ * Append a cubic Bzier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x3, y3) as the Bzier control points.
* The new current point shall be (x3, y3).
* @param $x1 (float) Abscissa of control point 1.
* @param $y1 (float) Ordinate of control point 1.
@@ -13299,7 +15082,7 @@ class TCPDF {
* @since 2.1.000 (2008-01-08)
*/
protected function _outCurveY($x1, $y1, $x3, $y3) {
- $this->_out(sprintf('%.2F %.2F %.2F %.2F y', $x1 * $this->k, ($this->h - $y1) * $this->k, $x3 * $this->k, ($this->h - $y3) * $this->k));
+ $this->_out(sprintf('%F %F %F %F y', $x1 * $this->k, ($this->h - $y1) * $this->k, $x3 * $this->k, ($this->h - $y3) * $this->k));
}
/**
@@ -13844,7 +15627,7 @@ class TCPDF {
* @param $w (float) Width.
* @param $h (float) Height.
* @param $r (float) the radius of the circle used to round off the corners of the rectangle.
- * @param $round_corner (string) Draws rounded corner or not. String with a 0 (not rounded i-corner) or 1 (rounded i-corner) in i-position. Positions are, in order and begin to 0: top left, top right, bottom right and bottom left. Default value: all rounded corner ("1111").
+ * @param $round_corner (string) Draws rounded corner or not. String with a 0 (not rounded i-corner) or 1 (rounded i-corner) in i-position. Positions are, in order and begin to 0: top right, bottom right, bottom left and top left. Default value: all rounded corner ("1111").
* @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
* @param $border_style (array) Border style of rectangle. Array like for SetLineStyle(). Default value: default line style (empty array).
* @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K). Default value: default color (empty array).
@@ -13863,7 +15646,7 @@ class TCPDF {
* @param $h (float) Height.
* @param $rx (float) the x-axis radius of the ellipse used to round off the corners of the rectangle.
* @param $ry (float) the y-axis radius of the ellipse used to round off the corners of the rectangle.
- * @param $round_corner (string) Draws rounded corner or not. String with a 0 (not rounded i-corner) or 1 (rounded i-corner) in i-position. Positions are, in order and begin to 0: top left, top right, bottom right and bottom left. Default value: all rounded corner ("1111").
+ * @param $round_corner (string) Draws rounded corner or not. String with a 0 (not rounded i-corner) or 1 (rounded i-corner) in i-position. Positions are, in order and begin to 0: top right, bottom right, bottom left and top left. Default value: all rounded corner ("1111").
* @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
* @param $border_style (array) Border style of rectangle. Array like for SetLineStyle(). Default value: default line style (empty array).
* @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K). Default value: default color (empty array).
@@ -14605,7 +16388,7 @@ class TCPDF {
$escname = '';
$length = strlen($name);
for ($i = 0; $i < $length; ++$i) {
- $chr = $name{$i};
+ $chr = $name[$i];
if (preg_match('/[0-9a-zA-Z]/', $chr) == 1) {
$escname .= $chr;
} else {
@@ -14659,7 +16442,7 @@ class TCPDF {
/**
* Create a javascript PDF string.
* @protected
- * @author Johannes G�ntert, Nicola Asuni
+ * @author Johannes Gntert, Nicola Asuni
* @since 5.9.098 (2011-06-23)
*/
protected function _putdests() {
@@ -14669,7 +16452,7 @@ class TCPDF {
$this->n_dests = $this->_newobj();
$out = ' <<';
foreach($this->dests as $name => $o) {
- $out .= ' /'.$name.' '.sprintf('[%u 0 R /XYZ 0 %.2F null]', $this->page_obj_id[($o['p'])], ($this->pagedim[$o['p']]['h'] - ($o['y'] * $this->k)));
+ $out .= ' /'.$name.' '.sprintf('[%u 0 R /XYZ 0 %F null]', $this->page_obj_id[($o['p'])], ($this->pagedim[$o['p']]['h'] - ($o['y'] * $this->k)));
}
$out .= ' >>';
$out .= "\n".'endobj';
@@ -14727,6 +16510,23 @@ class TCPDF {
$this->outlines[] = array('t' => $txt, 'l' => $level, 'y' => $y, 'p' => $page, 's' => strtoupper($style), 'c' => $color);
}
+ /**
+ * Sort bookmarks for page and key.
+ * @protected
+ * @since 5.9.119 (2011-09-19)
+ */
+ protected function sortBookmarks() {
+ // get sorting columns
+ $outline_p = array();
+ $outline_y = array();
+ foreach ($this->outlines as $key => $row) {
+ $outline_p[$key] = $row['p'];
+ $outline_k[$key] = $key;
+ }
+ // sort outlines by page and original position
+ array_multisort($outline_p, SORT_NUMERIC, SORT_ASC, $outline_k, SORT_NUMERIC, SORT_ASC, $this->outlines);
+ }
+
/**
* Create a bookmark PDF string.
* @protected
@@ -14738,15 +16538,8 @@ class TCPDF {
if ($nb == 0) {
return;
}
- // get sorting columns
- $outline_p = array();
- $outline_y = array();
- foreach ($this->outlines as $key => $row) {
- $outline_p[$key] = $row['p'];
- $outline_k[$key] = $key;
- }
- // sort outlines by page and original position
- array_multisort($outline_p, SORT_NUMERIC, SORT_ASC, $outline_k, SORT_NUMERIC, SORT_ASC, $this->outlines);
+ // sort bookmarks
+ $this->sortBookmarks();
$lru = array();
$level = 0;
foreach ($this->outlines as $i => $o) {
@@ -14775,55 +16568,55 @@ class TCPDF {
$n = $this->n + 1;
$nltags = '/|<\/(blockquote|dd|dl|div|dt|h1|h2|h3|h4|h5|h6|hr|li|ol|p|pre|ul|tcpdf|table|tr|td)>/si';
foreach ($this->outlines as $i => $o) {
- if (isset($this->page_obj_id[($o['p'])])) {
- $oid = $this->_newobj();
- // covert HTML title to string
- $title = preg_replace($nltags, "\n", $o['t']);
- $title = preg_replace("/[\r]+/si", '', $title);
- $title = preg_replace("/[\n]+/si", "\n", $title);
- $title = strip_tags($title);
- $title = $this->stringTrim($title);
- $out = '<_textstring($title, $oid);
- $out .= ' /Parent '.($n + $o['parent']).' 0 R';
- if (isset($o['prev'])) {
- $out .= ' /Prev '.($n + $o['prev']).' 0 R';
- }
- if (isset($o['next'])) {
- $out .= ' /Next '.($n + $o['next']).' 0 R';
- }
- if (isset($o['first'])) {
- $out .= ' /First '.($n + $o['first']).' 0 R';
- }
- if (isset($o['last'])) {
- $out .= ' /Last '.($n + $o['last']).' 0 R';
- }
- $out .= ' '.sprintf('/Dest [%u 0 R /XYZ 0 %.2F null]', $this->page_obj_id[($o['p'])], ($this->pagedim[$o['p']]['h'] - ($o['y'] * $this->k)));
- // set font style
- $style = 0;
- if (!empty($o['s'])) {
- // bold
- if (strpos($o['s'], 'B') !== false) {
- $style |= 2;
- }
- // oblique
- if (strpos($o['s'], 'I') !== false) {
- $style |= 1;
- }
- }
- $out .= sprintf(' /F %d', $style);
- // set bookmark color
- if (isset($o['c']) AND is_array($o['c']) AND (count($o['c']) == 3)) {
- $color = array_values($o['c']);
- $out .= sprintf(' /C [%.3F %.3F %.3F]', ($color[0] / 255), ($color[1] / 255), ($color[2] / 255));
- } else {
- // black
- $out .= ' /C [0.0 0.0 0.0]';
- }
- $out .= ' /Count 0'; // normally closed item
- $out .= ' >>';
- $out .= "\n".'endobj';
- $this->_out($out);
+ $oid = $this->_newobj();
+ // covert HTML title to string
+ $title = preg_replace($nltags, "\n", $o['t']);
+ $title = preg_replace("/[\r]+/si", '', $title);
+ $title = preg_replace("/[\n]+/si", "\n", $title);
+ $title = strip_tags($title);
+ $title = $this->stringTrim($title);
+ $out = '<_textstring($title, $oid);
+ $out .= ' /Parent '.($n + $o['parent']).' 0 R';
+ if (isset($o['prev'])) {
+ $out .= ' /Prev '.($n + $o['prev']).' 0 R';
}
+ if (isset($o['next'])) {
+ $out .= ' /Next '.($n + $o['next']).' 0 R';
+ }
+ if (isset($o['first'])) {
+ $out .= ' /First '.($n + $o['first']).' 0 R';
+ }
+ if (isset($o['last'])) {
+ $out .= ' /Last '.($n + $o['last']).' 0 R';
+ }
+ if (isset($this->page_obj_id[($o['p'])])) {
+ $out .= ' '.sprintf('/Dest [%u 0 R /XYZ 0 %F null]', $this->page_obj_id[($o['p'])], ($this->pagedim[$o['p']]['h'] - ($o['y'] * $this->k)));
+ }
+ // set font style
+ $style = 0;
+ if (!empty($o['s'])) {
+ // bold
+ if (strpos($o['s'], 'B') !== false) {
+ $style |= 2;
+ }
+ // oblique
+ if (strpos($o['s'], 'I') !== false) {
+ $style |= 1;
+ }
+ }
+ $out .= sprintf(' /F %d', $style);
+ // set bookmark color
+ if (isset($o['c']) AND is_array($o['c']) AND (count($o['c']) == 3)) {
+ $color = array_values($o['c']);
+ $out .= sprintf(' /C [%F %F %F]', ($color[0] / 255), ($color[1] / 255), ($color[2] / 255));
+ } else {
+ // black
+ $out .= ' /C [0.0 0.0 0.0]';
+ }
+ $out .= ' /Count 0'; // normally closed item
+ $out .= ' >>';
+ $out .= "\n".'endobj';
+ $this->_out($out);
}
//Outline root
$this->OutlineRoot = $this->_newobj();
@@ -14836,7 +16629,7 @@ class TCPDF {
* Adds a javascript
* @param $script (string) Javascript code
* @public
- * @author Johannes G�ntert, Nicola Asuni
+ * @author Johannes Gntert, Nicola Asuni
* @since 2.1.002 (2008-02-12)
*/
public function IncludeJS($script) {
@@ -14853,6 +16646,10 @@ class TCPDF {
* @since 4.8.000 (2009-09-07)
*/
public function addJavascriptObject($script, $onload=false) {
+ if ($this->pdfa_mode) {
+ // javascript is not allowed in PDF/A mode
+ return false;
+ }
++$this->n;
$this->js_objects[$this->n] = array('n' => $this->n, 'js' => $script, 'onload' => $onload);
return $this->n;
@@ -14861,11 +16658,11 @@ class TCPDF {
/**
* Create a javascript PDF string.
* @protected
- * @author Johannes G�ntert, Nicola Asuni
+ * @author Johannes Gntert, Nicola Asuni
* @since 2.1.002 (2008-02-12)
*/
protected function _putjavascript() {
- if (empty($this->javascript) AND empty($this->js_objects)) {
+ if ($this->pdfa_mode OR (empty($this->javascript) AND empty($this->js_objects))) {
return;
}
if (strpos($this->javascript, 'this.addField') > 0) {
@@ -14874,7 +16671,7 @@ class TCPDF {
}
// the following two lines are used to avoid form fields duplication after saving
// The addField method only works when releasing user rights (UR3)
- $jsa = sprintf("ftcpdfdocsaved=this.addField('%s','%s',%d,[%.2F,%.2F,%.2F,%.2F]);", 'tcpdfdocsaved', 'text', 0, 0, 1, 0, 1);
+ $jsa = sprintf("ftcpdfdocsaved=this.addField('%s','%s',%d,[%F,%F,%F,%F]);", 'tcpdfdocsaved', 'text', 0, 0, 1, 0, 1);
$jsb = "getField('tcpdfdocsaved').value='saved';";
$this->javascript = $jsa."\n".$this->javascript."\n".$jsb;
}
@@ -14921,7 +16718,7 @@ class TCPDF {
protected function _JScolor($color) {
static $aColors = array('transparent', 'black', 'white', 'red', 'green', 'blue', 'cyan', 'magenta', 'yellow', 'dkGray', 'gray', 'ltGray');
if (substr($color,0,1) == '#') {
- return sprintf("['RGB',%.3F,%.3F,%.3F]", hexdec(substr($color,1,2))/255, hexdec(substr($color,3,2))/255, hexdec(substr($color,5,2))/255);
+ return sprintf("['RGB',%F,%F,%F]", hexdec(substr($color,1,2))/255, hexdec(substr($color,3,2))/255, hexdec(substr($color,5,2))/255);
}
if (!in_array($color,$aColors)) {
$this->Error('Invalid color: '.$color);
@@ -14949,7 +16746,7 @@ class TCPDF {
// the followind avoid fields duplication after saving the document
$this->javascript .= "if (getField('tcpdfdocsaved').value != 'saved') {";
$k = $this->k;
- $this->javascript .= sprintf("f".$name."=this.addField('%s','%s',%u,[%.2F,%.2F,%.2F,%.2F]);", $name, $type, $this->PageNo()-1, $x*$k, ($this->h-$y)*$k+1, ($x+$w)*$k, ($this->h-$y-$h)*$k+1)."\n";
+ $this->javascript .= sprintf("f".$name."=this.addField('%s','%s',%u,[%F,%F,%F,%F]);", $name, $type, $this->PageNo()-1, $x*$k, ($this->h-$y)*$k+1, ($x+$w)*$k, ($this->h-$y-$h)*$k+1)."\n";
$this->javascript .= 'f'.$name.'.textSize='.$this->FontSizePt.";\n";
while (list($key, $val) = each($prop)) {
if (strcmp(substr($key, -5), 'Color') == 0) {
@@ -15169,7 +16966,7 @@ class TCPDF {
$opt['maxlen'] = intval($prop['charLimit']);
}
if (!isset($ff)) {
- $ff = 0;
+ $ff = 0; // default value
}
// readonly: The read-only characteristic of a field. If a field is read-only, the user can see the field but cannot change it.
if (isset($prop['readonly']) AND ($prop['readonly'] == 'true')) {
@@ -15391,10 +17188,24 @@ class TCPDF {
$popt = $this->getAnnotOptFromJSProp($prop);
// set default appearance stream
$this->annotation_fonts[$this->CurrentFont['fontkey']] = $this->CurrentFont['i'];
- $fontstyle = sprintf('/F%d %.2F Tf %s', $this->CurrentFont['i'], $this->FontSizePt, $this->TextColor);
+ $fontstyle = sprintf('/F%d %F Tf %s', $this->CurrentFont['i'], $this->FontSizePt, $this->TextColor);
$popt['da'] = $fontstyle;
+ // build appearance stream
$popt['ap'] = array();
- $popt['ap']['n'] = 'q BT '.$fontstyle.' ET Q';
+ $popt['ap']['n'] = '/Tx BMC q '.$fontstyle.' ';
+ $text = '';
+ if (isset($prop['value']) AND !empty($prop['value'])) {
+ $text = $prop['value'];
+ } elseif (isset($opt['v']) AND !empty($opt['v'])) {
+ $text = $opt['v'];
+ }
+ $tmpid = $this->startTemplate($w, $h, false);
+ $this->MultiCell($w, $h, $text, 0, '', false, 0, 0, 0, true, 0, false, true, 0, 'T', false);
+ $this->endTemplate();
+ --$this->n;
+ $popt['ap']['n'] .= $this->xobjects[$tmpid]['outdata'];
+ unset($this->xobjects[$tmpid]);
+ $popt['ap']['n'] .= 'Q EMC';
// merge options
$opt = array_merge($popt, $opt);
// remove some conflicting options
@@ -15403,32 +17214,30 @@ class TCPDF {
$opt['Subtype'] = 'Widget';
$opt['ft'] = 'Tx';
$opt['t'] = $name;
- /*
- Additional annotation's parameters (check _putannotsobj() method):
+ // Additional annotation's parameters (check _putannotsobj() method):
//$opt['f']
- //$opt['ap']
//$opt['as']
//$opt['bs']
//$opt['be']
//$opt['c']
//$opt['border']
//$opt['h']
- //$opt['mk']
+ //$opt['mk'];
//$opt['mk']['r']
- //$opt['mk']['bc']
- //$opt['mk']['bg']
- //$opt['mk']['ca']
- //$opt['mk']['rc']
- //$opt['mk']['ac']
- //$opt['mk']['i']
- //$opt['mk']['ri']
- //$opt['mk']['ix']
- //$opt['mk']['if']
- //$opt['mk']['if']['sw']
- //$opt['mk']['if']['s']
- //$opt['mk']['if']['a']
- //$opt['mk']['if']['fb']
- //$opt['mk']['tp']
+ //$opt['mk']['bc'];
+ //$opt['mk']['bg'];
+ unset($opt['mk']['ca']);
+ unset($opt['mk']['rc']);
+ unset($opt['mk']['ac']);
+ unset($opt['mk']['i']);
+ unset($opt['mk']['ri']);
+ unset($opt['mk']['ix']);
+ unset($opt['mk']['if']);
+ //$opt['mk']['if']['sw'];
+ //$opt['mk']['if']['s'];
+ //$opt['mk']['if']['a'];
+ //$opt['mk']['if']['fb'];
+ unset($opt['mk']['tp']);
//$opt['tu']
//$opt['tm']
//$opt['ff']
@@ -15437,7 +17246,6 @@ class TCPDF {
//$opt['a']
//$opt['aa']
//$opt['q']
- */
$this->Annotation($x, $y, $w, $h, $name, $opt, 0);
if ($this->rtl) {
$this->x -= $w;
@@ -15447,16 +17255,16 @@ class TCPDF {
}
/**
- * Creates a RadioButton field
- * @param $name (string) field name
- * @param $w (int) width
- * @param $prop (array) javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
- * @param $opt (array) annotation parameters. Possible values are described on official PDF32000_2008 reference.
- * @param $onvalue (string) value to be returned if selected.
- * @param $checked (boolean) define the initial state.
+ * Creates a RadioButton field.
+ * @param $name (string) Field name.
+ * @param $w (int) Width or the radio button.
+ * @param $prop (array) Javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
+ * @param $opt (array) Annotation parameters. Possible values are described on official PDF32000_2008 reference.
+ * @param $onvalue (string) Value to be returned if selected.
+ * @param $checked (boolean) Define the initial state.
* @param $x (float) Abscissa of the upper-left corner of the rectangle
* @param $y (float) Ordinate of the upper-left corner of the rectangle
- * @param $js (boolean) if true put the field using JavaScript (requires Acrobat Writer to be rendered).
+ * @param $js (boolean) If true put the field using JavaScript (requires Acrobat Writer to be rendered).
* @public
* @author Nicola Asuni
* @since 4.8.000 (2009-09-07)
@@ -15482,6 +17290,14 @@ class TCPDF {
} else {
$defval = 'Off';
}
+ // set font
+ $font = 'zapfdingbats';
+ if ($this->pdfa_mode) {
+ // all fonts must be embedded
+ $font = 'pdfa'.$font;
+ }
+ $this->AddFont($font);
+ $tmpfont = $this->getFontBuffer($font);
// set data for parent group
if (!isset($this->radiobutton_groups[$this->page])) {
$this->radiobutton_groups[$this->page] = array();
@@ -15491,10 +17307,8 @@ class TCPDF {
++$this->n;
$this->radiobutton_groups[$this->page][$name]['n'] = $this->n;
$this->radio_groups[] = $this->n;
- $kid = ($this->n + 2);
- } else {
- $kid = ($this->n + 1);
}
+ $kid = ($this->n + 1);
// save object ID to be added on Kids entry on parent object
$this->radiobutton_groups[$this->page][$name][] = array('kid' => $kid, 'def' => $defval);
// get default style
@@ -15504,17 +17318,16 @@ class TCPDF {
$prop['borderStyle'] = 'inset';
// get annotation data
$popt = $this->getAnnotOptFromJSProp($prop);
- // set additional default values
- $font = 'zapfdingbats';
- $this->AddFont($font);
- $tmpfont = $this->getFontBuffer($font);
+ // set additional default options
$this->annotation_fonts[$tmpfont['fontkey']] = $tmpfont['i'];
- $fontstyle = sprintf('/F%d %.2F Tf %s', $tmpfont['i'], $this->FontSizePt, $this->TextColor);
+ $fontstyle = sprintf('/F%d %F Tf %s', $tmpfont['i'], $this->FontSizePt, $this->TextColor);
$popt['da'] = $fontstyle;
+ // build appearance stream
$popt['ap'] = array();
$popt['ap']['n'] = array();
- $popt['ap']['n'][$onvalue] = 'q BT '.$fontstyle.' 0 0 Td (8) Tj ET Q';
- $popt['ap']['n']['Off'] = 'q BT '.$fontstyle.' 0 0 Td (8) Tj ET Q';
+ $fy = (($w - ((($tmpfont['desc']['Ascent'] - $tmpfont['desc']['Descent']) * $this->FontSizePt / 1000) / $this->k)) * $this->k);
+ $popt['ap']['n'][$onvalue] = sprintf('q %s BT /F%d %F Tf %F %F Td ('.chr(108).') Tj ET Q', $this->TextColor, $tmpfont['i'], $this->FontSizePt, 0, $fy);
+ $popt['ap']['n']['Off'] = sprintf('q %s BT /F%d %F Tf %F %F Td ('.chr(109).') Tj ET Q', $this->TextColor, $tmpfont['i'], $this->FontSizePt, 0, $fy);
if (!isset($popt['mk'])) {
$popt['mk'] = array();
}
@@ -15530,6 +17343,11 @@ class TCPDF {
} else {
$opt['as'] = 'Off';
}
+ // store readonly flag
+ if (!isset($this->radiobutton_groups[$this->page][$name]['#readonly#'])) {
+ $this->radiobutton_groups[$this->page][$name]['#readonly#'] = false;
+ }
+ $this->radiobutton_groups[$this->page][$name]['#readonly#'] |= ($opt['f'] & 64);
$this->Annotation($x, $y, $w, $w, $name, $opt, 0);
if ($this->rtl) {
$this->x -= $w;
@@ -15566,9 +17384,13 @@ class TCPDF {
$this->_addfield('listbox', $name, $x, $y, $w, $h, $prop);
$s = '';
foreach ($values as $value) {
- $s .= "'".addslashes($value)."',";
+ if (is_array($value)) {
+ $s .= ',[\''.addslashes($value[1]).'\',\''.addslashes($value[0]).'\']';
+ } else {
+ $s .= ',[\''.addslashes($value).'\',\''.addslashes($value).'\']';
+ }
}
- $this->javascript .= 'f'.$name.'.setItems(['.substr($s, 0, -1)."]);\n";
+ $this->javascript .= 'f'.$name.'.setItems('.substr($s, 1).');'."\n";
return;
}
// get default style
@@ -15577,10 +17399,26 @@ class TCPDF {
$popt = $this->getAnnotOptFromJSProp($prop);
// set additional default values
$this->annotation_fonts[$this->CurrentFont['fontkey']] = $this->CurrentFont['i'];
- $fontstyle = sprintf('/F%d %.2F Tf %s', $this->CurrentFont['i'], $this->FontSizePt, $this->TextColor);
+ $fontstyle = sprintf('/F%d %F Tf %s', $this->CurrentFont['i'], $this->FontSizePt, $this->TextColor);
$popt['da'] = $fontstyle;
+ // build appearance stream
$popt['ap'] = array();
- $popt['ap']['n'] = 'q BT '.$fontstyle.' ET Q';
+ $popt['ap']['n'] = '/Tx BMC q '.$fontstyle.' ';
+ $text = '';
+ foreach($values as $item) {
+ if (is_array($item)) {
+ $text .= $item[1]."\n";
+ } else {
+ $text .= $item."\n";
+ }
+ }
+ $tmpid = $this->startTemplate($w, $h, false);
+ $this->MultiCell($w, $h, $text, 0, '', false, 0, 0, 0, true, 0, false, true, 0, 'T', false);
+ $this->endTemplate();
+ --$this->n;
+ $popt['ap']['n'] .= $this->xobjects[$tmpid]['outdata'];
+ unset($this->xobjects[$tmpid]);
+ $popt['ap']['n'] .= 'Q EMC';
// merge options
$opt = array_merge($popt, $opt);
// set remaining annotation data
@@ -15588,6 +17426,14 @@ class TCPDF {
$opt['ft'] = 'Ch';
$opt['t'] = $name;
$opt['opt'] = $values;
+ unset($opt['mk']['ca']);
+ unset($opt['mk']['rc']);
+ unset($opt['mk']['ac']);
+ unset($opt['mk']['i']);
+ unset($opt['mk']['ri']);
+ unset($opt['mk']['ix']);
+ unset($opt['mk']['if']);
+ unset($opt['mk']['tp']);
$this->Annotation($x, $y, $w, $h, $name, $opt, 0);
if ($this->rtl) {
$this->x -= $w;
@@ -15624,9 +17470,13 @@ class TCPDF {
$this->_addfield('combobox', $name, $x, $y, $w, $h, $prop);
$s = '';
foreach ($values as $value) {
- $s .= "'".addslashes($value)."',";
+ if (is_array($value)) {
+ $s .= ',[\''.addslashes($value[1]).'\',\''.addslashes($value[0]).'\']';
+ } else {
+ $s .= ',[\''.addslashes($value).'\',\''.addslashes($value).'\']';
+ }
}
- $this->javascript .= 'f'.$name.'.setItems(['.substr($s, 0, -1)."]);\n";
+ $this->javascript .= 'f'.$name.'.setItems('.substr($s, 1).');'."\n";
return;
}
// get default style
@@ -15636,10 +17486,26 @@ class TCPDF {
$popt = $this->getAnnotOptFromJSProp($prop);
// set additional default options
$this->annotation_fonts[$this->CurrentFont['fontkey']] = $this->CurrentFont['i'];
- $fontstyle = sprintf('/F%d %.2F Tf %s', $this->CurrentFont['i'], $this->FontSizePt, $this->TextColor);
+ $fontstyle = sprintf('/F%d %F Tf %s', $this->CurrentFont['i'], $this->FontSizePt, $this->TextColor);
$popt['da'] = $fontstyle;
+ // build appearance stream
$popt['ap'] = array();
- $popt['ap']['n'] = 'q BT '.$fontstyle.' ET Q';
+ $popt['ap']['n'] = '/Tx BMC q '.$fontstyle.' ';
+ $text = '';
+ foreach($values as $item) {
+ if (is_array($item)) {
+ $text .= $item[1]."\n";
+ } else {
+ $text .= $item."\n";
+ }
+ }
+ $tmpid = $this->startTemplate($w, $h, false);
+ $this->MultiCell($w, $h, $text, 0, '', false, 0, 0, 0, true, 0, false, true, 0, 'T', false);
+ $this->endTemplate();
+ --$this->n;
+ $popt['ap']['n'] .= $this->xobjects[$tmpid]['outdata'];
+ unset($this->xobjects[$tmpid]);
+ $popt['ap']['n'] .= 'Q EMC';
// merge options
$opt = array_merge($popt, $opt);
// set remaining annotation data
@@ -15647,6 +17513,14 @@ class TCPDF {
$opt['ft'] = 'Ch';
$opt['t'] = $name;
$opt['opt'] = $values;
+ unset($opt['mk']['ca']);
+ unset($opt['mk']['rc']);
+ unset($opt['mk']['ac']);
+ unset($opt['mk']['i']);
+ unset($opt['mk']['ri']);
+ unset($opt['mk']['ix']);
+ unset($opt['mk']['if']);
+ unset($opt['mk']['tp']);
$this->Annotation($x, $y, $w, $h, $name, $opt, 0);
if ($this->rtl) {
$this->x -= $w;
@@ -15693,24 +17567,34 @@ class TCPDF {
$popt = $this->getAnnotOptFromJSProp($prop);
// set additional default options
$font = 'zapfdingbats';
+ if ($this->pdfa_mode) {
+ // all fonts must be embedded
+ $font = 'pdfa'.$font;
+ }
$this->AddFont($font);
$tmpfont = $this->getFontBuffer($font);
$this->annotation_fonts[$tmpfont['fontkey']] = $tmpfont['i'];
- $fontstyle = sprintf('/F%d %.2F Tf %s', $tmpfont['i'], $this->FontSizePt, $this->TextColor);
+ $fontstyle = sprintf('/F%d %F Tf %s', $tmpfont['i'], $this->FontSizePt, $this->TextColor);
$popt['da'] = $fontstyle;
+ // build appearance stream
$popt['ap'] = array();
$popt['ap']['n'] = array();
- $popt['ap']['n']['Yes'] = 'q BT '.$fontstyle.' 0 0 Td (8) Tj ET Q';
- $popt['ap']['n']['Off'] = 'q BT '.$fontstyle.' 0 0 Td (8) Tj ET Q';
+ $fy = ((($tmpfont['desc']['Ascent'] + $tmpfont['desc']['Descent']) * $this->FontSizePt) / (1000 * $this->k));
+ $fy = (($w - ((($tmpfont['desc']['Ascent'] - $tmpfont['desc']['Descent']) * $this->FontSizePt / 1000) / $this->k)) * $this->k);
+ $popt['ap']['n']['Yes'] = sprintf('q %s BT /F%d %F Tf %F %F Td ('.chr(110).') Tj ET Q', $this->TextColor, $tmpfont['i'], $this->FontSizePt, 0, $fy);
+ $popt['ap']['n']['Off'] = sprintf('q %s BT /F%d %F Tf %F %F Td ('.chr(111).') Tj ET Q', $this->TextColor, $tmpfont['i'], $this->FontSizePt, 0, $fy);
// merge options
$opt = array_merge($popt, $opt);
// set remaining annotation data
$opt['Subtype'] = 'Widget';
$opt['ft'] = 'Btn';
$opt['t'] = $name;
+ if ($this->empty_string($onvalue)) {
+ $onvalue = 'Yes';
+ }
$opt['opt'] = array($onvalue);
if ($checked) {
- $opt['v'] = array('/0');
+ $opt['v'] = array('/Yes');
$opt['as'] = 'Yes';
} else {
$opt['v'] = array('/Off');
@@ -15765,10 +17649,25 @@ class TCPDF {
// get annotation data
$popt = $this->getAnnotOptFromJSProp($prop);
$this->annotation_fonts[$this->CurrentFont['fontkey']] = $this->CurrentFont['i'];
- $fontstyle = sprintf('/F%d %.2F Tf %s', $this->CurrentFont['i'], $this->FontSizePt, $this->TextColor);
+ $fontstyle = sprintf('/F%d %F Tf %s', $this->CurrentFont['i'], $this->FontSizePt, $this->TextColor);
$popt['da'] = $fontstyle;
+ // build appearance stream
$popt['ap'] = array();
- $popt['ap']['n'] = 'q BT '.$fontstyle.' ET Q';
+ $popt['ap']['n'] = '/Tx BMC q '.$fontstyle.' ';
+ $tmpid = $this->startTemplate($w, $h, false);
+ $bw = (2 / $this->k); // border width
+ $border = array(
+ 'L' => array('width' => $bw, 'cap' => 'square', 'join' => 'miter', 'dash' => 0, 'color' => array(231)),
+ 'R' => array('width' => $bw, 'cap' => 'square', 'join' => 'miter', 'dash' => 0, 'color' => array(51)),
+ 'T' => array('width' => $bw, 'cap' => 'square', 'join' => 'miter', 'dash' => 0, 'color' => array(231)),
+ 'B' => array('width' => $bw, 'cap' => 'square', 'join' => 'miter', 'dash' => 0, 'color' => array(51)));
+ $this->SetFillColor(204);
+ $this->Cell($w, $h, $caption, $border, 0, 'C', true, '', 1, false, 'T', 'M');
+ $this->endTemplate();
+ --$this->n;
+ $popt['ap']['n'] .= $this->xobjects[$tmpid]['outdata'];
+ unset($this->xobjects[$tmpid]);
+ $popt['ap']['n'] .= 'Q EMC';
// set additional default options
if (!isset($popt['mk'])) {
$popt['mk'] = array();
@@ -15955,7 +17854,7 @@ class TCPDF {
if (isset($this->signature_data['info']['ContactInfo']) AND !$this->empty_string($this->signature_data['info']['ContactInfo'])) {
$out .= ' /ContactInfo '.$this->_textstring($this->signature_data['info']['ContactInfo'], $sigobjid);
}
- $out .= ' /M '.$this->_datestring($sigobjid);
+ $out .= ' /M '.$this->_datestring($sigobjid, $this->doc_modification_timestamp);
$out .= ' >>';
$out .= "\n".'endobj';
$this->_out($out);
@@ -16051,16 +17950,50 @@ class TCPDF {
* @since 5.3.011 (2010-06-17)
*/
public function setSignatureAppearance($x=0, $y=0, $w=0, $h=0, $page=-1) {
+ $this->signature_appearance = $this->getSignatureAppearanceArray($x, $y, $w, $h, $page);
+ }
+
+ /**
+ * Add an empty digital signature appearance (a cliccable rectangle area to get signature properties)
+ * @param $x (float) Abscissa of the upper-left corner.
+ * @param $y (float) Ordinate of the upper-left corner.
+ * @param $w (float) Width of the signature area.
+ * @param $h (float) Height of the signature area.
+ * @param $page (int) option page number (if < 0 the current page is used).
+ * @public
+ * @author Nicola Asuni
+ * @since 5.9.101 (2011-07-06)
+ */
+ public function addEmptySignatureAppearance($x=0, $y=0, $w=0, $h=0, $page=-1) {
+ ++$this->n;
+ $this->empty_signature_appearance[] = array('objid' => $this->n) + $this->getSignatureAppearanceArray($x, $y, $w, $h, $page);
+ }
+
+ /**
+ * Get the array that defines the signature appearance (page and rectangle coordinates).
+ * @param $x (float) Abscissa of the upper-left corner.
+ * @param $y (float) Ordinate of the upper-left corner.
+ * @param $w (float) Width of the signature area.
+ * @param $h (float) Height of the signature area.
+ * @param $page (int) option page number (if < 0 the current page is used).
+ * @return (array) Array defining page and rectangle coordinates of signature appearance.
+ * @protected
+ * @author Nicola Asuni
+ * @since 5.9.101 (2011-07-06)
+ */
+ protected function getSignatureAppearanceArray($x=0, $y=0, $w=0, $h=0, $page=-1) {
+ $sigapp = array();
if (($page < 1) OR ($page > $this->numpages)) {
- $this->signature_appearance['page'] = $this->page;
+ $sigapp['page'] = $this->page;
} else {
- $this->signature_appearance['page'] = intval($page);
+ $sigapp['page'] = intval($page);
}
$a = $x * $this->k;
- $b = $this->pagedim[($this->signature_appearance['page'])]['h'] - (($y + $h) * $this->k);
+ $b = $this->pagedim[($sigapp['page'])]['h'] - (($y + $h) * $this->k);
$c = $w * $this->k;
$d = $h * $this->k;
- $this->signature_appearance['rect'] = sprintf('%.2F %.2F %.2F %.2F', $a, $b, $a+$c, $b+$d);
+ $sigapp['rect'] = sprintf('%F %F %F %F', $a, $b, ($a + $c), ($b + $d));
+ return $sigapp;
}
/**
@@ -16105,12 +18038,32 @@ class TCPDF {
$this->starting_page_number = max(0, intval($num));
}
+ /**
+ * Returns the string alias used right align page numbers.
+ * If the current font is unicode type, the returned string wil contain an additional open curly brace.
+ * @return string
+ * @since 5.9.099 (2011-06-27)
+ * @public
+ */
+ public function getAliasRightShift() {
+ // calculate aproximatively the ratio between widths of aliases and replacements.
+ $ref = '{'.$this->alias_right_shift.'}{'.$this->alias_tot_pages.'}{'.$this->alias_num_page.'}';
+ $rep = str_repeat(' ', $this->GetNumChars($ref));
+ $wdiff = max(1, ($this->GetStringWidth($ref) / $this->GetStringWidth($rep)));
+ $sdiff = sprintf('%F', $wdiff);
+ $alias = $this->alias_right_shift.$sdiff.'}';
+ if ($this->isUnicodeFont()) {
+ $alias = '{'.$alias;
+ }
+ return $alias;
+ }
+
/**
* Returns the string alias used for the total number of pages.
* If the current font is unicode type, the returned string is surrounded by additional curly braces.
+ * This alias will be replaced by the total number of pages in the document.
* @return string
* @since 4.0.018 (2008-08-08)
- * @see alias_tot_pages(), PageNo(), Footer()
* @public
*/
public function getAliasNbPages() {
@@ -16123,9 +18076,9 @@ class TCPDF {
/**
* Returns the string alias used for the page number.
* If the current font is unicode type, the returned string is surrounded by additional curly braces.
+ * This alias will be replaced by the page number.
* @return string
* @since 4.5.000 (2009-01-02)
- * @see alias_tot_pages(), PageNo(), Footer()
* @public
*/
public function getAliasNumPage() {
@@ -16136,9 +18089,9 @@ class TCPDF {
}
/**
- * Return the alias for the total number of pages in the current page group
+ * Return the alias for the total number of pages in the current page group.
* If the current font is unicode type, the returned string is surrounded by additional curly braces.
- * (will be replaced by the total number of pages in this group).
+ * This alias will be replaced by the total number of pages in this group.
* @return alias of the current page group
* @public
* @since 3.0.000 (2008-03-27)
@@ -16151,9 +18104,9 @@ class TCPDF {
}
/**
- * Return the alias for the page number on the current page group
+ * Return the alias for the page number on the current page group.
* If the current font is unicode type, the returned string is surrounded by additional curly braces.
- * (will be replaced by the total number of pages in this group).
+ * This alias will be replaced by the page number (relative to the belonging group).
* @return alias of the current page group
* @public
* @since 4.5.000 (2009-01-02)
@@ -16219,16 +18172,57 @@ class TCPDF {
}
/**
- * Put visibility settings.
+ * Put pdf layers.
* @protected
* @since 3.0.000 (2008-03-27)
*/
protected function _putocg() {
- if ($this->pdflayers) {
- $this->n_ocg_print = $this->_newobj();
- $this->_out('<< /Type /OCG /Name '.$this->_textstring('print', $this->n_ocg_print).' /Usage << /Print <> /View <> >> >>'."\n".'endobj');
- $this->n_ocg_view = $this->_newobj();
- $this->_out('<< /Type /OCG /Name '.$this->_textstring('view', $this->n_ocg_view).' /Usage << /Print <> /View <> >> >>'."\n".'endobj');
+ if (empty($this->pdflayers)) {
+ return;
+ }
+ foreach ($this->pdflayers as $key => $layer) {
+ $this->pdflayers[$key]['objid'] = $this->_newobj();
+ $out = '<< /Type /OCG';
+ $out .= ' /Name '.$this->_textstring($layer['name'], $this->pdflayers[$key]['objid']);
+ $out .= ' /Usage <<';
+ $out .= ' /Print <>';
+ $out .= ' /View <>';
+ $out .= ' >> >>';
+ $out .= "\n".'endobj';
+ $this->_out($out);
+ }
+ }
+
+ /**
+ * Start a new pdf layer.
+ * @param $name (string) Layer name (only a-z letters and numbers). Leave empty for automatic name.
+ * @param $print (boolean) Set to true to print this layer.
+ * @param $view (boolean) Set to true to view this layer.
+ * @public
+ * @since 5.9.102 (2011-07-13)
+ */
+ public function startLayer($name='', $print=true, $view=true) {
+ $layer = sprintf('LYR%03d', (count($this->pdflayers) + 1));
+ if (empty($name)) {
+ $name = $layer;
+ } else {
+ $name = preg_replace('/[^a-zA-Z0-9_\-]/', '', $name);
+ }
+ $this->pdflayers[] = array('layer' => $layer, 'name' => $name, 'print' => $print, 'view' => $view);
+ $this->openMarkedContent = true;
+ $this->_out('/OC /'.$layer.' BDC');
+ }
+
+ /**
+ * End the current PDF layer.
+ * @public
+ * @since 5.9.102 (2011-07-13)
+ */
+ public function endLayer() {
+ if ($this->openMarkedContent) {
+ // close existing open marked-content layer
+ $this->_out('EMC');
+ $this->openMarkedContent = false;
}
}
@@ -16236,27 +18230,20 @@ class TCPDF {
* Set the visibility of the successive elements.
* This can be useful, for instance, to put a background
* image or color that will show on screen but won't print.
- * @param $v (string) visibility mode. Legal values are: all, print, screen.
+ * @param $v (string) visibility mode. Legal values are: all, print, screen or view.
* @public
* @since 3.0.000 (2008-03-27)
*/
public function setVisibility($v) {
- if ($this->openMarkedContent) {
- // close existing open marked-content
- $this->_out('EMC');
- $this->openMarkedContent = false;
- }
+ $this->endLayer();
switch($v) {
case 'print': {
- $this->_out('/OC /OC1 BDC');
- $this->openMarkedContent = true;
- $this->pdflayers = true;
+ $this->startLayer('Print', true, false);
break;
}
+ case 'view':
case 'screen': {
- $this->_out('/OC /OC2 BDC');
- $this->openMarkedContent = true;
- $this->pdflayers = true;
+ $this->startLayer('View', false, true);
break;
}
case 'all': {
@@ -16268,7 +18255,6 @@ class TCPDF {
break;
}
}
- $this->visibility = $v;
}
/**
@@ -16279,15 +18265,27 @@ class TCPDF {
* @since 3.0.000 (2008-03-27)
*/
protected function addExtGState($parms) {
- $n = count($this->extgstates) + 1;
+ if ($this->pdfa_mode) {
+ // transparencies are not allowed in PDF/A mode
+ return;
+ }
// check if this ExtGState already exist
- for ($i = 1; $i < $n; ++$i) {
- if ($this->extgstates[$i]['parms'] == $parms) {
+ foreach ($this->extgstates as $i => $ext) {
+ if ($ext['parms'] == $parms) {
+ if ($this->inxobj) {
+ // we are inside an XObject template
+ $this->xobjects[$this->xobjid]['extgstates'][$i] = $ext;
+ }
// return reference to existing ExtGState
return $i;
}
}
- $this->extgstates[$n]['parms'] = $parms;
+ $n = (count($this->extgstates) + 1);
+ $this->extgstates[$n] = array('parms' => $parms);
+ if ($this->inxobj) {
+ // we are inside an XObject template
+ $this->xobjects[$this->xobjid]['extgstates'][$n] = $this->extgstates[$n];
+ }
return $n;
}
@@ -16298,6 +18296,10 @@ class TCPDF {
* @since 3.0.000 (2008-03-27)
*/
protected function setExtGState($gs) {
+ if ($this->pdfa_mode) {
+ // transparency is not allowed in PDF/A mode
+ return;
+ }
$this->_out(sprintf('/GS%d gs', $gs));
}
@@ -16307,13 +18309,16 @@ class TCPDF {
* @since 3.0.000 (2008-03-27)
*/
protected function _putextgstates() {
- $ne = count($this->extgstates);
- for ($i = 1; $i <= $ne; ++$i) {
+ foreach ($this->extgstates as $i => $ext) {
$this->extgstates[$i]['n'] = $this->_newobj();
$out = '<< /Type /ExtGState';
- foreach ($this->extgstates[$i]['parms'] as $k => $v) {
+ foreach ($ext['parms'] as $k => $v) {
if (is_float($v)) {
- $v = sprintf('%.2F', $v);
+ $v = sprintf('%F', $v);
+ } elseif ($v === true) {
+ $v = 'true';
+ } elseif ($v === false) {
+ $v = 'false';
}
$out .= ' /'.$k.' '.$v;
}
@@ -16323,18 +18328,87 @@ class TCPDF {
}
}
+ /**
+ * Set overprint mode for stroking (OP) and non-stroking (op) painting operations.
+ * (Check the "Entries in a Graphics State Parameter Dictionary" on PDF 32000-1:2008).
+ * @param $stroking (boolean) If true apply overprint for stroking operations.
+ * @param $nonstroking (boolean) If true apply overprint for painting operations other than stroking.
+ * @param $mode (integer) Overprint mode: (0 = each source colour component value replaces the value previously painted for the corresponding device colorant; 1 = a tint value of 0.0 for a source colour component shall leave the corresponding component of the previously painted colour unchanged).
+ * @public
+ * @since 5.9.152 (2012-03-23)
+ */
+ public function setOverprint($stroking=true, $nonstroking='', $mode=0) {
+ $stroking = $stroking ? true : false;
+ if ($this->empty_string($nonstroking)) {
+ // default value if not set
+ $nonstroking = $stroking;
+ } else {
+ $nonstroking = $nonstroking ? true : false;
+ }
+ if (($mode != 0) AND ($mode != 1)) {
+ $mode = 0;
+ }
+ $this->overprint = array('OP' => $stroking, 'op' => $nonstroking, 'OPM' => $mode);
+ $gs = $this->addExtGState($this->overprint);
+ $this->setExtGState($gs);
+ }
+
+ /**
+ * Get the overprint mode array (OP, op, OPM).
+ * (Check the "Entries in a Graphics State Parameter Dictionary" on PDF 32000-1:2008).
+ * @return array.
+ * @public
+ * @since 5.9.152 (2012-03-23)
+ */
+ public function getOverprint() {
+ return $this->overprint;
+ }
+
/**
* Set alpha for stroking (CA) and non-stroking (ca) operations.
- * @param $alpha (float) real value from 0 (transparent) to 1 (opaque)
+ * @param $stroking (float) Alpha value for stroking operations: real value from 0 (transparent) to 1 (opaque).
* @param $bm (string) blend mode, one of the following: Normal, Multiply, Screen, Overlay, Darken, Lighten, ColorDodge, ColorBurn, HardLight, SoftLight, Difference, Exclusion, Hue, Saturation, Color, Luminosity
+ * @param $nonstroking (float) Alpha value for non-stroking operations: real value from 0 (transparent) to 1 (opaque).
+ * @param $ais (boolean)
* @public
* @since 3.0.000 (2008-03-27)
*/
- public function setAlpha($alpha, $bm='Normal') {
- $gs = $this->addExtGState(array('ca' => $alpha, 'CA' => $alpha, 'BM' => '/'.$bm, 'AIS' => 'false'));
+ public function setAlpha($stroking=1, $bm='Normal', $nonstroking='', $ais=false) {
+ if ($this->pdfa_mode) {
+ // transparency is not allowed in PDF/A mode
+ return;
+ }
+ $stroking = floatval($stroking);
+ if ($this->empty_string($nonstroking)) {
+ // default value if not set
+ $nonstroking = $stroking;
+ } else {
+ $nonstroking = floatval($nonstroking);
+ }
+ if ($bm[0] == '/') {
+ // remove trailing slash
+ $bm = substr($bm, 1);
+ }
+ if (!in_array($bm, array('Normal', 'Multiply', 'Screen', 'Overlay', 'Darken', 'Lighten', 'ColorDodge', 'ColorBurn', 'HardLight', 'SoftLight', 'Difference', 'Exclusion', 'Hue', 'Saturation', 'Color', 'Luminosity'))) {
+ $bm = 'Normal';
+ }
+ $ais = $ais ? true : false;
+ $this->alpha = array('CA' => $stroking, 'ca' => $nonstroking, 'BM' => '/'.$bm, 'AIS' => $ais);
+ $gs = $this->addExtGState($this->alpha);
$this->setExtGState($gs);
}
+ /**
+ * Get the alpha mode array (CA, ca, BM, AIS).
+ * (Check the "Entries in a Graphics State Parameter Dictionary" on PDF 32000-1:2008).
+ * @return array.
+ * @public
+ * @since 5.9.152 (2012-03-23)
+ */
+ public function getAlpha() {
+ return $this->alpha;
+ }
+
/**
* Set the default JPEG compression quality (1-100)
* @param $quality (int) JPEG quality, integer between 1 and 100
@@ -16384,7 +18458,12 @@ class TCPDF {
* @since 3.1.000 (2008-06-09)
*/
public function setPDFVersion($version='1.7') {
- $this->PDFVersion = $version;
+ if ($this->pdfa_mode) {
+ // PDF/A mode
+ $this->PDFVersion = '1.4';
+ } else {
+ $this->PDFVersion = $version;
+ }
}
/**
@@ -16500,72 +18579,73 @@ class TCPDF {
}
/**
- * Paints crop mark
+ * Paints crop marks.
* @param $x (float) abscissa of the crop mark center.
* @param $y (float) ordinate of the crop mark center.
* @param $w (float) width of the crop mark.
* @param $h (float) height of the crop mark.
- * @param $type (string) type of crop mark, one sybol per type separated by comma: A = top left, B = top right, C = bottom left, D = bottom right.
+ * @param $type (string) type of crop mark, one symbol per type separated by comma: T = TOP, F = BOTTOM, L = LEFT, R = RIGHT, TL = A = TOP-LEFT, TR = B = TOP-RIGHT, BL = C = BOTTOM-LEFT, BR = D = BOTTOM-RIGHT.
* @param $color (array) crop mark color (default black).
* @author Nicola Asuni
* @since 4.9.000 (2010-03-26)
* @public
*/
- public function cropMark($x, $y, $w, $h, $type='A,B,C,D', $color=array(0,0,0)) {
+ public function cropMark($x, $y, $w, $h, $type='T,R,B,L', $color=array(0,0,0)) {
$this->SetLineStyle(array('width' => (0.5 / $this->k), 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => $color));
- $crops = explode(',', $type);
- $numcrops = count($crops); // number of crop marks to print
- $dw = $w / 4; // horizontal space to leave before the intersection point
- $dh = $h / 4; // vertical space to leave before the intersection point
+ $type = strtoupper($type);
+ $type = preg_replace('/[^A-Z\-\,]*/', '', $type);
+ // split type in single components
+ $type = str_replace('-', ',', $type);
+ $type = str_replace('TL', 'T,L', $type);
+ $type = str_replace('TR', 'T,R', $type);
+ $type = str_replace('BL', 'F,L', $type);
+ $type = str_replace('BR', 'F,R', $type);
+ $type = str_replace('A', 'T,L', $type);
+ $type = str_replace('B', 'T,R', $type);
+ $type = str_replace('T,RO', 'BO', $type);
+ $type = str_replace('C', 'F,L', $type);
+ $type = str_replace('D', 'F,R', $type);
+ $crops = explode(',', strtoupper($type));
+ // remove duplicates
+ $crops = array_unique($crops);
+ $dw = ($w / 4); // horizontal space to leave before the intersection point
+ $dh = ($h / 4); // vertical space to leave before the intersection point
foreach ($crops as $crop) {
switch ($crop) {
- case 'A': {
+ case 'T':
+ case 'TOP': {
$x1 = $x;
- $y1 = $y - $h;
+ $y1 = ($y - $h);
$x2 = $x;
- $y2 = $y - $dh;
- $x3 = $x - $w;
- $y3 = $y;
- $x4 = $x - $dw;
- $y4 = $y;
+ $y2 = ($y - $dh);
break;
}
- case 'B': {
+ case 'F':
+ case 'BOTTOM': {
$x1 = $x;
- $y1 = $y - $h;
+ $y1 = ($y + $dh);
$x2 = $x;
- $y2 = $y - $dh;
- $x3 = $x + $dw;
- $y3 = $y;
- $x4 = $x + $w;
- $y4 = $y;
+ $y2 = ($y + $h);
break;
}
- case 'C': {
- $x1 = $x - $w;
+ case 'L':
+ case 'LEFT': {
+ $x1 = ($x - $w);
$y1 = $y;
- $x2 = $x - $dw;
+ $x2 = ($x - $dw);
$y2 = $y;
- $x3 = $x;
- $y3 = $y + $dh;
- $x4 = $x;
- $y4 = $y + $h;
break;
}
- case 'D': {
- $x1 = $x + $dw;
+ case 'R':
+ case 'RIGHT': {
+ $x1 = ($x + $dw);
$y1 = $y;
- $x2 = $x + $w;
+ $x2 = ($x + $w);
$y2 = $y;
- $x3 = $x;
- $y3 = $y + $dh;
- $x4 = $x;
- $y4 = $y + $h;
break;
}
}
$this->Line($x1, $y1, $x2, $y2);
- $this->Line($x3, $y3, $x4, $y4);
}
}
@@ -16608,7 +18688,7 @@ class TCPDF {
* @param $col1 (array) first color (Grayscale, RGB or CMYK components).
* @param $col2 (array) second color (Grayscale, RGB or CMYK components).
* @param $coords (array) array of the form (x1, y1, x2, y2) which defines the gradient vector (see linear_gradient_coords.jpg). The default value is from left to right (x1=0, y1=0, x2=1, y2=0).
- * @author Andreas W�rmser, Nicola Asuni
+ * @author Andreas Wrmser, Nicola Asuni
* @since 3.1.000 (2008-06-09)
* @public
*/
@@ -16626,7 +18706,7 @@ class TCPDF {
* @param $col1 (array) first color (Grayscale, RGB or CMYK components).
* @param $col2 (array) second color (Grayscale, RGB or CMYK components).
* @param $coords (array) array of the form (fx, fy, cx, cy, r) where (fx, fy) is the starting point of the gradient with color1, (cx, cy) is the center of the circle with color2, and r is the radius of the circle (see radial_gradient_coords.jpg). (fx, fy) should be inside the circle, otherwise some areas will not be defined.
- * @author Andreas W�rmser, Nicola Asuni
+ * @author Andreas Wrmser, Nicola Asuni
* @since 3.1.000 (2008-06-09)
* @public
*/
@@ -16649,11 +18729,14 @@ class TCPDF {
* @param $coords_min (array) minimum value used by the coordinates. If a coordinate's value is smaller than this it will be cut to coords_min. default: 0
* @param $coords_max (array) maximum value used by the coordinates. If a coordinate's value is greater than this it will be cut to coords_max. default: 1
* @param $antialias (boolean) A flag indicating whether to filter the shading function to prevent aliasing artifacts.
- * @author Andreas W�rmser, Nicola Asuni
+ * @author Andreas Wrmser, Nicola Asuni
* @since 3.1.000 (2008-06-09)
* @public
*/
public function CoonsPatchMesh($x, $y, $w, $h, $col1=array(), $col2=array(), $col3=array(), $col4=array(), $coords=array(0.00,0.0,0.33,0.00,0.67,0.00,1.00,0.00,1.00,0.33,1.00,0.67,1.00,1.00,0.67,1.00,0.33,1.00,0.00,1.00,0.00,0.67,0.00,0.33), $coords_min=0, $coords_max=1, $antialias=false) {
+ if ($this->pdfa_mode) {
+ return;
+ }
$this->Clip($x, $y, $w, $h);
$n = count($this->gradients) + 1;
$this->gradients[$n] = array();
@@ -16726,6 +18809,10 @@ class TCPDF {
$this->_out('/Sh'.$n.' sh');
//restore previous Graphic State
$this->_out('Q');
+ if ($this->inxobj) {
+ // we are inside an XObject template
+ $this->xobjects[$this->xobjid]['gradients'][$n] = $this->gradients[$n];
+ }
}
/**
@@ -16734,7 +18821,7 @@ class TCPDF {
* @param $y (float) ordinate of the top left corner of the rectangle.
* @param $w (float) width of the rectangle.
* @param $h (float) height of the rectangle.
- * @author Andreas W�rmser, Nicola Asuni
+ * @author Andreas Wrmser, Nicola Asuni
* @since 3.1.000 (2008-06-09)
* @protected
*/
@@ -16745,9 +18832,9 @@ class TCPDF {
//save current Graphic State
$s = 'q';
//set clipping area
- $s .= sprintf(' %.2F %.2F %.2F %.2F re W n', $x*$this->k, ($this->h-$y)*$this->k, $w*$this->k, -$h*$this->k);
+ $s .= sprintf(' %F %F %F %F re W n', $x*$this->k, ($this->h-$y)*$this->k, $w*$this->k, -$h*$this->k);
//set up transformation matrix for gradient
- $s .= sprintf(' %.3F 0 0 %.3F %.3F %.3F cm', $w*$this->k, $h*$this->k, $x*$this->k, ($this->h-($y+$h))*$this->k);
+ $s .= sprintf(' %F 0 0 %F %F %F cm', $w*$this->k, $h*$this->k, $x*$this->k, ($this->h-($y+$h))*$this->k);
$this->_out($s);
}
@@ -16763,6 +18850,9 @@ class TCPDF {
* @public
*/
public function Gradient($type, $coords, $stops, $background=array(), $antialias=false) {
+ if ($this->pdfa_mode) {
+ return;
+ }
$n = count($this->gradients) + 1;
$this->gradients[$n] = array();
$this->gradients[$n]['type'] = $type;
@@ -16777,21 +18867,21 @@ class TCPDF {
case 4: { // CMYK
$this->gradients[$n]['colspace'] = 'DeviceCMYK';
if (!empty($background)) {
- $this->gradients[$n]['background'] = sprintf('%.3F %.3F %.3F %.3F', $bcolor[0]/100, $bcolor[1]/100, $bcolor[2]/100, $bcolor[3]/100);
+ $this->gradients[$n]['background'] = sprintf('%F %F %F %F', $bcolor[0]/100, $bcolor[1]/100, $bcolor[2]/100, $bcolor[3]/100);
}
break;
}
case 3: { // RGB
$this->gradients[$n]['colspace'] = 'DeviceRGB';
if (!empty($background)) {
- $this->gradients[$n]['background'] = sprintf('%.3F %.3F %.3F', $bcolor[0]/255, $bcolor[1]/255, $bcolor[2]/255);
+ $this->gradients[$n]['background'] = sprintf('%F %F %F', $bcolor[0]/255, $bcolor[1]/255, $bcolor[2]/255);
}
break;
}
case 1: { // Gray scale
$this->gradients[$n]['colspace'] = 'DeviceGray';
if (!empty($background)) {
- $this->gradients[$n]['background'] = sprintf('%.3F', $bcolor[0]/255);
+ $this->gradients[$n]['background'] = sprintf('%F', $bcolor[0]/255);
}
break;
}
@@ -16815,7 +18905,7 @@ class TCPDF {
}
if (isset($stop['opacity'])) {
$this->gradients[$n]['colors'][$key]['opacity'] = $stop['opacity'];
- if ($stop['opacity'] < 1) {
+ if ((!$this->pdfa_mode) AND ($stop['opacity'] < 1)) {
$this->gradients[$n]['transparency'] = true;
}
} else {
@@ -16831,15 +18921,15 @@ class TCPDF {
$color = array_values($stop['color']);
switch($numcolspace) {
case 4: { // CMYK
- $this->gradients[$n]['colors'][$key]['color'] = sprintf('%.3F %.3F %.3F %.3F', $color[0]/100, $color[1]/100, $color[2]/100, $color[3]/100);
+ $this->gradients[$n]['colors'][$key]['color'] = sprintf('%F %F %F %F', $color[0]/100, $color[1]/100, $color[2]/100, $color[3]/100);
break;
}
case 3: { // RGB
- $this->gradients[$n]['colors'][$key]['color'] = sprintf('%.3F %.3F %.3F', $color[0]/255, $color[1]/255, $color[2]/255);
+ $this->gradients[$n]['colors'][$key]['color'] = sprintf('%F %F %F', $color[0]/255, $color[1]/255, $color[2]/255);
break;
}
case 1: { // Gray scale
- $this->gradients[$n]['colors'][$key]['color'] = sprintf('%.3F', $color[0]/255);
+ $this->gradients[$n]['colors'][$key]['color'] = sprintf('%F', $color[0]/255);
break;
}
}
@@ -16852,6 +18942,10 @@ class TCPDF {
$this->_out('/Sh'.$n.' sh');
//restore previous Graphic State
$this->_out('Q');
+ if ($this->inxobj) {
+ // we are inside an XObject template
+ $this->xobjects[$this->xobjid]['gradients'][$n] = $this->gradients[$n];
+ }
}
/**
@@ -16861,6 +18955,9 @@ class TCPDF {
* @protected
*/
function _putshaders() {
+ if ($this->pdfa_mode) {
+ return;
+ }
$idt = count($this->gradients); //index for transparency gradients
foreach ($this->gradients as $id => $grad) {
if (($grad['type'] == 2) OR ($grad['type'] == 3)) {
@@ -16877,7 +18974,7 @@ class TCPDF {
for ($i = 1; $i < $num_cols; ++$i) {
$functions .= ($fc + $i).' 0 R ';
if ($i < $lastcols) {
- $bounds .= sprintf('%.3F ', $grad['colors'][$i]['offset']);
+ $bounds .= sprintf('%F ', $grad['colors'][$i]['offset']);
}
$encode .= '0 1 ';
}
@@ -16946,7 +19043,7 @@ class TCPDF {
$out .= ' /AntiAlias true';
}
if ($grad['type'] == 2) {
- $out .= ' '.sprintf('/Coords [%.3F %.3F %.3F %.3F]', $grad['coords'][0], $grad['coords'][1], $grad['coords'][2], $grad['coords'][3]);
+ $out .= ' '.sprintf('/Coords [%F %F %F %F]', $grad['coords'][0], $grad['coords'][1], $grad['coords'][2], $grad['coords'][3]);
$out .= ' /Domain [0 1]';
$out .= ' /Function '.$fc.' 0 R';
$out .= ' /Extend [true true]';
@@ -16954,7 +19051,7 @@ class TCPDF {
} elseif ($grad['type'] == 3) {
//x0, y0, r0, x1, y1, r1
//at this this time radius of inner circle is 0
- $out .= ' '.sprintf('/Coords [%.3F %.3F 0 %.3F %.3F %.3F]', $grad['coords'][0], $grad['coords'][1], $grad['coords'][2], $grad['coords'][3], $grad['coords'][4]);
+ $out .= ' '.sprintf('/Coords [%F %F 0 %F %F %F]', $grad['coords'][0], $grad['coords'][1], $grad['coords'][2], $grad['coords'][3], $grad['coords'][4]);
$out .= ' /Domain [0 1]';
$out .= ' /Function '.$fc.' 0 R';
$out .= ' /Extend [true true]';
@@ -17010,7 +19107,7 @@ class TCPDF {
$stream = $this->_getrawstream($stream);
$out = '<< /Type /XObject /Subtype /Form /FormType 1'.$filter;
$out .= ' /Length '.strlen($stream);
- $rect = sprintf('%.2F %.2F', $this->wPt, $this->hPt);
+ $rect = sprintf('%F %F', $this->wPt, $this->hPt);
$out .= ' /BBox [0 0 '.$rect.']';
$out .= ' /Group << /Type /Group /S /Transparency /CS /DeviceGray >>';
$out .= ' /Resources <<';
@@ -17227,10 +19324,10 @@ class TCPDF {
// save the current graphic state
$this->_out('q'.$this->epsmarker);
// translate
- $this->_out(sprintf('%.3F %.3F %.3F %.3F %.3F %.3F cm', 1, 0, 0, 1, $dx, $dy + ($this->hPt - (2 * $y * $k) - ($y2 - $y1))));
+ $this->_out(sprintf('%F %F %F %F %F %F cm', 1, 0, 0, 1, $dx, $dy + ($this->hPt - (2 * $y * $k) - ($y2 - $y1))));
// scale
if (isset($scale_x)) {
- $this->_out(sprintf('%.3F %.3F %.3F %.3F %.3F %.3F cm', $scale_x, 0, 0, $scale_y, $x1 * (1 - $scale_x), $y2 * (1 - $scale_y)));
+ $this->_out(sprintf('%F %F %F %F %F %F cm', $scale_x, 0, 0, $scale_y, $x1 * (1 - $scale_x), $y2 * (1 - $scale_y)));
}
// handle pc/unix/mac line endings
$lines = preg_split('/[\r\n]+/si', $data, -1, PREG_SPLIT_NO_EMPTY);
@@ -17315,7 +19412,7 @@ class TCPDF {
// Spot Color (CMYK + tint)
list($col_c, $col_m, $col_y, $col_k, $col_t) = $chunks;
$this->AddSpotColor($color_name, ($col_c * 100), ($col_m * 100), ($col_y * 100), ($col_k * 100));
- $color_cmd = sprintf('/CS%d cs %.3F scn', $this->spot_colors[$color_name]['i'], (1 - $col_t));
+ $color_cmd = sprintf('/CS%d cs %F scn', $this->spot_colors[$color_name]['i'], (1 - $col_t));
$this->_out($color_cmd);
}
break;
@@ -17329,7 +19426,7 @@ class TCPDF {
// Spot Color (CMYK + tint)
list($col_c, $col_m, $col_y, $col_k, $col_t) = $chunks;
$this->AddSpotColor($color_name, ($col_c * 100), ($col_m * 100), ($col_y * 100), ($col_k * 100));
- $color_cmd = sprintf('/CS%d CS %.3F SCN', $this->spot_colors[$color_name]['i'], (1 - $col_t));
+ $color_cmd = sprintf('/CS%d CS %F SCN', $this->spot_colors[$color_name]['i'], (1 - $col_t));
$this->_out($color_cmd);
}
break;
@@ -17342,7 +19439,7 @@ class TCPDF {
if ($skip) {
break;
}
- $line{$len-1} = strtolower($cmd);
+ $line[($len - 1)] = strtolower($cmd);
$this->_out($line);
break;
}
@@ -17727,7 +19824,7 @@ class TCPDF {
$this->y = $y + $vpadding + $barh;
$cellpadding = $this->cell_padding;
$this->SetCellPadding(0);
- $this->Cell($txtwidth, '', $label, 0, 0, 'C', 0, '', $style['stretchtext'], false, 'T', 'T');
+ $this->Cell($txtwidth, '', $label, 0, 0, 'C', false, '', $style['stretchtext'], false, 'T', 'T');
$this->cell_padding = $cellpadding;
}
// restore original direction
@@ -17884,6 +19981,8 @@ class TCPDF {
} elseif ($style['vpadding'] === 'auto') {
$style['vpadding'] = 4;
}
+ $hpad = (2 * $style['hpadding']);
+ $vpad = (2 * $style['vpadding']);
// cell (module) dimension
if (!isset($style['module_width'])) {
$style['module_width'] = 1; // width of a single module in points
@@ -17912,8 +20011,8 @@ class TCPDF {
$maxw = $this->w - $this->rMargin - $x;
}
$maxh = ($this->h - $this->tMargin - $this->bMargin);
- $ratioHW = ($rows * $mh) / ($cols * $mw);
- $ratioWH = ($cols * $mw) / ($rows * $mh);
+ $ratioHW = ((($rows * $mh) + $hpad) / (($cols * $mw) + $vpad));
+ $ratioWH = ((($cols * $mw) + $vpad) / (($rows * $mh) + $hpad));
if (!$distort) {
if (($maxw * $ratioHW) > $maxh) {
$maxw = $maxh * $ratioWH;
@@ -17929,8 +20028,6 @@ class TCPDF {
if ($h > $maxh) {
$h = $maxh;
}
- $hpad = (2 * $style['hpadding']);
- $vpad = (2 * $style['vpadding']);
// set dimensions
if ((($w === '') OR ($w <= 0)) AND (($h === '') OR ($h <= 0))) {
$w = ($cols + $hpad) * ($mw / $this->k);
@@ -18142,7 +20239,7 @@ class TCPDF {
/**
* Cleanup HTML code (requires HTML Tidy library).
- * @param $form (string) htmlcode to fix
+ * @param $html (string) htmlcode to fix
* @param $default_css (string) CSS commands to add
* @param $tagvs (array) parameters for setHtmlVSpace method
* @param $tidy_options (array) options for tidy_parse_string function
@@ -18152,7 +20249,7 @@ class TCPDF {
* @since 5.9.017 (2010-11-16)
* @see setHtmlVSpace()
*/
- public function fixHTMLCode($form, $default_css='', $tagvs='', $tidy_options='') {
+ public function fixHTMLCode($html, $default_css='', $tagvs='', $tidy_options='') {
// configure parameters for HTML Tidy
if ($tidy_options === '') {
$tidy_options = array (
@@ -18175,7 +20272,7 @@ class TCPDF {
);
}
// clean up the HTML code
- $tidy = tidy_parse_string($form, $tidy_options);
+ $tidy = tidy_parse_string($html, $tidy_options);
// fix the HTML
$tidy->cleanRepair();
// get the CSS part
@@ -18195,18 +20292,18 @@ class TCPDF {
$css = '';
// get the body part
$tidy_body = tidy_get_body($tidy);
- $form = $tidy_body->value;
+ $html = $tidy_body->value;
// fix some self-closing tags
- $form = str_replace(' ', ' ', $form);
+ $html = str_replace(' ', ' ', $html);
// remove some empty tag blocks
- $form = preg_replace('/]*)><\/div>/', '', $form);
- $form = preg_replace('/]*)><\/p>/', '', $form);
+ $html = preg_replace('/]*)><\/div>/', '', $html);
+ $html = preg_replace('/]*)><\/p>/', '', $html);
if ($tagvs !== '') {
// set vertical space for some XHTML tags
$this->setHtmlVSpace($tagvs);
}
// return the cleaned XHTML code + CSS
- return $css.$form;
+ return $css.$html;
}
/**
@@ -18230,19 +20327,19 @@ class TCPDF {
// remove empty blocks
$cssdata = preg_replace('/([^\}\{]+)\{\}/', '', $cssdata);
// replace media type parenthesis
- $cssdata = preg_replace('/@media[\s]+([^\{]*)\{/i', '@media \\1�', $cssdata);
- $cssdata = preg_replace('/\}\}/si', '}�', $cssdata);
+ $cssdata = preg_replace('/@media[\s]+([^\{]*)\{/i', '@media \\1', $cssdata);
+ $cssdata = preg_replace('/\}\}/si', '}', $cssdata);
// trim string
$cssdata = trim($cssdata);
// find media blocks (all, braille, embossed, handheld, print, projection, screen, speech, tty, tv)
$cssblocks = array();
$matches = array();
- if (preg_match_all('/@media[\s]+([^\�]*)�([^�]*)�/i', $cssdata, $matches) > 0) {
+ if (preg_match_all('/@media[\s]+([^\]*)([^]*)/i', $cssdata, $matches) > 0) {
foreach ($matches[1] as $key => $type) {
$cssblocks[$type] = $matches[2][$key];
}
// remove media blocks
- $cssdata = preg_replace('/@media[\s]+([^\�]*)�([^�]*)�/i', '', $cssdata);
+ $cssdata = preg_replace('/@media[\s]+([^\]*)([^]*)/i', '', $cssdata);
}
// keep 'all' and 'print' media, other media types are discarded
if (isset($cssblocks['all']) AND !empty($cssblocks['all'])) {
@@ -18890,25 +20987,25 @@ class TCPDF {
/**
* Returns the HTML DOM array.
- * @param $form (string) html code
+ * @param $html (string) html code
* @return array
* @protected
* @since 3.2.000 (2008-06-20)
*/
- protected function getHtmlDomArray($form) {
+ protected function getHtmlDomArray($html) {
// array of CSS styles ( selector => properties).
$css = array();
// get CSS array defined at previous call
$matches = array();
- if (preg_match_all('/([^\<]*)<\/cssarray>/isU', $form, $matches) > 0) {
+ if (preg_match_all('/([^\<]*)<\/cssarray>/isU', $html, $matches) > 0) {
if (isset($matches[1][0])) {
$css = array_merge($css, unserialize($this->unhtmlentities($matches[1][0])));
}
- $form = preg_replace('/(.*?)<\/cssarray>/isU', '', $form);
+ $html = preg_replace('/(.*?)<\/cssarray>/isU', '', $html);
}
// extract external CSS files
$matches = array();
- if (preg_match_all('/]*)>/isU', $form, $matches) > 0) {
+ if (preg_match_all('/]*)>/isU', $html, $matches) > 0) {
foreach ($matches[1] as $key => $link) {
$type = array();
if (preg_match('/type[\s]*=[\s]*"text\/css"/', $link, $type)) {
@@ -18929,7 +21026,7 @@ class TCPDF {
}
// extract style tags
$matches = array();
- if (preg_match_all('/]*)>([^\<]*)<\/style>/isU', $form, $matches) > 0) {
+ if (preg_match_all('/]*)>([^\<]*)<\/style>/isU', $html, $matches) > 0) {
foreach ($matches[1] as $key => $media) {
$type = array();
preg_match('/media[\s]*=[\s]*"([^"]*)"/', $media, $type);
@@ -18944,93 +21041,95 @@ class TCPDF {
// create a special tag to contain the CSS array (used for table content)
$csstagarray = ''.htmlentities(serialize($css)).'';
// remove head and style blocks
- $form = preg_replace('/]*)>(.*?)<\/head>/siU', '', $form);
- $form = preg_replace('/]*)>([^\<]*)<\/style>/isU', '', $form);
+ $html = preg_replace('/]*)>(.*?)<\/head>/siU', '', $html);
+ $html = preg_replace('/]*)>([^\<]*)<\/style>/isU', '', $html);
// define block tags
$blocktags = array('blockquote','br','dd','dl','div','dt','h1','h2','h3','h4','h5','h6','hr','li','ol','p','pre','ul','tcpdf','table','tr','td');
// define self-closing tags
$selfclosingtags = array('area','base','basefont','br','hr','input','img','link','meta');
// remove all unsupported tags (the line below lists all supported tags)
- $form = strip_tags($form, '