From 0ba557162e577ef8648764e26d2ee70eb94354f9 Mon Sep 17 00:00:00 2001
From: Rod Roark <rod@sunsetsystems.com>
Date: Fri, 5 Oct 2012 09:42:40 -0700
Subject: [PATCH] Some assorted fixes for html2pdf (converted line endings) and
 the patient report.

---
 interface/patient_file/report/custom_report.php    |     1 +
 interface/super/edit_globals.php                   |     5 +-
 interface/themes/style_pdf.css                     |    22 +-
 library/html2pdf/_LGPL.txt                         |   330 +-
 library/html2pdf/_changelog.txt                    |   432 +-
 library/html2pdf/_fpdf/FAQ.htm                     |   682 +-
 library/html2pdf/_fpdf/doc/read_me.txt             |     4 +-
 library/html2pdf/_fpdf/font/courier.php            |    14 +-
 library/html2pdf/_fpdf/font/helvetica.php          |    30 +-
 library/html2pdf/_fpdf/font/helveticab.php         |    30 +-
 library/html2pdf/_fpdf/font/helveticabi.php        |    30 +-
 library/html2pdf/_fpdf/font/helveticai.php         |    30 +-
 library/html2pdf/_fpdf/font/makefont/makefont.php  |   838 +-
 library/html2pdf/_fpdf/font/symbol.php             |    30 +-
 library/html2pdf/_fpdf/font/times.php              |    30 +-
 library/html2pdf/_fpdf/font/timesb.php             |    30 +-
 library/html2pdf/_fpdf/font/timesbi.php            |    30 +-
 library/html2pdf/_fpdf/font/timesi.php             |    30 +-
 library/html2pdf/_fpdf/font/zapfdingbats.php       |    30 +-
 library/html2pdf/_fpdf/fpdf.php                    |  3464 +++---
 library/html2pdf/_fpdf/histo.htm                   |   256 +-
 library/html2pdf/_fpdf/install.txt                 |    52 +-
 library/html2pdf/_fpdf/license.txt                 |    10 +-
 library/html2pdf/_fpdf/tutorial/read_me.txt        |     4 +-
 library/html2pdf/_lisez_moi.txt                    |   216 +-
 library/html2pdf/_mypdf/00_fpdf_codebar.class.php  |   496 +-
 .../html2pdf/_mypdf/99_fpdf_protection.class.php   |   456 +-
 library/html2pdf/_mypdf/htmlcolors.php             |   420 +-
 library/html2pdf/_mypdf/mypdf.class.php            |  1900 +--
 library/html2pdf/_read_me.txt                      |   212 +-
 .../html2pdf/fpdi/filters/FilterASCII85_FPDI.php   |    64 +-
 library/html2pdf/fpdi/filters/FilterLZW_FPDI.php   |    64 +-
 library/html2pdf/fpdi/fpdf_tpl.php                 |   898 +-
 library/html2pdf/fpdi/fpdi.php                     |  1140 +-
 library/html2pdf/fpdi/fpdi_pdf_parser.php          |   814 +-
 library/html2pdf/fpdi/pdf_context.php              |   206 +-
 library/html2pdf/fpdi/pdf_parser.php               |  1438 +--
 library/html2pdf/html2pdf.class.php                | 12218 +++++++++----------
 library/html2pdf/langues/ca.txt                    |    42 +-
 library/html2pdf/langues/cs.txt                    |    42 +-
 library/html2pdf/langues/da.txt                    |    42 +-
 library/html2pdf/langues/de.txt                    |    42 +-
 library/html2pdf/langues/en.txt                    |    42 +-
 library/html2pdf/langues/es.txt                    |    42 +-
 library/html2pdf/langues/fr.txt                    |    42 +-
 library/html2pdf/langues/it.txt                    |    42 +-
 library/html2pdf/langues/nl.txt                    |    42 +-
 library/html2pdf/langues/pt.txt                    |    42 +-
 library/html2pdf/langues/tr.txt                    |    42 +-
 library/html2pdf/parsingHTML.class.php             |   924 +-
 library/html2pdf/styleHTML.class.php               |  3148 ++---
 51 files changed, 15749 insertions(+), 15741 deletions(-)

diff --git a/interface/patient_file/report/custom_report.php b/interface/patient_file/report/custom_report.php
index effcf2ba9..52765eb2f 100644
--- a/interface/patient_file/report/custom_report.php
+++ b/interface/patient_file/report/custom_report.php
@@ -167,6 +167,7 @@ while($result = sqlFetchArray($inclookupres)) {
 // For each form field from patient_report.php...
 //
 foreach ($ar as $key => $val) {
+    if ($key == 'pdf') continue;
 
     // These are the top checkboxes (demographics, allergies, etc.).
     //
diff --git a/interface/super/edit_globals.php b/interface/super/edit_globals.php
index b694ce495..62aa5f2f1 100644
--- a/interface/super/edit_globals.php
+++ b/interface/super/edit_globals.php
@@ -348,7 +348,10 @@ foreach ($GLOBALS_METADATA as $grpname => $grparr) {
           // Only show files that contain style_ as options
           //  Skip style_blue.css since this is used for
           //  lone scripts such as setup.php
-          if (!preg_match("/^style_.*\.css$/", $tfname) || $tfname == 'style_blue.css') { continue; }
+          //  Also skip style_pdf.css which is for PDFs and not screen output
+          if (!preg_match("/^style_.*\.css$/", $tfname) ||
+            $tfname == 'style_blue.css' || $tfname == 'style_pdf.css')
+            continue;
           echo "<option value='$tfname'";
           if ($tfname == $fldvalue) echo " selected";
           echo ">";
diff --git a/interface/themes/style_pdf.css b/interface/themes/style_pdf.css
index 11c546df7..e8b5f5813 100644
--- a/interface/themes/style_pdf.css
+++ b/interface/themes/style_pdf.css
@@ -1,9 +1,3 @@
-body {
-    margin: 0px 0px 0px 2px;
-    font-family: Arial; 
-    font-size: 1em;
-}
-
 a {
   color: #0000cc;
   text-decoration: none;
@@ -272,21 +266,24 @@ font-weight: bold;
 #DEM .groupname {
     font-weight: bold;
     color: #080;
-    font-size: 0.8em;
+    font-size: 9pt;
     padding-right: 5px;
     vertical-align: top;
+    width: 12%;
 }
 #DEM .label {
     font-weight: bold;
-    font-size: 0.8em;
+    font-size: 9pt;
     vertical-align: top;
     text-align: right;
+    width: 22%;
 }
 #DEM .data {
-    font-size: 0.8em;
+    font-size: 9pt;
     vertical-align: top;
     text-align: left;
     padding-right: 6px;/*30px - ie 6 fix*/
+    width: 22%;
 }
 
 /* Patient History */
@@ -298,17 +295,20 @@ font-weight: bold;
     padding-right: 1px;
     vertical-align: top;
     height: 2em;
+    width: 12%;
 }
 #HIS .label {
     font-weight: bold;
     font-size: 9pt;
     vertical-align: top;
+    width: 22%;
 }
 #HIS .data {
     font-size: 9pt;
     vertical-align: top;
     text-align: left;
     padding-right: 10px;
+    width: 22%;
 }
 
 
@@ -513,6 +513,10 @@ font-weight: bold;
     width:100%;
 }
 
+#report_custom table {
+    width:100%;
+}
+
 #report_custom hr {
     border: 2px dotted black;
 }
diff --git a/library/html2pdf/_LGPL.txt b/library/html2pdf/_LGPL.txt
index e8bec28df..cca7fc278 100644
--- a/library/html2pdf/_LGPL.txt
+++ b/library/html2pdf/_LGPL.txt
@@ -1,165 +1,165 @@
-		   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
+		   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/library/html2pdf/_changelog.txt b/library/html2pdf/_changelog.txt
index 4a9cd30f8..3adf77b41 100644
--- a/library/html2pdf/_changelog.txt
+++ b/library/html2pdf/_changelog.txt
@@ -1,217 +1,217 @@
-3.31 (2001-05-21)
-	problème de compatibilité avec FPDF corrigé
-	
-3.30 / 4.01 (2001-05-07)
-	correction sur la gestion des textes
-	correction sur le parseur HTML
-	correction sur la gestion de border-collapse
-	correction sur la gestion des TDs, H1->H6
-	ajout des balises fieldset et legend (cf exemple 4)
-	ajout de la langue CS
-	nombreuses améliorations
-	v4.01 uniquement : Utilisation de TCPDF 5.0.002
-	v4.01 uniquement : Utilisation des QR-code de TCPDF, il n'y a plus besoin d'une librairie externe
-	v4.01 uniquement : Utilisation des exceptions PHP pour les erreurs. Tous les exemples ont été mis à jour en consequence
-	(merci à Pavel Kochman pour ses sugestions et ses ajouts)
-	
-3.29 / 4.00 (2010-03-17)
-	modification des barcodes. ATTENTION : bar_w et bar_h n'existent plus !
-	correction sur la gestion de page_footer
-	correction sur la gestion des html entities
-	correction sur le positionnement des textes
-	correction sur le positionnement des tableaux
-	nombreuses corrections sur les positionnements, les couleurs, ...
-	amélioration de la partie SVG (balise G, ...)
-	amélioration sur createIndex
-	harmonisation des noms des méthodes
-	correction sur la gestion des textes
-	v4.00 uniquement : HTML2PDF est maintenant écrit en PHP5 et basé sur TCPDF (=> unicode, utf8, ...)
-	v4.00 uniquement : utilisation de TCPDF pour les formulaires et les barcodes
-	v4.00 uniquement : amélioration de la partie SVG (alpha)
-	
-3.28 (2010-01-18)
-	ajout de la gestion de la balise label
-	correction pour compatibilité PHP4
-	
-3.27 (2010-01-11)
-	correction sur page_header et page_footer
-	ajout de la possibilité de pouvoir mettre l'index automatique dans la page que l'on veut
-	correction sur la gestion du canal alpha pour les PNGs
-	correction sur la gestion des border-radius (cf exemple radius) conforme au CSS3
-	correction sur la gestion du background-color
-	correction sur la gestion de thead, tfoot, et tbody
-	ajout du dessin verctoriel (cf exemples draw, tigre, sapin)
-	ajout de la propriété label="none/label" pour la balise <barcode>
-	nombreux petits correctifs
-	
-3.26 (2009-11-16)
-	correction pour support des images générés en CGI
-	ajout de la gestion du canal alpha pour les PNGs (nécessite GD2)
-	ajout de la méthode setDefaultFont permettant de spécifier une fonte par défaut
-	ajout de la propriété format pour la balise <page> (cf exemple 4)
-	amélioration de la gestion des couleurs css RGB (cf exemple 2)
-	ajout de la gestion des couleurs css CMYK (cf exemple 2)
-	ajout de la propriété css overflow:hidden pour la balise <div> (cf exemple 2)
-	correction sur page_header et page_footer
-	ajout de la possibilité de pouvoir directement convertir le résultat d'une vraie page HTML
-	nombreux petits correctifs sur les styles
-	
-3.25 (2009-10-07)
-	correctif sur le calcul des tableaux dans le page_footer
-	correctif sur l'interprétation des espaces entre certaines balises
-	correction sur la gestion des balises H1, H2, H3, H4, H5, H6
-	correction sur la gestion de la balise table
-	support des balises xhtml du type <span />
-	ajout des balises COL (cf exemple 5), DEL, INS, et QRCODE (cf exemple 13)
-	ajout de la propriété css text-transform
-	ajout de la propriété css rotate (uniquement sur les DIV, cf exemple 8)
-	ne plus rendre obligatoire l'existence d'une image (nouvelle méthode setTestIsImage)
-	ajout d'un mode DEBUG - les anciennes fonction d'analyse des ressources ont été supprimées
-	ajout de la méthode setEncoding
-	ajout de la langue danoise DA (merci à Daniel K.)
-	
-3.24 (2009-08-05)
-	correction sur le calcul de la largeur des divs
-	modification pour compatibilité avec la localisation PHP
-	modification pour compatibilité avec PHP 5.3.0
-	
-3.23 (2009-07-30)
-	correction sur le calcul des DIVs
-	correction sur l'interpretation de certains styles CSS
-	correction de la fonction de creation d'index automatique CreateIndex
-	ATTENTION : la methode d'appel de CreateIndex a changé. Regardez l'exemple About !!!!
-	
-3.22a (2009-06-16)
-	redistribution de HTML2PDF sous la licence LGPL !!! (au lieu de GPL)
-	
-3.22 (2009-06-08)
-	correction sur le background-color
-	refonte totale de la gestion de text-align. les valeurs center et right marchent maintenant meme en cas de contenu riche
-	
-3.21 (2009-05-05)
-	ajout de la propriété css FLOAT pour la balise IMG
-	correction sur la gestion des TFOOT
-	correction sur le positionnement des images
-	
-3.20 (2009-04-06)
-	ajout de la gestion des margins pour la balise DIV
-	ajout de la gestion de la propriete css LINE-HEIGHT
-	correction sur l'interpretation de la valeur de certains styles CSS (background-image, background-position, ...)
-	correction sur la reconnaissance des balises thead et tfoot
-	correction sur la balise select
-	correction sur les fichiers de langue (merci à Sinan)
-	
-3.19 (2009-03-11)
-	optimisation du parseur HTML - merci à Jezelinside
-	ajout de la balise TFOOT
-	amélioration de la gestion des tableaux : les contenus des balises THEAD et TFOOT sont maintenant répétés sur chaque page.
-	ajout de la balise spécifique BOOKMARK afin de créer des "marques-page"
-	possibilité de rajouter un index automatique en fin de fichier
-	ajout de la langue turque TR (merci à Hidayet)
-	amélioration de la méthode Output. Elle est maintenant également utilisable comme celle de FPDF
-	
-3.18 (2009-02-22)
-	correction sur les sauts de page automatique pour les balises TABLE, UL, OL
-	correction sur l'interpretation des styles pour la balise HR
-	correction sur l'interpretation du style border-collapse pour la balise TABLE
-	prise en compte de margin:auto pour les tables et les divs
-	les commentaires dans les CSS sont acceptés
-	
-3.17 (2008-12-30)
-	ajout de la gestion des balises INPUT (text, radio, checkbox, button, hidden, ...), SELECT, OPTION, TEXTAREA (cf exemple 14)
-	ajout de la possibilité de mettre des scripts dans le pdf, via $html2pdf->pdf->IncludeJS(...); (cf exemples JS)
-	correction sur le saut de page automatique pour les images
-	correction sur les sauts de lignes automatiques pour certaines balises (UL, P, ...)
-	ajout de la langue NL (merci à Roland)
-	
-3.16 (2008-12-09)
-	ajout de la gestion de list-style: none (cf exemple 13)
-	correction dans la gestion des fontes ajoutées à fpdf (via la méthode AddFont)
-	nombreuses corrections sur le calcul des largeurs des éléments table, div, hr, td, th
-	ajout de l'exemple about.php
-	(pour info, les PDF générés à partir des exemples sont maintenant dans le répertoire /exemples/pdf/, et sont supprimables)
-	
-3.15 (2008-12-01)
-	correction sur l'identification des styles en cas de valeurs multiples dans la propriete class
-	prise en compte de border-radius pour la limite des backgrounds (color et image)
-	ajout des proprietes CSS border-top-*, border-right-*, border-bottom-*, border-left-*
-	ajout de la propriété CSS list-style-image (cf exemple 12)
-	pour la balise table, ajout de l'interprétation de align="center" et align="right" (cf exemple 1)
-	correction dans le positionnement des images
-	correction de quelques bugs
-	ajout d'une fonction d'analyse des ressources HTML2PDFgetTimerDebug (cf début du fichier html2pdf.class.php)
-	
-3.14 (2008-11-17)
-	ajout d'une langue (pt : Brazilian Portuguese language) et amelioration de la methode vueHTML (merci à Rodrigo)
-	correction du positionnement du contenu des DIVs. gestion des proprietes valign et align
-	ajout de la propriete CSS border-collapse (cf exemple 0)
-	ajout de la propriete CSS border-radius (cf exemple 1)
-	correction de quelques bugs
-	
-3.13 (2008-09-24)
-	reecriture de la balise hr, avec prise en compte des styles (cf exemple 0)
-	ajout de la propriete backcolor pour la balise page (cf exemple 9)
-	ajout des proprietes backleft et backright pour la balise page afin de pouvoir changer les marges des pages (cf exemple 8)
-	nombreuses corrections sur les balises et les styles
-	
-3.12 (2008-09-16)
-	ajout des balises ol, ul, li (cf exemple 12)
-	correction sur le calcul de la taille des td en cas de colspan et rowspan
-	ajout de la méthode setTestTdInOnePage afin de pouvoir desactiver le test sur la taille des TD (cf exemple 11)
-	correction de quelques bugs
-	
-3.11 (2008-08-29)
-	ajout des balises div, p, pre, s
-	gestion des styles CSS position (relative, absolute), left, top, right, bottom (cf exemple 10)
-	meilleur gestion des border : border-style, border-color, border-width (cf exemple 10)
-	possibilité d'indiquer les marges par défault, via le constructeur (cf exemple 2)
-	
-3.10a (2008-08-26)
-	correction pour compatibilité php4 / php5
-	
-3.10 (2008-08-25)
-	ajout des liens internes (cf exemple 7)
-	gestion complete des background : image, repeat, position, color (cf exemple 1)
-	gestion de underline, overline, linethrough (cf exemple 2)
-	correction de quelques bugs
-	
-3.09 :
-	mise à jour vers fpdf version 1.6, ajout de barcode, correction de l'affichage de certains caractères spéciaux
-	correction du calcul de la hauteur de ligne de la balise br
-	detection en cas de contenu trop grand dans un TD
-	amélioration de la balise page (ajout de l'attribue pageset, avec les valeurs new et old)
-	ajout de FPDF_PROTECTION, accesible via $pdf->pdf->SetProtection(...)
-	
-3.08 : version opérationnelle de page_header, ajout de page_footer, correction des borders des tableaux
-3.07 : correction de l'interpretation de cellspacing, amélioration de la balise page_header
-3.06 : première gestion de la balise page_header, correction des dimensions des tableaux
-3.05 : ajout de la propriété vertical-align, ajout de la gestion des fichiers de langue
-3.04 : correction du saut de page automatique pour les tableaux. Ajout de propriétés à la balise PAGE
-3.03 : correction de bugs au niveau de la gestion des images PHP par FPDF, meilleure gestion des erreurs
-3.02 : ajout de la gestion des noms des couleurs, correction de la gestion des images générées par php, correction de quelques bugs
-3.01 : correction de quelques bugs, ajout d'une protection pour les balises non existantes
-3.00 : refont totale du calcul des tableaux. Prise en compte des colspan et rowspan
-2.85 : ajout de la propriété cellspacing, nouvelle gestion des padding des tableaux (identique à l'html)
-2.80 : ajout des types de border dotted et dasheds
-2.75 : ajout des top, left, right, bottom pour padding et border
-2.70 :
-	correction de la balise HR, ajout de la propriété padding pour les table, th, td
-	correction des dimensions, les unités px, mm, in, pt sont enfin réellement reproduites, correction de font-size, border, ...
-	ajout d'une propriété à la balise page : footer
-	correction dans l'affichage et le calcul des tables
-2.55 : vérification de la validité du code (ouverture / fermeture) - ajout des unités mm, in, pt
-2.50 : correction de nobreak, des marges, ajout de nombreuses balises
-2.40 : refonte totale de l'identification des styles CSS. Les héritages marchent.
-2.39 : corrections diverses, ajout de certaines propriétés (bgcolor, ...)
-2.38 : meilleur identification des propriétés border et color
-2.37 : nombreuses corrections : balise A, couleur de fond, retour à la ligne, gestion des images dans un texte, ...
-2.36 : ajout des balises STRONG, EM
-2.35 : amélioration de la gestion des feuilles de style
-2.31 : correction de quelques bugs
-2.30 : première version opérationnel des feuilles de style
-2.25 : ajout de la balise LINK pour le type text/css
-2.20 : premier jet de la gestion des feuilles de style, ajout de la balise STYLE
-2.15 : n'interprète plus l'HTML en commentaire <!-- -->
-2.10 : ajout des balises H1 -> H6
-2.01 : correction de quelques bugs
+3.31 (2001-05-21)
+	problème de compatibilité avec FPDF corrigé
+	
+3.30 / 4.01 (2001-05-07)
+	correction sur la gestion des textes
+	correction sur le parseur HTML
+	correction sur la gestion de border-collapse
+	correction sur la gestion des TDs, H1->H6
+	ajout des balises fieldset et legend (cf exemple 4)
+	ajout de la langue CS
+	nombreuses améliorations
+	v4.01 uniquement : Utilisation de TCPDF 5.0.002
+	v4.01 uniquement : Utilisation des QR-code de TCPDF, il n'y a plus besoin d'une librairie externe
+	v4.01 uniquement : Utilisation des exceptions PHP pour les erreurs. Tous les exemples ont été mis à jour en consequence
+	(merci à Pavel Kochman pour ses sugestions et ses ajouts)
+	
+3.29 / 4.00 (2010-03-17)
+	modification des barcodes. ATTENTION : bar_w et bar_h n'existent plus !
+	correction sur la gestion de page_footer
+	correction sur la gestion des html entities
+	correction sur le positionnement des textes
+	correction sur le positionnement des tableaux
+	nombreuses corrections sur les positionnements, les couleurs, ...
+	amélioration de la partie SVG (balise G, ...)
+	amélioration sur createIndex
+	harmonisation des noms des méthodes
+	correction sur la gestion des textes
+	v4.00 uniquement : HTML2PDF est maintenant écrit en PHP5 et basé sur TCPDF (=> unicode, utf8, ...)
+	v4.00 uniquement : utilisation de TCPDF pour les formulaires et les barcodes
+	v4.00 uniquement : amélioration de la partie SVG (alpha)
+	
+3.28 (2010-01-18)
+	ajout de la gestion de la balise label
+	correction pour compatibilité PHP4
+	
+3.27 (2010-01-11)
+	correction sur page_header et page_footer
+	ajout de la possibilité de pouvoir mettre l'index automatique dans la page que l'on veut
+	correction sur la gestion du canal alpha pour les PNGs
+	correction sur la gestion des border-radius (cf exemple radius) conforme au CSS3
+	correction sur la gestion du background-color
+	correction sur la gestion de thead, tfoot, et tbody
+	ajout du dessin verctoriel (cf exemples draw, tigre, sapin)
+	ajout de la propriété label="none/label" pour la balise <barcode>
+	nombreux petits correctifs
+	
+3.26 (2009-11-16)
+	correction pour support des images générés en CGI
+	ajout de la gestion du canal alpha pour les PNGs (nécessite GD2)
+	ajout de la méthode setDefaultFont permettant de spécifier une fonte par défaut
+	ajout de la propriété format pour la balise <page> (cf exemple 4)
+	amélioration de la gestion des couleurs css RGB (cf exemple 2)
+	ajout de la gestion des couleurs css CMYK (cf exemple 2)
+	ajout de la propriété css overflow:hidden pour la balise <div> (cf exemple 2)
+	correction sur page_header et page_footer
+	ajout de la possibilité de pouvoir directement convertir le résultat d'une vraie page HTML
+	nombreux petits correctifs sur les styles
+	
+3.25 (2009-10-07)
+	correctif sur le calcul des tableaux dans le page_footer
+	correctif sur l'interprétation des espaces entre certaines balises
+	correction sur la gestion des balises H1, H2, H3, H4, H5, H6
+	correction sur la gestion de la balise table
+	support des balises xhtml du type <span />
+	ajout des balises COL (cf exemple 5), DEL, INS, et QRCODE (cf exemple 13)
+	ajout de la propriété css text-transform
+	ajout de la propriété css rotate (uniquement sur les DIV, cf exemple 8)
+	ne plus rendre obligatoire l'existence d'une image (nouvelle méthode setTestIsImage)
+	ajout d'un mode DEBUG - les anciennes fonction d'analyse des ressources ont été supprimées
+	ajout de la méthode setEncoding
+	ajout de la langue danoise DA (merci à Daniel K.)
+	
+3.24 (2009-08-05)
+	correction sur le calcul de la largeur des divs
+	modification pour compatibilité avec la localisation PHP
+	modification pour compatibilité avec PHP 5.3.0
+	
+3.23 (2009-07-30)
+	correction sur le calcul des DIVs
+	correction sur l'interpretation de certains styles CSS
+	correction de la fonction de creation d'index automatique CreateIndex
+	ATTENTION : la methode d'appel de CreateIndex a changé. Regardez l'exemple About !!!!
+	
+3.22a (2009-06-16)
+	redistribution de HTML2PDF sous la licence LGPL !!! (au lieu de GPL)
+	
+3.22 (2009-06-08)
+	correction sur le background-color
+	refonte totale de la gestion de text-align. les valeurs center et right marchent maintenant meme en cas de contenu riche
+	
+3.21 (2009-05-05)
+	ajout de la propriété css FLOAT pour la balise IMG
+	correction sur la gestion des TFOOT
+	correction sur le positionnement des images
+	
+3.20 (2009-04-06)
+	ajout de la gestion des margins pour la balise DIV
+	ajout de la gestion de la propriete css LINE-HEIGHT
+	correction sur l'interpretation de la valeur de certains styles CSS (background-image, background-position, ...)
+	correction sur la reconnaissance des balises thead et tfoot
+	correction sur la balise select
+	correction sur les fichiers de langue (merci à Sinan)
+	
+3.19 (2009-03-11)
+	optimisation du parseur HTML - merci à Jezelinside
+	ajout de la balise TFOOT
+	amélioration de la gestion des tableaux : les contenus des balises THEAD et TFOOT sont maintenant répétés sur chaque page.
+	ajout de la balise spécifique BOOKMARK afin de créer des "marques-page"
+	possibilité de rajouter un index automatique en fin de fichier
+	ajout de la langue turque TR (merci à Hidayet)
+	amélioration de la méthode Output. Elle est maintenant également utilisable comme celle de FPDF
+	
+3.18 (2009-02-22)
+	correction sur les sauts de page automatique pour les balises TABLE, UL, OL
+	correction sur l'interpretation des styles pour la balise HR
+	correction sur l'interpretation du style border-collapse pour la balise TABLE
+	prise en compte de margin:auto pour les tables et les divs
+	les commentaires dans les CSS sont acceptés
+	
+3.17 (2008-12-30)
+	ajout de la gestion des balises INPUT (text, radio, checkbox, button, hidden, ...), SELECT, OPTION, TEXTAREA (cf exemple 14)
+	ajout de la possibilité de mettre des scripts dans le pdf, via $html2pdf->pdf->IncludeJS(...); (cf exemples JS)
+	correction sur le saut de page automatique pour les images
+	correction sur les sauts de lignes automatiques pour certaines balises (UL, P, ...)
+	ajout de la langue NL (merci à Roland)
+	
+3.16 (2008-12-09)
+	ajout de la gestion de list-style: none (cf exemple 13)
+	correction dans la gestion des fontes ajoutées à fpdf (via la méthode AddFont)
+	nombreuses corrections sur le calcul des largeurs des éléments table, div, hr, td, th
+	ajout de l'exemple about.php
+	(pour info, les PDF générés à partir des exemples sont maintenant dans le répertoire /exemples/pdf/, et sont supprimables)
+	
+3.15 (2008-12-01)
+	correction sur l'identification des styles en cas de valeurs multiples dans la propriete class
+	prise en compte de border-radius pour la limite des backgrounds (color et image)
+	ajout des proprietes CSS border-top-*, border-right-*, border-bottom-*, border-left-*
+	ajout de la propriété CSS list-style-image (cf exemple 12)
+	pour la balise table, ajout de l'interprétation de align="center" et align="right" (cf exemple 1)
+	correction dans le positionnement des images
+	correction de quelques bugs
+	ajout d'une fonction d'analyse des ressources HTML2PDFgetTimerDebug (cf début du fichier html2pdf.class.php)
+	
+3.14 (2008-11-17)
+	ajout d'une langue (pt : Brazilian Portuguese language) et amelioration de la methode vueHTML (merci à Rodrigo)
+	correction du positionnement du contenu des DIVs. gestion des proprietes valign et align
+	ajout de la propriete CSS border-collapse (cf exemple 0)
+	ajout de la propriete CSS border-radius (cf exemple 1)
+	correction de quelques bugs
+	
+3.13 (2008-09-24)
+	reecriture de la balise hr, avec prise en compte des styles (cf exemple 0)
+	ajout de la propriete backcolor pour la balise page (cf exemple 9)
+	ajout des proprietes backleft et backright pour la balise page afin de pouvoir changer les marges des pages (cf exemple 8)
+	nombreuses corrections sur les balises et les styles
+	
+3.12 (2008-09-16)
+	ajout des balises ol, ul, li (cf exemple 12)
+	correction sur le calcul de la taille des td en cas de colspan et rowspan
+	ajout de la méthode setTestTdInOnePage afin de pouvoir desactiver le test sur la taille des TD (cf exemple 11)
+	correction de quelques bugs
+	
+3.11 (2008-08-29)
+	ajout des balises div, p, pre, s
+	gestion des styles CSS position (relative, absolute), left, top, right, bottom (cf exemple 10)
+	meilleur gestion des border : border-style, border-color, border-width (cf exemple 10)
+	possibilité d'indiquer les marges par défault, via le constructeur (cf exemple 2)
+	
+3.10a (2008-08-26)
+	correction pour compatibilité php4 / php5
+	
+3.10 (2008-08-25)
+	ajout des liens internes (cf exemple 7)
+	gestion complete des background : image, repeat, position, color (cf exemple 1)
+	gestion de underline, overline, linethrough (cf exemple 2)
+	correction de quelques bugs
+	
+3.09 :
+	mise à jour vers fpdf version 1.6, ajout de barcode, correction de l'affichage de certains caractères spéciaux
+	correction du calcul de la hauteur de ligne de la balise br
+	detection en cas de contenu trop grand dans un TD
+	amélioration de la balise page (ajout de l'attribue pageset, avec les valeurs new et old)
+	ajout de FPDF_PROTECTION, accesible via $pdf->pdf->SetProtection(...)
+	
+3.08 : version opérationnelle de page_header, ajout de page_footer, correction des borders des tableaux
+3.07 : correction de l'interpretation de cellspacing, amélioration de la balise page_header
+3.06 : première gestion de la balise page_header, correction des dimensions des tableaux
+3.05 : ajout de la propriété vertical-align, ajout de la gestion des fichiers de langue
+3.04 : correction du saut de page automatique pour les tableaux. Ajout de propriétés à la balise PAGE
+3.03 : correction de bugs au niveau de la gestion des images PHP par FPDF, meilleure gestion des erreurs
+3.02 : ajout de la gestion des noms des couleurs, correction de la gestion des images générées par php, correction de quelques bugs
+3.01 : correction de quelques bugs, ajout d'une protection pour les balises non existantes
+3.00 : refont totale du calcul des tableaux. Prise en compte des colspan et rowspan
+2.85 : ajout de la propriété cellspacing, nouvelle gestion des padding des tableaux (identique à l'html)
+2.80 : ajout des types de border dotted et dasheds
+2.75 : ajout des top, left, right, bottom pour padding et border
+2.70 :
+	correction de la balise HR, ajout de la propriété padding pour les table, th, td
+	correction des dimensions, les unités px, mm, in, pt sont enfin réellement reproduites, correction de font-size, border, ...
+	ajout d'une propriété à la balise page : footer
+	correction dans l'affichage et le calcul des tables
+2.55 : vérification de la validité du code (ouverture / fermeture) - ajout des unités mm, in, pt
+2.50 : correction de nobreak, des marges, ajout de nombreuses balises
+2.40 : refonte totale de l'identification des styles CSS. Les héritages marchent.
+2.39 : corrections diverses, ajout de certaines propriétés (bgcolor, ...)
+2.38 : meilleur identification des propriétés border et color
+2.37 : nombreuses corrections : balise A, couleur de fond, retour à la ligne, gestion des images dans un texte, ...
+2.36 : ajout des balises STRONG, EM
+2.35 : amélioration de la gestion des feuilles de style
+2.31 : correction de quelques bugs
+2.30 : première version opérationnel des feuilles de style
+2.25 : ajout de la balise LINK pour le type text/css
+2.20 : premier jet de la gestion des feuilles de style, ajout de la balise STYLE
+2.15 : n'interprète plus l'HTML en commentaire <!-- -->
+2.10 : ajout des balises H1 -> H6
+2.01 : correction de quelques bugs
 2.00 : première version diffusée
\ No newline at end of file
diff --git a/library/html2pdf/_fpdf/FAQ.htm b/library/html2pdf/_fpdf/FAQ.htm
index 05d85c6e0..72094a961 100644
--- a/library/html2pdf/_fpdf/FAQ.htm
+++ b/library/html2pdf/_fpdf/FAQ.htm
@@ -1,341 +1,341 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>FAQ</title>
-<link type="text/css" rel="stylesheet" href="fpdf.css">
-<style type="text/css">
-ul {list-style-type:none; margin:0; padding:0}
-ul#answers li {margin-top:1.8em}
-.question {font-weight:bold; color:#900000}
-</style>
-</head>
-<body>
-<h1>FAQ</h1>
-<ul>
-<li><b>1.</b> <a href='#q1'>What's exactly the license of FPDF? Are there any usage restrictions?</a></li>
-<li><b>2.</b> <a href='#q2'>When I try to create a PDF, a lot of weird characters show on the screen. Why?</a></li>
-<li><b>3.</b> <a href='#q3'>I try to generate a PDF and IE displays a blank page. What happens?</a></li>
-<li><b>4.</b> <a href='#q4'>I can't make line breaks work. I put \n in the string printed by MultiCell but it doesn't work.</a></li>
-<li><b>5.</b> <a href='#q5'>I try to display a variable in the Header method but nothing prints.</a></li>
-<li><b>6.</b> <a href='#q6'>I defined the Header and Footer methods in my PDF class but nothing appears.</a></li>
-<li><b>7.</b> <a href='#q7'>Accented characters are replaced by some strange characters like é.</a></li>
-<li><b>8.</b> <a href='#q8'>I try to display the Euro symbol but it doesn't work.</a></li>
-<li><b>9.</b> <a href='#q9'>I get the following error when I try to generate a PDF: Some data has already been output, can't send PDF file</a></li>
-<li><b>10.</b> <a href='#q10'>I draw a frame with very precise dimensions, but when printed I notice some differences.</a></li>
-<li><b>11.</b> <a href='#q11'>I'd like to use the whole surface of the page, but when printed I always have some margins. How can I get rid of them?</a></li>
-<li><b>12.</b> <a href='#q12'>How can I put a background in my PDF?</a></li>
-<li><b>13.</b> <a href='#q13'>How can I set a specific header or footer on the first page?</a></li>
-<li><b>14.</b> <a href='#q14'>I'd like to use extensions provided by different scripts. How can I combine them?</a></li>
-<li><b>15.</b> <a href='#q15'>How can I send the PDF by email?</a></li>
-<li><b>16.</b> <a href='#q16'>What's the limit of the file sizes I can generate with FPDF?</a></li>
-<li><b>17.</b> <a href='#q17'>Can I modify a PDF with FPDF?</a></li>
-<li><b>18.</b> <a href='#q18'>I'd like to make a search engine in PHP and index PDF files. Can I do it with FPDF?</a></li>
-<li><b>19.</b> <a href='#q19'>Can I convert an HTML page to PDF with FPDF?</a></li>
-<li><b>20.</b> <a href='#q20'>Can I concatenate PDF files with FPDF?</a></li>
-</ul>
-
-<ul id='answers'>
-<li id='q1'>
-<p><b>1.</b> <span class='question'>What's exactly the license of FPDF? Are there any usage restrictions?</span></p>
-FPDF is released under a permissive license: there is no usage restriction. You may embed it
-freely in your application (commercial or not), with or without modifications.
-</li>
-
-<li id='q2'>
-<p><b>2.</b> <span class='question'>When I try to create a PDF, a lot of weird characters show on the screen. Why?</span></p>
-These "weird" characters are in fact the actual content of your PDF. This behavior is a bug of
-IE6. When it first receives an HTML page, then a PDF from the same URL, it displays it directly
-without launching Acrobat. This happens frequently during the development stage: on the least
-script error, an HTML page is sent, and after correction, the PDF arrives.
-<br>
-To solve the problem, simply quit and restart IE. You can also go to another URL and come
-back.
-<br>
-To avoid this kind of inconvenience during the development, you can generate the PDF directly
-to a file and open it through the explorer.
-</li>
-
-<li id='q3'>
-<p><b>3.</b> <span class='question'>I try to generate a PDF and IE displays a blank page. What happens?</span></p>
-First of all, check that you send nothing to the browser after the PDF (not even a space or a
-carriage return). You can put an exit statement just after the call to the Output() method to
-be sure. If it still doesn't work, it means you're a victim of the "blank page syndrome". IE
-used in conjunction with the Acrobat plug-in suffers from many bugs. To avoid these problems
-in a reliable manner, two main techniques exist:
-<br>
-<br>
-- Disable the plug-in and use Acrobat as a helper application. To do this, launch Acrobat, go
-to the Edit menu, Preferences, Internet, and uncheck "Display PDF in browser". Then, the next
-time you load a PDF in IE, it displays the dialog box "Open it" or "Save it to disk". Uncheck
-the option "Always ask before opening this type of file" and choose Open. From now on, PDF files
-will open automatically in an external Acrobat window.
-<br>
-The drawback of the method is that you need to alter the client configuration, which you can do
-in an intranet environment but not for the Internet.
-<br>
-<br>
-- Use a redirection technique. It consists in generating the PDF in a temporary file on the server
-and redirect the client to it. For example, at the end of the script, you can put the following:
-<div class="doc-source">
-<pre><code>//Determine a temporary file name in the current directory
-$file = basename(tempnam('.', 'tmp'));
-rename($file, $file.'.pdf');
-$file .= '.pdf';
-//Save PDF to file
-$pdf-&gt;Output($file, 'F');
-//Redirect
-header('Location: '.$file);</code></pre>
-</div>
-This method turns the dynamic PDF into a static one and avoids all troubles. But you have to do
-some cleaning in order to delete the temporary files. For example:
-<div class="doc-source">
-<pre><code>function CleanFiles($dir)
-{
-    //Delete temporary files
-    $t = time();
-    $h = opendir($dir);
-    while($file=readdir($h))
-    {
-        if(substr($file,0,3)=='tmp' &amp;&amp; substr($file,-4)=='.pdf')
-        {
-            $path = $dir.'/'.$file;
-            if($t-filemtime($path)&gt;3600)
-                @unlink($path);
-        }
-    }
-    closedir($h);
-}</code></pre>
-</div>
-This function deletes all files of the form tmp*.pdf older than an hour in the specified
-directory. You may call it where you want, for example in the script which generates the PDF.
-</li>
-
-<li id='q4'>
-<p><b>4.</b> <span class='question'>I can't make line breaks work. I put \n in the string printed by MultiCell but it doesn't work.</span></p>
-You have to enclose your string with double quotes, not single ones.
-</li>
-
-<li id='q5'>
-<p><b>5.</b> <span class='question'>I try to display a variable in the Header method but nothing prints.</span></p>
-You have to use the <code>global</code> keyword to access global variables, for example:
-<div class="doc-source">
-<pre><code>function Header()
-{
-    global $title;
-
-    $this-&gt;SetFont('Arial', 'B', 15);
-    $this-&gt;Cell(0, 10, $title, 1, 1, 'C');
-}
-
-$title = 'My title';</code></pre>
-</div>
-Alternatively, you can use an object property:
-<div class="doc-source">
-<pre><code>function Header()
-{
-    $this-&gt;SetFont('Arial', 'B', 15);
-    $this-&gt;Cell(0, 10, $this-&gt;title, 1, 1, 'C');
-}
-
-$pdf-&gt;title = 'My title';</code></pre>
-</div>
-</li>
-
-<li id='q6'>
-<p><b>6.</b> <span class='question'>I defined the Header and Footer methods in my PDF class but nothing appears.</span></p>
-You have to create an object from the PDF class, not FPDF:
-<div class="doc-source">
-<pre><code>$pdf = new PDF();</code></pre>
-</div>
-</li>
-
-<li id='q7'>
-<p><b>7.</b> <span class='question'>Accented characters are replaced by some strange characters like é.</span></p>
-Don't use UTF-8 encoding. Standard FPDF fonts use ISO-8859-1 or Windows-1252.
-It is possible to perform a conversion to ISO-8859-1 with utf8_decode():
-<div class="doc-source">
-<pre><code>$str = utf8_decode($str);</code></pre>
-</div>
-But some characters such as Euro won't be translated correctly. If the iconv extension is available, the
-right way to do it is the following:
-<div class="doc-source">
-<pre><code>$str = iconv('UTF-8', 'windows-1252', $str);</code></pre>
-</div>
-</li>
-
-<li id='q8'>
-<p><b>8.</b> <span class='question'>I try to display the Euro symbol but it doesn't work.</span></p>
-The standard fonts have the Euro character at position 128. You can define a constant like this
-for convenience:
-<div class="doc-source">
-<pre><code>define('EURO', chr(128));</code></pre>
-</div>
-</li>
-
-<li id='q9'>
-<p><b>9.</b> <span class='question'>I get the following error when I try to generate a PDF: Some data has already been output, can't send PDF file</span></p>
-You must send nothing to the browser except the PDF itself: no HTML, no space, no carriage return. A common
-case is having extra blank at the end of an included script file.<br>
-If you can't figure out where the problem comes from, this other message appearing just before can help you:<br>
-<br>
-<b>Warning:</b> Cannot modify header information - headers already sent by (output started at script.php:X)<br>
-<br>
-It means that script.php outputs something at line X. Go to this line and fix it.
-In case the message doesn't show, first check that you didn't disable warnings, then add this at the very
-beginning of your script:
-<div class="doc-source">
-<pre><code>ob_end_clean();</code></pre>
-</div>
-If you still don't see it, disable zlib.output_compression in your php.ini and it should appear.
-</li>
-
-<li id='q10'>
-<p><b>10.</b> <span class='question'>I draw a frame with very precise dimensions, but when printed I notice some differences.</span></p>
-To respect dimensions, select "None" for the Page Scaling setting instead of "Shrink to Printable Area" in the print dialog box.
-</li>
-
-<li id='q11'>
-<p><b>11.</b> <span class='question'>I'd like to use the whole surface of the page, but when printed I always have some margins. How can I get rid of them?</span></p>
-Printers have physical margins (different depending on the models); it is therefore impossible to remove
-them and print on the whole surface of the paper.
-</li>
-
-<li id='q12'>
-<p><b>12.</b> <span class='question'>How can I put a background in my PDF?</span></p>
-For a picture, call Image() in the Header() method, before any other output. To set a background color, use Rect().
-</li>
-
-<li id='q13'>
-<p><b>13.</b> <span class='question'>How can I set a specific header or footer on the first page?</span></p>
-Simply test the page number:
-<div class="doc-source">
-<pre><code>function Header()
-{
-    if($this-&gt;PageNo()==1)
-    {
-        //First page
-        ...
-    }
-    else
-    {
-        //Other pages
-        ...
-    }
-}</code></pre>
-</div>
-</li>
-
-<li id='q14'>
-<p><b>14.</b> <span class='question'>I'd like to use extensions provided by different scripts. How can I combine them?</span></p>
-Use an inheritance chain. If you have two classes, say A in a.php:
-<div class="doc-source">
-<pre><code>require('fpdf.php');
-
-class A extends FPDF
-{
-...
-}</code></pre>
-</div>
-and B in b.php:
-<div class="doc-source">
-<pre><code>require('fpdf.php');
-
-class B extends FPDF
-{
-...
-}</code></pre>
-</div>
-then make B extend A:
-<div class="doc-source">
-<pre><code>require('a.php');
-
-class B extends A
-{
-...
-}</code></pre>
-</div>
-and make your own class extend B:
-<div class="doc-source">
-<pre><code>require('b.php');
-
-class PDF extends B
-{
-...
-}
-
-$pdf = new PDF();</code></pre>
-</div>
-</li>
-
-<li id='q15'>
-<p><b>15.</b> <span class='question'>How can I send the PDF by email?</span></p>
-As any other file, but an easy way is to use <a href="http://phpmailer.codeworxtech.com">PHPMailer</a> and
-its in-memory attachment:
-<div class="doc-source">
-<pre><code>$mail = new PHPMailer();
-...
-$doc = $pdf-&gt;Output('', 'S');
-$mail-&gt;AddStringAttachment($doc, 'doc.pdf', 'base64', 'application/pdf');
-$mail-&gt;Send();</code></pre>
-</div>
-</li>
-
-<li id='q16'>
-<p><b>16.</b> <span class='question'>What's the limit of the file sizes I can generate with FPDF?</span></p>
-There is no particular limit. There are some constraints, however:
-<br>
-<br>
-- The maximum memory size allocated to PHP scripts is usually 8MB. For very big documents,
-especially with images, this limit may be reached (the file being built into memory). The
-parameter is configured in the php.ini file.
-<br>
-<br>
-- The maximum execution time allocated defaults to 30 seconds. This limit can of course be easily
-reached. It is configured in php.ini and may be altered dynamically with set_time_limit().
-<br>
-<br>
-- Browsers generally have a 5 minute time-out. If you send the PDF directly to the browser and
-reach the limit, it will be lost. It is therefore advised for very big documents to
-generate them in a file, and to send some data to the browser from time to time (with a call
-to flush() to force the output). When the document is finished, you can send a redirection to
-it or create a link.
-<br>
-Remark: even if the browser times out, the script may continue to run on the server.
-</li>
-
-<li id='q17'>
-<p><b>17.</b> <span class='question'>Can I modify a PDF with FPDF?</span></p>
-It is possible to import pages from an existing PDF document thanks to the FPDI extension:<br>
-<br>
-<a href="http://www.setasign.de/products/pdf-php-solutions/fpdi/" target="_blank">http://www.setasign.de/products/pdf-php-solutions/fpdi/</a><br>
-<br>
-You can then add some content to them.
-</li>
-
-<li id='q18'>
-<p><b>18.</b> <span class='question'>I'd like to make a search engine in PHP and index PDF files. Can I do it with FPDF?</span></p>
-No. But a GPL C utility does exist, pdftotext, which is able to extract the textual content from
-a PDF. It is provided with the Xpdf package:<br>
-<br>
-<a href="http://www.foolabs.com/xpdf/" target="_blank">http://www.foolabs.com/xpdf/</a>
-</li>
-
-<li id='q19'>
-<p><b>19.</b> <span class='question'>Can I convert an HTML page to PDF with FPDF?</span></p>
-Not real-world pages. But a GPL C utility does exist, htmldoc, which allows to do it and gives good results:<br>
-<br>
-<a href="http://www.htmldoc.org" target="_blank">http://www.htmldoc.org</a>
-</li>
-
-<li id='q20'>
-<p><b>20.</b> <span class='question'>Can I concatenate PDF files with FPDF?</span></p>
-Not directly, but it is possible to use <a href="http://www.setasign.de/products/pdf-php-solutions/fpdi/demos/concatenate-fake/" target="_blank">FPDI</a>
-to perform this task. Some free command-line tools also exist:<br>
-<br>
-<a href="http://thierry.schmit.free.fr/spip/spip.php?article15&amp;lang=en" target="_blank">mbtPdfAsm</a><br>
-<a href="http://www.accesspdf.com/pdftk/" target="_blank">pdftk</a>
-</li>
-</ul>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>FAQ</title>
+<link type="text/css" rel="stylesheet" href="fpdf.css">
+<style type="text/css">
+ul {list-style-type:none; margin:0; padding:0}
+ul#answers li {margin-top:1.8em}
+.question {font-weight:bold; color:#900000}
+</style>
+</head>
+<body>
+<h1>FAQ</h1>
+<ul>
+<li><b>1.</b> <a href='#q1'>What's exactly the license of FPDF? Are there any usage restrictions?</a></li>
+<li><b>2.</b> <a href='#q2'>When I try to create a PDF, a lot of weird characters show on the screen. Why?</a></li>
+<li><b>3.</b> <a href='#q3'>I try to generate a PDF and IE displays a blank page. What happens?</a></li>
+<li><b>4.</b> <a href='#q4'>I can't make line breaks work. I put \n in the string printed by MultiCell but it doesn't work.</a></li>
+<li><b>5.</b> <a href='#q5'>I try to display a variable in the Header method but nothing prints.</a></li>
+<li><b>6.</b> <a href='#q6'>I defined the Header and Footer methods in my PDF class but nothing appears.</a></li>
+<li><b>7.</b> <a href='#q7'>Accented characters are replaced by some strange characters like é.</a></li>
+<li><b>8.</b> <a href='#q8'>I try to display the Euro symbol but it doesn't work.</a></li>
+<li><b>9.</b> <a href='#q9'>I get the following error when I try to generate a PDF: Some data has already been output, can't send PDF file</a></li>
+<li><b>10.</b> <a href='#q10'>I draw a frame with very precise dimensions, but when printed I notice some differences.</a></li>
+<li><b>11.</b> <a href='#q11'>I'd like to use the whole surface of the page, but when printed I always have some margins. How can I get rid of them?</a></li>
+<li><b>12.</b> <a href='#q12'>How can I put a background in my PDF?</a></li>
+<li><b>13.</b> <a href='#q13'>How can I set a specific header or footer on the first page?</a></li>
+<li><b>14.</b> <a href='#q14'>I'd like to use extensions provided by different scripts. How can I combine them?</a></li>
+<li><b>15.</b> <a href='#q15'>How can I send the PDF by email?</a></li>
+<li><b>16.</b> <a href='#q16'>What's the limit of the file sizes I can generate with FPDF?</a></li>
+<li><b>17.</b> <a href='#q17'>Can I modify a PDF with FPDF?</a></li>
+<li><b>18.</b> <a href='#q18'>I'd like to make a search engine in PHP and index PDF files. Can I do it with FPDF?</a></li>
+<li><b>19.</b> <a href='#q19'>Can I convert an HTML page to PDF with FPDF?</a></li>
+<li><b>20.</b> <a href='#q20'>Can I concatenate PDF files with FPDF?</a></li>
+</ul>
+
+<ul id='answers'>
+<li id='q1'>
+<p><b>1.</b> <span class='question'>What's exactly the license of FPDF? Are there any usage restrictions?</span></p>
+FPDF is released under a permissive license: there is no usage restriction. You may embed it
+freely in your application (commercial or not), with or without modifications.
+</li>
+
+<li id='q2'>
+<p><b>2.</b> <span class='question'>When I try to create a PDF, a lot of weird characters show on the screen. Why?</span></p>
+These "weird" characters are in fact the actual content of your PDF. This behavior is a bug of
+IE6. When it first receives an HTML page, then a PDF from the same URL, it displays it directly
+without launching Acrobat. This happens frequently during the development stage: on the least
+script error, an HTML page is sent, and after correction, the PDF arrives.
+<br>
+To solve the problem, simply quit and restart IE. You can also go to another URL and come
+back.
+<br>
+To avoid this kind of inconvenience during the development, you can generate the PDF directly
+to a file and open it through the explorer.
+</li>
+
+<li id='q3'>
+<p><b>3.</b> <span class='question'>I try to generate a PDF and IE displays a blank page. What happens?</span></p>
+First of all, check that you send nothing to the browser after the PDF (not even a space or a
+carriage return). You can put an exit statement just after the call to the Output() method to
+be sure. If it still doesn't work, it means you're a victim of the "blank page syndrome". IE
+used in conjunction with the Acrobat plug-in suffers from many bugs. To avoid these problems
+in a reliable manner, two main techniques exist:
+<br>
+<br>
+- Disable the plug-in and use Acrobat as a helper application. To do this, launch Acrobat, go
+to the Edit menu, Preferences, Internet, and uncheck "Display PDF in browser". Then, the next
+time you load a PDF in IE, it displays the dialog box "Open it" or "Save it to disk". Uncheck
+the option "Always ask before opening this type of file" and choose Open. From now on, PDF files
+will open automatically in an external Acrobat window.
+<br>
+The drawback of the method is that you need to alter the client configuration, which you can do
+in an intranet environment but not for the Internet.
+<br>
+<br>
+- Use a redirection technique. It consists in generating the PDF in a temporary file on the server
+and redirect the client to it. For example, at the end of the script, you can put the following:
+<div class="doc-source">
+<pre><code>//Determine a temporary file name in the current directory
+$file = basename(tempnam('.', 'tmp'));
+rename($file, $file.'.pdf');
+$file .= '.pdf';
+//Save PDF to file
+$pdf-&gt;Output($file, 'F');
+//Redirect
+header('Location: '.$file);</code></pre>
+</div>
+This method turns the dynamic PDF into a static one and avoids all troubles. But you have to do
+some cleaning in order to delete the temporary files. For example:
+<div class="doc-source">
+<pre><code>function CleanFiles($dir)
+{
+    //Delete temporary files
+    $t = time();
+    $h = opendir($dir);
+    while($file=readdir($h))
+    {
+        if(substr($file,0,3)=='tmp' &amp;&amp; substr($file,-4)=='.pdf')
+        {
+            $path = $dir.'/'.$file;
+            if($t-filemtime($path)&gt;3600)
+                @unlink($path);
+        }
+    }
+    closedir($h);
+}</code></pre>
+</div>
+This function deletes all files of the form tmp*.pdf older than an hour in the specified
+directory. You may call it where you want, for example in the script which generates the PDF.
+</li>
+
+<li id='q4'>
+<p><b>4.</b> <span class='question'>I can't make line breaks work. I put \n in the string printed by MultiCell but it doesn't work.</span></p>
+You have to enclose your string with double quotes, not single ones.
+</li>
+
+<li id='q5'>
+<p><b>5.</b> <span class='question'>I try to display a variable in the Header method but nothing prints.</span></p>
+You have to use the <code>global</code> keyword to access global variables, for example:
+<div class="doc-source">
+<pre><code>function Header()
+{
+    global $title;
+
+    $this-&gt;SetFont('Arial', 'B', 15);
+    $this-&gt;Cell(0, 10, $title, 1, 1, 'C');
+}
+
+$title = 'My title';</code></pre>
+</div>
+Alternatively, you can use an object property:
+<div class="doc-source">
+<pre><code>function Header()
+{
+    $this-&gt;SetFont('Arial', 'B', 15);
+    $this-&gt;Cell(0, 10, $this-&gt;title, 1, 1, 'C');
+}
+
+$pdf-&gt;title = 'My title';</code></pre>
+</div>
+</li>
+
+<li id='q6'>
+<p><b>6.</b> <span class='question'>I defined the Header and Footer methods in my PDF class but nothing appears.</span></p>
+You have to create an object from the PDF class, not FPDF:
+<div class="doc-source">
+<pre><code>$pdf = new PDF();</code></pre>
+</div>
+</li>
+
+<li id='q7'>
+<p><b>7.</b> <span class='question'>Accented characters are replaced by some strange characters like é.</span></p>
+Don't use UTF-8 encoding. Standard FPDF fonts use ISO-8859-1 or Windows-1252.
+It is possible to perform a conversion to ISO-8859-1 with utf8_decode():
+<div class="doc-source">
+<pre><code>$str = utf8_decode($str);</code></pre>
+</div>
+But some characters such as Euro won't be translated correctly. If the iconv extension is available, the
+right way to do it is the following:
+<div class="doc-source">
+<pre><code>$str = iconv('UTF-8', 'windows-1252', $str);</code></pre>
+</div>
+</li>
+
+<li id='q8'>
+<p><b>8.</b> <span class='question'>I try to display the Euro symbol but it doesn't work.</span></p>
+The standard fonts have the Euro character at position 128. You can define a constant like this
+for convenience:
+<div class="doc-source">
+<pre><code>define('EURO', chr(128));</code></pre>
+</div>
+</li>
+
+<li id='q9'>
+<p><b>9.</b> <span class='question'>I get the following error when I try to generate a PDF: Some data has already been output, can't send PDF file</span></p>
+You must send nothing to the browser except the PDF itself: no HTML, no space, no carriage return. A common
+case is having extra blank at the end of an included script file.<br>
+If you can't figure out where the problem comes from, this other message appearing just before can help you:<br>
+<br>
+<b>Warning:</b> Cannot modify header information - headers already sent by (output started at script.php:X)<br>
+<br>
+It means that script.php outputs something at line X. Go to this line and fix it.
+In case the message doesn't show, first check that you didn't disable warnings, then add this at the very
+beginning of your script:
+<div class="doc-source">
+<pre><code>ob_end_clean();</code></pre>
+</div>
+If you still don't see it, disable zlib.output_compression in your php.ini and it should appear.
+</li>
+
+<li id='q10'>
+<p><b>10.</b> <span class='question'>I draw a frame with very precise dimensions, but when printed I notice some differences.</span></p>
+To respect dimensions, select "None" for the Page Scaling setting instead of "Shrink to Printable Area" in the print dialog box.
+</li>
+
+<li id='q11'>
+<p><b>11.</b> <span class='question'>I'd like to use the whole surface of the page, but when printed I always have some margins. How can I get rid of them?</span></p>
+Printers have physical margins (different depending on the models); it is therefore impossible to remove
+them and print on the whole surface of the paper.
+</li>
+
+<li id='q12'>
+<p><b>12.</b> <span class='question'>How can I put a background in my PDF?</span></p>
+For a picture, call Image() in the Header() method, before any other output. To set a background color, use Rect().
+</li>
+
+<li id='q13'>
+<p><b>13.</b> <span class='question'>How can I set a specific header or footer on the first page?</span></p>
+Simply test the page number:
+<div class="doc-source">
+<pre><code>function Header()
+{
+    if($this-&gt;PageNo()==1)
+    {
+        //First page
+        ...
+    }
+    else
+    {
+        //Other pages
+        ...
+    }
+}</code></pre>
+</div>
+</li>
+
+<li id='q14'>
+<p><b>14.</b> <span class='question'>I'd like to use extensions provided by different scripts. How can I combine them?</span></p>
+Use an inheritance chain. If you have two classes, say A in a.php:
+<div class="doc-source">
+<pre><code>require('fpdf.php');
+
+class A extends FPDF
+{
+...
+}</code></pre>
+</div>
+and B in b.php:
+<div class="doc-source">
+<pre><code>require('fpdf.php');
+
+class B extends FPDF
+{
+...
+}</code></pre>
+</div>
+then make B extend A:
+<div class="doc-source">
+<pre><code>require('a.php');
+
+class B extends A
+{
+...
+}</code></pre>
+</div>
+and make your own class extend B:
+<div class="doc-source">
+<pre><code>require('b.php');
+
+class PDF extends B
+{
+...
+}
+
+$pdf = new PDF();</code></pre>
+</div>
+</li>
+
+<li id='q15'>
+<p><b>15.</b> <span class='question'>How can I send the PDF by email?</span></p>
+As any other file, but an easy way is to use <a href="http://phpmailer.codeworxtech.com">PHPMailer</a> and
+its in-memory attachment:
+<div class="doc-source">
+<pre><code>$mail = new PHPMailer();
+...
+$doc = $pdf-&gt;Output('', 'S');
+$mail-&gt;AddStringAttachment($doc, 'doc.pdf', 'base64', 'application/pdf');
+$mail-&gt;Send();</code></pre>
+</div>
+</li>
+
+<li id='q16'>
+<p><b>16.</b> <span class='question'>What's the limit of the file sizes I can generate with FPDF?</span></p>
+There is no particular limit. There are some constraints, however:
+<br>
+<br>
+- The maximum memory size allocated to PHP scripts is usually 8MB. For very big documents,
+especially with images, this limit may be reached (the file being built into memory). The
+parameter is configured in the php.ini file.
+<br>
+<br>
+- The maximum execution time allocated defaults to 30 seconds. This limit can of course be easily
+reached. It is configured in php.ini and may be altered dynamically with set_time_limit().
+<br>
+<br>
+- Browsers generally have a 5 minute time-out. If you send the PDF directly to the browser and
+reach the limit, it will be lost. It is therefore advised for very big documents to
+generate them in a file, and to send some data to the browser from time to time (with a call
+to flush() to force the output). When the document is finished, you can send a redirection to
+it or create a link.
+<br>
+Remark: even if the browser times out, the script may continue to run on the server.
+</li>
+
+<li id='q17'>
+<p><b>17.</b> <span class='question'>Can I modify a PDF with FPDF?</span></p>
+It is possible to import pages from an existing PDF document thanks to the FPDI extension:<br>
+<br>
+<a href="http://www.setasign.de/products/pdf-php-solutions/fpdi/" target="_blank">http://www.setasign.de/products/pdf-php-solutions/fpdi/</a><br>
+<br>
+You can then add some content to them.
+</li>
+
+<li id='q18'>
+<p><b>18.</b> <span class='question'>I'd like to make a search engine in PHP and index PDF files. Can I do it with FPDF?</span></p>
+No. But a GPL C utility does exist, pdftotext, which is able to extract the textual content from
+a PDF. It is provided with the Xpdf package:<br>
+<br>
+<a href="http://www.foolabs.com/xpdf/" target="_blank">http://www.foolabs.com/xpdf/</a>
+</li>
+
+<li id='q19'>
+<p><b>19.</b> <span class='question'>Can I convert an HTML page to PDF with FPDF?</span></p>
+Not real-world pages. But a GPL C utility does exist, htmldoc, which allows to do it and gives good results:<br>
+<br>
+<a href="http://www.htmldoc.org" target="_blank">http://www.htmldoc.org</a>
+</li>
+
+<li id='q20'>
+<p><b>20.</b> <span class='question'>Can I concatenate PDF files with FPDF?</span></p>
+Not directly, but it is possible to use <a href="http://www.setasign.de/products/pdf-php-solutions/fpdi/demos/concatenate-fake/" target="_blank">FPDI</a>
+to perform this task. Some free command-line tools also exist:<br>
+<br>
+<a href="http://thierry.schmit.free.fr/spip/spip.php?article15&amp;lang=en" target="_blank">mbtPdfAsm</a><br>
+<a href="http://www.accesspdf.com/pdftk/" target="_blank">pdftk</a>
+</li>
+</ul>
+</body>
+</html>
diff --git a/library/html2pdf/_fpdf/doc/read_me.txt b/library/html2pdf/_fpdf/doc/read_me.txt
index 24a310a9c..94623fb93 100644
--- a/library/html2pdf/_fpdf/doc/read_me.txt
+++ b/library/html2pdf/_fpdf/doc/read_me.txt
@@ -1,3 +1,3 @@
-You can read the documentation at : http://fpdf.org/en/doc/index.php
-
+You can read the documentation at : http://fpdf.org/en/doc/index.php
+
 it has been removed because of the size of the package of HTML2PDF... 
\ No newline at end of file
diff --git a/library/html2pdf/_fpdf/font/courier.php b/library/html2pdf/_fpdf/font/courier.php
index 913f9a453..4c009f39b 100644
--- a/library/html2pdf/_fpdf/font/courier.php
+++ b/library/html2pdf/_fpdf/font/courier.php
@@ -1,7 +1,7 @@
-<?php
-for($i=0;$i<=255;$i++)
-	$fpdf_charwidths['courier'][chr($i)]=600;
-$fpdf_charwidths['courierB']=$fpdf_charwidths['courier'];
-$fpdf_charwidths['courierI']=$fpdf_charwidths['courier'];
-$fpdf_charwidths['courierBI']=$fpdf_charwidths['courier'];
-?>
+<?php
+for($i=0;$i<=255;$i++)
+	$fpdf_charwidths['courier'][chr($i)]=600;
+$fpdf_charwidths['courierB']=$fpdf_charwidths['courier'];
+$fpdf_charwidths['courierI']=$fpdf_charwidths['courier'];
+$fpdf_charwidths['courierBI']=$fpdf_charwidths['courier'];
+?>
diff --git a/library/html2pdf/_fpdf/font/helvetica.php b/library/html2pdf/_fpdf/font/helvetica.php
index ca94cdf21..8fa7683e7 100644
--- a/library/html2pdf/_fpdf/font/helvetica.php
+++ b/library/html2pdf/_fpdf/font/helvetica.php
@@ -1,15 +1,15 @@
-<?php
-$fpdf_charwidths['helvetica']=array(
-	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
-	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>278,'"'=>355,'#'=>556,'$'=>556,'%'=>889,'&'=>667,'\''=>191,'('=>333,')'=>333,'*'=>389,'+'=>584,
-	','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>278,';'=>278,'<'=>584,'='=>584,'>'=>584,'?'=>556,'@'=>1015,'A'=>667,
-	'B'=>667,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>500,'K'=>667,'L'=>556,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
-	'X'=>667,'Y'=>667,'Z'=>611,'['=>278,'\\'=>278,']'=>278,'^'=>469,'_'=>556,'`'=>333,'a'=>556,'b'=>556,'c'=>500,'d'=>556,'e'=>556,'f'=>278,'g'=>556,'h'=>556,'i'=>222,'j'=>222,'k'=>500,'l'=>222,'m'=>833,
-	'n'=>556,'o'=>556,'p'=>556,'q'=>556,'r'=>333,'s'=>500,'t'=>278,'u'=>556,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>500,'{'=>334,'|'=>260,'}'=>334,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>222,chr(131)=>556,
-	chr(132)=>333,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>222,chr(146)=>222,chr(147)=>333,chr(148)=>333,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
-	chr(154)=>500,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>260,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
-	chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>556,chr(182)=>537,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>667,chr(193)=>667,chr(194)=>667,chr(195)=>667,chr(196)=>667,chr(197)=>667,
-	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
-	chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>500,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>556,chr(241)=>556,
-	chr(242)=>556,chr(243)=>556,chr(244)=>556,chr(245)=>556,chr(246)=>556,chr(247)=>584,chr(248)=>611,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500);
-?>
+<?php
+$fpdf_charwidths['helvetica']=array(
+	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
+	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>278,'"'=>355,'#'=>556,'$'=>556,'%'=>889,'&'=>667,'\''=>191,'('=>333,')'=>333,'*'=>389,'+'=>584,
+	','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>278,';'=>278,'<'=>584,'='=>584,'>'=>584,'?'=>556,'@'=>1015,'A'=>667,
+	'B'=>667,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>500,'K'=>667,'L'=>556,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
+	'X'=>667,'Y'=>667,'Z'=>611,'['=>278,'\\'=>278,']'=>278,'^'=>469,'_'=>556,'`'=>333,'a'=>556,'b'=>556,'c'=>500,'d'=>556,'e'=>556,'f'=>278,'g'=>556,'h'=>556,'i'=>222,'j'=>222,'k'=>500,'l'=>222,'m'=>833,
+	'n'=>556,'o'=>556,'p'=>556,'q'=>556,'r'=>333,'s'=>500,'t'=>278,'u'=>556,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>500,'{'=>334,'|'=>260,'}'=>334,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>222,chr(131)=>556,
+	chr(132)=>333,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>222,chr(146)=>222,chr(147)=>333,chr(148)=>333,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
+	chr(154)=>500,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>260,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
+	chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>556,chr(182)=>537,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>667,chr(193)=>667,chr(194)=>667,chr(195)=>667,chr(196)=>667,chr(197)=>667,
+	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+	chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>500,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>556,chr(241)=>556,
+	chr(242)=>556,chr(243)=>556,chr(244)=>556,chr(245)=>556,chr(246)=>556,chr(247)=>584,chr(248)=>611,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500);
+?>
diff --git a/library/html2pdf/_fpdf/font/helveticab.php b/library/html2pdf/_fpdf/font/helveticab.php
index 276cfa8cb..a8473c94d 100644
--- a/library/html2pdf/_fpdf/font/helveticab.php
+++ b/library/html2pdf/_fpdf/font/helveticab.php
@@ -1,15 +1,15 @@
-<?php
-$fpdf_charwidths['helveticaB']=array(
-	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
-	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>333,'"'=>474,'#'=>556,'$'=>556,'%'=>889,'&'=>722,'\''=>238,'('=>333,')'=>333,'*'=>389,'+'=>584,
-	','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>333,';'=>333,'<'=>584,'='=>584,'>'=>584,'?'=>611,'@'=>975,'A'=>722,
-	'B'=>722,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>556,'K'=>722,'L'=>611,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
-	'X'=>667,'Y'=>667,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>584,'_'=>556,'`'=>333,'a'=>556,'b'=>611,'c'=>556,'d'=>611,'e'=>556,'f'=>333,'g'=>611,'h'=>611,'i'=>278,'j'=>278,'k'=>556,'l'=>278,'m'=>889,
-	'n'=>611,'o'=>611,'p'=>611,'q'=>611,'r'=>389,'s'=>556,'t'=>333,'u'=>611,'v'=>556,'w'=>778,'x'=>556,'y'=>556,'z'=>500,'{'=>389,'|'=>280,'}'=>389,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>278,chr(131)=>556,
-	chr(132)=>500,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>278,chr(146)=>278,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
-	chr(154)=>556,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>280,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
-	chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>611,chr(182)=>556,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
-	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
-	chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>556,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>611,chr(241)=>611,
-	chr(242)=>611,chr(243)=>611,chr(244)=>611,chr(245)=>611,chr(246)=>611,chr(247)=>584,chr(248)=>611,chr(249)=>611,chr(250)=>611,chr(251)=>611,chr(252)=>611,chr(253)=>556,chr(254)=>611,chr(255)=>556);
-?>
+<?php
+$fpdf_charwidths['helveticaB']=array(
+	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
+	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>333,'"'=>474,'#'=>556,'$'=>556,'%'=>889,'&'=>722,'\''=>238,'('=>333,')'=>333,'*'=>389,'+'=>584,
+	','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>333,';'=>333,'<'=>584,'='=>584,'>'=>584,'?'=>611,'@'=>975,'A'=>722,
+	'B'=>722,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>556,'K'=>722,'L'=>611,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
+	'X'=>667,'Y'=>667,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>584,'_'=>556,'`'=>333,'a'=>556,'b'=>611,'c'=>556,'d'=>611,'e'=>556,'f'=>333,'g'=>611,'h'=>611,'i'=>278,'j'=>278,'k'=>556,'l'=>278,'m'=>889,
+	'n'=>611,'o'=>611,'p'=>611,'q'=>611,'r'=>389,'s'=>556,'t'=>333,'u'=>611,'v'=>556,'w'=>778,'x'=>556,'y'=>556,'z'=>500,'{'=>389,'|'=>280,'}'=>389,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>278,chr(131)=>556,
+	chr(132)=>500,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>278,chr(146)=>278,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
+	chr(154)=>556,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>280,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
+	chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>611,chr(182)=>556,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
+	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+	chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>556,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>611,chr(241)=>611,
+	chr(242)=>611,chr(243)=>611,chr(244)=>611,chr(245)=>611,chr(246)=>611,chr(247)=>584,chr(248)=>611,chr(249)=>611,chr(250)=>611,chr(251)=>611,chr(252)=>611,chr(253)=>556,chr(254)=>611,chr(255)=>556);
+?>
diff --git a/library/html2pdf/_fpdf/font/helveticabi.php b/library/html2pdf/_fpdf/font/helveticabi.php
index 8d2177432..41379537d 100644
--- a/library/html2pdf/_fpdf/font/helveticabi.php
+++ b/library/html2pdf/_fpdf/font/helveticabi.php
@@ -1,15 +1,15 @@
-<?php
-$fpdf_charwidths['helveticaBI']=array(
-	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
-	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>333,'"'=>474,'#'=>556,'$'=>556,'%'=>889,'&'=>722,'\''=>238,'('=>333,')'=>333,'*'=>389,'+'=>584,
-	','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>333,';'=>333,'<'=>584,'='=>584,'>'=>584,'?'=>611,'@'=>975,'A'=>722,
-	'B'=>722,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>556,'K'=>722,'L'=>611,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
-	'X'=>667,'Y'=>667,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>584,'_'=>556,'`'=>333,'a'=>556,'b'=>611,'c'=>556,'d'=>611,'e'=>556,'f'=>333,'g'=>611,'h'=>611,'i'=>278,'j'=>278,'k'=>556,'l'=>278,'m'=>889,
-	'n'=>611,'o'=>611,'p'=>611,'q'=>611,'r'=>389,'s'=>556,'t'=>333,'u'=>611,'v'=>556,'w'=>778,'x'=>556,'y'=>556,'z'=>500,'{'=>389,'|'=>280,'}'=>389,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>278,chr(131)=>556,
-	chr(132)=>500,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>278,chr(146)=>278,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
-	chr(154)=>556,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>280,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
-	chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>611,chr(182)=>556,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
-	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
-	chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>556,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>611,chr(241)=>611,
-	chr(242)=>611,chr(243)=>611,chr(244)=>611,chr(245)=>611,chr(246)=>611,chr(247)=>584,chr(248)=>611,chr(249)=>611,chr(250)=>611,chr(251)=>611,chr(252)=>611,chr(253)=>556,chr(254)=>611,chr(255)=>556);
-?>
+<?php
+$fpdf_charwidths['helveticaBI']=array(
+	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
+	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>333,'"'=>474,'#'=>556,'$'=>556,'%'=>889,'&'=>722,'\''=>238,'('=>333,')'=>333,'*'=>389,'+'=>584,
+	','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>333,';'=>333,'<'=>584,'='=>584,'>'=>584,'?'=>611,'@'=>975,'A'=>722,
+	'B'=>722,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>556,'K'=>722,'L'=>611,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
+	'X'=>667,'Y'=>667,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>584,'_'=>556,'`'=>333,'a'=>556,'b'=>611,'c'=>556,'d'=>611,'e'=>556,'f'=>333,'g'=>611,'h'=>611,'i'=>278,'j'=>278,'k'=>556,'l'=>278,'m'=>889,
+	'n'=>611,'o'=>611,'p'=>611,'q'=>611,'r'=>389,'s'=>556,'t'=>333,'u'=>611,'v'=>556,'w'=>778,'x'=>556,'y'=>556,'z'=>500,'{'=>389,'|'=>280,'}'=>389,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>278,chr(131)=>556,
+	chr(132)=>500,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>278,chr(146)=>278,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
+	chr(154)=>556,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>280,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
+	chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>611,chr(182)=>556,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
+	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+	chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>556,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>611,chr(241)=>611,
+	chr(242)=>611,chr(243)=>611,chr(244)=>611,chr(245)=>611,chr(246)=>611,chr(247)=>584,chr(248)=>611,chr(249)=>611,chr(250)=>611,chr(251)=>611,chr(252)=>611,chr(253)=>556,chr(254)=>611,chr(255)=>556);
+?>
diff --git a/library/html2pdf/_fpdf/font/helveticai.php b/library/html2pdf/_fpdf/font/helveticai.php
index 88bf4371b..d5bb6e094 100644
--- a/library/html2pdf/_fpdf/font/helveticai.php
+++ b/library/html2pdf/_fpdf/font/helveticai.php
@@ -1,15 +1,15 @@
-<?php
-$fpdf_charwidths['helveticaI']=array(
-	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
-	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>278,'"'=>355,'#'=>556,'$'=>556,'%'=>889,'&'=>667,'\''=>191,'('=>333,')'=>333,'*'=>389,'+'=>584,
-	','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>278,';'=>278,'<'=>584,'='=>584,'>'=>584,'?'=>556,'@'=>1015,'A'=>667,
-	'B'=>667,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>500,'K'=>667,'L'=>556,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
-	'X'=>667,'Y'=>667,'Z'=>611,'['=>278,'\\'=>278,']'=>278,'^'=>469,'_'=>556,'`'=>333,'a'=>556,'b'=>556,'c'=>500,'d'=>556,'e'=>556,'f'=>278,'g'=>556,'h'=>556,'i'=>222,'j'=>222,'k'=>500,'l'=>222,'m'=>833,
-	'n'=>556,'o'=>556,'p'=>556,'q'=>556,'r'=>333,'s'=>500,'t'=>278,'u'=>556,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>500,'{'=>334,'|'=>260,'}'=>334,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>222,chr(131)=>556,
-	chr(132)=>333,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>222,chr(146)=>222,chr(147)=>333,chr(148)=>333,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
-	chr(154)=>500,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>260,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
-	chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>556,chr(182)=>537,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>667,chr(193)=>667,chr(194)=>667,chr(195)=>667,chr(196)=>667,chr(197)=>667,
-	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
-	chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>500,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>556,chr(241)=>556,
-	chr(242)=>556,chr(243)=>556,chr(244)=>556,chr(245)=>556,chr(246)=>556,chr(247)=>584,chr(248)=>611,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500);
-?>
+<?php
+$fpdf_charwidths['helveticaI']=array(
+	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
+	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>278,'"'=>355,'#'=>556,'$'=>556,'%'=>889,'&'=>667,'\''=>191,'('=>333,')'=>333,'*'=>389,'+'=>584,
+	','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>278,';'=>278,'<'=>584,'='=>584,'>'=>584,'?'=>556,'@'=>1015,'A'=>667,
+	'B'=>667,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>500,'K'=>667,'L'=>556,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
+	'X'=>667,'Y'=>667,'Z'=>611,'['=>278,'\\'=>278,']'=>278,'^'=>469,'_'=>556,'`'=>333,'a'=>556,'b'=>556,'c'=>500,'d'=>556,'e'=>556,'f'=>278,'g'=>556,'h'=>556,'i'=>222,'j'=>222,'k'=>500,'l'=>222,'m'=>833,
+	'n'=>556,'o'=>556,'p'=>556,'q'=>556,'r'=>333,'s'=>500,'t'=>278,'u'=>556,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>500,'{'=>334,'|'=>260,'}'=>334,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>222,chr(131)=>556,
+	chr(132)=>333,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>222,chr(146)=>222,chr(147)=>333,chr(148)=>333,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
+	chr(154)=>500,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>260,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
+	chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>556,chr(182)=>537,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>667,chr(193)=>667,chr(194)=>667,chr(195)=>667,chr(196)=>667,chr(197)=>667,
+	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+	chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>500,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>556,chr(241)=>556,
+	chr(242)=>556,chr(243)=>556,chr(244)=>556,chr(245)=>556,chr(246)=>556,chr(247)=>584,chr(248)=>611,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500);
+?>
diff --git a/library/html2pdf/_fpdf/font/makefont/makefont.php b/library/html2pdf/_fpdf/font/makefont/makefont.php
index 7e7ed5647..7fe558f27 100644
--- a/library/html2pdf/_fpdf/font/makefont/makefont.php
+++ b/library/html2pdf/_fpdf/font/makefont/makefont.php
@@ -1,419 +1,419 @@
-<?php
-/*******************************************************************************
-* Utility to generate font definition files                                    *
-*                                                                              *
-* Version: 1.14                                                                *
-* Date:    2008-08-03                                                          *
-* Author:  Olivier PLATHEY                                                     *
-*******************************************************************************/
-
-function ReadMap($enc)
-{
-	//Read a map file
-	$file=dirname(__FILE__).'/'.strtolower($enc).'.map';
-	$a=file($file);
-	if(empty($a))
-		die('<b>Error:</b> encoding not found: '.$enc);
-	$cc2gn=array();
-	foreach($a as $l)
-	{
-		if($l[0]=='!')
-		{
-			$e=preg_split('/[ \\t]+/',rtrim($l));
-			$cc=hexdec(substr($e[0],1));
-			$gn=$e[2];
-			$cc2gn[$cc]=$gn;
-		}
-	}
-	for($i=0;$i<=255;$i++)
-	{
-		if(!isset($cc2gn[$i]))
-			$cc2gn[$i]='.notdef';
-	}
-	return $cc2gn;
-}
-
-function ReadAFM($file, &$map)
-{
-	//Read a font metric file
-	$a=file($file);
-	if(empty($a))
-		die('File not found');
-	$widths=array();
-	$fm=array();
-	$fix=array('Edot'=>'Edotaccent','edot'=>'edotaccent','Idot'=>'Idotaccent','Zdot'=>'Zdotaccent','zdot'=>'zdotaccent',
-		'Odblacute'=>'Ohungarumlaut','odblacute'=>'ohungarumlaut','Udblacute'=>'Uhungarumlaut','udblacute'=>'uhungarumlaut',
-		'Gcedilla'=>'Gcommaaccent','gcedilla'=>'gcommaaccent','Kcedilla'=>'Kcommaaccent','kcedilla'=>'kcommaaccent',
-		'Lcedilla'=>'Lcommaaccent','lcedilla'=>'lcommaaccent','Ncedilla'=>'Ncommaaccent','ncedilla'=>'ncommaaccent',
-		'Rcedilla'=>'Rcommaaccent','rcedilla'=>'rcommaaccent','Scedilla'=>'Scommaaccent','scedilla'=>'scommaaccent',
-		'Tcedilla'=>'Tcommaaccent','tcedilla'=>'tcommaaccent','Dslash'=>'Dcroat','dslash'=>'dcroat','Dmacron'=>'Dcroat','dmacron'=>'dcroat',
-		'combininggraveaccent'=>'gravecomb','combininghookabove'=>'hookabovecomb','combiningtildeaccent'=>'tildecomb',
-		'combiningacuteaccent'=>'acutecomb','combiningdotbelow'=>'dotbelowcomb','dongsign'=>'dong');
-	foreach($a as $l)
-	{
-		$e=explode(' ',rtrim($l));
-		if(count($e)<2)
-			continue;
-		$code=$e[0];
-		$param=$e[1];
-		if($code=='C')
-		{
-			//Character metrics
-			$cc=(int)$e[1];
-			$w=$e[4];
-			$gn=$e[7];
-			if(substr($gn,-4)=='20AC')
-				$gn='Euro';
-			if(isset($fix[$gn]))
-			{
-				//Fix incorrect glyph name
-				foreach($map as $c=>$n)
-				{
-					if($n==$fix[$gn])
-						$map[$c]=$gn;
-				}
-			}
-			if(empty($map))
-			{
-				//Symbolic font: use built-in encoding
-				$widths[$cc]=$w;
-			}
-			else
-			{
-				$widths[$gn]=$w;
-				if($gn=='X')
-					$fm['CapXHeight']=$e[13];
-			}
-			if($gn=='.notdef')
-				$fm['MissingWidth']=$w;
-		}
-		elseif($code=='FontName')
-			$fm['FontName']=$param;
-		elseif($code=='Weight')
-			$fm['Weight']=$param;
-		elseif($code=='ItalicAngle')
-			$fm['ItalicAngle']=(double)$param;
-		elseif($code=='Ascender')
-			$fm['Ascender']=(int)$param;
-		elseif($code=='Descender')
-			$fm['Descender']=(int)$param;
-		elseif($code=='UnderlineThickness')
-			$fm['UnderlineThickness']=(int)$param;
-		elseif($code=='UnderlinePosition')
-			$fm['UnderlinePosition']=(int)$param;
-		elseif($code=='IsFixedPitch')
-			$fm['IsFixedPitch']=($param=='true');
-		elseif($code=='FontBBox')
-			$fm['FontBBox']=array($e[1],$e[2],$e[3],$e[4]);
-		elseif($code=='CapHeight')
-			$fm['CapHeight']=(int)$param;
-		elseif($code=='StdVW')
-			$fm['StdVW']=(int)$param;
-	}
-	if(!isset($fm['FontName']))
-		die('FontName not found');
-	if(!empty($map))
-	{
-		if(!isset($widths['.notdef']))
-			$widths['.notdef']=600;
-		if(!isset($widths['Delta']) && isset($widths['increment']))
-			$widths['Delta']=$widths['increment'];
-		//Order widths according to map
-		for($i=0;$i<=255;$i++)
-		{
-			if(!isset($widths[$map[$i]]))
-			{
-				echo '<b>Warning:</b> character '.$map[$i].' is missing<br>';
-				$widths[$i]=$widths['.notdef'];
-			}
-			else
-				$widths[$i]=$widths[$map[$i]];
-		}
-	}
-	$fm['Widths']=$widths;
-	return $fm;
-}
-
-function MakeFontDescriptor($fm, $symbolic)
-{
-	//Ascent
-	$asc=(isset($fm['Ascender']) ? $fm['Ascender'] : 1000);
-	$fd="array('Ascent'=>".$asc;
-	//Descent
-	$desc=(isset($fm['Descender']) ? $fm['Descender'] : -200);
-	$fd.=",'Descent'=>".$desc;
-	//CapHeight
-	if(isset($fm['CapHeight']))
-		$ch=$fm['CapHeight'];
-	elseif(isset($fm['CapXHeight']))
-		$ch=$fm['CapXHeight'];
-	else
-		$ch=$asc;
-	$fd.=",'CapHeight'=>".$ch;
-	//Flags
-	$flags=0;
-	if(isset($fm['IsFixedPitch']) && $fm['IsFixedPitch'])
-		$flags+=1<<0;
-	if($symbolic)
-		$flags+=1<<2;
-	if(!$symbolic)
-		$flags+=1<<5;
-	if(isset($fm['ItalicAngle']) && $fm['ItalicAngle']!=0)
-		$flags+=1<<6;
-	$fd.=",'Flags'=>".$flags;
-	//FontBBox
-	if(isset($fm['FontBBox']))
-		$fbb=$fm['FontBBox'];
-	else
-		$fbb=array(0,$desc-100,1000,$asc+100);
-	$fd.=",'FontBBox'=>'[".$fbb[0].' '.$fbb[1].' '.$fbb[2].' '.$fbb[3]."]'";
-	//ItalicAngle
-	$ia=(isset($fm['ItalicAngle']) ? $fm['ItalicAngle'] : 0);
-	$fd.=",'ItalicAngle'=>".$ia;
-	//StemV
-	if(isset($fm['StdVW']))
-		$stemv=$fm['StdVW'];
-	elseif(isset($fm['Weight']) && preg_match('/bold|black/i',$fm['Weight']))
-		$stemv=120;
-	else
-		$stemv=70;
-	$fd.=",'StemV'=>".$stemv;
-	//MissingWidth
-	if(isset($fm['MissingWidth']))
-		$fd.=",'MissingWidth'=>".$fm['MissingWidth'];
-	$fd.=')';
-	return $fd;
-}
-
-function MakeWidthArray($fm)
-{
-	//Make character width array
-	$s="array(\n\t";
-	$cw=$fm['Widths'];
-	for($i=0;$i<=255;$i++)
-	{
-		if(chr($i)=="'")
-			$s.="'\\''";
-		elseif(chr($i)=="\\")
-			$s.="'\\\\'";
-		elseif($i>=32 && $i<=126)
-			$s.="'".chr($i)."'";
-		else
-			$s.="chr($i)";
-		$s.='=>'.$fm['Widths'][$i];
-		if($i<255)
-			$s.=',';
-		if(($i+1)%22==0)
-			$s.="\n\t";
-	}
-	$s.=')';
-	return $s;
-}
-
-function MakeFontEncoding($map)
-{
-	//Build differences from reference encoding
-	$ref=ReadMap('cp1252');
-	$s='';
-	$last=0;
-	for($i=32;$i<=255;$i++)
-	{
-		if($map[$i]!=$ref[$i])
-		{
-			if($i!=$last+1)
-				$s.=$i.' ';
-			$last=$i;
-			$s.='/'.$map[$i].' ';
-		}
-	}
-	return rtrim($s);
-}
-
-function SaveToFile($file, $s, $mode)
-{
-	$f=fopen($file,'w'.$mode);
-	if(!$f)
-		die('Can\'t write to file '.$file);
-	fwrite($f,$s,strlen($s));
-	fclose($f);
-}
-
-function ReadShort($f)
-{
-	$a=unpack('n1n',fread($f,2));
-	return $a['n'];
-}
-
-function ReadLong($f)
-{
-	$a=unpack('N1N',fread($f,4));
-	return $a['N'];
-}
-
-function CheckTTF($file)
-{
-	//Check if font license allows embedding
-	$f=fopen($file,'rb');
-	if(!$f)
-		die('<b>Error:</b> Can\'t open '.$file);
-	//Extract number of tables
-	fseek($f,4,SEEK_CUR);
-	$nb=ReadShort($f);
-	fseek($f,6,SEEK_CUR);
-	//Seek OS/2 table
-	$found=false;
-	for($i=0;$i<$nb;$i++)
-	{
-		if(fread($f,4)=='OS/2')
-		{
-			$found=true;
-			break;
-		}
-		fseek($f,12,SEEK_CUR);
-	}
-	if(!$found)
-	{
-		fclose($f);
-		return;
-	}
-	fseek($f,4,SEEK_CUR);
-	$offset=ReadLong($f);
-	fseek($f,$offset,SEEK_SET);
-	//Extract fsType flags
-	fseek($f,8,SEEK_CUR);
-	$fsType=ReadShort($f);
-	$rl=($fsType & 0x02)!=0;
-	$pp=($fsType & 0x04)!=0;
-	$e=($fsType & 0x08)!=0;
-	fclose($f);
-	if($rl && !$pp && !$e)
-		echo '<b>Warning:</b> font license does not allow embedding';
-}
-
-/*******************************************************************************
-* fontfile: path to TTF file (or empty string if not to be embedded)           *
-* afmfile:  path to AFM file                                                   *
-* enc:      font encoding (or empty string for symbolic fonts)                 *
-* patch:    optional patch for encoding                                        *
-* type:     font type if fontfile is empty                                     *
-*******************************************************************************/
-function MakeFont($fontfile, $afmfile, $enc='cp1252', $patch=array(), $type='TrueType')
-{
-	//Generate a font definition file
-	if(get_magic_quotes_runtime())
-		@set_magic_quotes_runtime(0);
-	ini_set('auto_detect_line_endings','1');
-	if($enc)
-	{
-		$map=ReadMap($enc);
-		foreach($patch as $cc=>$gn)
-			$map[$cc]=$gn;
-	}
-	else
-		$map=array();
-	if(!file_exists($afmfile))
-		die('<b>Error:</b> AFM file not found: '.$afmfile);
-	$fm=ReadAFM($afmfile,$map);
-	if($enc)
-		$diff=MakeFontEncoding($map);
-	else
-		$diff='';
-	$fd=MakeFontDescriptor($fm,empty($map));
-	//Find font type
-	if($fontfile)
-	{
-		$ext=strtolower(substr($fontfile,-3));
-		if($ext=='ttf')
-			$type='TrueType';
-		elseif($ext=='pfb')
-			$type='Type1';
-		else
-			die('<b>Error:</b> unrecognized font file extension: '.$ext);
-	}
-	else
-	{
-		if($type!='TrueType' && $type!='Type1')
-			die('<b>Error:</b> incorrect font type: '.$type);
-	}
-	//Start generation
-	$s='<?php'."\n";
-	$s.='$type=\''.$type."';\n";
-	$s.='$name=\''.$fm['FontName']."';\n";
-	$s.='$desc='.$fd.";\n";
-	if(!isset($fm['UnderlinePosition']))
-		$fm['UnderlinePosition']=-100;
-	if(!isset($fm['UnderlineThickness']))
-		$fm['UnderlineThickness']=50;
-	$s.='$up='.$fm['UnderlinePosition'].";\n";
-	$s.='$ut='.$fm['UnderlineThickness'].";\n";
-	$w=MakeWidthArray($fm);
-	$s.='$cw='.$w.";\n";
-	$s.='$enc=\''.$enc."';\n";
-	$s.='$diff=\''.$diff."';\n";
-	$basename=substr(basename($afmfile),0,-4);
-	if($fontfile)
-	{
-		//Embedded font
-		if(!file_exists($fontfile))
-			die('<b>Error:</b> font file not found: '.$fontfile);
-		if($type=='TrueType')
-			CheckTTF($fontfile);
-		$f=fopen($fontfile,'rb');
-		if(!$f)
-			die('<b>Error:</b> Can\'t open '.$fontfile);
-		$file=fread($f,filesize($fontfile));
-		fclose($f);
-		if($type=='Type1')
-		{
-			//Find first two sections and discard third one
-			$header=(ord($file[0])==128);
-			if($header)
-			{
-				//Strip first binary header
-				$file=substr($file,6);
-			}
-			$pos=strpos($file,'eexec');
-			if(!$pos)
-				die('<b>Error:</b> font file does not seem to be valid Type1');
-			$size1=$pos+6;
-			if($header && ord($file[$size1])==128)
-			{
-				//Strip second binary header
-				$file=substr($file,0,$size1).substr($file,$size1+6);
-			}
-			$pos=strpos($file,'00000000');
-			if(!$pos)
-				die('<b>Error:</b> font file does not seem to be valid Type1');
-			$size2=$pos-$size1;
-			$file=substr($file,0,$size1+$size2);
-		}
-		if(function_exists('gzcompress'))
-		{
-			$cmp=$basename.'.z';
-			SaveToFile($cmp,gzcompress($file),'b');
-			$s.='$file=\''.$cmp."';\n";
-			echo 'Font file compressed ('.$cmp.')<br>';
-		}
-		else
-		{
-			$s.='$file=\''.basename($fontfile)."';\n";
-			echo '<b>Notice:</b> font file could not be compressed (zlib extension not available)<br>';
-		}
-		if($type=='Type1')
-		{
-			$s.='$size1='.$size1.";\n";
-			$s.='$size2='.$size2.";\n";
-		}
-		else
-			$s.='$originalsize='.filesize($fontfile).";\n";
-	}
-	else
-	{
-		//Not embedded font
-		$s.='$file='."'';\n";
-	}
-	$s.="?>\n";
-	SaveToFile($basename.'.php',$s,'t');
-	echo 'Font definition file generated ('.$basename.'.php'.')<br>';
-}
-?>
+<?php
+/*******************************************************************************
+* Utility to generate font definition files                                    *
+*                                                                              *
+* Version: 1.14                                                                *
+* Date:    2008-08-03                                                          *
+* Author:  Olivier PLATHEY                                                     *
+*******************************************************************************/
+
+function ReadMap($enc)
+{
+	//Read a map file
+	$file=dirname(__FILE__).'/'.strtolower($enc).'.map';
+	$a=file($file);
+	if(empty($a))
+		die('<b>Error:</b> encoding not found: '.$enc);
+	$cc2gn=array();
+	foreach($a as $l)
+	{
+		if($l[0]=='!')
+		{
+			$e=preg_split('/[ \\t]+/',rtrim($l));
+			$cc=hexdec(substr($e[0],1));
+			$gn=$e[2];
+			$cc2gn[$cc]=$gn;
+		}
+	}
+	for($i=0;$i<=255;$i++)
+	{
+		if(!isset($cc2gn[$i]))
+			$cc2gn[$i]='.notdef';
+	}
+	return $cc2gn;
+}
+
+function ReadAFM($file, &$map)
+{
+	//Read a font metric file
+	$a=file($file);
+	if(empty($a))
+		die('File not found');
+	$widths=array();
+	$fm=array();
+	$fix=array('Edot'=>'Edotaccent','edot'=>'edotaccent','Idot'=>'Idotaccent','Zdot'=>'Zdotaccent','zdot'=>'zdotaccent',
+		'Odblacute'=>'Ohungarumlaut','odblacute'=>'ohungarumlaut','Udblacute'=>'Uhungarumlaut','udblacute'=>'uhungarumlaut',
+		'Gcedilla'=>'Gcommaaccent','gcedilla'=>'gcommaaccent','Kcedilla'=>'Kcommaaccent','kcedilla'=>'kcommaaccent',
+		'Lcedilla'=>'Lcommaaccent','lcedilla'=>'lcommaaccent','Ncedilla'=>'Ncommaaccent','ncedilla'=>'ncommaaccent',
+		'Rcedilla'=>'Rcommaaccent','rcedilla'=>'rcommaaccent','Scedilla'=>'Scommaaccent','scedilla'=>'scommaaccent',
+		'Tcedilla'=>'Tcommaaccent','tcedilla'=>'tcommaaccent','Dslash'=>'Dcroat','dslash'=>'dcroat','Dmacron'=>'Dcroat','dmacron'=>'dcroat',
+		'combininggraveaccent'=>'gravecomb','combininghookabove'=>'hookabovecomb','combiningtildeaccent'=>'tildecomb',
+		'combiningacuteaccent'=>'acutecomb','combiningdotbelow'=>'dotbelowcomb','dongsign'=>'dong');
+	foreach($a as $l)
+	{
+		$e=explode(' ',rtrim($l));
+		if(count($e)<2)
+			continue;
+		$code=$e[0];
+		$param=$e[1];
+		if($code=='C')
+		{
+			//Character metrics
+			$cc=(int)$e[1];
+			$w=$e[4];
+			$gn=$e[7];
+			if(substr($gn,-4)=='20AC')
+				$gn='Euro';
+			if(isset($fix[$gn]))
+			{
+				//Fix incorrect glyph name
+				foreach($map as $c=>$n)
+				{
+					if($n==$fix[$gn])
+						$map[$c]=$gn;
+				}
+			}
+			if(empty($map))
+			{
+				//Symbolic font: use built-in encoding
+				$widths[$cc]=$w;
+			}
+			else
+			{
+				$widths[$gn]=$w;
+				if($gn=='X')
+					$fm['CapXHeight']=$e[13];
+			}
+			if($gn=='.notdef')
+				$fm['MissingWidth']=$w;
+		}
+		elseif($code=='FontName')
+			$fm['FontName']=$param;
+		elseif($code=='Weight')
+			$fm['Weight']=$param;
+		elseif($code=='ItalicAngle')
+			$fm['ItalicAngle']=(double)$param;
+		elseif($code=='Ascender')
+			$fm['Ascender']=(int)$param;
+		elseif($code=='Descender')
+			$fm['Descender']=(int)$param;
+		elseif($code=='UnderlineThickness')
+			$fm['UnderlineThickness']=(int)$param;
+		elseif($code=='UnderlinePosition')
+			$fm['UnderlinePosition']=(int)$param;
+		elseif($code=='IsFixedPitch')
+			$fm['IsFixedPitch']=($param=='true');
+		elseif($code=='FontBBox')
+			$fm['FontBBox']=array($e[1],$e[2],$e[3],$e[4]);
+		elseif($code=='CapHeight')
+			$fm['CapHeight']=(int)$param;
+		elseif($code=='StdVW')
+			$fm['StdVW']=(int)$param;
+	}
+	if(!isset($fm['FontName']))
+		die('FontName not found');
+	if(!empty($map))
+	{
+		if(!isset($widths['.notdef']))
+			$widths['.notdef']=600;
+		if(!isset($widths['Delta']) && isset($widths['increment']))
+			$widths['Delta']=$widths['increment'];
+		//Order widths according to map
+		for($i=0;$i<=255;$i++)
+		{
+			if(!isset($widths[$map[$i]]))
+			{
+				echo '<b>Warning:</b> character '.$map[$i].' is missing<br>';
+				$widths[$i]=$widths['.notdef'];
+			}
+			else
+				$widths[$i]=$widths[$map[$i]];
+		}
+	}
+	$fm['Widths']=$widths;
+	return $fm;
+}
+
+function MakeFontDescriptor($fm, $symbolic)
+{
+	//Ascent
+	$asc=(isset($fm['Ascender']) ? $fm['Ascender'] : 1000);
+	$fd="array('Ascent'=>".$asc;
+	//Descent
+	$desc=(isset($fm['Descender']) ? $fm['Descender'] : -200);
+	$fd.=",'Descent'=>".$desc;
+	//CapHeight
+	if(isset($fm['CapHeight']))
+		$ch=$fm['CapHeight'];
+	elseif(isset($fm['CapXHeight']))
+		$ch=$fm['CapXHeight'];
+	else
+		$ch=$asc;
+	$fd.=",'CapHeight'=>".$ch;
+	//Flags
+	$flags=0;
+	if(isset($fm['IsFixedPitch']) && $fm['IsFixedPitch'])
+		$flags+=1<<0;
+	if($symbolic)
+		$flags+=1<<2;
+	if(!$symbolic)
+		$flags+=1<<5;
+	if(isset($fm['ItalicAngle']) && $fm['ItalicAngle']!=0)
+		$flags+=1<<6;
+	$fd.=",'Flags'=>".$flags;
+	//FontBBox
+	if(isset($fm['FontBBox']))
+		$fbb=$fm['FontBBox'];
+	else
+		$fbb=array(0,$desc-100,1000,$asc+100);
+	$fd.=",'FontBBox'=>'[".$fbb[0].' '.$fbb[1].' '.$fbb[2].' '.$fbb[3]."]'";
+	//ItalicAngle
+	$ia=(isset($fm['ItalicAngle']) ? $fm['ItalicAngle'] : 0);
+	$fd.=",'ItalicAngle'=>".$ia;
+	//StemV
+	if(isset($fm['StdVW']))
+		$stemv=$fm['StdVW'];
+	elseif(isset($fm['Weight']) && preg_match('/bold|black/i',$fm['Weight']))
+		$stemv=120;
+	else
+		$stemv=70;
+	$fd.=",'StemV'=>".$stemv;
+	//MissingWidth
+	if(isset($fm['MissingWidth']))
+		$fd.=",'MissingWidth'=>".$fm['MissingWidth'];
+	$fd.=')';
+	return $fd;
+}
+
+function MakeWidthArray($fm)
+{
+	//Make character width array
+	$s="array(\n\t";
+	$cw=$fm['Widths'];
+	for($i=0;$i<=255;$i++)
+	{
+		if(chr($i)=="'")
+			$s.="'\\''";
+		elseif(chr($i)=="\\")
+			$s.="'\\\\'";
+		elseif($i>=32 && $i<=126)
+			$s.="'".chr($i)."'";
+		else
+			$s.="chr($i)";
+		$s.='=>'.$fm['Widths'][$i];
+		if($i<255)
+			$s.=',';
+		if(($i+1)%22==0)
+			$s.="\n\t";
+	}
+	$s.=')';
+	return $s;
+}
+
+function MakeFontEncoding($map)
+{
+	//Build differences from reference encoding
+	$ref=ReadMap('cp1252');
+	$s='';
+	$last=0;
+	for($i=32;$i<=255;$i++)
+	{
+		if($map[$i]!=$ref[$i])
+		{
+			if($i!=$last+1)
+				$s.=$i.' ';
+			$last=$i;
+			$s.='/'.$map[$i].' ';
+		}
+	}
+	return rtrim($s);
+}
+
+function SaveToFile($file, $s, $mode)
+{
+	$f=fopen($file,'w'.$mode);
+	if(!$f)
+		die('Can\'t write to file '.$file);
+	fwrite($f,$s,strlen($s));
+	fclose($f);
+}
+
+function ReadShort($f)
+{
+	$a=unpack('n1n',fread($f,2));
+	return $a['n'];
+}
+
+function ReadLong($f)
+{
+	$a=unpack('N1N',fread($f,4));
+	return $a['N'];
+}
+
+function CheckTTF($file)
+{
+	//Check if font license allows embedding
+	$f=fopen($file,'rb');
+	if(!$f)
+		die('<b>Error:</b> Can\'t open '.$file);
+	//Extract number of tables
+	fseek($f,4,SEEK_CUR);
+	$nb=ReadShort($f);
+	fseek($f,6,SEEK_CUR);
+	//Seek OS/2 table
+	$found=false;
+	for($i=0;$i<$nb;$i++)
+	{
+		if(fread($f,4)=='OS/2')
+		{
+			$found=true;
+			break;
+		}
+		fseek($f,12,SEEK_CUR);
+	}
+	if(!$found)
+	{
+		fclose($f);
+		return;
+	}
+	fseek($f,4,SEEK_CUR);
+	$offset=ReadLong($f);
+	fseek($f,$offset,SEEK_SET);
+	//Extract fsType flags
+	fseek($f,8,SEEK_CUR);
+	$fsType=ReadShort($f);
+	$rl=($fsType & 0x02)!=0;
+	$pp=($fsType & 0x04)!=0;
+	$e=($fsType & 0x08)!=0;
+	fclose($f);
+	if($rl && !$pp && !$e)
+		echo '<b>Warning:</b> font license does not allow embedding';
+}
+
+/*******************************************************************************
+* fontfile: path to TTF file (or empty string if not to be embedded)           *
+* afmfile:  path to AFM file                                                   *
+* enc:      font encoding (or empty string for symbolic fonts)                 *
+* patch:    optional patch for encoding                                        *
+* type:     font type if fontfile is empty                                     *
+*******************************************************************************/
+function MakeFont($fontfile, $afmfile, $enc='cp1252', $patch=array(), $type='TrueType')
+{
+	//Generate a font definition file
+	if(get_magic_quotes_runtime())
+		@set_magic_quotes_runtime(0);
+	ini_set('auto_detect_line_endings','1');
+	if($enc)
+	{
+		$map=ReadMap($enc);
+		foreach($patch as $cc=>$gn)
+			$map[$cc]=$gn;
+	}
+	else
+		$map=array();
+	if(!file_exists($afmfile))
+		die('<b>Error:</b> AFM file not found: '.$afmfile);
+	$fm=ReadAFM($afmfile,$map);
+	if($enc)
+		$diff=MakeFontEncoding($map);
+	else
+		$diff='';
+	$fd=MakeFontDescriptor($fm,empty($map));
+	//Find font type
+	if($fontfile)
+	{
+		$ext=strtolower(substr($fontfile,-3));
+		if($ext=='ttf')
+			$type='TrueType';
+		elseif($ext=='pfb')
+			$type='Type1';
+		else
+			die('<b>Error:</b> unrecognized font file extension: '.$ext);
+	}
+	else
+	{
+		if($type!='TrueType' && $type!='Type1')
+			die('<b>Error:</b> incorrect font type: '.$type);
+	}
+	//Start generation
+	$s='<?php'."\n";
+	$s.='$type=\''.$type."';\n";
+	$s.='$name=\''.$fm['FontName']."';\n";
+	$s.='$desc='.$fd.";\n";
+	if(!isset($fm['UnderlinePosition']))
+		$fm['UnderlinePosition']=-100;
+	if(!isset($fm['UnderlineThickness']))
+		$fm['UnderlineThickness']=50;
+	$s.='$up='.$fm['UnderlinePosition'].";\n";
+	$s.='$ut='.$fm['UnderlineThickness'].";\n";
+	$w=MakeWidthArray($fm);
+	$s.='$cw='.$w.";\n";
+	$s.='$enc=\''.$enc."';\n";
+	$s.='$diff=\''.$diff."';\n";
+	$basename=substr(basename($afmfile),0,-4);
+	if($fontfile)
+	{
+		//Embedded font
+		if(!file_exists($fontfile))
+			die('<b>Error:</b> font file not found: '.$fontfile);
+		if($type=='TrueType')
+			CheckTTF($fontfile);
+		$f=fopen($fontfile,'rb');
+		if(!$f)
+			die('<b>Error:</b> Can\'t open '.$fontfile);
+		$file=fread($f,filesize($fontfile));
+		fclose($f);
+		if($type=='Type1')
+		{
+			//Find first two sections and discard third one
+			$header=(ord($file[0])==128);
+			if($header)
+			{
+				//Strip first binary header
+				$file=substr($file,6);
+			}
+			$pos=strpos($file,'eexec');
+			if(!$pos)
+				die('<b>Error:</b> font file does not seem to be valid Type1');
+			$size1=$pos+6;
+			if($header && ord($file[$size1])==128)
+			{
+				//Strip second binary header
+				$file=substr($file,0,$size1).substr($file,$size1+6);
+			}
+			$pos=strpos($file,'00000000');
+			if(!$pos)
+				die('<b>Error:</b> font file does not seem to be valid Type1');
+			$size2=$pos-$size1;
+			$file=substr($file,0,$size1+$size2);
+		}
+		if(function_exists('gzcompress'))
+		{
+			$cmp=$basename.'.z';
+			SaveToFile($cmp,gzcompress($file),'b');
+			$s.='$file=\''.$cmp."';\n";
+			echo 'Font file compressed ('.$cmp.')<br>';
+		}
+		else
+		{
+			$s.='$file=\''.basename($fontfile)."';\n";
+			echo '<b>Notice:</b> font file could not be compressed (zlib extension not available)<br>';
+		}
+		if($type=='Type1')
+		{
+			$s.='$size1='.$size1.";\n";
+			$s.='$size2='.$size2.";\n";
+		}
+		else
+			$s.='$originalsize='.filesize($fontfile).";\n";
+	}
+	else
+	{
+		//Not embedded font
+		$s.='$file='."'';\n";
+	}
+	$s.="?>\n";
+	SaveToFile($basename.'.php',$s,'t');
+	echo 'Font definition file generated ('.$basename.'.php'.')<br>';
+}
+?>
diff --git a/library/html2pdf/_fpdf/font/symbol.php b/library/html2pdf/_fpdf/font/symbol.php
index 43b50e451..b556ed84c 100644
--- a/library/html2pdf/_fpdf/font/symbol.php
+++ b/library/html2pdf/_fpdf/font/symbol.php
@@ -1,15 +1,15 @@
-<?php
-$fpdf_charwidths['symbol']=array(
-	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
-	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>713,'#'=>500,'$'=>549,'%'=>833,'&'=>778,'\''=>439,'('=>333,')'=>333,'*'=>500,'+'=>549,
-	','=>250,'-'=>549,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>278,';'=>278,'<'=>549,'='=>549,'>'=>549,'?'=>444,'@'=>549,'A'=>722,
-	'B'=>667,'C'=>722,'D'=>612,'E'=>611,'F'=>763,'G'=>603,'H'=>722,'I'=>333,'J'=>631,'K'=>722,'L'=>686,'M'=>889,'N'=>722,'O'=>722,'P'=>768,'Q'=>741,'R'=>556,'S'=>592,'T'=>611,'U'=>690,'V'=>439,'W'=>768,
-	'X'=>645,'Y'=>795,'Z'=>611,'['=>333,'\\'=>863,']'=>333,'^'=>658,'_'=>500,'`'=>500,'a'=>631,'b'=>549,'c'=>549,'d'=>494,'e'=>439,'f'=>521,'g'=>411,'h'=>603,'i'=>329,'j'=>603,'k'=>549,'l'=>549,'m'=>576,
-	'n'=>521,'o'=>549,'p'=>549,'q'=>521,'r'=>549,'s'=>603,'t'=>439,'u'=>576,'v'=>713,'w'=>686,'x'=>493,'y'=>686,'z'=>494,'{'=>480,'|'=>200,'}'=>480,'~'=>549,chr(127)=>0,chr(128)=>0,chr(129)=>0,chr(130)=>0,chr(131)=>0,
-	chr(132)=>0,chr(133)=>0,chr(134)=>0,chr(135)=>0,chr(136)=>0,chr(137)=>0,chr(138)=>0,chr(139)=>0,chr(140)=>0,chr(141)=>0,chr(142)=>0,chr(143)=>0,chr(144)=>0,chr(145)=>0,chr(146)=>0,chr(147)=>0,chr(148)=>0,chr(149)=>0,chr(150)=>0,chr(151)=>0,chr(152)=>0,chr(153)=>0,
-	chr(154)=>0,chr(155)=>0,chr(156)=>0,chr(157)=>0,chr(158)=>0,chr(159)=>0,chr(160)=>750,chr(161)=>620,chr(162)=>247,chr(163)=>549,chr(164)=>167,chr(165)=>713,chr(166)=>500,chr(167)=>753,chr(168)=>753,chr(169)=>753,chr(170)=>753,chr(171)=>1042,chr(172)=>987,chr(173)=>603,chr(174)=>987,chr(175)=>603,
-	chr(176)=>400,chr(177)=>549,chr(178)=>411,chr(179)=>549,chr(180)=>549,chr(181)=>713,chr(182)=>494,chr(183)=>460,chr(184)=>549,chr(185)=>549,chr(186)=>549,chr(187)=>549,chr(188)=>1000,chr(189)=>603,chr(190)=>1000,chr(191)=>658,chr(192)=>823,chr(193)=>686,chr(194)=>795,chr(195)=>987,chr(196)=>768,chr(197)=>768,
-	chr(198)=>823,chr(199)=>768,chr(200)=>768,chr(201)=>713,chr(202)=>713,chr(203)=>713,chr(204)=>713,chr(205)=>713,chr(206)=>713,chr(207)=>713,chr(208)=>768,chr(209)=>713,chr(210)=>790,chr(211)=>790,chr(212)=>890,chr(213)=>823,chr(214)=>549,chr(215)=>250,chr(216)=>713,chr(217)=>603,chr(218)=>603,chr(219)=>1042,
-	chr(220)=>987,chr(221)=>603,chr(222)=>987,chr(223)=>603,chr(224)=>494,chr(225)=>329,chr(226)=>790,chr(227)=>790,chr(228)=>786,chr(229)=>713,chr(230)=>384,chr(231)=>384,chr(232)=>384,chr(233)=>384,chr(234)=>384,chr(235)=>384,chr(236)=>494,chr(237)=>494,chr(238)=>494,chr(239)=>494,chr(240)=>0,chr(241)=>329,
-	chr(242)=>274,chr(243)=>686,chr(244)=>686,chr(245)=>686,chr(246)=>384,chr(247)=>384,chr(248)=>384,chr(249)=>384,chr(250)=>384,chr(251)=>384,chr(252)=>494,chr(253)=>494,chr(254)=>494,chr(255)=>0);
-?>
+<?php
+$fpdf_charwidths['symbol']=array(
+	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
+	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>713,'#'=>500,'$'=>549,'%'=>833,'&'=>778,'\''=>439,'('=>333,')'=>333,'*'=>500,'+'=>549,
+	','=>250,'-'=>549,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>278,';'=>278,'<'=>549,'='=>549,'>'=>549,'?'=>444,'@'=>549,'A'=>722,
+	'B'=>667,'C'=>722,'D'=>612,'E'=>611,'F'=>763,'G'=>603,'H'=>722,'I'=>333,'J'=>631,'K'=>722,'L'=>686,'M'=>889,'N'=>722,'O'=>722,'P'=>768,'Q'=>741,'R'=>556,'S'=>592,'T'=>611,'U'=>690,'V'=>439,'W'=>768,
+	'X'=>645,'Y'=>795,'Z'=>611,'['=>333,'\\'=>863,']'=>333,'^'=>658,'_'=>500,'`'=>500,'a'=>631,'b'=>549,'c'=>549,'d'=>494,'e'=>439,'f'=>521,'g'=>411,'h'=>603,'i'=>329,'j'=>603,'k'=>549,'l'=>549,'m'=>576,
+	'n'=>521,'o'=>549,'p'=>549,'q'=>521,'r'=>549,'s'=>603,'t'=>439,'u'=>576,'v'=>713,'w'=>686,'x'=>493,'y'=>686,'z'=>494,'{'=>480,'|'=>200,'}'=>480,'~'=>549,chr(127)=>0,chr(128)=>0,chr(129)=>0,chr(130)=>0,chr(131)=>0,
+	chr(132)=>0,chr(133)=>0,chr(134)=>0,chr(135)=>0,chr(136)=>0,chr(137)=>0,chr(138)=>0,chr(139)=>0,chr(140)=>0,chr(141)=>0,chr(142)=>0,chr(143)=>0,chr(144)=>0,chr(145)=>0,chr(146)=>0,chr(147)=>0,chr(148)=>0,chr(149)=>0,chr(150)=>0,chr(151)=>0,chr(152)=>0,chr(153)=>0,
+	chr(154)=>0,chr(155)=>0,chr(156)=>0,chr(157)=>0,chr(158)=>0,chr(159)=>0,chr(160)=>750,chr(161)=>620,chr(162)=>247,chr(163)=>549,chr(164)=>167,chr(165)=>713,chr(166)=>500,chr(167)=>753,chr(168)=>753,chr(169)=>753,chr(170)=>753,chr(171)=>1042,chr(172)=>987,chr(173)=>603,chr(174)=>987,chr(175)=>603,
+	chr(176)=>400,chr(177)=>549,chr(178)=>411,chr(179)=>549,chr(180)=>549,chr(181)=>713,chr(182)=>494,chr(183)=>460,chr(184)=>549,chr(185)=>549,chr(186)=>549,chr(187)=>549,chr(188)=>1000,chr(189)=>603,chr(190)=>1000,chr(191)=>658,chr(192)=>823,chr(193)=>686,chr(194)=>795,chr(195)=>987,chr(196)=>768,chr(197)=>768,
+	chr(198)=>823,chr(199)=>768,chr(200)=>768,chr(201)=>713,chr(202)=>713,chr(203)=>713,chr(204)=>713,chr(205)=>713,chr(206)=>713,chr(207)=>713,chr(208)=>768,chr(209)=>713,chr(210)=>790,chr(211)=>790,chr(212)=>890,chr(213)=>823,chr(214)=>549,chr(215)=>250,chr(216)=>713,chr(217)=>603,chr(218)=>603,chr(219)=>1042,
+	chr(220)=>987,chr(221)=>603,chr(222)=>987,chr(223)=>603,chr(224)=>494,chr(225)=>329,chr(226)=>790,chr(227)=>790,chr(228)=>786,chr(229)=>713,chr(230)=>384,chr(231)=>384,chr(232)=>384,chr(233)=>384,chr(234)=>384,chr(235)=>384,chr(236)=>494,chr(237)=>494,chr(238)=>494,chr(239)=>494,chr(240)=>0,chr(241)=>329,
+	chr(242)=>274,chr(243)=>686,chr(244)=>686,chr(245)=>686,chr(246)=>384,chr(247)=>384,chr(248)=>384,chr(249)=>384,chr(250)=>384,chr(251)=>384,chr(252)=>494,chr(253)=>494,chr(254)=>494,chr(255)=>0);
+?>
diff --git a/library/html2pdf/_fpdf/font/times.php b/library/html2pdf/_fpdf/font/times.php
index 837c706e0..b9be1b21d 100644
--- a/library/html2pdf/_fpdf/font/times.php
+++ b/library/html2pdf/_fpdf/font/times.php
@@ -1,15 +1,15 @@
-<?php
-$fpdf_charwidths['times']=array(
-	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
-	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>408,'#'=>500,'$'=>500,'%'=>833,'&'=>778,'\''=>180,'('=>333,')'=>333,'*'=>500,'+'=>564,
-	','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>278,';'=>278,'<'=>564,'='=>564,'>'=>564,'?'=>444,'@'=>921,'A'=>722,
-	'B'=>667,'C'=>667,'D'=>722,'E'=>611,'F'=>556,'G'=>722,'H'=>722,'I'=>333,'J'=>389,'K'=>722,'L'=>611,'M'=>889,'N'=>722,'O'=>722,'P'=>556,'Q'=>722,'R'=>667,'S'=>556,'T'=>611,'U'=>722,'V'=>722,'W'=>944,
-	'X'=>722,'Y'=>722,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>469,'_'=>500,'`'=>333,'a'=>444,'b'=>500,'c'=>444,'d'=>500,'e'=>444,'f'=>333,'g'=>500,'h'=>500,'i'=>278,'j'=>278,'k'=>500,'l'=>278,'m'=>778,
-	'n'=>500,'o'=>500,'p'=>500,'q'=>500,'r'=>333,'s'=>389,'t'=>278,'u'=>500,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>444,'{'=>480,'|'=>200,'}'=>480,'~'=>541,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
-	chr(132)=>444,chr(133)=>1000,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>556,chr(139)=>333,chr(140)=>889,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>444,chr(148)=>444,chr(149)=>350,chr(150)=>500,chr(151)=>1000,chr(152)=>333,chr(153)=>980,
-	chr(154)=>389,chr(155)=>333,chr(156)=>722,chr(157)=>350,chr(158)=>444,chr(159)=>722,chr(160)=>250,chr(161)=>333,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>200,chr(167)=>500,chr(168)=>333,chr(169)=>760,chr(170)=>276,chr(171)=>500,chr(172)=>564,chr(173)=>333,chr(174)=>760,chr(175)=>333,
-	chr(176)=>400,chr(177)=>564,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>500,chr(182)=>453,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>310,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>444,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
-	chr(198)=>889,chr(199)=>667,chr(200)=>611,chr(201)=>611,chr(202)=>611,chr(203)=>611,chr(204)=>333,chr(205)=>333,chr(206)=>333,chr(207)=>333,chr(208)=>722,chr(209)=>722,chr(210)=>722,chr(211)=>722,chr(212)=>722,chr(213)=>722,chr(214)=>722,chr(215)=>564,chr(216)=>722,chr(217)=>722,chr(218)=>722,chr(219)=>722,
-	chr(220)=>722,chr(221)=>722,chr(222)=>556,chr(223)=>500,chr(224)=>444,chr(225)=>444,chr(226)=>444,chr(227)=>444,chr(228)=>444,chr(229)=>444,chr(230)=>667,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>500,
-	chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>564,chr(248)=>500,chr(249)=>500,chr(250)=>500,chr(251)=>500,chr(252)=>500,chr(253)=>500,chr(254)=>500,chr(255)=>500);
-?>
+<?php
+$fpdf_charwidths['times']=array(
+	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
+	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>408,'#'=>500,'$'=>500,'%'=>833,'&'=>778,'\''=>180,'('=>333,')'=>333,'*'=>500,'+'=>564,
+	','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>278,';'=>278,'<'=>564,'='=>564,'>'=>564,'?'=>444,'@'=>921,'A'=>722,
+	'B'=>667,'C'=>667,'D'=>722,'E'=>611,'F'=>556,'G'=>722,'H'=>722,'I'=>333,'J'=>389,'K'=>722,'L'=>611,'M'=>889,'N'=>722,'O'=>722,'P'=>556,'Q'=>722,'R'=>667,'S'=>556,'T'=>611,'U'=>722,'V'=>722,'W'=>944,
+	'X'=>722,'Y'=>722,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>469,'_'=>500,'`'=>333,'a'=>444,'b'=>500,'c'=>444,'d'=>500,'e'=>444,'f'=>333,'g'=>500,'h'=>500,'i'=>278,'j'=>278,'k'=>500,'l'=>278,'m'=>778,
+	'n'=>500,'o'=>500,'p'=>500,'q'=>500,'r'=>333,'s'=>389,'t'=>278,'u'=>500,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>444,'{'=>480,'|'=>200,'}'=>480,'~'=>541,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
+	chr(132)=>444,chr(133)=>1000,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>556,chr(139)=>333,chr(140)=>889,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>444,chr(148)=>444,chr(149)=>350,chr(150)=>500,chr(151)=>1000,chr(152)=>333,chr(153)=>980,
+	chr(154)=>389,chr(155)=>333,chr(156)=>722,chr(157)=>350,chr(158)=>444,chr(159)=>722,chr(160)=>250,chr(161)=>333,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>200,chr(167)=>500,chr(168)=>333,chr(169)=>760,chr(170)=>276,chr(171)=>500,chr(172)=>564,chr(173)=>333,chr(174)=>760,chr(175)=>333,
+	chr(176)=>400,chr(177)=>564,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>500,chr(182)=>453,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>310,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>444,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
+	chr(198)=>889,chr(199)=>667,chr(200)=>611,chr(201)=>611,chr(202)=>611,chr(203)=>611,chr(204)=>333,chr(205)=>333,chr(206)=>333,chr(207)=>333,chr(208)=>722,chr(209)=>722,chr(210)=>722,chr(211)=>722,chr(212)=>722,chr(213)=>722,chr(214)=>722,chr(215)=>564,chr(216)=>722,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+	chr(220)=>722,chr(221)=>722,chr(222)=>556,chr(223)=>500,chr(224)=>444,chr(225)=>444,chr(226)=>444,chr(227)=>444,chr(228)=>444,chr(229)=>444,chr(230)=>667,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>500,
+	chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>564,chr(248)=>500,chr(249)=>500,chr(250)=>500,chr(251)=>500,chr(252)=>500,chr(253)=>500,chr(254)=>500,chr(255)=>500);
+?>
diff --git a/library/html2pdf/_fpdf/font/timesb.php b/library/html2pdf/_fpdf/font/timesb.php
index 09cff86ac..c3eb9fa75 100644
--- a/library/html2pdf/_fpdf/font/timesb.php
+++ b/library/html2pdf/_fpdf/font/timesb.php
@@ -1,15 +1,15 @@
-<?php
-$fpdf_charwidths['timesB']=array(
-	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
-	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>555,'#'=>500,'$'=>500,'%'=>1000,'&'=>833,'\''=>278,'('=>333,')'=>333,'*'=>500,'+'=>570,
-	','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>333,';'=>333,'<'=>570,'='=>570,'>'=>570,'?'=>500,'@'=>930,'A'=>722,
-	'B'=>667,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>778,'I'=>389,'J'=>500,'K'=>778,'L'=>667,'M'=>944,'N'=>722,'O'=>778,'P'=>611,'Q'=>778,'R'=>722,'S'=>556,'T'=>667,'U'=>722,'V'=>722,'W'=>1000,
-	'X'=>722,'Y'=>722,'Z'=>667,'['=>333,'\\'=>278,']'=>333,'^'=>581,'_'=>500,'`'=>333,'a'=>500,'b'=>556,'c'=>444,'d'=>556,'e'=>444,'f'=>333,'g'=>500,'h'=>556,'i'=>278,'j'=>333,'k'=>556,'l'=>278,'m'=>833,
-	'n'=>556,'o'=>500,'p'=>556,'q'=>556,'r'=>444,'s'=>389,'t'=>333,'u'=>556,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>444,'{'=>394,'|'=>220,'}'=>394,'~'=>520,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
-	chr(132)=>500,chr(133)=>1000,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>556,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>667,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>500,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
-	chr(154)=>389,chr(155)=>333,chr(156)=>722,chr(157)=>350,chr(158)=>444,chr(159)=>722,chr(160)=>250,chr(161)=>333,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>220,chr(167)=>500,chr(168)=>333,chr(169)=>747,chr(170)=>300,chr(171)=>500,chr(172)=>570,chr(173)=>333,chr(174)=>747,chr(175)=>333,
-	chr(176)=>400,chr(177)=>570,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>556,chr(182)=>540,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>330,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>500,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
-	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>389,chr(205)=>389,chr(206)=>389,chr(207)=>389,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>570,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
-	chr(220)=>722,chr(221)=>722,chr(222)=>611,chr(223)=>556,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>722,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>556,
-	chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>570,chr(248)=>500,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500);
-?>
+<?php
+$fpdf_charwidths['timesB']=array(
+	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
+	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>555,'#'=>500,'$'=>500,'%'=>1000,'&'=>833,'\''=>278,'('=>333,')'=>333,'*'=>500,'+'=>570,
+	','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>333,';'=>333,'<'=>570,'='=>570,'>'=>570,'?'=>500,'@'=>930,'A'=>722,
+	'B'=>667,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>778,'I'=>389,'J'=>500,'K'=>778,'L'=>667,'M'=>944,'N'=>722,'O'=>778,'P'=>611,'Q'=>778,'R'=>722,'S'=>556,'T'=>667,'U'=>722,'V'=>722,'W'=>1000,
+	'X'=>722,'Y'=>722,'Z'=>667,'['=>333,'\\'=>278,']'=>333,'^'=>581,'_'=>500,'`'=>333,'a'=>500,'b'=>556,'c'=>444,'d'=>556,'e'=>444,'f'=>333,'g'=>500,'h'=>556,'i'=>278,'j'=>333,'k'=>556,'l'=>278,'m'=>833,
+	'n'=>556,'o'=>500,'p'=>556,'q'=>556,'r'=>444,'s'=>389,'t'=>333,'u'=>556,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>444,'{'=>394,'|'=>220,'}'=>394,'~'=>520,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
+	chr(132)=>500,chr(133)=>1000,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>556,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>667,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>500,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
+	chr(154)=>389,chr(155)=>333,chr(156)=>722,chr(157)=>350,chr(158)=>444,chr(159)=>722,chr(160)=>250,chr(161)=>333,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>220,chr(167)=>500,chr(168)=>333,chr(169)=>747,chr(170)=>300,chr(171)=>500,chr(172)=>570,chr(173)=>333,chr(174)=>747,chr(175)=>333,
+	chr(176)=>400,chr(177)=>570,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>556,chr(182)=>540,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>330,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>500,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
+	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>389,chr(205)=>389,chr(206)=>389,chr(207)=>389,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>570,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+	chr(220)=>722,chr(221)=>722,chr(222)=>611,chr(223)=>556,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>722,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>556,
+	chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>570,chr(248)=>500,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500);
+?>
diff --git a/library/html2pdf/_fpdf/font/timesbi.php b/library/html2pdf/_fpdf/font/timesbi.php
index b4e38d763..161f6302c 100644
--- a/library/html2pdf/_fpdf/font/timesbi.php
+++ b/library/html2pdf/_fpdf/font/timesbi.php
@@ -1,15 +1,15 @@
-<?php
-$fpdf_charwidths['timesBI']=array(
-	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
-	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>389,'"'=>555,'#'=>500,'$'=>500,'%'=>833,'&'=>778,'\''=>278,'('=>333,')'=>333,'*'=>500,'+'=>570,
-	','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>333,';'=>333,'<'=>570,'='=>570,'>'=>570,'?'=>500,'@'=>832,'A'=>667,
-	'B'=>667,'C'=>667,'D'=>722,'E'=>667,'F'=>667,'G'=>722,'H'=>778,'I'=>389,'J'=>500,'K'=>667,'L'=>611,'M'=>889,'N'=>722,'O'=>722,'P'=>611,'Q'=>722,'R'=>667,'S'=>556,'T'=>611,'U'=>722,'V'=>667,'W'=>889,
-	'X'=>667,'Y'=>611,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>570,'_'=>500,'`'=>333,'a'=>500,'b'=>500,'c'=>444,'d'=>500,'e'=>444,'f'=>333,'g'=>500,'h'=>556,'i'=>278,'j'=>278,'k'=>500,'l'=>278,'m'=>778,
-	'n'=>556,'o'=>500,'p'=>500,'q'=>500,'r'=>389,'s'=>389,'t'=>278,'u'=>556,'v'=>444,'w'=>667,'x'=>500,'y'=>444,'z'=>389,'{'=>348,'|'=>220,'}'=>348,'~'=>570,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
-	chr(132)=>500,chr(133)=>1000,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>556,chr(139)=>333,chr(140)=>944,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>500,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
-	chr(154)=>389,chr(155)=>333,chr(156)=>722,chr(157)=>350,chr(158)=>389,chr(159)=>611,chr(160)=>250,chr(161)=>389,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>220,chr(167)=>500,chr(168)=>333,chr(169)=>747,chr(170)=>266,chr(171)=>500,chr(172)=>606,chr(173)=>333,chr(174)=>747,chr(175)=>333,
-	chr(176)=>400,chr(177)=>570,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>576,chr(182)=>500,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>300,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>500,chr(192)=>667,chr(193)=>667,chr(194)=>667,chr(195)=>667,chr(196)=>667,chr(197)=>667,
-	chr(198)=>944,chr(199)=>667,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>389,chr(205)=>389,chr(206)=>389,chr(207)=>389,chr(208)=>722,chr(209)=>722,chr(210)=>722,chr(211)=>722,chr(212)=>722,chr(213)=>722,chr(214)=>722,chr(215)=>570,chr(216)=>722,chr(217)=>722,chr(218)=>722,chr(219)=>722,
-	chr(220)=>722,chr(221)=>611,chr(222)=>611,chr(223)=>500,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>722,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>556,
-	chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>570,chr(248)=>500,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>444,chr(254)=>500,chr(255)=>444);
-?>
+<?php
+$fpdf_charwidths['timesBI']=array(
+	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
+	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>389,'"'=>555,'#'=>500,'$'=>500,'%'=>833,'&'=>778,'\''=>278,'('=>333,')'=>333,'*'=>500,'+'=>570,
+	','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>333,';'=>333,'<'=>570,'='=>570,'>'=>570,'?'=>500,'@'=>832,'A'=>667,
+	'B'=>667,'C'=>667,'D'=>722,'E'=>667,'F'=>667,'G'=>722,'H'=>778,'I'=>389,'J'=>500,'K'=>667,'L'=>611,'M'=>889,'N'=>722,'O'=>722,'P'=>611,'Q'=>722,'R'=>667,'S'=>556,'T'=>611,'U'=>722,'V'=>667,'W'=>889,
+	'X'=>667,'Y'=>611,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>570,'_'=>500,'`'=>333,'a'=>500,'b'=>500,'c'=>444,'d'=>500,'e'=>444,'f'=>333,'g'=>500,'h'=>556,'i'=>278,'j'=>278,'k'=>500,'l'=>278,'m'=>778,
+	'n'=>556,'o'=>500,'p'=>500,'q'=>500,'r'=>389,'s'=>389,'t'=>278,'u'=>556,'v'=>444,'w'=>667,'x'=>500,'y'=>444,'z'=>389,'{'=>348,'|'=>220,'}'=>348,'~'=>570,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
+	chr(132)=>500,chr(133)=>1000,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>556,chr(139)=>333,chr(140)=>944,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>500,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
+	chr(154)=>389,chr(155)=>333,chr(156)=>722,chr(157)=>350,chr(158)=>389,chr(159)=>611,chr(160)=>250,chr(161)=>389,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>220,chr(167)=>500,chr(168)=>333,chr(169)=>747,chr(170)=>266,chr(171)=>500,chr(172)=>606,chr(173)=>333,chr(174)=>747,chr(175)=>333,
+	chr(176)=>400,chr(177)=>570,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>576,chr(182)=>500,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>300,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>500,chr(192)=>667,chr(193)=>667,chr(194)=>667,chr(195)=>667,chr(196)=>667,chr(197)=>667,
+	chr(198)=>944,chr(199)=>667,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>389,chr(205)=>389,chr(206)=>389,chr(207)=>389,chr(208)=>722,chr(209)=>722,chr(210)=>722,chr(211)=>722,chr(212)=>722,chr(213)=>722,chr(214)=>722,chr(215)=>570,chr(216)=>722,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+	chr(220)=>722,chr(221)=>611,chr(222)=>611,chr(223)=>500,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>722,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>556,
+	chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>570,chr(248)=>500,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>444,chr(254)=>500,chr(255)=>444);
+?>
diff --git a/library/html2pdf/_fpdf/font/timesi.php b/library/html2pdf/_fpdf/font/timesi.php
index 0ba2b7773..de171fd19 100644
--- a/library/html2pdf/_fpdf/font/timesi.php
+++ b/library/html2pdf/_fpdf/font/timesi.php
@@ -1,15 +1,15 @@
-<?php
-$fpdf_charwidths['timesI']=array(
-	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
-	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>420,'#'=>500,'$'=>500,'%'=>833,'&'=>778,'\''=>214,'('=>333,')'=>333,'*'=>500,'+'=>675,
-	','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>333,';'=>333,'<'=>675,'='=>675,'>'=>675,'?'=>500,'@'=>920,'A'=>611,
-	'B'=>611,'C'=>667,'D'=>722,'E'=>611,'F'=>611,'G'=>722,'H'=>722,'I'=>333,'J'=>444,'K'=>667,'L'=>556,'M'=>833,'N'=>667,'O'=>722,'P'=>611,'Q'=>722,'R'=>611,'S'=>500,'T'=>556,'U'=>722,'V'=>611,'W'=>833,
-	'X'=>611,'Y'=>556,'Z'=>556,'['=>389,'\\'=>278,']'=>389,'^'=>422,'_'=>500,'`'=>333,'a'=>500,'b'=>500,'c'=>444,'d'=>500,'e'=>444,'f'=>278,'g'=>500,'h'=>500,'i'=>278,'j'=>278,'k'=>444,'l'=>278,'m'=>722,
-	'n'=>500,'o'=>500,'p'=>500,'q'=>500,'r'=>389,'s'=>389,'t'=>278,'u'=>500,'v'=>444,'w'=>667,'x'=>444,'y'=>444,'z'=>389,'{'=>400,'|'=>275,'}'=>400,'~'=>541,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
-	chr(132)=>556,chr(133)=>889,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>500,chr(139)=>333,chr(140)=>944,chr(141)=>350,chr(142)=>556,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>556,chr(148)=>556,chr(149)=>350,chr(150)=>500,chr(151)=>889,chr(152)=>333,chr(153)=>980,
-	chr(154)=>389,chr(155)=>333,chr(156)=>667,chr(157)=>350,chr(158)=>389,chr(159)=>556,chr(160)=>250,chr(161)=>389,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>275,chr(167)=>500,chr(168)=>333,chr(169)=>760,chr(170)=>276,chr(171)=>500,chr(172)=>675,chr(173)=>333,chr(174)=>760,chr(175)=>333,
-	chr(176)=>400,chr(177)=>675,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>500,chr(182)=>523,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>310,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>500,chr(192)=>611,chr(193)=>611,chr(194)=>611,chr(195)=>611,chr(196)=>611,chr(197)=>611,
-	chr(198)=>889,chr(199)=>667,chr(200)=>611,chr(201)=>611,chr(202)=>611,chr(203)=>611,chr(204)=>333,chr(205)=>333,chr(206)=>333,chr(207)=>333,chr(208)=>722,chr(209)=>667,chr(210)=>722,chr(211)=>722,chr(212)=>722,chr(213)=>722,chr(214)=>722,chr(215)=>675,chr(216)=>722,chr(217)=>722,chr(218)=>722,chr(219)=>722,
-	chr(220)=>722,chr(221)=>556,chr(222)=>611,chr(223)=>500,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>667,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>500,
-	chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>675,chr(248)=>500,chr(249)=>500,chr(250)=>500,chr(251)=>500,chr(252)=>500,chr(253)=>444,chr(254)=>500,chr(255)=>444);
-?>
+<?php
+$fpdf_charwidths['timesI']=array(
+	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
+	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>420,'#'=>500,'$'=>500,'%'=>833,'&'=>778,'\''=>214,'('=>333,')'=>333,'*'=>500,'+'=>675,
+	','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>333,';'=>333,'<'=>675,'='=>675,'>'=>675,'?'=>500,'@'=>920,'A'=>611,
+	'B'=>611,'C'=>667,'D'=>722,'E'=>611,'F'=>611,'G'=>722,'H'=>722,'I'=>333,'J'=>444,'K'=>667,'L'=>556,'M'=>833,'N'=>667,'O'=>722,'P'=>611,'Q'=>722,'R'=>611,'S'=>500,'T'=>556,'U'=>722,'V'=>611,'W'=>833,
+	'X'=>611,'Y'=>556,'Z'=>556,'['=>389,'\\'=>278,']'=>389,'^'=>422,'_'=>500,'`'=>333,'a'=>500,'b'=>500,'c'=>444,'d'=>500,'e'=>444,'f'=>278,'g'=>500,'h'=>500,'i'=>278,'j'=>278,'k'=>444,'l'=>278,'m'=>722,
+	'n'=>500,'o'=>500,'p'=>500,'q'=>500,'r'=>389,'s'=>389,'t'=>278,'u'=>500,'v'=>444,'w'=>667,'x'=>444,'y'=>444,'z'=>389,'{'=>400,'|'=>275,'}'=>400,'~'=>541,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
+	chr(132)=>556,chr(133)=>889,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>500,chr(139)=>333,chr(140)=>944,chr(141)=>350,chr(142)=>556,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>556,chr(148)=>556,chr(149)=>350,chr(150)=>500,chr(151)=>889,chr(152)=>333,chr(153)=>980,
+	chr(154)=>389,chr(155)=>333,chr(156)=>667,chr(157)=>350,chr(158)=>389,chr(159)=>556,chr(160)=>250,chr(161)=>389,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>275,chr(167)=>500,chr(168)=>333,chr(169)=>760,chr(170)=>276,chr(171)=>500,chr(172)=>675,chr(173)=>333,chr(174)=>760,chr(175)=>333,
+	chr(176)=>400,chr(177)=>675,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>500,chr(182)=>523,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>310,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>500,chr(192)=>611,chr(193)=>611,chr(194)=>611,chr(195)=>611,chr(196)=>611,chr(197)=>611,
+	chr(198)=>889,chr(199)=>667,chr(200)=>611,chr(201)=>611,chr(202)=>611,chr(203)=>611,chr(204)=>333,chr(205)=>333,chr(206)=>333,chr(207)=>333,chr(208)=>722,chr(209)=>667,chr(210)=>722,chr(211)=>722,chr(212)=>722,chr(213)=>722,chr(214)=>722,chr(215)=>675,chr(216)=>722,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+	chr(220)=>722,chr(221)=>556,chr(222)=>611,chr(223)=>500,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>667,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>500,
+	chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>675,chr(248)=>500,chr(249)=>500,chr(250)=>500,chr(251)=>500,chr(252)=>500,chr(253)=>444,chr(254)=>500,chr(255)=>444);
+?>
diff --git a/library/html2pdf/_fpdf/font/zapfdingbats.php b/library/html2pdf/_fpdf/font/zapfdingbats.php
index 1f926a8c3..f2bdfd5c9 100644
--- a/library/html2pdf/_fpdf/font/zapfdingbats.php
+++ b/library/html2pdf/_fpdf/font/zapfdingbats.php
@@ -1,15 +1,15 @@
-<?php
-$fpdf_charwidths['zapfdingbats']=array(
-	chr(0)=>0,chr(1)=>0,chr(2)=>0,chr(3)=>0,chr(4)=>0,chr(5)=>0,chr(6)=>0,chr(7)=>0,chr(8)=>0,chr(9)=>0,chr(10)=>0,chr(11)=>0,chr(12)=>0,chr(13)=>0,chr(14)=>0,chr(15)=>0,chr(16)=>0,chr(17)=>0,chr(18)=>0,chr(19)=>0,chr(20)=>0,chr(21)=>0,
-	chr(22)=>0,chr(23)=>0,chr(24)=>0,chr(25)=>0,chr(26)=>0,chr(27)=>0,chr(28)=>0,chr(29)=>0,chr(30)=>0,chr(31)=>0,' '=>278,'!'=>974,'"'=>961,'#'=>974,'$'=>980,'%'=>719,'&'=>789,'\''=>790,'('=>791,')'=>690,'*'=>960,'+'=>939,
-	','=>549,'-'=>855,'.'=>911,'/'=>933,'0'=>911,'1'=>945,'2'=>974,'3'=>755,'4'=>846,'5'=>762,'6'=>761,'7'=>571,'8'=>677,'9'=>763,':'=>760,';'=>759,'<'=>754,'='=>494,'>'=>552,'?'=>537,'@'=>577,'A'=>692,
-	'B'=>786,'C'=>788,'D'=>788,'E'=>790,'F'=>793,'G'=>794,'H'=>816,'I'=>823,'J'=>789,'K'=>841,'L'=>823,'M'=>833,'N'=>816,'O'=>831,'P'=>923,'Q'=>744,'R'=>723,'S'=>749,'T'=>790,'U'=>792,'V'=>695,'W'=>776,
-	'X'=>768,'Y'=>792,'Z'=>759,'['=>707,'\\'=>708,']'=>682,'^'=>701,'_'=>826,'`'=>815,'a'=>789,'b'=>789,'c'=>707,'d'=>687,'e'=>696,'f'=>689,'g'=>786,'h'=>787,'i'=>713,'j'=>791,'k'=>785,'l'=>791,'m'=>873,
-	'n'=>761,'o'=>762,'p'=>762,'q'=>759,'r'=>759,'s'=>892,'t'=>892,'u'=>788,'v'=>784,'w'=>438,'x'=>138,'y'=>277,'z'=>415,'{'=>392,'|'=>392,'}'=>668,'~'=>668,chr(127)=>0,chr(128)=>390,chr(129)=>390,chr(130)=>317,chr(131)=>317,
-	chr(132)=>276,chr(133)=>276,chr(134)=>509,chr(135)=>509,chr(136)=>410,chr(137)=>410,chr(138)=>234,chr(139)=>234,chr(140)=>334,chr(141)=>334,chr(142)=>0,chr(143)=>0,chr(144)=>0,chr(145)=>0,chr(146)=>0,chr(147)=>0,chr(148)=>0,chr(149)=>0,chr(150)=>0,chr(151)=>0,chr(152)=>0,chr(153)=>0,
-	chr(154)=>0,chr(155)=>0,chr(156)=>0,chr(157)=>0,chr(158)=>0,chr(159)=>0,chr(160)=>0,chr(161)=>732,chr(162)=>544,chr(163)=>544,chr(164)=>910,chr(165)=>667,chr(166)=>760,chr(167)=>760,chr(168)=>776,chr(169)=>595,chr(170)=>694,chr(171)=>626,chr(172)=>788,chr(173)=>788,chr(174)=>788,chr(175)=>788,
-	chr(176)=>788,chr(177)=>788,chr(178)=>788,chr(179)=>788,chr(180)=>788,chr(181)=>788,chr(182)=>788,chr(183)=>788,chr(184)=>788,chr(185)=>788,chr(186)=>788,chr(187)=>788,chr(188)=>788,chr(189)=>788,chr(190)=>788,chr(191)=>788,chr(192)=>788,chr(193)=>788,chr(194)=>788,chr(195)=>788,chr(196)=>788,chr(197)=>788,
-	chr(198)=>788,chr(199)=>788,chr(200)=>788,chr(201)=>788,chr(202)=>788,chr(203)=>788,chr(204)=>788,chr(205)=>788,chr(206)=>788,chr(207)=>788,chr(208)=>788,chr(209)=>788,chr(210)=>788,chr(211)=>788,chr(212)=>894,chr(213)=>838,chr(214)=>1016,chr(215)=>458,chr(216)=>748,chr(217)=>924,chr(218)=>748,chr(219)=>918,
-	chr(220)=>927,chr(221)=>928,chr(222)=>928,chr(223)=>834,chr(224)=>873,chr(225)=>828,chr(226)=>924,chr(227)=>924,chr(228)=>917,chr(229)=>930,chr(230)=>931,chr(231)=>463,chr(232)=>883,chr(233)=>836,chr(234)=>836,chr(235)=>867,chr(236)=>867,chr(237)=>696,chr(238)=>696,chr(239)=>874,chr(240)=>0,chr(241)=>874,
-	chr(242)=>760,chr(243)=>946,chr(244)=>771,chr(245)=>865,chr(246)=>771,chr(247)=>888,chr(248)=>967,chr(249)=>888,chr(250)=>831,chr(251)=>873,chr(252)=>927,chr(253)=>970,chr(254)=>918,chr(255)=>0);
-?>
+<?php
+$fpdf_charwidths['zapfdingbats']=array(
+	chr(0)=>0,chr(1)=>0,chr(2)=>0,chr(3)=>0,chr(4)=>0,chr(5)=>0,chr(6)=>0,chr(7)=>0,chr(8)=>0,chr(9)=>0,chr(10)=>0,chr(11)=>0,chr(12)=>0,chr(13)=>0,chr(14)=>0,chr(15)=>0,chr(16)=>0,chr(17)=>0,chr(18)=>0,chr(19)=>0,chr(20)=>0,chr(21)=>0,
+	chr(22)=>0,chr(23)=>0,chr(24)=>0,chr(25)=>0,chr(26)=>0,chr(27)=>0,chr(28)=>0,chr(29)=>0,chr(30)=>0,chr(31)=>0,' '=>278,'!'=>974,'"'=>961,'#'=>974,'$'=>980,'%'=>719,'&'=>789,'\''=>790,'('=>791,')'=>690,'*'=>960,'+'=>939,
+	','=>549,'-'=>855,'.'=>911,'/'=>933,'0'=>911,'1'=>945,'2'=>974,'3'=>755,'4'=>846,'5'=>762,'6'=>761,'7'=>571,'8'=>677,'9'=>763,':'=>760,';'=>759,'<'=>754,'='=>494,'>'=>552,'?'=>537,'@'=>577,'A'=>692,
+	'B'=>786,'C'=>788,'D'=>788,'E'=>790,'F'=>793,'G'=>794,'H'=>816,'I'=>823,'J'=>789,'K'=>841,'L'=>823,'M'=>833,'N'=>816,'O'=>831,'P'=>923,'Q'=>744,'R'=>723,'S'=>749,'T'=>790,'U'=>792,'V'=>695,'W'=>776,
+	'X'=>768,'Y'=>792,'Z'=>759,'['=>707,'\\'=>708,']'=>682,'^'=>701,'_'=>826,'`'=>815,'a'=>789,'b'=>789,'c'=>707,'d'=>687,'e'=>696,'f'=>689,'g'=>786,'h'=>787,'i'=>713,'j'=>791,'k'=>785,'l'=>791,'m'=>873,
+	'n'=>761,'o'=>762,'p'=>762,'q'=>759,'r'=>759,'s'=>892,'t'=>892,'u'=>788,'v'=>784,'w'=>438,'x'=>138,'y'=>277,'z'=>415,'{'=>392,'|'=>392,'}'=>668,'~'=>668,chr(127)=>0,chr(128)=>390,chr(129)=>390,chr(130)=>317,chr(131)=>317,
+	chr(132)=>276,chr(133)=>276,chr(134)=>509,chr(135)=>509,chr(136)=>410,chr(137)=>410,chr(138)=>234,chr(139)=>234,chr(140)=>334,chr(141)=>334,chr(142)=>0,chr(143)=>0,chr(144)=>0,chr(145)=>0,chr(146)=>0,chr(147)=>0,chr(148)=>0,chr(149)=>0,chr(150)=>0,chr(151)=>0,chr(152)=>0,chr(153)=>0,
+	chr(154)=>0,chr(155)=>0,chr(156)=>0,chr(157)=>0,chr(158)=>0,chr(159)=>0,chr(160)=>0,chr(161)=>732,chr(162)=>544,chr(163)=>544,chr(164)=>910,chr(165)=>667,chr(166)=>760,chr(167)=>760,chr(168)=>776,chr(169)=>595,chr(170)=>694,chr(171)=>626,chr(172)=>788,chr(173)=>788,chr(174)=>788,chr(175)=>788,
+	chr(176)=>788,chr(177)=>788,chr(178)=>788,chr(179)=>788,chr(180)=>788,chr(181)=>788,chr(182)=>788,chr(183)=>788,chr(184)=>788,chr(185)=>788,chr(186)=>788,chr(187)=>788,chr(188)=>788,chr(189)=>788,chr(190)=>788,chr(191)=>788,chr(192)=>788,chr(193)=>788,chr(194)=>788,chr(195)=>788,chr(196)=>788,chr(197)=>788,
+	chr(198)=>788,chr(199)=>788,chr(200)=>788,chr(201)=>788,chr(202)=>788,chr(203)=>788,chr(204)=>788,chr(205)=>788,chr(206)=>788,chr(207)=>788,chr(208)=>788,chr(209)=>788,chr(210)=>788,chr(211)=>788,chr(212)=>894,chr(213)=>838,chr(214)=>1016,chr(215)=>458,chr(216)=>748,chr(217)=>924,chr(218)=>748,chr(219)=>918,
+	chr(220)=>927,chr(221)=>928,chr(222)=>928,chr(223)=>834,chr(224)=>873,chr(225)=>828,chr(226)=>924,chr(227)=>924,chr(228)=>917,chr(229)=>930,chr(230)=>931,chr(231)=>463,chr(232)=>883,chr(233)=>836,chr(234)=>836,chr(235)=>867,chr(236)=>867,chr(237)=>696,chr(238)=>696,chr(239)=>874,chr(240)=>0,chr(241)=>874,
+	chr(242)=>760,chr(243)=>946,chr(244)=>771,chr(245)=>865,chr(246)=>771,chr(247)=>888,chr(248)=>967,chr(249)=>888,chr(250)=>831,chr(251)=>873,chr(252)=>927,chr(253)=>970,chr(254)=>918,chr(255)=>0);
+?>
diff --git a/library/html2pdf/_fpdf/fpdf.php b/library/html2pdf/_fpdf/fpdf.php
index b27ca6dfa..51f5d598a 100644
--- a/library/html2pdf/_fpdf/fpdf.php
+++ b/library/html2pdf/_fpdf/fpdf.php
@@ -1,1732 +1,1732 @@
-<?php
-/*******************************************************************************
-* FPDF                                                                         *
-*                                                                              *
-* Version: 1.6                                                                 *
-* Date:    2008-08-03                                                          *
-* Author:  Olivier PLATHEY                                                     *
-*******************************************************************************/
-
-define('FPDF_VERSION','1.6');
-
-class FPDF
-{
-var $page;               //current page number
-var $n;                  //current object number
-var $offsets;            //array of object offsets
-var $buffer;             //buffer holding in-memory PDF
-var $pages;              //array containing pages
-var $state;              //current document state
-var $compress;           //compression flag
-var $k;                  //scale factor (number of points in user unit)
-var $DefOrientation;     //default orientation
-var $CurOrientation;     //current orientation
-var $PageFormats;        //available page formats
-var $DefPageFormat;      //default page format
-var $CurPageFormat;      //current page format
-var $PageSizes;          //array storing non-default page sizes
-var $wPt,$hPt;           //dimensions of current page in points
-var $w,$h;               //dimensions of current page in user unit
-var $lMargin;            //left margin
-var $tMargin;            //top margin
-var $rMargin;            //right margin
-var $bMargin;            //page break margin
-var $cMargin;            //cell margin
-var $x,$y;               //current position in user unit
-var $lasth;              //height of last printed cell
-var $LineWidth;          //line width in user unit
-var $CoreFonts;          //array of standard font names
-var $fonts;              //array of used fonts
-var $FontFiles;          //array of font files
-var $diffs;              //array of encoding differences
-var $FontFamily;         //current font family
-var $FontStyle;          //current font style
-var $underline;          //underlining flag
-var $CurrentFont;        //current font info
-var $FontSizePt;         //current font size in points
-var $FontSize;           //current font size in user unit
-var $DrawColor;          //commands for drawing color
-var $FillColor;          //commands for filling color
-var $TextColor;          //commands for text color
-var $ColorFlag;          //indicates whether fill and text colors are different
-var $ws;                 //word spacing
-var $images;             //array of used images
-var $PageLinks;          //array of links in pages
-var $links;              //array of internal links
-var $AutoPageBreak;      //automatic page breaking
-var $PageBreakTrigger;   //threshold used to trigger page breaks
-var $InHeader;           //flag set when processing header
-var $InFooter;           //flag set when processing footer
-var $ZoomMode;           //zoom display mode
-var $LayoutMode;         //layout display mode
-var $title;              //title
-var $subject;            //subject
-var $author;             //author
-var $keywords;           //keywords
-var $creator;            //creator
-var $AliasNbPages;       //alias for total number of pages
-var $PDFVersion;         //PDF version number
-
-/*******************************************************************************
-*                                                                              *
-*                               Public methods                                 *
-*                                                                              *
-*******************************************************************************/
-function FPDF($orientation='P', $unit='mm', $format='A4')
-{
-	//Some checks
-	$this->_dochecks();
-	//Initialization of properties
-	$this->page=0;
-	$this->n=2;
-	$this->buffer='';
-	$this->pages=array();
-	$this->PageSizes=array();
-	$this->state=0;
-	$this->fonts=array();
-	$this->FontFiles=array();
-	$this->diffs=array();
-	$this->images=array();
-	$this->links=array();
-	$this->InHeader=false;
-	$this->InFooter=false;
-	$this->lasth=0;
-	$this->FontFamily='';
-	$this->FontStyle='';
-	$this->FontSizePt=12;
-	$this->underline=false;
-	$this->DrawColor='0 G';
-	$this->FillColor='0 g';
-	$this->TextColor='0 g';
-	$this->ColorFlag=false;
-	$this->ws=0;
-	//Standard fonts
-	$this->CoreFonts=array('courier'=>'Courier', 'courierB'=>'Courier-Bold', 'courierI'=>'Courier-Oblique', 'courierBI'=>'Courier-BoldOblique',
-		'helvetica'=>'Helvetica', 'helveticaB'=>'Helvetica-Bold', 'helveticaI'=>'Helvetica-Oblique', 'helveticaBI'=>'Helvetica-BoldOblique',
-		'times'=>'Times-Roman', 'timesB'=>'Times-Bold', 'timesI'=>'Times-Italic', 'timesBI'=>'Times-BoldItalic',
-		'symbol'=>'Symbol', 'zapfdingbats'=>'ZapfDingbats');
-	//Scale factor
-	if($unit=='pt')
-		$this->k=1;
-	elseif($unit=='mm')
-		$this->k=72/25.4;
-	elseif($unit=='cm')
-		$this->k=72/2.54;
-	elseif($unit=='in')
-		$this->k=72;
-	else
-		$this->Error('Incorrect unit: '.$unit);
-	//Page format
-	$this->PageFormats=array('a3'=>array(841.89,1190.55), 'a4'=>array(595.28,841.89), 'a5'=>array(420.94,595.28),
-		'letter'=>array(612,792), 'legal'=>array(612,1008));
-	if(is_string($format))
-		$format=$this->_getpageformat($format);
-	$this->DefPageFormat=$format;
-	$this->CurPageFormat=$format;
-	//Page orientation
-	$orientation=strtolower($orientation);
-	if($orientation=='p' || $orientation=='portrait')
-	{
-		$this->DefOrientation='P';
-		$this->w=$this->DefPageFormat[0];
-		$this->h=$this->DefPageFormat[1];
-	}
-	elseif($orientation=='l' || $orientation=='landscape')
-	{
-		$this->DefOrientation='L';
-		$this->w=$this->DefPageFormat[1];
-		$this->h=$this->DefPageFormat[0];
-	}
-	else
-		$this->Error('Incorrect orientation: '.$orientation);
-	$this->CurOrientation=$this->DefOrientation;
-	$this->wPt=$this->w*$this->k;
-	$this->hPt=$this->h*$this->k;
-	//Page margins (1 cm)
-	$margin=28.35/$this->k;
-	$this->SetMargins($margin,$margin);
-	//Interior cell margin (1 mm)
-	$this->cMargin=$margin/10;
-	//Line width (0.2 mm)
-	$this->LineWidth=.567/$this->k;
-	//Automatic page break
-	$this->SetAutoPageBreak(true,2*$margin);
-	//Full width display mode
-	$this->SetDisplayMode('fullwidth');
-	//Enable compression
-	$this->SetCompression(true);
-	//Set default PDF version number
-	$this->PDFVersion='1.3';
-}
-
-function SetMargins($left, $top, $right=null)
-{
-	//Set left, top and right margins
-	$this->lMargin=$left;
-	$this->tMargin=$top;
-	if($right===null)
-		$right=$left;
-	$this->rMargin=$right;
-}
-
-function SetLeftMargin($margin)
-{
-	//Set left margin
-	$this->lMargin=$margin;
-	if($this->page>0 && $this->x<$margin)
-		$this->x=$margin;
-}
-
-function SetTopMargin($margin)
-{
-	//Set top margin
-	$this->tMargin=$margin;
-}
-
-function SetRightMargin($margin)
-{
-	//Set right margin
-	$this->rMargin=$margin;
-}
-
-function SetAutoPageBreak($auto, $margin=0)
-{
-	//Set auto page break mode and triggering margin
-	$this->AutoPageBreak=$auto;
-	$this->bMargin=$margin;
-	$this->PageBreakTrigger=$this->h-$margin;
-}
-
-function SetDisplayMode($zoom, $layout='continuous')
-{
-	//Set display mode in viewer
-	if($zoom=='fullpage' || $zoom=='fullwidth' || $zoom=='real' || $zoom=='default' || !is_string($zoom))
-		$this->ZoomMode=$zoom;
-	else
-		$this->Error('Incorrect zoom display mode: '.$zoom);
-	if($layout=='single' || $layout=='continuous' || $layout=='two' || $layout=='default')
-		$this->LayoutMode=$layout;
-	else
-		$this->Error('Incorrect layout display mode: '.$layout);
-}
-
-function SetCompression($compress)
-{
-	//Set page compression
-	if(function_exists('gzcompress'))
-		$this->compress=$compress;
-	else
-		$this->compress=false;
-}
-
-function SetTitle($title, $isUTF8=false)
-{
-	//Title of document
-	if($isUTF8)
-		$title=$this->_UTF8toUTF16($title);
-	$this->title=$title;
-}
-
-function SetSubject($subject, $isUTF8=false)
-{
-	//Subject of document
-	if($isUTF8)
-		$subject=$this->_UTF8toUTF16($subject);
-	$this->subject=$subject;
-}
-
-function SetAuthor($author, $isUTF8=false)
-{
-	//Author of document
-	if($isUTF8)
-		$author=$this->_UTF8toUTF16($author);
-	$this->author=$author;
-}
-
-function SetKeywords($keywords, $isUTF8=false)
-{
-	//Keywords of document
-	if($isUTF8)
-		$keywords=$this->_UTF8toUTF16($keywords);
-	$this->keywords=$keywords;
-}
-
-function SetCreator($creator, $isUTF8=false)
-{
-	//Creator of document
-	if($isUTF8)
-		$creator=$this->_UTF8toUTF16($creator);
-	$this->creator=$creator;
-}
-
-function AliasNbPages($alias='{nb}')
-{
-	//Define an alias for total number of pages
-	$this->AliasNbPages=$alias;
-}
-
-function Error($msg)
-{
-	//Fatal error
-	die('<b>FPDF error:</b> '.$msg);
-}
-
-function Open()
-{
-	//Begin document
-	$this->state=1;
-}
-
-function Close()
-{
-	//Terminate document
-	if($this->state==3)
-		return;
-	if($this->page==0)
-		$this->AddPage();
-	//Page footer
-	$this->InFooter=true;
-	$this->Footer();
-	$this->InFooter=false;
-	//Close page
-	$this->_endpage();
-	//Close document
-	$this->_enddoc();
-}
-
-function AddPage($orientation='', $format='')
-{
-	//Start a new page
-	if($this->state==0)
-		$this->Open();
-	$family=$this->FontFamily;
-	$style=$this->FontStyle.($this->underline ? 'U' : '');
-	$size=$this->FontSizePt;
-	$lw=$this->LineWidth;
-	$dc=$this->DrawColor;
-	$fc=$this->FillColor;
-	$tc=$this->TextColor;
-	$cf=$this->ColorFlag;
-	if($this->page>0)
-	{
-		//Page footer
-		$this->InFooter=true;
-		$this->Footer();
-		$this->InFooter=false;
-		//Close page
-		$this->_endpage();
-	}
-	//Start new page
-	$this->_beginpage($orientation,$format);
-	//Set line cap style to square
-	$this->_out('2 J');
-	//Set line width
-	$this->LineWidth=$lw;
-	$this->_out(sprintf('%.2F w',$lw*$this->k));
-	//Set font
-	if($family)
-		$this->SetFont($family,$style,$size);
-	//Set colors
-	$this->DrawColor=$dc;
-	if($dc!='0 G')
-		$this->_out($dc);
-	$this->FillColor=$fc;
-	if($fc!='0 g')
-		$this->_out($fc);
-	$this->TextColor=$tc;
-	$this->ColorFlag=$cf;
-	//Page header
-	$this->InHeader=true;
-	$this->Header();
-	$this->InHeader=false;
-	//Restore line width
-	if($this->LineWidth!=$lw)
-	{
-		$this->LineWidth=$lw;
-		$this->_out(sprintf('%.2F w',$lw*$this->k));
-	}
-	//Restore font
-	if($family)
-		$this->SetFont($family,$style,$size);
-	//Restore colors
-	if($this->DrawColor!=$dc)
-	{
-		$this->DrawColor=$dc;
-		$this->_out($dc);
-	}
-	if($this->FillColor!=$fc)
-	{
-		$this->FillColor=$fc;
-		$this->_out($fc);
-	}
-	$this->TextColor=$tc;
-	$this->ColorFlag=$cf;
-}
-
-function Header()
-{
-	//To be implemented in your own inherited class
-}
-
-function Footer()
-{
-	//To be implemented in your own inherited class
-}
-
-function PageNo()
-{
-	//Get current page number
-	return $this->page;
-}
-
-function SetDrawColor($r, $g=null, $b=null)
-{
-	//Set color for all stroking operations
-	if(($r==0 && $g==0 && $b==0) || $g===null)
-		$this->DrawColor=sprintf('%.3F G',$r/255);
-	else
-		$this->DrawColor=sprintf('%.3F %.3F %.3F RG',$r/255,$g/255,$b/255);
-	if($this->page>0)
-		$this->_out($this->DrawColor);
-}
-
-function SetFillColor($r, $g=null, $b=null)
-{
-	//Set color for all filling operations
-	if(($r==0 && $g==0 && $b==0) || $g===null)
-		$this->FillColor=sprintf('%.3F g',$r/255);
-	else
-		$this->FillColor=sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
-	$this->ColorFlag=($this->FillColor!=$this->TextColor);
-	if($this->page>0)
-		$this->_out($this->FillColor);
-}
-
-function SetTextColor($r, $g=null, $b=null)
-{
-	//Set color for text
-	if(($r==0 && $g==0 && $b==0) || $g===null)
-		$this->TextColor=sprintf('%.3F g',$r/255);
-	else
-		$this->TextColor=sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
-	$this->ColorFlag=($this->FillColor!=$this->TextColor);
-}
-
-function GetStringWidth($s)
-{
-	//Get width of a string in the current font
-	$s=(string)$s;
-	$cw=&$this->CurrentFont['cw'];
-	$w=0;
-	$l=strlen($s);
-	for($i=0;$i<$l;$i++)
-		$w+=$cw[$s[$i]];
-	return $w*$this->FontSize/1000;
-}
-
-function SetLineWidth($width)
-{
-	//Set line width
-	$this->LineWidth=$width;
-	if($this->page>0)
-		$this->_out(sprintf('%.2F w',$width*$this->k));
-}
-
-function Line($x1, $y1, $x2, $y2)
-{
-	//Draw a line
-	$this->_out(sprintf('%.2F %.2F m %.2F %.2F l S',$x1*$this->k,($this->h-$y1)*$this->k,$x2*$this->k,($this->h-$y2)*$this->k));
-}
-
-function Rect($x, $y, $w, $h, $style='')
-{
-	//Draw a rectangle
-	if($style=='F')
-		$op='f';
-	elseif($style=='FD' || $style=='DF')
-		$op='B';
-	else
-		$op='S';
-	$this->_out(sprintf('%.2F %.2F %.2F %.2F re %s',$x*$this->k,($this->h-$y)*$this->k,$w*$this->k,-$h*$this->k,$op));
-}
-
-function AddFont($family, $style='', $file='')
-{
-	//Add a TrueType or Type1 font
-	$family=strtolower($family);
-	if($file=='')
-		$file=str_replace(' ','',$family).strtolower($style).'.php';
-	if($family=='arial')
-		$family='helvetica';
-	$style=strtoupper($style);
-	if($style=='IB')
-		$style='BI';
-	$fontkey=$family.$style;
-	if(isset($this->fonts[$fontkey]))
-		return;
-	include($this->_getfontpath().$file);
-	if(!isset($name))
-		$this->Error('Could not include font definition file');
-	$i=count($this->fonts)+1;
-	$this->fonts[$fontkey]=array('i'=>$i, 'type'=>$type, 'name'=>$name, 'desc'=>$desc, 'up'=>$up, 'ut'=>$ut, 'cw'=>$cw, 'enc'=>$enc, 'file'=>$file);
-	if($diff)
-	{
-		//Search existing encodings
-		$d=0;
-		$nb=count($this->diffs);
-		for($i=1;$i<=$nb;$i++)
-		{
-			if($this->diffs[$i]==$diff)
-			{
-				$d=$i;
-				break;
-			}
-		}
-		if($d==0)
-		{
-			$d=$nb+1;
-			$this->diffs[$d]=$diff;
-		}
-		$this->fonts[$fontkey]['diff']=$d;
-	}
-	if($file)
-	{
-		if($type=='TrueType')
-			$this->FontFiles[$file]=array('length1'=>$originalsize);
-		else
-			$this->FontFiles[$file]=array('length1'=>$size1, 'length2'=>$size2);
-	}
-}
-
-function SetFont($family, $style='', $size=0)
-{
-	//Select a font; size given in points
-	global $fpdf_charwidths;
-
-	$family=strtolower($family);
-	if($family=='')
-		$family=$this->FontFamily;
-	if($family=='arial')
-		$family='helvetica';
-	elseif($family=='symbol' || $family=='zapfdingbats')
-		$style='';
-	$style=strtoupper($style);
-	if(strpos($style,'U')!==false)
-	{
-		$this->underline=true;
-		$style=str_replace('U','',$style);
-	}
-	else
-		$this->underline=false;
-	if($style=='IB')
-		$style='BI';
-	if($size==0)
-		$size=$this->FontSizePt;
-	//Test if font is already selected
-	if($this->FontFamily==$family && $this->FontStyle==$style && $this->FontSizePt==$size)
-		return;
-	//Test if used for the first time
-	$fontkey=$family.$style;
-	if(!isset($this->fonts[$fontkey]))
-	{
-		//Check if one of the standard fonts
-		if(isset($this->CoreFonts[$fontkey]))
-		{
-			if(!isset($fpdf_charwidths[$fontkey]))
-			{
-				//Load metric file
-				$file=$family;
-				if($family=='times' || $family=='helvetica')
-					$file.=strtolower($style);
-				include($this->_getfontpath().$file.'.php');
-				if(!isset($fpdf_charwidths[$fontkey]))
-					$this->Error('Could not include font metric file');
-			}
-			$i=count($this->fonts)+1;
-			$name=$this->CoreFonts[$fontkey];
-			$cw=$fpdf_charwidths[$fontkey];
-			$this->fonts[$fontkey]=array('i'=>$i, 'type'=>'core', 'name'=>$name, 'up'=>-100, 'ut'=>50, 'cw'=>$cw);
-		}
-		else
-			$this->Error('Undefined font: '.$family.' '.$style);
-	}
-	//Select it
-	$this->FontFamily=$family;
-	$this->FontStyle=$style;
-	$this->FontSizePt=$size;
-	$this->FontSize=$size/$this->k;
-	$this->CurrentFont=&$this->fonts[$fontkey];
-	if($this->page>0)
-		$this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
-}
-
-function SetFontSize($size)
-{
-	//Set font size in points
-	if($this->FontSizePt==$size)
-		return;
-	$this->FontSizePt=$size;
-	$this->FontSize=$size/$this->k;
-	if($this->page>0)
-		$this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
-}
-
-function AddLink()
-{
-	//Create a new internal link
-	$n=count($this->links)+1;
-	$this->links[$n]=array(0, 0);
-	return $n;
-}
-
-function SetLink($link, $y=0, $page=-1)
-{
-	//Set destination of internal link
-	if($y==-1)
-		$y=$this->y;
-	if($page==-1)
-		$page=$this->page;
-	$this->links[$link]=array($page, $y);
-}
-
-function Link($x, $y, $w, $h, $link)
-{
-	//Put a link on the page
-	$this->PageLinks[$this->page][]=array($x*$this->k, $this->hPt-$y*$this->k, $w*$this->k, $h*$this->k, $link);
-}
-
-function Text($x, $y, $txt)
-{
-	//Output a string
-	$s=sprintf('BT %.2F %.2F Td (%s) Tj ET',$x*$this->k,($this->h-$y)*$this->k,$this->_escape($txt));
-	if($this->underline && $txt!='')
-		$s.=' '.$this->_dounderline($x,$y,$txt);
-	if($this->ColorFlag)
-		$s='q '.$this->TextColor.' '.$s.' Q';
-	$this->_out($s);
-}
-
-function AcceptPageBreak()
-{
-	//Accept automatic page break or not
-	return $this->AutoPageBreak;
-}
-
-function Cell($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false, $link='')
-{
-	//Output a cell
-	$k=$this->k;
-	if($this->y+$h>$this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())
-	{
-		//Automatic page break
-		$x=$this->x;
-		$ws=$this->ws;
-		if($ws>0)
-		{
-			$this->ws=0;
-			$this->_out('0 Tw');
-		}
-		$this->AddPage($this->CurOrientation,$this->CurPageFormat);
-		$this->x=$x;
-		if($ws>0)
-		{
-			$this->ws=$ws;
-			$this->_out(sprintf('%.3F Tw',$ws*$k));
-		}
-	}
-	if($w==0)
-		$w=$this->w-$this->rMargin-$this->x;
-	$s='';
-	if($fill || $border==1)
-	{
-		if($fill)
-			$op=($border==1) ? 'B' : 'f';
-		else
-			$op='S';
-		$s=sprintf('%.2F %.2F %.2F %.2F re %s ',$this->x*$k,($this->h-$this->y)*$k,$w*$k,-$h*$k,$op);
-	}
-	if(is_string($border))
-	{
-		$x=$this->x;
-		$y=$this->y;
-		if(strpos($border,'L')!==false)
-			$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,$x*$k,($this->h-($y+$h))*$k);
-		if(strpos($border,'T')!==false)
-			$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-$y)*$k);
-		if(strpos($border,'R')!==false)
-			$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',($x+$w)*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
-		if(strpos($border,'B')!==false)
-			$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-($y+$h))*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
-	}
-	if($txt!=='')
-	{
-		if($align=='R')
-			$dx=$w-$this->cMargin-$this->GetStringWidth($txt);
-		elseif($align=='C')
-			$dx=($w-$this->GetStringWidth($txt))/2;
-		else
-			$dx=$this->cMargin;
-		if($this->ColorFlag)
-			$s.='q '.$this->TextColor.' ';
-		$txt2=str_replace(')','\\)',str_replace('(','\\(',str_replace('\\','\\\\',$txt)));
-		$s.=sprintf('BT %.2F %.2F Td (%s) Tj ET',($this->x+$dx)*$k,($this->h-($this->y+.5*$h+.3*$this->FontSize))*$k,$txt2);
-		if($this->underline)
-			$s.=' '.$this->_dounderline($this->x+$dx,$this->y+.5*$h+.3*$this->FontSize,$txt);
-		if($this->ColorFlag)
-			$s.=' Q';
-		if($link)
-			$this->Link($this->x+$dx,$this->y+.5*$h-.5*$this->FontSize,$this->GetStringWidth($txt),$this->FontSize,$link);
-	}
-	if($s)
-		$this->_out($s);
-	$this->lasth=$h;
-	if($ln>0)
-	{
-		//Go to next line
-		$this->y+=$h;
-		if($ln==1)
-			$this->x=$this->lMargin;
-	}
-	else
-		$this->x+=$w;
-}
-
-function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false)
-{
-	//Output text with automatic or explicit line breaks
-	$cw=&$this->CurrentFont['cw'];
-	if($w==0)
-		$w=$this->w-$this->rMargin-$this->x;
-	$wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
-	$s=str_replace("\r",'',$txt);
-	$nb=strlen($s);
-	if($nb>0 && $s[$nb-1]=="\n")
-		$nb--;
-	$b=0;
-	if($border)
-	{
-		if($border==1)
-		{
-			$border='LTRB';
-			$b='LRT';
-			$b2='LR';
-		}
-		else
-		{
-			$b2='';
-			if(strpos($border,'L')!==false)
-				$b2.='L';
-			if(strpos($border,'R')!==false)
-				$b2.='R';
-			$b=(strpos($border,'T')!==false) ? $b2.'T' : $b2;
-		}
-	}
-	$sep=-1;
-	$i=0;
-	$j=0;
-	$l=0;
-	$ns=0;
-	$nl=1;
-	while($i<$nb)
-	{
-		//Get next character
-		$c=$s[$i];
-		if($c=="\n")
-		{
-			//Explicit line break
-			if($this->ws>0)
-			{
-				$this->ws=0;
-				$this->_out('0 Tw');
-			}
-			$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
-			$i++;
-			$sep=-1;
-			$j=$i;
-			$l=0;
-			$ns=0;
-			$nl++;
-			if($border && $nl==2)
-				$b=$b2;
-			continue;
-		}
-		if($c==' ')
-		{
-			$sep=$i;
-			$ls=$l;
-			$ns++;
-		}
-		$l+=$cw[$c];
-		if($l>$wmax)
-		{
-			//Automatic line break
-			if($sep==-1)
-			{
-				if($i==$j)
-					$i++;
-				if($this->ws>0)
-				{
-					$this->ws=0;
-					$this->_out('0 Tw');
-				}
-				$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
-			}
-			else
-			{
-				if($align=='J')
-				{
-					$this->ws=($ns>1) ? ($wmax-$ls)/1000*$this->FontSize/($ns-1) : 0;
-					$this->_out(sprintf('%.3F Tw',$this->ws*$this->k));
-				}
-				$this->Cell($w,$h,substr($s,$j,$sep-$j),$b,2,$align,$fill);
-				$i=$sep+1;
-			}
-			$sep=-1;
-			$j=$i;
-			$l=0;
-			$ns=0;
-			$nl++;
-			if($border && $nl==2)
-				$b=$b2;
-		}
-		else
-			$i++;
-	}
-	//Last chunk
-	if($this->ws>0)
-	{
-		$this->ws=0;
-		$this->_out('0 Tw');
-	}
-	if($border && strpos($border,'B')!==false)
-		$b.='B';
-	$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
-	$this->x=$this->lMargin;
-}
-
-function Write($h, $txt, $link='')
-{
-	//Output text in flowing mode
-	$cw=&$this->CurrentFont['cw'];
-	$w=$this->w-$this->rMargin-$this->x;
-	$wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
-	$s=str_replace("\r",'',$txt);
-	$nb=strlen($s);
-	$sep=-1;
-	$i=0;
-	$j=0;
-	$l=0;
-	$nl=1;
-	while($i<$nb)
-	{
-		//Get next character
-		$c=$s[$i];
-		if($c=="\n")
-		{
-			//Explicit line break
-			$this->Cell($w,$h,substr($s,$j,$i-$j),0,2,'',0,$link);
-			$i++;
-			$sep=-1;
-			$j=$i;
-			$l=0;
-			if($nl==1)
-			{
-				$this->x=$this->lMargin;
-				$w=$this->w-$this->rMargin-$this->x;
-				$wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
-			}
-			$nl++;
-			continue;
-		}
-		if($c==' ')
-			$sep=$i;
-		$l+=$cw[$c];
-		if($l>$wmax)
-		{
-			//Automatic line break
-			if($sep==-1)
-			{
-				if($this->x>$this->lMargin)
-				{
-					//Move to next line
-					$this->x=$this->lMargin;
-					$this->y+=$h;
-					$w=$this->w-$this->rMargin-$this->x;
-					$wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
-					$i++;
-					$nl++;
-					continue;
-				}
-				if($i==$j)
-					$i++;
-				$this->Cell($w,$h,substr($s,$j,$i-$j),0,2,'',0,$link);
-			}
-			else
-			{
-				$this->Cell($w,$h,substr($s,$j,$sep-$j),0,2,'',0,$link);
-				$i=$sep+1;
-			}
-			$sep=-1;
-			$j=$i;
-			$l=0;
-			if($nl==1)
-			{
-				$this->x=$this->lMargin;
-				$w=$this->w-$this->rMargin-$this->x;
-				$wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
-			}
-			$nl++;
-		}
-		else
-			$i++;
-	}
-	//Last chunk
-	if($i!=$j)
-		$this->Cell($l/1000*$this->FontSize,$h,substr($s,$j),0,0,'',0,$link);
-}
-
-function Ln($h=null)
-{
-	//Line feed; default value is last cell height
-	$this->x=$this->lMargin;
-	if($h===null)
-		$this->y+=$this->lasth;
-	else
-		$this->y+=$h;
-}
-
-function Image($file, $x=null, $y=null, $w=0, $h=0, $type='', $link='')
-{
-	//Put an image on the page
-	if(!isset($this->images[$file]))
-	{
-		//First use of this image, get info
-		if($type=='')
-		{
-			$pos=strrpos($file,'.');
-			if(!$pos)
-				$this->Error('Image file has no extension and no type was specified: '.$file);
-			$type=substr($file,$pos+1);
-		}
-		$type=strtolower($type);
-		if($type=='jpeg')
-			$type='jpg';
-		$mtd='_parse'.$type;
-		if(!method_exists($this,$mtd))
-			$this->Error('Unsupported image type: '.$type);
-		$info=$this->$mtd($file);
-		$info['i']=count($this->images)+1;
-		$this->images[$file]=$info;
-	}
-	else
-		$info=$this->images[$file];
-	//Automatic width and height calculation if needed
-	if($w==0 && $h==0)
-	{
-		//Put image at 72 dpi
-		$w=$info['w']/$this->k;
-		$h=$info['h']/$this->k;
-	}
-	elseif($w==0)
-		$w=$h*$info['w']/$info['h'];
-	elseif($h==0)
-		$h=$w*$info['h']/$info['w'];
-	//Flowing mode
-	if($y===null)
-	{
-		if($this->y+$h>$this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())
-		{
-			//Automatic page break
-			$x2=$this->x;
-			$this->AddPage($this->CurOrientation,$this->CurPageFormat);
-			$this->x=$x2;
-		}
-		$y=$this->y;
-		$this->y+=$h;
-	}
-	if($x===null)
-		$x=$this->x;
-	$this->_out(sprintf('q %.2F 0 0 %.2F %.2F %.2F cm /I%d Do Q',$w*$this->k,$h*$this->k,$x*$this->k,($this->h-($y+$h))*$this->k,$info['i']));
-	if($link)
-		$this->Link($x,$y,$w,$h,$link);
-}
-
-function GetX()
-{
-	//Get x position
-	return $this->x;
-}
-
-function SetX($x)
-{
-	//Set x position
-	if($x>=0)
-		$this->x=$x;
-	else
-		$this->x=$this->w+$x;
-}
-
-function GetY()
-{
-	//Get y position
-	return $this->y;
-}
-
-function SetY($y)
-{
-	//Set y position and reset x
-	$this->x=$this->lMargin;
-	if($y>=0)
-		$this->y=$y;
-	else
-		$this->y=$this->h+$y;
-}
-
-function SetXY($x, $y)
-{
-	//Set x and y positions
-	$this->SetY($y);
-	$this->SetX($x);
-}
-
-function Output($name='', $dest='')
-{
-	//Output PDF to some destination
-	if($this->state<3)
-		$this->Close();
-	$dest=strtoupper($dest);
-	if($dest=='')
-	{
-		if($name=='')
-		{
-			$name='doc.pdf';
-			$dest='I';
-		}
-		else
-			$dest='F';
-	}
-	switch($dest)
-	{
-		case 'I':
-			//Send to standard output
-			if(ob_get_length())
-				$this->Error('Some data has already been output, can\'t send PDF file');
-			if(php_sapi_name()!='cli')
-			{
-				//We send to a browser
-				header('Content-Type: application/pdf');
-				if(headers_sent())
-					$this->Error('Some data has already been output, can\'t send PDF file');
-				header('Content-Length: '.strlen($this->buffer));
-				header('Content-Disposition: inline; filename="'.$name.'"');
-				header('Cache-Control: private, max-age=0, must-revalidate');
-				header('Pragma: public');
-				ini_set('zlib.output_compression','0');
-			}
-			echo $this->buffer;
-			break;
-		case 'D':
-			//Download file
-			if(ob_get_length())
-				$this->Error('Some data has already been output, can\'t send PDF file');
-			header('Content-Type: application/x-download');
-			if(headers_sent())
-				$this->Error('Some data has already been output, can\'t send PDF file');
-			header('Content-Length: '.strlen($this->buffer));
-			header('Content-Disposition: attachment; filename="'.$name.'"');
-			header('Cache-Control: private, max-age=0, must-revalidate');
-			header('Pragma: public');
-			ini_set('zlib.output_compression','0');
-			echo $this->buffer;
-			break;
-		case 'F':
-			//Save to local file
-			$f=fopen($name,'wb');
-			if(!$f)
-				$this->Error('Unable to create output file: '.$name);
-			fwrite($f,$this->buffer,strlen($this->buffer));
-			fclose($f);
-			break;
-		case 'S':
-			//Return as a string
-			return $this->buffer;
-		default:
-			$this->Error('Incorrect output destination: '.$dest);
-	}
-	return '';
-}
-
-/*******************************************************************************
-*                                                                              *
-*                              Protected methods                               *
-*                                                                              *
-*******************************************************************************/
-function _dochecks()
-{
-	//Check availability of %F
-	if(sprintf('%.1F',1.0)!='1.0')
-		$this->Error('This version of PHP is not supported');
-	//Check mbstring overloading
-	if(ini_get('mbstring.func_overload') & 2)
-		$this->Error('mbstring overloading must be disabled');
-	//Disable runtime magic quotes
-	if(get_magic_quotes_runtime())
-		@set_magic_quotes_runtime(0);
-}
-
-function _getpageformat($format)
-{
-	$format=strtolower($format);
-	if(!isset($this->PageFormats[$format]))
-		$this->Error('Unknown page format: '.$format);
-	$a=$this->PageFormats[$format];
-	return array($a[0]/$this->k, $a[1]/$this->k);
-}
-
-function _getfontpath()
-{
-	if(!defined('FPDF_FONTPATH') && is_dir(dirname(__FILE__).'/font'))
-		define('FPDF_FONTPATH',dirname(__FILE__).'/font/');
-	return defined('FPDF_FONTPATH') ? FPDF_FONTPATH : '';
-}
-
-function _beginpage($orientation, $format)
-{
-	$this->page++;
-	$this->pages[$this->page]='';
-	$this->state=2;
-	$this->x=$this->lMargin;
-	$this->y=$this->tMargin;
-	$this->FontFamily='';
-	//Check page size
-	if($orientation=='')
-		$orientation=$this->DefOrientation;
-	else
-		$orientation=strtoupper($orientation[0]);
-	if($format=='')
-		$format=$this->DefPageFormat;
-	else
-	{
-		if(is_string($format))
-			$format=$this->_getpageformat($format);
-	}
-	if($orientation!=$this->CurOrientation || $format[0]!=$this->CurPageFormat[0] || $format[1]!=$this->CurPageFormat[1])
-	{
-		//New size
-		if($orientation=='P')
-		{
-			$this->w=$format[0];
-			$this->h=$format[1];
-		}
-		else
-		{
-			$this->w=$format[1];
-			$this->h=$format[0];
-		}
-		$this->wPt=$this->w*$this->k;
-		$this->hPt=$this->h*$this->k;
-		$this->PageBreakTrigger=$this->h-$this->bMargin;
-		$this->CurOrientation=$orientation;
-		$this->CurPageFormat=$format;
-	}
-	if($orientation!=$this->DefOrientation || $format[0]!=$this->DefPageFormat[0] || $format[1]!=$this->DefPageFormat[1])
-		$this->PageSizes[$this->page]=array($this->wPt, $this->hPt);
-}
-
-function _endpage()
-{
-	$this->state=1;
-}
-
-function _escape($s)
-{
-	//Escape special characters in strings
-	$s=str_replace('\\','\\\\',$s);
-	$s=str_replace('(','\\(',$s);
-	$s=str_replace(')','\\)',$s);
-	$s=str_replace("\r",'\\r',$s);
-	return $s;
-}
-
-function _textstring($s)
-{
-	//Format a text string
-	return '('.$this->_escape($s).')';
-}
-
-function _UTF8toUTF16($s)
-{
-	//Convert UTF-8 to UTF-16BE with BOM
-	$res="\xFE\xFF";
-	$nb=strlen($s);
-	$i=0;
-	while($i<$nb)
-	{
-		$c1=ord($s[$i++]);
-		if($c1>=224)
-		{
-			//3-byte character
-			$c2=ord($s[$i++]);
-			$c3=ord($s[$i++]);
-			$res.=chr((($c1 & 0x0F)<<4) + (($c2 & 0x3C)>>2));
-			$res.=chr((($c2 & 0x03)<<6) + ($c3 & 0x3F));
-		}
-		elseif($c1>=192)
-		{
-			//2-byte character
-			$c2=ord($s[$i++]);
-			$res.=chr(($c1 & 0x1C)>>2);
-			$res.=chr((($c1 & 0x03)<<6) + ($c2 & 0x3F));
-		}
-		else
-		{
-			//Single-byte character
-			$res.="\0".chr($c1);
-		}
-	}
-	return $res;
-}
-
-function _dounderline($x, $y, $txt)
-{
-	//Underline text
-	$up=$this->CurrentFont['up'];
-	$ut=$this->CurrentFont['ut'];
-	$w=$this->GetStringWidth($txt)+$this->ws*substr_count($txt,' ');
-	return sprintf('%.2F %.2F %.2F %.2F re f',$x*$this->k,($this->h-($y-$up/1000*$this->FontSize))*$this->k,$w*$this->k,-$ut/1000*$this->FontSizePt);
-}
-
-function _parsejpg($file)
-{
-	//Extract info from a JPEG file
-	$a=GetImageSize($file);
-	if(!$a)
-		$this->Error('Missing or incorrect image file: '.$file);
-	if($a[2]!=2)
-		$this->Error('Not a JPEG file: '.$file);
-	if(!isset($a['channels']) || $a['channels']==3)
-		$colspace='DeviceRGB';
-	elseif($a['channels']==4)
-		$colspace='DeviceCMYK';
-	else
-		$colspace='DeviceGray';
-	$bpc=isset($a['bits']) ? $a['bits'] : 8;
-	//Read whole file
-	$f=fopen($file,'rb');
-	$data='';
-	while(!feof($f))
-		$data.=fread($f,8192);
-	fclose($f);
-	return array('w'=>$a[0], 'h'=>$a[1], 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'DCTDecode', 'data'=>$data);
-}
-
-function _parsepng($file)
-{
-	//Extract info from a PNG file
-	$f=fopen($file,'rb');
-	if(!$f)
-		$this->Error('Can\'t open image file: '.$file);
-	//Check signature
-	if($this->_readstream($f,8)!=chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10))
-		$this->Error('Not a PNG file: '.$file);
-	//Read header chunk
-	$this->_readstream($f,4);
-	if($this->_readstream($f,4)!='IHDR')
-		$this->Error('Incorrect PNG file: '.$file);
-	$w=$this->_readint($f);
-	$h=$this->_readint($f);
-	$bpc=ord($this->_readstream($f,1));
-	if($bpc>8)
-		$this->Error('16-bit depth not supported: '.$file);
-	$ct=ord($this->_readstream($f,1));
-	if($ct==0)
-		$colspace='DeviceGray';
-	elseif($ct==2)
-		$colspace='DeviceRGB';
-	elseif($ct==3)
-		$colspace='Indexed';
-	else
-		$this->Error('Alpha channel not supported: '.$file);
-	if(ord($this->_readstream($f,1))!=0)
-		$this->Error('Unknown compression method: '.$file);
-	if(ord($this->_readstream($f,1))!=0)
-		$this->Error('Unknown filter method: '.$file);
-	if(ord($this->_readstream($f,1))!=0)
-		$this->Error('Interlacing not supported: '.$file);
-	$this->_readstream($f,4);
-	$parms='/DecodeParms <</Predictor 15 /Colors '.($ct==2 ? 3 : 1).' /BitsPerComponent '.$bpc.' /Columns '.$w.'>>';
-	//Scan chunks looking for palette, transparency and image data
-	$pal='';
-	$trns='';
-	$data='';
-	do
-	{
-		$n=$this->_readint($f);
-		$type=$this->_readstream($f,4);
-		if($type=='PLTE')
-		{
-			//Read palette
-			$pal=$this->_readstream($f,$n);
-			$this->_readstream($f,4);
-		}
-		elseif($type=='tRNS')
-		{
-			//Read transparency info
-			$t=$this->_readstream($f,$n);
-			if($ct==0)
-				$trns=array(ord(substr($t,1,1)));
-			elseif($ct==2)
-				$trns=array(ord(substr($t,1,1)), ord(substr($t,3,1)), ord(substr($t,5,1)));
-			else
-			{
-				$pos=strpos($t,chr(0));
-				if($pos!==false)
-					$trns=array($pos);
-			}
-			$this->_readstream($f,4);
-		}
-		elseif($type=='IDAT')
-		{
-			//Read image data block
-			$data.=$this->_readstream($f,$n);
-			$this->_readstream($f,4);
-		}
-		elseif($type=='IEND')
-			break;
-		else
-			$this->_readstream($f,$n+4);
-	}
-	while($n);
-	if($colspace=='Indexed' && empty($pal))
-		$this->Error('Missing palette in '.$file);
-	fclose($f);
-	return array('w'=>$w, 'h'=>$h, 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'FlateDecode', 'parms'=>$parms, 'pal'=>$pal, 'trns'=>$trns, 'data'=>$data);
-}
-
-function _readstream($f, $n)
-{
-	//Read n bytes from stream
-	$res='';
-	while($n>0 && !feof($f))
-	{
-		$s=fread($f,$n);
-		if($s===false)
-			$this->Error('Error while reading stream');
-		$n-=strlen($s);
-		$res.=$s;
-	}
-	if($n>0)
-		$this->Error('Unexpected end of stream');
-	return $res;
-}
-
-function _readint($f)
-{
-	//Read a 4-byte integer from stream
-	$a=unpack('Ni',$this->_readstream($f,4));
-	return $a['i'];
-}
-
-function _parsegif($file)
-{
-	//Extract info from a GIF file (via PNG conversion)
-	if(!function_exists('imagepng'))
-		$this->Error('GD extension is required for GIF support');
-	if(!function_exists('imagecreatefromgif'))
-		$this->Error('GD has no GIF read support');
-	$im=imagecreatefromgif($file);
-	if(!$im)
-		$this->Error('Missing or incorrect image file: '.$file);
-	imageinterlace($im,0);
-	$tmp=tempnam('.','gif');
-	if(!$tmp)
-		$this->Error('Unable to create a temporary file');
-	if(!imagepng($im,$tmp))
-		$this->Error('Error while saving to temporary file');
-	imagedestroy($im);
-	$info=$this->_parsepng($tmp);
-	unlink($tmp);
-	return $info;
-}
-
-function _newobj()
-{
-	//Begin a new object
-	$this->n++;
-	$this->offsets[$this->n]=strlen($this->buffer);
-	$this->_out($this->n.' 0 obj');
-}
-
-function _putstream($s)
-{
-	$this->_out('stream');
-	$this->_out($s);
-	$this->_out('endstream');
-}
-
-function _out($s)
-{
-	//Add a line to the document
-	if($this->state==2)
-		$this->pages[$this->page].=$s."\n";
-	else
-		$this->buffer.=$s."\n";
-}
-
-function _putpages()
-{
-	$nb=$this->page;
-	if(!empty($this->AliasNbPages))
-	{
-		//Replace number of pages
-		for($n=1;$n<=$nb;$n++)
-			$this->pages[$n]=str_replace($this->AliasNbPages,$nb,$this->pages[$n]);
-	}
-	if($this->DefOrientation=='P')
-	{
-		$wPt=$this->DefPageFormat[0]*$this->k;
-		$hPt=$this->DefPageFormat[1]*$this->k;
-	}
-	else
-	{
-		$wPt=$this->DefPageFormat[1]*$this->k;
-		$hPt=$this->DefPageFormat[0]*$this->k;
-	}
-	$filter=($this->compress) ? '/Filter /FlateDecode ' : '';
-	for($n=1;$n<=$nb;$n++)
-	{
-		//Page
-		$this->_newobj();
-		$this->_out('<</Type /Page');
-		$this->_out('/Parent 1 0 R');
-		if(isset($this->PageSizes[$n]))
-			$this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]',$this->PageSizes[$n][0],$this->PageSizes[$n][1]));
-		$this->_out('/Resources 2 0 R');
-		if(isset($this->PageLinks[$n]))
-		{
-			//Links
-			$annots='/Annots [';
-			foreach($this->PageLinks[$n] as $pl)
-			{
-				$rect=sprintf('%.2F %.2F %.2F %.2F',$pl[0],$pl[1],$pl[0]+$pl[2],$pl[1]-$pl[3]);
-				$annots.='<</Type /Annot /Subtype /Link /Rect ['.$rect.'] /Border [0 0 0] ';
-				if(is_string($pl[4]))
-					$annots.='/A <</S /URI /URI '.$this->_textstring($pl[4]).'>>>>';
-				else
-				{
-					$l=$this->links[$pl[4]];
-					$h=isset($this->PageSizes[$l[0]]) ? $this->PageSizes[$l[0]][1] : $hPt;
-					$annots.=sprintf('/Dest [%d 0 R /XYZ 0 %.2F null]>>',1+2*$l[0],$h-$l[1]*$this->k);
-				}
-			}
-			$this->_out($annots.']');
-		}
-		$this->_out('/Contents '.($this->n+1).' 0 R>>');
-		$this->_out('endobj');
-		//Page content
-		$p=($this->compress) ? gzcompress($this->pages[$n]) : $this->pages[$n];
-		$this->_newobj();
-		$this->_out('<<'.$filter.'/Length '.strlen($p).'>>');
-		$this->_putstream($p);
-		$this->_out('endobj');
-	}
-	//Pages root
-	$this->offsets[1]=strlen($this->buffer);
-	$this->_out('1 0 obj');
-	$this->_out('<</Type /Pages');
-	$kids='/Kids [';
-	for($i=0;$i<$nb;$i++)
-		$kids.=(3+2*$i).' 0 R ';
-	$this->_out($kids.']');
-	$this->_out('/Count '.$nb);
-	$this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]',$wPt,$hPt));
-	$this->_out('>>');
-	$this->_out('endobj');
-}
-
-function _putfonts()
-{
-	$nf=$this->n;
-	foreach($this->diffs as $diff)
-	{
-		//Encodings
-		$this->_newobj();
-		$this->_out('<</Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences ['.$diff.']>>');
-		$this->_out('endobj');
-	}
-	foreach($this->FontFiles as $file=>$info)
-	{
-		//Font file embedding
-		$this->_newobj();
-		$this->FontFiles[$file]['n']=$this->n;
-		$font='';
-		$f=fopen($this->_getfontpath().$file,'rb',1);
-		if(!$f)
-			$this->Error('Font file not found');
-		while(!feof($f))
-			$font.=fread($f,8192);
-		fclose($f);
-		$compressed=(substr($file,-2)=='.z');
-		if(!$compressed && isset($info['length2']))
-		{
-			$header=(ord($font[0])==128);
-			if($header)
-			{
-				//Strip first binary header
-				$font=substr($font,6);
-			}
-			if($header && ord($font[$info['length1']])==128)
-			{
-				//Strip second binary header
-				$font=substr($font,0,$info['length1']).substr($font,$info['length1']+6);
-			}
-		}
-		$this->_out('<</Length '.strlen($font));
-		if($compressed)
-			$this->_out('/Filter /FlateDecode');
-		$this->_out('/Length1 '.$info['length1']);
-		if(isset($info['length2']))
-			$this->_out('/Length2 '.$info['length2'].' /Length3 0');
-		$this->_out('>>');
-		$this->_putstream($font);
-		$this->_out('endobj');
-	}
-	foreach($this->fonts as $k=>$font)
-	{
-		//Font objects
-		$this->fonts[$k]['n']=$this->n+1;
-		$type=$font['type'];
-		$name=$font['name'];
-		if($type=='core')
-		{
-			//Standard font
-			$this->_newobj();
-			$this->_out('<</Type /Font');
-			$this->_out('/BaseFont /'.$name);
-			$this->_out('/Subtype /Type1');
-			if($name!='Symbol' && $name!='ZapfDingbats')
-				$this->_out('/Encoding /WinAnsiEncoding');
-			$this->_out('>>');
-			$this->_out('endobj');
-		}
-		elseif($type=='Type1' || $type=='TrueType')
-		{
-			//Additional Type1 or TrueType font
-			$this->_newobj();
-			$this->_out('<</Type /Font');
-			$this->_out('/BaseFont /'.$name);
-			$this->_out('/Subtype /'.$type);
-			$this->_out('/FirstChar 32 /LastChar 255');
-			$this->_out('/Widths '.($this->n+1).' 0 R');
-			$this->_out('/FontDescriptor '.($this->n+2).' 0 R');
-			if($font['enc'])
-			{
-				if(isset($font['diff']))
-					$this->_out('/Encoding '.($nf+$font['diff']).' 0 R');
-				else
-					$this->_out('/Encoding /WinAnsiEncoding');
-			}
-			$this->_out('>>');
-			$this->_out('endobj');
-			//Widths
-			$this->_newobj();
-			$cw=&$font['cw'];
-			$s='[';
-			for($i=32;$i<=255;$i++)
-				$s.=$cw[chr($i)].' ';
-			$this->_out($s.']');
-			$this->_out('endobj');
-			//Descriptor
-			$this->_newobj();
-			$s='<</Type /FontDescriptor /FontName /'.$name;
-			foreach($font['desc'] as $k=>$v)
-				$s.=' /'.$k.' '.$v;
-			$file=$font['file'];
-			if($file)
-				$s.=' /FontFile'.($type=='Type1' ? '' : '2').' '.$this->FontFiles[$file]['n'].' 0 R';
-			$this->_out($s.'>>');
-			$this->_out('endobj');
-		}
-		else
-		{
-			//Allow for additional types
-			$mtd='_put'.strtolower($type);
-			if(!method_exists($this,$mtd))
-				$this->Error('Unsupported font type: '.$type);
-			$this->$mtd($font);
-		}
-	}
-}
-
-function _putimages()
-{
-	$filter=($this->compress) ? '/Filter /FlateDecode ' : '';
-	reset($this->images);
-	while(list($file,$info)=each($this->images))
-	{
-		$this->_newobj();
-		$this->images[$file]['n']=$this->n;
-		$this->_out('<</Type /XObject');
-		$this->_out('/Subtype /Image');
-		$this->_out('/Width '.$info['w']);
-		$this->_out('/Height '.$info['h']);
-		if($info['cs']=='Indexed')
-			$this->_out('/ColorSpace [/Indexed /DeviceRGB '.(strlen($info['pal'])/3-1).' '.($this->n+1).' 0 R]');
-		else
-		{
-			$this->_out('/ColorSpace /'.$info['cs']);
-			if($info['cs']=='DeviceCMYK')
-				$this->_out('/Decode [1 0 1 0 1 0 1 0]');
-		}
-		$this->_out('/BitsPerComponent '.$info['bpc']);
-		if(isset($info['f']))
-			$this->_out('/Filter /'.$info['f']);
-		if(isset($info['parms']))
-			$this->_out($info['parms']);
-		if(isset($info['trns']) && is_array($info['trns']))
-		{
-			$trns='';
-			for($i=0;$i<count($info['trns']);$i++)
-				$trns.=$info['trns'][$i].' '.$info['trns'][$i].' ';
-			$this->_out('/Mask ['.$trns.']');
-		}
-		$this->_out('/Length '.strlen($info['data']).'>>');
-		$this->_putstream($info['data']);
-		unset($this->images[$file]['data']);
-		$this->_out('endobj');
-		//Palette
-		if($info['cs']=='Indexed')
-		{
-			$this->_newobj();
-			$pal=($this->compress) ? gzcompress($info['pal']) : $info['pal'];
-			$this->_out('<<'.$filter.'/Length '.strlen($pal).'>>');
-			$this->_putstream($pal);
-			$this->_out('endobj');
-		}
-	}
-}
-
-function _putxobjectdict()
-{
-	foreach($this->images as $image)
-		$this->_out('/I'.$image['i'].' '.$image['n'].' 0 R');
-}
-
-function _putresourcedict()
-{
-	$this->_out('/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');
-	$this->_out('/Font <<');
-	foreach($this->fonts as $font)
-		$this->_out('/F'.$font['i'].' '.$font['n'].' 0 R');
-	$this->_out('>>');
-	$this->_out('/XObject <<');
-	$this->_putxobjectdict();
-	$this->_out('>>');
-}
-
-function _putresources()
-{
-	$this->_putfonts();
-	$this->_putimages();
-	//Resource dictionary
-	$this->offsets[2]=strlen($this->buffer);
-	$this->_out('2 0 obj');
-	$this->_out('<<');
-	$this->_putresourcedict();
-	$this->_out('>>');
-	$this->_out('endobj');
-}
-
-function _putinfo()
-{
-	$this->_out('/Producer '.$this->_textstring('FPDF '.FPDF_VERSION));
-	if(!empty($this->title))
-		$this->_out('/Title '.$this->_textstring($this->title));
-	if(!empty($this->subject))
-		$this->_out('/Subject '.$this->_textstring($this->subject));
-	if(!empty($this->author))
-		$this->_out('/Author '.$this->_textstring($this->author));
-	if(!empty($this->keywords))
-		$this->_out('/Keywords '.$this->_textstring($this->keywords));
-	if(!empty($this->creator))
-		$this->_out('/Creator '.$this->_textstring($this->creator));
-	$this->_out('/CreationDate '.$this->_textstring('D:'.@date('YmdHis')));
-}
-
-function _putcatalog()
-{
-	$this->_out('/Type /Catalog');
-	$this->_out('/Pages 1 0 R');
-	if($this->ZoomMode=='fullpage')
-		$this->_out('/OpenAction [3 0 R /Fit]');
-	elseif($this->ZoomMode=='fullwidth')
-		$this->_out('/OpenAction [3 0 R /FitH null]');
-	elseif($this->ZoomMode=='real')
-		$this->_out('/OpenAction [3 0 R /XYZ null null 1]');
-	elseif(!is_string($this->ZoomMode))
-		$this->_out('/OpenAction [3 0 R /XYZ null null '.($this->ZoomMode/100).']');
-	if($this->LayoutMode=='single')
-		$this->_out('/PageLayout /SinglePage');
-	elseif($this->LayoutMode=='continuous')
-		$this->_out('/PageLayout /OneColumn');
-	elseif($this->LayoutMode=='two')
-		$this->_out('/PageLayout /TwoColumnLeft');
-}
-
-function _putheader()
-{
-	$this->_out('%PDF-'.$this->PDFVersion);
-}
-
-function _puttrailer()
-{
-	$this->_out('/Size '.($this->n+1));
-	$this->_out('/Root '.$this->n.' 0 R');
-	$this->_out('/Info '.($this->n-1).' 0 R');
-}
-
-function _enddoc()
-{
-	$this->_putheader();
-	$this->_putpages();
-	$this->_putresources();
-	//Info
-	$this->_newobj();
-	$this->_out('<<');
-	$this->_putinfo();
-	$this->_out('>>');
-	$this->_out('endobj');
-	//Catalog
-	$this->_newobj();
-	$this->_out('<<');
-	$this->_putcatalog();
-	$this->_out('>>');
-	$this->_out('endobj');
-	//Cross-ref
-	$o=strlen($this->buffer);
-	$this->_out('xref');
-	$this->_out('0 '.($this->n+1));
-	$this->_out('0000000000 65535 f ');
-	for($i=1;$i<=$this->n;$i++)
-		$this->_out(sprintf('%010d 00000 n ',$this->offsets[$i]));
-	//Trailer
-	$this->_out('trailer');
-	$this->_out('<<');
-	$this->_puttrailer();
-	$this->_out('>>');
-	$this->_out('startxref');
-	$this->_out($o);
-	$this->_out('%%EOF');
-	$this->state=3;
-}
-//End of class
-}
-
-//Handle special IE contype request
-if(isset($_SERVER['HTTP_USER_AGENT']) && $_SERVER['HTTP_USER_AGENT']=='contype')
-{
-	header('Content-Type: application/pdf');
-	exit;
-}
-
-?>
+<?php
+/*******************************************************************************
+* FPDF                                                                         *
+*                                                                              *
+* Version: 1.6                                                                 *
+* Date:    2008-08-03                                                          *
+* Author:  Olivier PLATHEY                                                     *
+*******************************************************************************/
+
+define('FPDF_VERSION','1.6');
+
+class FPDF
+{
+var $page;               //current page number
+var $n;                  //current object number
+var $offsets;            //array of object offsets
+var $buffer;             //buffer holding in-memory PDF
+var $pages;              //array containing pages
+var $state;              //current document state
+var $compress;           //compression flag
+var $k;                  //scale factor (number of points in user unit)
+var $DefOrientation;     //default orientation
+var $CurOrientation;     //current orientation
+var $PageFormats;        //available page formats
+var $DefPageFormat;      //default page format
+var $CurPageFormat;      //current page format
+var $PageSizes;          //array storing non-default page sizes
+var $wPt,$hPt;           //dimensions of current page in points
+var $w,$h;               //dimensions of current page in user unit
+var $lMargin;            //left margin
+var $tMargin;            //top margin
+var $rMargin;            //right margin
+var $bMargin;            //page break margin
+var $cMargin;            //cell margin
+var $x,$y;               //current position in user unit
+var $lasth;              //height of last printed cell
+var $LineWidth;          //line width in user unit
+var $CoreFonts;          //array of standard font names
+var $fonts;              //array of used fonts
+var $FontFiles;          //array of font files
+var $diffs;              //array of encoding differences
+var $FontFamily;         //current font family
+var $FontStyle;          //current font style
+var $underline;          //underlining flag
+var $CurrentFont;        //current font info
+var $FontSizePt;         //current font size in points
+var $FontSize;           //current font size in user unit
+var $DrawColor;          //commands for drawing color
+var $FillColor;          //commands for filling color
+var $TextColor;          //commands for text color
+var $ColorFlag;          //indicates whether fill and text colors are different
+var $ws;                 //word spacing
+var $images;             //array of used images
+var $PageLinks;          //array of links in pages
+var $links;              //array of internal links
+var $AutoPageBreak;      //automatic page breaking
+var $PageBreakTrigger;   //threshold used to trigger page breaks
+var $InHeader;           //flag set when processing header
+var $InFooter;           //flag set when processing footer
+var $ZoomMode;           //zoom display mode
+var $LayoutMode;         //layout display mode
+var $title;              //title
+var $subject;            //subject
+var $author;             //author
+var $keywords;           //keywords
+var $creator;            //creator
+var $AliasNbPages;       //alias for total number of pages
+var $PDFVersion;         //PDF version number
+
+/*******************************************************************************
+*                                                                              *
+*                               Public methods                                 *
+*                                                                              *
+*******************************************************************************/
+function FPDF($orientation='P', $unit='mm', $format='A4')
+{
+	//Some checks
+	$this->_dochecks();
+	//Initialization of properties
+	$this->page=0;
+	$this->n=2;
+	$this->buffer='';
+	$this->pages=array();
+	$this->PageSizes=array();
+	$this->state=0;
+	$this->fonts=array();
+	$this->FontFiles=array();
+	$this->diffs=array();
+	$this->images=array();
+	$this->links=array();
+	$this->InHeader=false;
+	$this->InFooter=false;
+	$this->lasth=0;
+	$this->FontFamily='';
+	$this->FontStyle='';
+	$this->FontSizePt=12;
+	$this->underline=false;
+	$this->DrawColor='0 G';
+	$this->FillColor='0 g';
+	$this->TextColor='0 g';
+	$this->ColorFlag=false;
+	$this->ws=0;
+	//Standard fonts
+	$this->CoreFonts=array('courier'=>'Courier', 'courierB'=>'Courier-Bold', 'courierI'=>'Courier-Oblique', 'courierBI'=>'Courier-BoldOblique',
+		'helvetica'=>'Helvetica', 'helveticaB'=>'Helvetica-Bold', 'helveticaI'=>'Helvetica-Oblique', 'helveticaBI'=>'Helvetica-BoldOblique',
+		'times'=>'Times-Roman', 'timesB'=>'Times-Bold', 'timesI'=>'Times-Italic', 'timesBI'=>'Times-BoldItalic',
+		'symbol'=>'Symbol', 'zapfdingbats'=>'ZapfDingbats');
+	//Scale factor
+	if($unit=='pt')
+		$this->k=1;
+	elseif($unit=='mm')
+		$this->k=72/25.4;
+	elseif($unit=='cm')
+		$this->k=72/2.54;
+	elseif($unit=='in')
+		$this->k=72;
+	else
+		$this->Error('Incorrect unit: '.$unit);
+	//Page format
+	$this->PageFormats=array('a3'=>array(841.89,1190.55), 'a4'=>array(595.28,841.89), 'a5'=>array(420.94,595.28),
+		'letter'=>array(612,792), 'legal'=>array(612,1008));
+	if(is_string($format))
+		$format=$this->_getpageformat($format);
+	$this->DefPageFormat=$format;
+	$this->CurPageFormat=$format;
+	//Page orientation
+	$orientation=strtolower($orientation);
+	if($orientation=='p' || $orientation=='portrait')
+	{
+		$this->DefOrientation='P';
+		$this->w=$this->DefPageFormat[0];
+		$this->h=$this->DefPageFormat[1];
+	}
+	elseif($orientation=='l' || $orientation=='landscape')
+	{
+		$this->DefOrientation='L';
+		$this->w=$this->DefPageFormat[1];
+		$this->h=$this->DefPageFormat[0];
+	}
+	else
+		$this->Error('Incorrect orientation: '.$orientation);
+	$this->CurOrientation=$this->DefOrientation;
+	$this->wPt=$this->w*$this->k;
+	$this->hPt=$this->h*$this->k;
+	//Page margins (1 cm)
+	$margin=28.35/$this->k;
+	$this->SetMargins($margin,$margin);
+	//Interior cell margin (1 mm)
+	$this->cMargin=$margin/10;
+	//Line width (0.2 mm)
+	$this->LineWidth=.567/$this->k;
+	//Automatic page break
+	$this->SetAutoPageBreak(true,2*$margin);
+	//Full width display mode
+	$this->SetDisplayMode('fullwidth');
+	//Enable compression
+	$this->SetCompression(true);
+	//Set default PDF version number
+	$this->PDFVersion='1.3';
+}
+
+function SetMargins($left, $top, $right=null)
+{
+	//Set left, top and right margins
+	$this->lMargin=$left;
+	$this->tMargin=$top;
+	if($right===null)
+		$right=$left;
+	$this->rMargin=$right;
+}
+
+function SetLeftMargin($margin)
+{
+	//Set left margin
+	$this->lMargin=$margin;
+	if($this->page>0 && $this->x<$margin)
+		$this->x=$margin;
+}
+
+function SetTopMargin($margin)
+{
+	//Set top margin
+	$this->tMargin=$margin;
+}
+
+function SetRightMargin($margin)
+{
+	//Set right margin
+	$this->rMargin=$margin;
+}
+
+function SetAutoPageBreak($auto, $margin=0)
+{
+	//Set auto page break mode and triggering margin
+	$this->AutoPageBreak=$auto;
+	$this->bMargin=$margin;
+	$this->PageBreakTrigger=$this->h-$margin;
+}
+
+function SetDisplayMode($zoom, $layout='continuous')
+{
+	//Set display mode in viewer
+	if($zoom=='fullpage' || $zoom=='fullwidth' || $zoom=='real' || $zoom=='default' || !is_string($zoom))
+		$this->ZoomMode=$zoom;
+	else
+		$this->Error('Incorrect zoom display mode: '.$zoom);
+	if($layout=='single' || $layout=='continuous' || $layout=='two' || $layout=='default')
+		$this->LayoutMode=$layout;
+	else
+		$this->Error('Incorrect layout display mode: '.$layout);
+}
+
+function SetCompression($compress)
+{
+	//Set page compression
+	if(function_exists('gzcompress'))
+		$this->compress=$compress;
+	else
+		$this->compress=false;
+}
+
+function SetTitle($title, $isUTF8=false)
+{
+	//Title of document
+	if($isUTF8)
+		$title=$this->_UTF8toUTF16($title);
+	$this->title=$title;
+}
+
+function SetSubject($subject, $isUTF8=false)
+{
+	//Subject of document
+	if($isUTF8)
+		$subject=$this->_UTF8toUTF16($subject);
+	$this->subject=$subject;
+}
+
+function SetAuthor($author, $isUTF8=false)
+{
+	//Author of document
+	if($isUTF8)
+		$author=$this->_UTF8toUTF16($author);
+	$this->author=$author;
+}
+
+function SetKeywords($keywords, $isUTF8=false)
+{
+	//Keywords of document
+	if($isUTF8)
+		$keywords=$this->_UTF8toUTF16($keywords);
+	$this->keywords=$keywords;
+}
+
+function SetCreator($creator, $isUTF8=false)
+{
+	//Creator of document
+	if($isUTF8)
+		$creator=$this->_UTF8toUTF16($creator);
+	$this->creator=$creator;
+}
+
+function AliasNbPages($alias='{nb}')
+{
+	//Define an alias for total number of pages
+	$this->AliasNbPages=$alias;
+}
+
+function Error($msg)
+{
+	//Fatal error
+	die('<b>FPDF error:</b> '.$msg);
+}
+
+function Open()
+{
+	//Begin document
+	$this->state=1;
+}
+
+function Close()
+{
+	//Terminate document
+	if($this->state==3)
+		return;
+	if($this->page==0)
+		$this->AddPage();
+	//Page footer
+	$this->InFooter=true;
+	$this->Footer();
+	$this->InFooter=false;
+	//Close page
+	$this->_endpage();
+	//Close document
+	$this->_enddoc();
+}
+
+function AddPage($orientation='', $format='')
+{
+	//Start a new page
+	if($this->state==0)
+		$this->Open();
+	$family=$this->FontFamily;
+	$style=$this->FontStyle.($this->underline ? 'U' : '');
+	$size=$this->FontSizePt;
+	$lw=$this->LineWidth;
+	$dc=$this->DrawColor;
+	$fc=$this->FillColor;
+	$tc=$this->TextColor;
+	$cf=$this->ColorFlag;
+	if($this->page>0)
+	{
+		//Page footer
+		$this->InFooter=true;
+		$this->Footer();
+		$this->InFooter=false;
+		//Close page
+		$this->_endpage();
+	}
+	//Start new page
+	$this->_beginpage($orientation,$format);
+	//Set line cap style to square
+	$this->_out('2 J');
+	//Set line width
+	$this->LineWidth=$lw;
+	$this->_out(sprintf('%.2F w',$lw*$this->k));
+	//Set font
+	if($family)
+		$this->SetFont($family,$style,$size);
+	//Set colors
+	$this->DrawColor=$dc;
+	if($dc!='0 G')
+		$this->_out($dc);
+	$this->FillColor=$fc;
+	if($fc!='0 g')
+		$this->_out($fc);
+	$this->TextColor=$tc;
+	$this->ColorFlag=$cf;
+	//Page header
+	$this->InHeader=true;
+	$this->Header();
+	$this->InHeader=false;
+	//Restore line width
+	if($this->LineWidth!=$lw)
+	{
+		$this->LineWidth=$lw;
+		$this->_out(sprintf('%.2F w',$lw*$this->k));
+	}
+	//Restore font
+	if($family)
+		$this->SetFont($family,$style,$size);
+	//Restore colors
+	if($this->DrawColor!=$dc)
+	{
+		$this->DrawColor=$dc;
+		$this->_out($dc);
+	}
+	if($this->FillColor!=$fc)
+	{
+		$this->FillColor=$fc;
+		$this->_out($fc);
+	}
+	$this->TextColor=$tc;
+	$this->ColorFlag=$cf;
+}
+
+function Header()
+{
+	//To be implemented in your own inherited class
+}
+
+function Footer()
+{
+	//To be implemented in your own inherited class
+}
+
+function PageNo()
+{
+	//Get current page number
+	return $this->page;
+}
+
+function SetDrawColor($r, $g=null, $b=null)
+{
+	//Set color for all stroking operations
+	if(($r==0 && $g==0 && $b==0) || $g===null)
+		$this->DrawColor=sprintf('%.3F G',$r/255);
+	else
+		$this->DrawColor=sprintf('%.3F %.3F %.3F RG',$r/255,$g/255,$b/255);
+	if($this->page>0)
+		$this->_out($this->DrawColor);
+}
+
+function SetFillColor($r, $g=null, $b=null)
+{
+	//Set color for all filling operations
+	if(($r==0 && $g==0 && $b==0) || $g===null)
+		$this->FillColor=sprintf('%.3F g',$r/255);
+	else
+		$this->FillColor=sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
+	$this->ColorFlag=($this->FillColor!=$this->TextColor);
+	if($this->page>0)
+		$this->_out($this->FillColor);
+}
+
+function SetTextColor($r, $g=null, $b=null)
+{
+	//Set color for text
+	if(($r==0 && $g==0 && $b==0) || $g===null)
+		$this->TextColor=sprintf('%.3F g',$r/255);
+	else
+		$this->TextColor=sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
+	$this->ColorFlag=($this->FillColor!=$this->TextColor);
+}
+
+function GetStringWidth($s)
+{
+	//Get width of a string in the current font
+	$s=(string)$s;
+	$cw=&$this->CurrentFont['cw'];
+	$w=0;
+	$l=strlen($s);
+	for($i=0;$i<$l;$i++)
+		$w+=$cw[$s[$i]];
+	return $w*$this->FontSize/1000;
+}
+
+function SetLineWidth($width)
+{
+	//Set line width
+	$this->LineWidth=$width;
+	if($this->page>0)
+		$this->_out(sprintf('%.2F w',$width*$this->k));
+}
+
+function Line($x1, $y1, $x2, $y2)
+{
+	//Draw a line
+	$this->_out(sprintf('%.2F %.2F m %.2F %.2F l S',$x1*$this->k,($this->h-$y1)*$this->k,$x2*$this->k,($this->h-$y2)*$this->k));
+}
+
+function Rect($x, $y, $w, $h, $style='')
+{
+	//Draw a rectangle
+	if($style=='F')
+		$op='f';
+	elseif($style=='FD' || $style=='DF')
+		$op='B';
+	else
+		$op='S';
+	$this->_out(sprintf('%.2F %.2F %.2F %.2F re %s',$x*$this->k,($this->h-$y)*$this->k,$w*$this->k,-$h*$this->k,$op));
+}
+
+function AddFont($family, $style='', $file='')
+{
+	//Add a TrueType or Type1 font
+	$family=strtolower($family);
+	if($file=='')
+		$file=str_replace(' ','',$family).strtolower($style).'.php';
+	if($family=='arial')
+		$family='helvetica';
+	$style=strtoupper($style);
+	if($style=='IB')
+		$style='BI';
+	$fontkey=$family.$style;
+	if(isset($this->fonts[$fontkey]))
+		return;
+	include($this->_getfontpath().$file);
+	if(!isset($name))
+		$this->Error('Could not include font definition file');
+	$i=count($this->fonts)+1;
+	$this->fonts[$fontkey]=array('i'=>$i, 'type'=>$type, 'name'=>$name, 'desc'=>$desc, 'up'=>$up, 'ut'=>$ut, 'cw'=>$cw, 'enc'=>$enc, 'file'=>$file);
+	if($diff)
+	{
+		//Search existing encodings
+		$d=0;
+		$nb=count($this->diffs);
+		for($i=1;$i<=$nb;$i++)
+		{
+			if($this->diffs[$i]==$diff)
+			{
+				$d=$i;
+				break;
+			}
+		}
+		if($d==0)
+		{
+			$d=$nb+1;
+			$this->diffs[$d]=$diff;
+		}
+		$this->fonts[$fontkey]['diff']=$d;
+	}
+	if($file)
+	{
+		if($type=='TrueType')
+			$this->FontFiles[$file]=array('length1'=>$originalsize);
+		else
+			$this->FontFiles[$file]=array('length1'=>$size1, 'length2'=>$size2);
+	}
+}
+
+function SetFont($family, $style='', $size=0)
+{
+	//Select a font; size given in points
+	global $fpdf_charwidths;
+
+	$family=strtolower($family);
+	if($family=='')
+		$family=$this->FontFamily;
+	if($family=='arial')
+		$family='helvetica';
+	elseif($family=='symbol' || $family=='zapfdingbats')
+		$style='';
+	$style=strtoupper($style);
+	if(strpos($style,'U')!==false)
+	{
+		$this->underline=true;
+		$style=str_replace('U','',$style);
+	}
+	else
+		$this->underline=false;
+	if($style=='IB')
+		$style='BI';
+	if($size==0)
+		$size=$this->FontSizePt;
+	//Test if font is already selected
+	if($this->FontFamily==$family && $this->FontStyle==$style && $this->FontSizePt==$size)
+		return;
+	//Test if used for the first time
+	$fontkey=$family.$style;
+	if(!isset($this->fonts[$fontkey]))
+	{
+		//Check if one of the standard fonts
+		if(isset($this->CoreFonts[$fontkey]))
+		{
+			if(!isset($fpdf_charwidths[$fontkey]))
+			{
+				//Load metric file
+				$file=$family;
+				if($family=='times' || $family=='helvetica')
+					$file.=strtolower($style);
+				include($this->_getfontpath().$file.'.php');
+				if(!isset($fpdf_charwidths[$fontkey]))
+					$this->Error('Could not include font metric file');
+			}
+			$i=count($this->fonts)+1;
+			$name=$this->CoreFonts[$fontkey];
+			$cw=$fpdf_charwidths[$fontkey];
+			$this->fonts[$fontkey]=array('i'=>$i, 'type'=>'core', 'name'=>$name, 'up'=>-100, 'ut'=>50, 'cw'=>$cw);
+		}
+		else
+			$this->Error('Undefined font: '.$family.' '.$style);
+	}
+	//Select it
+	$this->FontFamily=$family;
+	$this->FontStyle=$style;
+	$this->FontSizePt=$size;
+	$this->FontSize=$size/$this->k;
+	$this->CurrentFont=&$this->fonts[$fontkey];
+	if($this->page>0)
+		$this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
+}
+
+function SetFontSize($size)
+{
+	//Set font size in points
+	if($this->FontSizePt==$size)
+		return;
+	$this->FontSizePt=$size;
+	$this->FontSize=$size/$this->k;
+	if($this->page>0)
+		$this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
+}
+
+function AddLink()
+{
+	//Create a new internal link
+	$n=count($this->links)+1;
+	$this->links[$n]=array(0, 0);
+	return $n;
+}
+
+function SetLink($link, $y=0, $page=-1)
+{
+	//Set destination of internal link
+	if($y==-1)
+		$y=$this->y;
+	if($page==-1)
+		$page=$this->page;
+	$this->links[$link]=array($page, $y);
+}
+
+function Link($x, $y, $w, $h, $link)
+{
+	//Put a link on the page
+	$this->PageLinks[$this->page][]=array($x*$this->k, $this->hPt-$y*$this->k, $w*$this->k, $h*$this->k, $link);
+}
+
+function Text($x, $y, $txt)
+{
+	//Output a string
+	$s=sprintf('BT %.2F %.2F Td (%s) Tj ET',$x*$this->k,($this->h-$y)*$this->k,$this->_escape($txt));
+	if($this->underline && $txt!='')
+		$s.=' '.$this->_dounderline($x,$y,$txt);
+	if($this->ColorFlag)
+		$s='q '.$this->TextColor.' '.$s.' Q';
+	$this->_out($s);
+}
+
+function AcceptPageBreak()
+{
+	//Accept automatic page break or not
+	return $this->AutoPageBreak;
+}
+
+function Cell($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false, $link='')
+{
+	//Output a cell
+	$k=$this->k;
+	if($this->y+$h>$this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())
+	{
+		//Automatic page break
+		$x=$this->x;
+		$ws=$this->ws;
+		if($ws>0)
+		{
+			$this->ws=0;
+			$this->_out('0 Tw');
+		}
+		$this->AddPage($this->CurOrientation,$this->CurPageFormat);
+		$this->x=$x;
+		if($ws>0)
+		{
+			$this->ws=$ws;
+			$this->_out(sprintf('%.3F Tw',$ws*$k));
+		}
+	}
+	if($w==0)
+		$w=$this->w-$this->rMargin-$this->x;
+	$s='';
+	if($fill || $border==1)
+	{
+		if($fill)
+			$op=($border==1) ? 'B' : 'f';
+		else
+			$op='S';
+		$s=sprintf('%.2F %.2F %.2F %.2F re %s ',$this->x*$k,($this->h-$this->y)*$k,$w*$k,-$h*$k,$op);
+	}
+	if(is_string($border))
+	{
+		$x=$this->x;
+		$y=$this->y;
+		if(strpos($border,'L')!==false)
+			$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,$x*$k,($this->h-($y+$h))*$k);
+		if(strpos($border,'T')!==false)
+			$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-$y)*$k);
+		if(strpos($border,'R')!==false)
+			$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',($x+$w)*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
+		if(strpos($border,'B')!==false)
+			$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-($y+$h))*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
+	}
+	if($txt!=='')
+	{
+		if($align=='R')
+			$dx=$w-$this->cMargin-$this->GetStringWidth($txt);
+		elseif($align=='C')
+			$dx=($w-$this->GetStringWidth($txt))/2;
+		else
+			$dx=$this->cMargin;
+		if($this->ColorFlag)
+			$s.='q '.$this->TextColor.' ';
+		$txt2=str_replace(')','\\)',str_replace('(','\\(',str_replace('\\','\\\\',$txt)));
+		$s.=sprintf('BT %.2F %.2F Td (%s) Tj ET',($this->x+$dx)*$k,($this->h-($this->y+.5*$h+.3*$this->FontSize))*$k,$txt2);
+		if($this->underline)
+			$s.=' '.$this->_dounderline($this->x+$dx,$this->y+.5*$h+.3*$this->FontSize,$txt);
+		if($this->ColorFlag)
+			$s.=' Q';
+		if($link)
+			$this->Link($this->x+$dx,$this->y+.5*$h-.5*$this->FontSize,$this->GetStringWidth($txt),$this->FontSize,$link);
+	}
+	if($s)
+		$this->_out($s);
+	$this->lasth=$h;
+	if($ln>0)
+	{
+		//Go to next line
+		$this->y+=$h;
+		if($ln==1)
+			$this->x=$this->lMargin;
+	}
+	else
+		$this->x+=$w;
+}
+
+function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false)
+{
+	//Output text with automatic or explicit line breaks
+	$cw=&$this->CurrentFont['cw'];
+	if($w==0)
+		$w=$this->w-$this->rMargin-$this->x;
+	$wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
+	$s=str_replace("\r",'',$txt);
+	$nb=strlen($s);
+	if($nb>0 && $s[$nb-1]=="\n")
+		$nb--;
+	$b=0;
+	if($border)
+	{
+		if($border==1)
+		{
+			$border='LTRB';
+			$b='LRT';
+			$b2='LR';
+		}
+		else
+		{
+			$b2='';
+			if(strpos($border,'L')!==false)
+				$b2.='L';
+			if(strpos($border,'R')!==false)
+				$b2.='R';
+			$b=(strpos($border,'T')!==false) ? $b2.'T' : $b2;
+		}
+	}
+	$sep=-1;
+	$i=0;
+	$j=0;
+	$l=0;
+	$ns=0;
+	$nl=1;
+	while($i<$nb)
+	{
+		//Get next character
+		$c=$s[$i];
+		if($c=="\n")
+		{
+			//Explicit line break
+			if($this->ws>0)
+			{
+				$this->ws=0;
+				$this->_out('0 Tw');
+			}
+			$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
+			$i++;
+			$sep=-1;
+			$j=$i;
+			$l=0;
+			$ns=0;
+			$nl++;
+			if($border && $nl==2)
+				$b=$b2;
+			continue;
+		}
+		if($c==' ')
+		{
+			$sep=$i;
+			$ls=$l;
+			$ns++;
+		}
+		$l+=$cw[$c];
+		if($l>$wmax)
+		{
+			//Automatic line break
+			if($sep==-1)
+			{
+				if($i==$j)
+					$i++;
+				if($this->ws>0)
+				{
+					$this->ws=0;
+					$this->_out('0 Tw');
+				}
+				$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
+			}
+			else
+			{
+				if($align=='J')
+				{
+					$this->ws=($ns>1) ? ($wmax-$ls)/1000*$this->FontSize/($ns-1) : 0;
+					$this->_out(sprintf('%.3F Tw',$this->ws*$this->k));
+				}
+				$this->Cell($w,$h,substr($s,$j,$sep-$j),$b,2,$align,$fill);
+				$i=$sep+1;
+			}
+			$sep=-1;
+			$j=$i;
+			$l=0;
+			$ns=0;
+			$nl++;
+			if($border && $nl==2)
+				$b=$b2;
+		}
+		else
+			$i++;
+	}
+	//Last chunk
+	if($this->ws>0)
+	{
+		$this->ws=0;
+		$this->_out('0 Tw');
+	}
+	if($border && strpos($border,'B')!==false)
+		$b.='B';
+	$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
+	$this->x=$this->lMargin;
+}
+
+function Write($h, $txt, $link='')
+{
+	//Output text in flowing mode
+	$cw=&$this->CurrentFont['cw'];
+	$w=$this->w-$this->rMargin-$this->x;
+	$wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
+	$s=str_replace("\r",'',$txt);
+	$nb=strlen($s);
+	$sep=-1;
+	$i=0;
+	$j=0;
+	$l=0;
+	$nl=1;
+	while($i<$nb)
+	{
+		//Get next character
+		$c=$s[$i];
+		if($c=="\n")
+		{
+			//Explicit line break
+			$this->Cell($w,$h,substr($s,$j,$i-$j),0,2,'',0,$link);
+			$i++;
+			$sep=-1;
+			$j=$i;
+			$l=0;
+			if($nl==1)
+			{
+				$this->x=$this->lMargin;
+				$w=$this->w-$this->rMargin-$this->x;
+				$wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
+			}
+			$nl++;
+			continue;
+		}
+		if($c==' ')
+			$sep=$i;
+		$l+=$cw[$c];
+		if($l>$wmax)
+		{
+			//Automatic line break
+			if($sep==-1)
+			{
+				if($this->x>$this->lMargin)
+				{
+					//Move to next line
+					$this->x=$this->lMargin;
+					$this->y+=$h;
+					$w=$this->w-$this->rMargin-$this->x;
+					$wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
+					$i++;
+					$nl++;
+					continue;
+				}
+				if($i==$j)
+					$i++;
+				$this->Cell($w,$h,substr($s,$j,$i-$j),0,2,'',0,$link);
+			}
+			else
+			{
+				$this->Cell($w,$h,substr($s,$j,$sep-$j),0,2,'',0,$link);
+				$i=$sep+1;
+			}
+			$sep=-1;
+			$j=$i;
+			$l=0;
+			if($nl==1)
+			{
+				$this->x=$this->lMargin;
+				$w=$this->w-$this->rMargin-$this->x;
+				$wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
+			}
+			$nl++;
+		}
+		else
+			$i++;
+	}
+	//Last chunk
+	if($i!=$j)
+		$this->Cell($l/1000*$this->FontSize,$h,substr($s,$j),0,0,'',0,$link);
+}
+
+function Ln($h=null)
+{
+	//Line feed; default value is last cell height
+	$this->x=$this->lMargin;
+	if($h===null)
+		$this->y+=$this->lasth;
+	else
+		$this->y+=$h;
+}
+
+function Image($file, $x=null, $y=null, $w=0, $h=0, $type='', $link='')
+{
+	//Put an image on the page
+	if(!isset($this->images[$file]))
+	{
+		//First use of this image, get info
+		if($type=='')
+		{
+			$pos=strrpos($file,'.');
+			if(!$pos)
+				$this->Error('Image file has no extension and no type was specified: '.$file);
+			$type=substr($file,$pos+1);
+		}
+		$type=strtolower($type);
+		if($type=='jpeg')
+			$type='jpg';
+		$mtd='_parse'.$type;
+		if(!method_exists($this,$mtd))
+			$this->Error('Unsupported image type: '.$type);
+		$info=$this->$mtd($file);
+		$info['i']=count($this->images)+1;
+		$this->images[$file]=$info;
+	}
+	else
+		$info=$this->images[$file];
+	//Automatic width and height calculation if needed
+	if($w==0 && $h==0)
+	{
+		//Put image at 72 dpi
+		$w=$info['w']/$this->k;
+		$h=$info['h']/$this->k;
+	}
+	elseif($w==0)
+		$w=$h*$info['w']/$info['h'];
+	elseif($h==0)
+		$h=$w*$info['h']/$info['w'];
+	//Flowing mode
+	if($y===null)
+	{
+		if($this->y+$h>$this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())
+		{
+			//Automatic page break
+			$x2=$this->x;
+			$this->AddPage($this->CurOrientation,$this->CurPageFormat);
+			$this->x=$x2;
+		}
+		$y=$this->y;
+		$this->y+=$h;
+	}
+	if($x===null)
+		$x=$this->x;
+	$this->_out(sprintf('q %.2F 0 0 %.2F %.2F %.2F cm /I%d Do Q',$w*$this->k,$h*$this->k,$x*$this->k,($this->h-($y+$h))*$this->k,$info['i']));
+	if($link)
+		$this->Link($x,$y,$w,$h,$link);
+}
+
+function GetX()
+{
+	//Get x position
+	return $this->x;
+}
+
+function SetX($x)
+{
+	//Set x position
+	if($x>=0)
+		$this->x=$x;
+	else
+		$this->x=$this->w+$x;
+}
+
+function GetY()
+{
+	//Get y position
+	return $this->y;
+}
+
+function SetY($y)
+{
+	//Set y position and reset x
+	$this->x=$this->lMargin;
+	if($y>=0)
+		$this->y=$y;
+	else
+		$this->y=$this->h+$y;
+}
+
+function SetXY($x, $y)
+{
+	//Set x and y positions
+	$this->SetY($y);
+	$this->SetX($x);
+}
+
+function Output($name='', $dest='')
+{
+	//Output PDF to some destination
+	if($this->state<3)
+		$this->Close();
+	$dest=strtoupper($dest);
+	if($dest=='')
+	{
+		if($name=='')
+		{
+			$name='doc.pdf';
+			$dest='I';
+		}
+		else
+			$dest='F';
+	}
+	switch($dest)
+	{
+		case 'I':
+			//Send to standard output
+			if(ob_get_length())
+				$this->Error('Some data has already been output, can\'t send PDF file');
+			if(php_sapi_name()!='cli')
+			{
+				//We send to a browser
+				header('Content-Type: application/pdf');
+				if(headers_sent())
+					$this->Error('Some data has already been output, can\'t send PDF file');
+				header('Content-Length: '.strlen($this->buffer));
+				header('Content-Disposition: inline; filename="'.$name.'"');
+				header('Cache-Control: private, max-age=0, must-revalidate');
+				header('Pragma: public');
+				ini_set('zlib.output_compression','0');
+			}
+			echo $this->buffer;
+			break;
+		case 'D':
+			//Download file
+			if(ob_get_length())
+				$this->Error('Some data has already been output, can\'t send PDF file');
+			header('Content-Type: application/x-download');
+			if(headers_sent())
+				$this->Error('Some data has already been output, can\'t send PDF file');
+			header('Content-Length: '.strlen($this->buffer));
+			header('Content-Disposition: attachment; filename="'.$name.'"');
+			header('Cache-Control: private, max-age=0, must-revalidate');
+			header('Pragma: public');
+			ini_set('zlib.output_compression','0');
+			echo $this->buffer;
+			break;
+		case 'F':
+			//Save to local file
+			$f=fopen($name,'wb');
+			if(!$f)
+				$this->Error('Unable to create output file: '.$name);
+			fwrite($f,$this->buffer,strlen($this->buffer));
+			fclose($f);
+			break;
+		case 'S':
+			//Return as a string
+			return $this->buffer;
+		default:
+			$this->Error('Incorrect output destination: '.$dest);
+	}
+	return '';
+}
+
+/*******************************************************************************
+*                                                                              *
+*                              Protected methods                               *
+*                                                                              *
+*******************************************************************************/
+function _dochecks()
+{
+	//Check availability of %F
+	if(sprintf('%.1F',1.0)!='1.0')
+		$this->Error('This version of PHP is not supported');
+	//Check mbstring overloading
+	if(ini_get('mbstring.func_overload') & 2)
+		$this->Error('mbstring overloading must be disabled');
+	//Disable runtime magic quotes
+	if(get_magic_quotes_runtime())
+		@set_magic_quotes_runtime(0);
+}
+
+function _getpageformat($format)
+{
+	$format=strtolower($format);
+	if(!isset($this->PageFormats[$format]))
+		$this->Error('Unknown page format: '.$format);
+	$a=$this->PageFormats[$format];
+	return array($a[0]/$this->k, $a[1]/$this->k);
+}
+
+function _getfontpath()
+{
+	if(!defined('FPDF_FONTPATH') && is_dir(dirname(__FILE__).'/font'))
+		define('FPDF_FONTPATH',dirname(__FILE__).'/font/');
+	return defined('FPDF_FONTPATH') ? FPDF_FONTPATH : '';
+}
+
+function _beginpage($orientation, $format)
+{
+	$this->page++;
+	$this->pages[$this->page]='';
+	$this->state=2;
+	$this->x=$this->lMargin;
+	$this->y=$this->tMargin;
+	$this->FontFamily='';
+	//Check page size
+	if($orientation=='')
+		$orientation=$this->DefOrientation;
+	else
+		$orientation=strtoupper($orientation[0]);
+	if($format=='')
+		$format=$this->DefPageFormat;
+	else
+	{
+		if(is_string($format))
+			$format=$this->_getpageformat($format);
+	}
+	if($orientation!=$this->CurOrientation || $format[0]!=$this->CurPageFormat[0] || $format[1]!=$this->CurPageFormat[1])
+	{
+		//New size
+		if($orientation=='P')
+		{
+			$this->w=$format[0];
+			$this->h=$format[1];
+		}
+		else
+		{
+			$this->w=$format[1];
+			$this->h=$format[0];
+		}
+		$this->wPt=$this->w*$this->k;
+		$this->hPt=$this->h*$this->k;
+		$this->PageBreakTrigger=$this->h-$this->bMargin;
+		$this->CurOrientation=$orientation;
+		$this->CurPageFormat=$format;
+	}
+	if($orientation!=$this->DefOrientation || $format[0]!=$this->DefPageFormat[0] || $format[1]!=$this->DefPageFormat[1])
+		$this->PageSizes[$this->page]=array($this->wPt, $this->hPt);
+}
+
+function _endpage()
+{
+	$this->state=1;
+}
+
+function _escape($s)
+{
+	//Escape special characters in strings
+	$s=str_replace('\\','\\\\',$s);
+	$s=str_replace('(','\\(',$s);
+	$s=str_replace(')','\\)',$s);
+	$s=str_replace("\r",'\\r',$s);
+	return $s;
+}
+
+function _textstring($s)
+{
+	//Format a text string
+	return '('.$this->_escape($s).')';
+}
+
+function _UTF8toUTF16($s)
+{
+	//Convert UTF-8 to UTF-16BE with BOM
+	$res="\xFE\xFF";
+	$nb=strlen($s);
+	$i=0;
+	while($i<$nb)
+	{
+		$c1=ord($s[$i++]);
+		if($c1>=224)
+		{
+			//3-byte character
+			$c2=ord($s[$i++]);
+			$c3=ord($s[$i++]);
+			$res.=chr((($c1 & 0x0F)<<4) + (($c2 & 0x3C)>>2));
+			$res.=chr((($c2 & 0x03)<<6) + ($c3 & 0x3F));
+		}
+		elseif($c1>=192)
+		{
+			//2-byte character
+			$c2=ord($s[$i++]);
+			$res.=chr(($c1 & 0x1C)>>2);
+			$res.=chr((($c1 & 0x03)<<6) + ($c2 & 0x3F));
+		}
+		else
+		{
+			//Single-byte character
+			$res.="\0".chr($c1);
+		}
+	}
+	return $res;
+}
+
+function _dounderline($x, $y, $txt)
+{
+	//Underline text
+	$up=$this->CurrentFont['up'];
+	$ut=$this->CurrentFont['ut'];
+	$w=$this->GetStringWidth($txt)+$this->ws*substr_count($txt,' ');
+	return sprintf('%.2F %.2F %.2F %.2F re f',$x*$this->k,($this->h-($y-$up/1000*$this->FontSize))*$this->k,$w*$this->k,-$ut/1000*$this->FontSizePt);
+}
+
+function _parsejpg($file)
+{
+	//Extract info from a JPEG file
+	$a=GetImageSize($file);
+	if(!$a)
+		$this->Error('Missing or incorrect image file: '.$file);
+	if($a[2]!=2)
+		$this->Error('Not a JPEG file: '.$file);
+	if(!isset($a['channels']) || $a['channels']==3)
+		$colspace='DeviceRGB';
+	elseif($a['channels']==4)
+		$colspace='DeviceCMYK';
+	else
+		$colspace='DeviceGray';
+	$bpc=isset($a['bits']) ? $a['bits'] : 8;
+	//Read whole file
+	$f=fopen($file,'rb');
+	$data='';
+	while(!feof($f))
+		$data.=fread($f,8192);
+	fclose($f);
+	return array('w'=>$a[0], 'h'=>$a[1], 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'DCTDecode', 'data'=>$data);
+}
+
+function _parsepng($file)
+{
+	//Extract info from a PNG file
+	$f=fopen($file,'rb');
+	if(!$f)
+		$this->Error('Can\'t open image file: '.$file);
+	//Check signature
+	if($this->_readstream($f,8)!=chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10))
+		$this->Error('Not a PNG file: '.$file);
+	//Read header chunk
+	$this->_readstream($f,4);
+	if($this->_readstream($f,4)!='IHDR')
+		$this->Error('Incorrect PNG file: '.$file);
+	$w=$this->_readint($f);
+	$h=$this->_readint($f);
+	$bpc=ord($this->_readstream($f,1));
+	if($bpc>8)
+		$this->Error('16-bit depth not supported: '.$file);
+	$ct=ord($this->_readstream($f,1));
+	if($ct==0)
+		$colspace='DeviceGray';
+	elseif($ct==2)
+		$colspace='DeviceRGB';
+	elseif($ct==3)
+		$colspace='Indexed';
+	else
+		$this->Error('Alpha channel not supported: '.$file);
+	if(ord($this->_readstream($f,1))!=0)
+		$this->Error('Unknown compression method: '.$file);
+	if(ord($this->_readstream($f,1))!=0)
+		$this->Error('Unknown filter method: '.$file);
+	if(ord($this->_readstream($f,1))!=0)
+		$this->Error('Interlacing not supported: '.$file);
+	$this->_readstream($f,4);
+	$parms='/DecodeParms <</Predictor 15 /Colors '.($ct==2 ? 3 : 1).' /BitsPerComponent '.$bpc.' /Columns '.$w.'>>';
+	//Scan chunks looking for palette, transparency and image data
+	$pal='';
+	$trns='';
+	$data='';
+	do
+	{
+		$n=$this->_readint($f);
+		$type=$this->_readstream($f,4);
+		if($type=='PLTE')
+		{
+			//Read palette
+			$pal=$this->_readstream($f,$n);
+			$this->_readstream($f,4);
+		}
+		elseif($type=='tRNS')
+		{
+			//Read transparency info
+			$t=$this->_readstream($f,$n);
+			if($ct==0)
+				$trns=array(ord(substr($t,1,1)));
+			elseif($ct==2)
+				$trns=array(ord(substr($t,1,1)), ord(substr($t,3,1)), ord(substr($t,5,1)));
+			else
+			{
+				$pos=strpos($t,chr(0));
+				if($pos!==false)
+					$trns=array($pos);
+			}
+			$this->_readstream($f,4);
+		}
+		elseif($type=='IDAT')
+		{
+			//Read image data block
+			$data.=$this->_readstream($f,$n);
+			$this->_readstream($f,4);
+		}
+		elseif($type=='IEND')
+			break;
+		else
+			$this->_readstream($f,$n+4);
+	}
+	while($n);
+	if($colspace=='Indexed' && empty($pal))
+		$this->Error('Missing palette in '.$file);
+	fclose($f);
+	return array('w'=>$w, 'h'=>$h, 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'FlateDecode', 'parms'=>$parms, 'pal'=>$pal, 'trns'=>$trns, 'data'=>$data);
+}
+
+function _readstream($f, $n)
+{
+	//Read n bytes from stream
+	$res='';
+	while($n>0 && !feof($f))
+	{
+		$s=fread($f,$n);
+		if($s===false)
+			$this->Error('Error while reading stream');
+		$n-=strlen($s);
+		$res.=$s;
+	}
+	if($n>0)
+		$this->Error('Unexpected end of stream');
+	return $res;
+}
+
+function _readint($f)
+{
+	//Read a 4-byte integer from stream
+	$a=unpack('Ni',$this->_readstream($f,4));
+	return $a['i'];
+}
+
+function _parsegif($file)
+{
+	//Extract info from a GIF file (via PNG conversion)
+	if(!function_exists('imagepng'))
+		$this->Error('GD extension is required for GIF support');
+	if(!function_exists('imagecreatefromgif'))
+		$this->Error('GD has no GIF read support');
+	$im=imagecreatefromgif($file);
+	if(!$im)
+		$this->Error('Missing or incorrect image file: '.$file);
+	imageinterlace($im,0);
+	$tmp=tempnam('.','gif');
+	if(!$tmp)
+		$this->Error('Unable to create a temporary file');
+	if(!imagepng($im,$tmp))
+		$this->Error('Error while saving to temporary file');
+	imagedestroy($im);
+	$info=$this->_parsepng($tmp);
+	unlink($tmp);
+	return $info;
+}
+
+function _newobj()
+{
+	//Begin a new object
+	$this->n++;
+	$this->offsets[$this->n]=strlen($this->buffer);
+	$this->_out($this->n.' 0 obj');
+}
+
+function _putstream($s)
+{
+	$this->_out('stream');
+	$this->_out($s);
+	$this->_out('endstream');
+}
+
+function _out($s)
+{
+	//Add a line to the document
+	if($this->state==2)
+		$this->pages[$this->page].=$s."\n";
+	else
+		$this->buffer.=$s."\n";
+}
+
+function _putpages()
+{
+	$nb=$this->page;
+	if(!empty($this->AliasNbPages))
+	{
+		//Replace number of pages
+		for($n=1;$n<=$nb;$n++)
+			$this->pages[$n]=str_replace($this->AliasNbPages,$nb,$this->pages[$n]);
+	}
+	if($this->DefOrientation=='P')
+	{
+		$wPt=$this->DefPageFormat[0]*$this->k;
+		$hPt=$this->DefPageFormat[1]*$this->k;
+	}
+	else
+	{
+		$wPt=$this->DefPageFormat[1]*$this->k;
+		$hPt=$this->DefPageFormat[0]*$this->k;
+	}
+	$filter=($this->compress) ? '/Filter /FlateDecode ' : '';
+	for($n=1;$n<=$nb;$n++)
+	{
+		//Page
+		$this->_newobj();
+		$this->_out('<</Type /Page');
+		$this->_out('/Parent 1 0 R');
+		if(isset($this->PageSizes[$n]))
+			$this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]',$this->PageSizes[$n][0],$this->PageSizes[$n][1]));
+		$this->_out('/Resources 2 0 R');
+		if(isset($this->PageLinks[$n]))
+		{
+			//Links
+			$annots='/Annots [';
+			foreach($this->PageLinks[$n] as $pl)
+			{
+				$rect=sprintf('%.2F %.2F %.2F %.2F',$pl[0],$pl[1],$pl[0]+$pl[2],$pl[1]-$pl[3]);
+				$annots.='<</Type /Annot /Subtype /Link /Rect ['.$rect.'] /Border [0 0 0] ';
+				if(is_string($pl[4]))
+					$annots.='/A <</S /URI /URI '.$this->_textstring($pl[4]).'>>>>';
+				else
+				{
+					$l=$this->links[$pl[4]];
+					$h=isset($this->PageSizes[$l[0]]) ? $this->PageSizes[$l[0]][1] : $hPt;
+					$annots.=sprintf('/Dest [%d 0 R /XYZ 0 %.2F null]>>',1+2*$l[0],$h-$l[1]*$this->k);
+				}
+			}
+			$this->_out($annots.']');
+		}
+		$this->_out('/Contents '.($this->n+1).' 0 R>>');
+		$this->_out('endobj');
+		//Page content
+		$p=($this->compress) ? gzcompress($this->pages[$n]) : $this->pages[$n];
+		$this->_newobj();
+		$this->_out('<<'.$filter.'/Length '.strlen($p).'>>');
+		$this->_putstream($p);
+		$this->_out('endobj');
+	}
+	//Pages root
+	$this->offsets[1]=strlen($this->buffer);
+	$this->_out('1 0 obj');
+	$this->_out('<</Type /Pages');
+	$kids='/Kids [';
+	for($i=0;$i<$nb;$i++)
+		$kids.=(3+2*$i).' 0 R ';
+	$this->_out($kids.']');
+	$this->_out('/Count '.$nb);
+	$this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]',$wPt,$hPt));
+	$this->_out('>>');
+	$this->_out('endobj');
+}
+
+function _putfonts()
+{
+	$nf=$this->n;
+	foreach($this->diffs as $diff)
+	{
+		//Encodings
+		$this->_newobj();
+		$this->_out('<</Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences ['.$diff.']>>');
+		$this->_out('endobj');
+	}
+	foreach($this->FontFiles as $file=>$info)
+	{
+		//Font file embedding
+		$this->_newobj();
+		$this->FontFiles[$file]['n']=$this->n;
+		$font='';
+		$f=fopen($this->_getfontpath().$file,'rb',1);
+		if(!$f)
+			$this->Error('Font file not found');
+		while(!feof($f))
+			$font.=fread($f,8192);
+		fclose($f);
+		$compressed=(substr($file,-2)=='.z');
+		if(!$compressed && isset($info['length2']))
+		{
+			$header=(ord($font[0])==128);
+			if($header)
+			{
+				//Strip first binary header
+				$font=substr($font,6);
+			}
+			if($header && ord($font[$info['length1']])==128)
+			{
+				//Strip second binary header
+				$font=substr($font,0,$info['length1']).substr($font,$info['length1']+6);
+			}
+		}
+		$this->_out('<</Length '.strlen($font));
+		if($compressed)
+			$this->_out('/Filter /FlateDecode');
+		$this->_out('/Length1 '.$info['length1']);
+		if(isset($info['length2']))
+			$this->_out('/Length2 '.$info['length2'].' /Length3 0');
+		$this->_out('>>');
+		$this->_putstream($font);
+		$this->_out('endobj');
+	}
+	foreach($this->fonts as $k=>$font)
+	{
+		//Font objects
+		$this->fonts[$k]['n']=$this->n+1;
+		$type=$font['type'];
+		$name=$font['name'];
+		if($type=='core')
+		{
+			//Standard font
+			$this->_newobj();
+			$this->_out('<</Type /Font');
+			$this->_out('/BaseFont /'.$name);
+			$this->_out('/Subtype /Type1');
+			if($name!='Symbol' && $name!='ZapfDingbats')
+				$this->_out('/Encoding /WinAnsiEncoding');
+			$this->_out('>>');
+			$this->_out('endobj');
+		}
+		elseif($type=='Type1' || $type=='TrueType')
+		{
+			//Additional Type1 or TrueType font
+			$this->_newobj();
+			$this->_out('<</Type /Font');
+			$this->_out('/BaseFont /'.$name);
+			$this->_out('/Subtype /'.$type);
+			$this->_out('/FirstChar 32 /LastChar 255');
+			$this->_out('/Widths '.($this->n+1).' 0 R');
+			$this->_out('/FontDescriptor '.($this->n+2).' 0 R');
+			if($font['enc'])
+			{
+				if(isset($font['diff']))
+					$this->_out('/Encoding '.($nf+$font['diff']).' 0 R');
+				else
+					$this->_out('/Encoding /WinAnsiEncoding');
+			}
+			$this->_out('>>');
+			$this->_out('endobj');
+			//Widths
+			$this->_newobj();
+			$cw=&$font['cw'];
+			$s='[';
+			for($i=32;$i<=255;$i++)
+				$s.=$cw[chr($i)].' ';
+			$this->_out($s.']');
+			$this->_out('endobj');
+			//Descriptor
+			$this->_newobj();
+			$s='<</Type /FontDescriptor /FontName /'.$name;
+			foreach($font['desc'] as $k=>$v)
+				$s.=' /'.$k.' '.$v;
+			$file=$font['file'];
+			if($file)
+				$s.=' /FontFile'.($type=='Type1' ? '' : '2').' '.$this->FontFiles[$file]['n'].' 0 R';
+			$this->_out($s.'>>');
+			$this->_out('endobj');
+		}
+		else
+		{
+			//Allow for additional types
+			$mtd='_put'.strtolower($type);
+			if(!method_exists($this,$mtd))
+				$this->Error('Unsupported font type: '.$type);
+			$this->$mtd($font);
+		}
+	}
+}
+
+function _putimages()
+{
+	$filter=($this->compress) ? '/Filter /FlateDecode ' : '';
+	reset($this->images);
+	while(list($file,$info)=each($this->images))
+	{
+		$this->_newobj();
+		$this->images[$file]['n']=$this->n;
+		$this->_out('<</Type /XObject');
+		$this->_out('/Subtype /Image');
+		$this->_out('/Width '.$info['w']);
+		$this->_out('/Height '.$info['h']);
+		if($info['cs']=='Indexed')
+			$this->_out('/ColorSpace [/Indexed /DeviceRGB '.(strlen($info['pal'])/3-1).' '.($this->n+1).' 0 R]');
+		else
+		{
+			$this->_out('/ColorSpace /'.$info['cs']);
+			if($info['cs']=='DeviceCMYK')
+				$this->_out('/Decode [1 0 1 0 1 0 1 0]');
+		}
+		$this->_out('/BitsPerComponent '.$info['bpc']);
+		if(isset($info['f']))
+			$this->_out('/Filter /'.$info['f']);
+		if(isset($info['parms']))
+			$this->_out($info['parms']);
+		if(isset($info['trns']) && is_array($info['trns']))
+		{
+			$trns='';
+			for($i=0;$i<count($info['trns']);$i++)
+				$trns.=$info['trns'][$i].' '.$info['trns'][$i].' ';
+			$this->_out('/Mask ['.$trns.']');
+		}
+		$this->_out('/Length '.strlen($info['data']).'>>');
+		$this->_putstream($info['data']);
+		unset($this->images[$file]['data']);
+		$this->_out('endobj');
+		//Palette
+		if($info['cs']=='Indexed')
+		{
+			$this->_newobj();
+			$pal=($this->compress) ? gzcompress($info['pal']) : $info['pal'];
+			$this->_out('<<'.$filter.'/Length '.strlen($pal).'>>');
+			$this->_putstream($pal);
+			$this->_out('endobj');
+		}
+	}
+}
+
+function _putxobjectdict()
+{
+	foreach($this->images as $image)
+		$this->_out('/I'.$image['i'].' '.$image['n'].' 0 R');
+}
+
+function _putresourcedict()
+{
+	$this->_out('/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');
+	$this->_out('/Font <<');
+	foreach($this->fonts as $font)
+		$this->_out('/F'.$font['i'].' '.$font['n'].' 0 R');
+	$this->_out('>>');
+	$this->_out('/XObject <<');
+	$this->_putxobjectdict();
+	$this->_out('>>');
+}
+
+function _putresources()
+{
+	$this->_putfonts();
+	$this->_putimages();
+	//Resource dictionary
+	$this->offsets[2]=strlen($this->buffer);
+	$this->_out('2 0 obj');
+	$this->_out('<<');
+	$this->_putresourcedict();
+	$this->_out('>>');
+	$this->_out('endobj');
+}
+
+function _putinfo()
+{
+	$this->_out('/Producer '.$this->_textstring('FPDF '.FPDF_VERSION));
+	if(!empty($this->title))
+		$this->_out('/Title '.$this->_textstring($this->title));
+	if(!empty($this->subject))
+		$this->_out('/Subject '.$this->_textstring($this->subject));
+	if(!empty($this->author))
+		$this->_out('/Author '.$this->_textstring($this->author));
+	if(!empty($this->keywords))
+		$this->_out('/Keywords '.$this->_textstring($this->keywords));
+	if(!empty($this->creator))
+		$this->_out('/Creator '.$this->_textstring($this->creator));
+	$this->_out('/CreationDate '.$this->_textstring('D:'.@date('YmdHis')));
+}
+
+function _putcatalog()
+{
+	$this->_out('/Type /Catalog');
+	$this->_out('/Pages 1 0 R');
+	if($this->ZoomMode=='fullpage')
+		$this->_out('/OpenAction [3 0 R /Fit]');
+	elseif($this->ZoomMode=='fullwidth')
+		$this->_out('/OpenAction [3 0 R /FitH null]');
+	elseif($this->ZoomMode=='real')
+		$this->_out('/OpenAction [3 0 R /XYZ null null 1]');
+	elseif(!is_string($this->ZoomMode))
+		$this->_out('/OpenAction [3 0 R /XYZ null null '.($this->ZoomMode/100).']');
+	if($this->LayoutMode=='single')
+		$this->_out('/PageLayout /SinglePage');
+	elseif($this->LayoutMode=='continuous')
+		$this->_out('/PageLayout /OneColumn');
+	elseif($this->LayoutMode=='two')
+		$this->_out('/PageLayout /TwoColumnLeft');
+}
+
+function _putheader()
+{
+	$this->_out('%PDF-'.$this->PDFVersion);
+}
+
+function _puttrailer()
+{
+	$this->_out('/Size '.($this->n+1));
+	$this->_out('/Root '.$this->n.' 0 R');
+	$this->_out('/Info '.($this->n-1).' 0 R');
+}
+
+function _enddoc()
+{
+	$this->_putheader();
+	$this->_putpages();
+	$this->_putresources();
+	//Info
+	$this->_newobj();
+	$this->_out('<<');
+	$this->_putinfo();
+	$this->_out('>>');
+	$this->_out('endobj');
+	//Catalog
+	$this->_newobj();
+	$this->_out('<<');
+	$this->_putcatalog();
+	$this->_out('>>');
+	$this->_out('endobj');
+	//Cross-ref
+	$o=strlen($this->buffer);
+	$this->_out('xref');
+	$this->_out('0 '.($this->n+1));
+	$this->_out('0000000000 65535 f ');
+	for($i=1;$i<=$this->n;$i++)
+		$this->_out(sprintf('%010d 00000 n ',$this->offsets[$i]));
+	//Trailer
+	$this->_out('trailer');
+	$this->_out('<<');
+	$this->_puttrailer();
+	$this->_out('>>');
+	$this->_out('startxref');
+	$this->_out($o);
+	$this->_out('%%EOF');
+	$this->state=3;
+}
+//End of class
+}
+
+//Handle special IE contype request
+if(isset($_SERVER['HTTP_USER_AGENT']) && $_SERVER['HTTP_USER_AGENT']=='contype')
+{
+	header('Content-Type: application/pdf');
+	exit;
+}
+
+?>
diff --git a/library/html2pdf/_fpdf/histo.htm b/library/html2pdf/_fpdf/histo.htm
index 7097fd890..be15851bf 100644
--- a/library/html2pdf/_fpdf/histo.htm
+++ b/library/html2pdf/_fpdf/histo.htm
@@ -1,128 +1,128 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>History</title>
-<link type="text/css" rel="stylesheet" href="fpdf.css">
-<style type="text/css">
-dd {margin-top:1em; margin-bottom:1em}
-</style>
-</head>
-<body>
-<h1>History</h1>
-<dl>
-<dt><strong>v1.6</strong> (2008-08-03)</dt>
-<dd>
-- GIF image support.<br>
-- Images can now trigger page breaks.<br>
-- Possibility to have different page formats in a single document.<br>
-- Document properties (author, creator, keywords, subject and title) can now be specified in UTF-8.<br>
-- Fixed a bug: when a PNG was inserted through a URL, an error sometimes occurred.<br>
-- An automatic page break in Header() doesn't cause an infinite loop any more.<br>
-- Removed some warning messages appearing with recent PHP versions.<br>
-- Added HTTP headers to reduce problems with IE.<br>
-</dd>
-<dt><strong>v1.53</strong> (2004-12-31)</dt>
-<dd>
-- When the font subdirectory is in the same directory as fpdf.php, it is no longer necessary to define the FPDF_FONTPATH constant.<br>
-- The array $HTTP_SERVER_VARS is no longer used. It could cause trouble on PHP5-based configurations with the register_long_arrays option disabled.<br>
-- Fixed a problem related to Type1 font embedding which caused trouble to some PDF processors.<br>
-- The file name sent to the browser could not contain a space character.<br>
-- The Cell() method could not print the number 0 (you had to pass the string '0').<br>
-</dd>
-<dt><strong>v1.52</strong> (2003-12-30)</dt>
-<dd>
-- Image() now displays the image at 72 dpi if no dimension is given.<br>
-- Output() takes a string as second parameter to indicate destination.<br>
-- Open() is now called automatically by AddPage().<br>
-- Inserting remote JPEG images doesn't generate an error any longer.<br>
-- Decimal separator is forced to dot in the constructor.<br>
-- Added several encodings (Turkish, Thai, Hebrew, Ukrainian and Vietnamese).<br>
-- The last line of a right-aligned MultiCell() was not correctly aligned if it was terminated by a carriage return.<br>
-- No more error message about already sent headers when outputting the PDF to the standard output from the command line.<br>
-- The underlining was going too far for text containing characters \, ( or ).<br>
-- $HTTP_ENV_VARS has been replaced by $HTTP_SERVER_VARS.<br>
-</dd>
-<dt><strong>v1.51</strong> (2002-08-03)</dt>
-<dd>
-- Type1 font support.<br>
-- Added Baltic encoding.<br>
-- The class now works internally in points with the origin at the bottom in order to avoid two bugs occurring with Acrobat 5 :<br>&nbsp;&nbsp;* The line thickness was too large when printed under Windows 98 SE and ME.<br>&nbsp;&nbsp;* TrueType fonts didn't appear immediately inside the plug-in (a substitution font was used), one had to cause a window refresh to make them show up.<br>
-- It is no longer necessary to set the decimal separator as dot to produce valid documents.<br>
-- The clickable area in a cell was always on the left independently from the text alignment.<br>
-- JPEG images in CMYK mode appeared in inverted colors.<br>
-- Transparent PNG images in grayscale or true color mode were incorrectly handled.<br>
-- Adding new fonts now works correctly even with the magic_quotes_runtime option set to on.<br>
-</dd>
-<dt><strong>v1.5</strong> (2002-05-28)</dt>
-<dd>
-- TrueType font (AddFont()) and encoding support (Western and Eastern Europe, Cyrillic and Greek).<br>
-- Added Write() method.<br>
-- Added underlined style.<br>
-- Internal and external link support (AddLink(), SetLink(), Link()).<br>
-- Added right margin management and methods SetRightMargin(), SetTopMargin().<br>
-- Modification of SetDisplayMode() to select page layout.<br>
-- The border parameter of MultiCell() now lets choose borders to draw as Cell().<br>
-- When a document contains no page, Close() now calls AddPage() instead of causing a fatal error.<br>
-</dd>
-<dt><strong>v1.41</strong> (2002-03-13)</dt>
-<dd>
-- Fixed SetDisplayMode() which no longer worked (the PDF viewer used its default display).<br>
-</dd>
-<dt><strong>v1.4</strong> (2002-03-02)</dt>
-<dd>
-- PHP3 is no longer supported.<br>
-- Page compression (SetCompression()).<br>
-- Choice of page format and possibility to change orientation inside document.<br>
-- Added AcceptPageBreak() method.<br>
-- Ability to print the total number of pages (AliasNbPages()).<br>
-- Choice of cell borders to draw.<br>
-- New mode for Cell(): the current position can now move under the cell.<br>
-- Ability to include an image by specifying height only (width is calculated automatically).<br>
-- Fixed a bug: when a justified line triggered a page break, the footer inherited the corresponding word spacing.<br>
-</dd>
-<dt><strong>v1.31</strong> (2002-01-12)</dt>
-<dd>
-- Fixed a bug in drawing frame with MultiCell(): the last line always started from the left margin.<br>
-- Removed Expires HTTP header (gives trouble in some situations).<br>
-- Added Content-disposition HTTP header (seems to help in some situations).<br>
-</dd>
-<dt><strong>v1.3</strong> (2001-12-03)</dt>
-<dd>
-- Line break and text justification support (MultiCell()).<br>
-- Color support (SetDrawColor(), SetFillColor(), SetTextColor()). Possibility to draw filled rectangles and paint cell background.<br>
-- A cell whose width is declared null extends up to the right margin of the page.<br>
-- Line width is now retained from page to page and defaults to 0.2 mm.<br>
-- Added SetXY() method.<br>
-- Fixed a passing by reference done in a deprecated manner for PHP4.<br>
-</dd>
-<dt><strong>v1.2</strong> (2001-11-11)</dt>
-<dd>
-- Added font metric files and GetStringWidth() method.<br>
-- Centering and right-aligning text in cells.<br>
-- Display mode control (SetDisplayMode()).<br>
-- Added methods to set document properties (SetAuthor(), SetCreator(), SetKeywords(), SetSubject(), SetTitle()).<br>
-- Possibility to force PDF download by browser.<br>
-- Added SetX() and GetX() methods.<br>
-- During automatic page break, current abscissa is now retained.<br>
-</dd>
-<dt><strong>v1.11</strong> (2001-10-20)</dt>
-<dd>
-- PNG support doesn't require PHP4/zlib any more. Data are now put directly into PDF without any decompression/recompression stage.<br>
-- Image insertion now works correctly even with magic_quotes_runtime option set to on.<br>
-</dd>
-<dt><strong>v1.1</strong> (2001-10-07)</dt>
-<dd>
-- JPEG and PNG image support.<br>
-</dd>
-<dt><strong>v1.01</strong> (2001-10-03)</dt>
-<dd>
-- Fixed a bug involving page break: in case when Header() doesn't specify a font, the one from previous page was not restored and produced an incorrect document.<br>
-</dd>
-<dt><strong>v1.0</strong> (2001-09-17)</dt>
-<dd>
-- First version.<br>
-</dd>
-</dl>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>History</title>
+<link type="text/css" rel="stylesheet" href="fpdf.css">
+<style type="text/css">
+dd {margin-top:1em; margin-bottom:1em}
+</style>
+</head>
+<body>
+<h1>History</h1>
+<dl>
+<dt><strong>v1.6</strong> (2008-08-03)</dt>
+<dd>
+- GIF image support.<br>
+- Images can now trigger page breaks.<br>
+- Possibility to have different page formats in a single document.<br>
+- Document properties (author, creator, keywords, subject and title) can now be specified in UTF-8.<br>
+- Fixed a bug: when a PNG was inserted through a URL, an error sometimes occurred.<br>
+- An automatic page break in Header() doesn't cause an infinite loop any more.<br>
+- Removed some warning messages appearing with recent PHP versions.<br>
+- Added HTTP headers to reduce problems with IE.<br>
+</dd>
+<dt><strong>v1.53</strong> (2004-12-31)</dt>
+<dd>
+- When the font subdirectory is in the same directory as fpdf.php, it is no longer necessary to define the FPDF_FONTPATH constant.<br>
+- The array $HTTP_SERVER_VARS is no longer used. It could cause trouble on PHP5-based configurations with the register_long_arrays option disabled.<br>
+- Fixed a problem related to Type1 font embedding which caused trouble to some PDF processors.<br>
+- The file name sent to the browser could not contain a space character.<br>
+- The Cell() method could not print the number 0 (you had to pass the string '0').<br>
+</dd>
+<dt><strong>v1.52</strong> (2003-12-30)</dt>
+<dd>
+- Image() now displays the image at 72 dpi if no dimension is given.<br>
+- Output() takes a string as second parameter to indicate destination.<br>
+- Open() is now called automatically by AddPage().<br>
+- Inserting remote JPEG images doesn't generate an error any longer.<br>
+- Decimal separator is forced to dot in the constructor.<br>
+- Added several encodings (Turkish, Thai, Hebrew, Ukrainian and Vietnamese).<br>
+- The last line of a right-aligned MultiCell() was not correctly aligned if it was terminated by a carriage return.<br>
+- No more error message about already sent headers when outputting the PDF to the standard output from the command line.<br>
+- The underlining was going too far for text containing characters \, ( or ).<br>
+- $HTTP_ENV_VARS has been replaced by $HTTP_SERVER_VARS.<br>
+</dd>
+<dt><strong>v1.51</strong> (2002-08-03)</dt>
+<dd>
+- Type1 font support.<br>
+- Added Baltic encoding.<br>
+- The class now works internally in points with the origin at the bottom in order to avoid two bugs occurring with Acrobat 5 :<br>&nbsp;&nbsp;* The line thickness was too large when printed under Windows 98 SE and ME.<br>&nbsp;&nbsp;* TrueType fonts didn't appear immediately inside the plug-in (a substitution font was used), one had to cause a window refresh to make them show up.<br>
+- It is no longer necessary to set the decimal separator as dot to produce valid documents.<br>
+- The clickable area in a cell was always on the left independently from the text alignment.<br>
+- JPEG images in CMYK mode appeared in inverted colors.<br>
+- Transparent PNG images in grayscale or true color mode were incorrectly handled.<br>
+- Adding new fonts now works correctly even with the magic_quotes_runtime option set to on.<br>
+</dd>
+<dt><strong>v1.5</strong> (2002-05-28)</dt>
+<dd>
+- TrueType font (AddFont()) and encoding support (Western and Eastern Europe, Cyrillic and Greek).<br>
+- Added Write() method.<br>
+- Added underlined style.<br>
+- Internal and external link support (AddLink(), SetLink(), Link()).<br>
+- Added right margin management and methods SetRightMargin(), SetTopMargin().<br>
+- Modification of SetDisplayMode() to select page layout.<br>
+- The border parameter of MultiCell() now lets choose borders to draw as Cell().<br>
+- When a document contains no page, Close() now calls AddPage() instead of causing a fatal error.<br>
+</dd>
+<dt><strong>v1.41</strong> (2002-03-13)</dt>
+<dd>
+- Fixed SetDisplayMode() which no longer worked (the PDF viewer used its default display).<br>
+</dd>
+<dt><strong>v1.4</strong> (2002-03-02)</dt>
+<dd>
+- PHP3 is no longer supported.<br>
+- Page compression (SetCompression()).<br>
+- Choice of page format and possibility to change orientation inside document.<br>
+- Added AcceptPageBreak() method.<br>
+- Ability to print the total number of pages (AliasNbPages()).<br>
+- Choice of cell borders to draw.<br>
+- New mode for Cell(): the current position can now move under the cell.<br>
+- Ability to include an image by specifying height only (width is calculated automatically).<br>
+- Fixed a bug: when a justified line triggered a page break, the footer inherited the corresponding word spacing.<br>
+</dd>
+<dt><strong>v1.31</strong> (2002-01-12)</dt>
+<dd>
+- Fixed a bug in drawing frame with MultiCell(): the last line always started from the left margin.<br>
+- Removed Expires HTTP header (gives trouble in some situations).<br>
+- Added Content-disposition HTTP header (seems to help in some situations).<br>
+</dd>
+<dt><strong>v1.3</strong> (2001-12-03)</dt>
+<dd>
+- Line break and text justification support (MultiCell()).<br>
+- Color support (SetDrawColor(), SetFillColor(), SetTextColor()). Possibility to draw filled rectangles and paint cell background.<br>
+- A cell whose width is declared null extends up to the right margin of the page.<br>
+- Line width is now retained from page to page and defaults to 0.2 mm.<br>
+- Added SetXY() method.<br>
+- Fixed a passing by reference done in a deprecated manner for PHP4.<br>
+</dd>
+<dt><strong>v1.2</strong> (2001-11-11)</dt>
+<dd>
+- Added font metric files and GetStringWidth() method.<br>
+- Centering and right-aligning text in cells.<br>
+- Display mode control (SetDisplayMode()).<br>
+- Added methods to set document properties (SetAuthor(), SetCreator(), SetKeywords(), SetSubject(), SetTitle()).<br>
+- Possibility to force PDF download by browser.<br>
+- Added SetX() and GetX() methods.<br>
+- During automatic page break, current abscissa is now retained.<br>
+</dd>
+<dt><strong>v1.11</strong> (2001-10-20)</dt>
+<dd>
+- PNG support doesn't require PHP4/zlib any more. Data are now put directly into PDF without any decompression/recompression stage.<br>
+- Image insertion now works correctly even with magic_quotes_runtime option set to on.<br>
+</dd>
+<dt><strong>v1.1</strong> (2001-10-07)</dt>
+<dd>
+- JPEG and PNG image support.<br>
+</dd>
+<dt><strong>v1.01</strong> (2001-10-03)</dt>
+<dd>
+- Fixed a bug involving page break: in case when Header() doesn't specify a font, the one from previous page was not restored and produced an incorrect document.<br>
+</dd>
+<dt><strong>v1.0</strong> (2001-09-17)</dt>
+<dd>
+- First version.<br>
+</dd>
+</dl>
+</body>
+</html>
diff --git a/library/html2pdf/_fpdf/install.txt b/library/html2pdf/_fpdf/install.txt
index 8ee326b05..a14099543 100644
--- a/library/html2pdf/_fpdf/install.txt
+++ b/library/html2pdf/_fpdf/install.txt
@@ -1,26 +1,26 @@
-The FPDF library is made up of the following elements:
-
-- the main file, fpdf.php, which contains the class
-- the font metric files (located in the font directory of this archive)
-
-The metric files are necessary as soon as you want to output some text in a document.
-They can be accessed from three different locations:
-
-- the directory defined by the FPDF_FONTPATH constant (if this constant is defined)
-- the font directory located in the directory containing fpdf.php (as it is the case in this archive)
-- the directories accessible through include()
-
-Here is an example defining FPDF_FONTPATH (note the mandatory final slash):
-
-define('FPDF_FONTPATH','/home/www/font/');
-require('fpdf.php');
-
-If the files are not accessible, the SetFont() method will produce the following error:
-
-FPDF error: Could not include font metric file
-
-
-Remarks:
-
-- Only the files corresponding to the fonts actually used are necessary
-- The tutorials provided in this package are ready to be executed
+The FPDF library is made up of the following elements:
+
+- the main file, fpdf.php, which contains the class
+- the font metric files (located in the font directory of this archive)
+
+The metric files are necessary as soon as you want to output some text in a document.
+They can be accessed from three different locations:
+
+- the directory defined by the FPDF_FONTPATH constant (if this constant is defined)
+- the font directory located in the directory containing fpdf.php (as it is the case in this archive)
+- the directories accessible through include()
+
+Here is an example defining FPDF_FONTPATH (note the mandatory final slash):
+
+define('FPDF_FONTPATH','/home/www/font/');
+require('fpdf.php');
+
+If the files are not accessible, the SetFont() method will produce the following error:
+
+FPDF error: Could not include font metric file
+
+
+Remarks:
+
+- Only the files corresponding to the fonts actually used are necessary
+- The tutorials provided in this package are ready to be executed
diff --git a/library/html2pdf/_fpdf/license.txt b/library/html2pdf/_fpdf/license.txt
index fd811c6f5..6107ee477 100644
--- a/library/html2pdf/_fpdf/license.txt
+++ b/library/html2pdf/_fpdf/license.txt
@@ -1,6 +1,6 @@
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software to use, copy, modify, distribute, sublicense, and/or sell
-copies of the software, and to permit persons to whom the software is furnished
-to do so.
-
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software to use, copy, modify, distribute, sublicense, and/or sell
+copies of the software, and to permit persons to whom the software is furnished
+to do so.
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED.
\ No newline at end of file
diff --git a/library/html2pdf/_fpdf/tutorial/read_me.txt b/library/html2pdf/_fpdf/tutorial/read_me.txt
index c23a7a375..6e131fb39 100644
--- a/library/html2pdf/_fpdf/tutorial/read_me.txt
+++ b/library/html2pdf/_fpdf/tutorial/read_me.txt
@@ -1,3 +1,3 @@
-You can read the tutorials at : http://fpdf.org/en/tutorial/index.php
-
+You can read the tutorials at : http://fpdf.org/en/tutorial/index.php
+
 it has been removed because of the size of the package of HTML2PDF... 
\ No newline at end of file
diff --git a/library/html2pdf/_lisez_moi.txt b/library/html2pdf/_lisez_moi.txt
index 1aa31c9bc..510af3578 100644
--- a/library/html2pdf/_lisez_moi.txt
+++ b/library/html2pdf/_lisez_moi.txt
@@ -1,108 +1,108 @@
-*******************************************************
-** Ce programme est distribué sous la licence LGPL,  **
-** reportez-vous au fichier _LGPL.txt ou à           **
-** http://www.gnu.org/licenses/lgpl.html             **
-** pour en savoir plus.                              **
-**                                                   **
-**  Copyright 2000-2010 par Laurent Minguet          **
-*******************************************************
-*******************************
-* HTML2PDF v3.31 - 21/05/2010 *
-*******************************
-
-Utilisation :
-------------
- - necessite au minimum PHP 4.3.10
- 
- - regardez les exemples fournis pour voir le fonctionnement.
-
- - les formulaires ne marchent QUE avec ADOBE READER 8 et ADOBE READER 9.0
- 
- - il est TRES IMPORTANT de fournir du HTML 4.01 valide au convertisseur,
-   mais seulement ce que contient le <body>
-
- - pour les borders : il est conseillé qu'ils soient au format "solid 1mm #000000"
-
- - pour les paddings : ils ne sont applicables qu'aux balises table, th, td, div, li
-
- - Vous pouvez préciser l'encodage. Une fonte compatible doit être utilisée. Ceux acceptés sont : 
-    cp1250, cp1251, cp1252, cp1253, cp1254, cp1255, cp1257, cp1258, cp874,
-    ISO-8859-1, ISO-8859-2, ISO-8859-4, ISO-8859-5, ISO-8859-7, ISO-8859-9,
-    ISO-8859-11, ISO-8859-15, ISO-8859-16, KOI8-R, KOI8-U
-  Pour l'utiliser : $html2pdf->setEncoding('cp1250');
-
- - Une fonte par défaut peut être précisée,au cas ou la fonte demandée n'existe pas ou si aucune fonte n'est indiquée :
-     $html2pdf->setDefaultFont('Arial');
-
- - la possibilité de protégé vos PDF est présente, CF Exemple 7.
-
- - Certains tests peuvent être activés (true) ou de désactivés(false) :
-     * méthode setTestIsImage      : tester que les images doivent existent bien
-     * méthode setTestTdInOnePage  : tester que le contenu des TDs rentre sur une seule page
-     * méthode setTestIsDeprecated : tester que les anciennes proprietes des balises spécifiques ne sont plus presentes
-        
- - Un mode DEBUG permettant de connaitre les ressources utilisées lors de la construction du PDF est présente.
-   Il est activable en rajoutant la commande suivante juste après le constructeur (cf exemple 0):
-      $htmlpdf->setModeDebug();
-     
- - Certaines balises spécifiques ont été introduites :
-     * <page></page>  (CF Exemple 7) :
-      permet de définir le format, l'orientation, les marges left, right, top et bottom, l'image
-      et la couleur de fond d'une page, sa taille et position, le footer.
-      Il est egalement possible de garder les header et footer des pages précédentes,
-      grace à l'attribue pageset="old" (CF Exemple 3 et 4)
- 
-     * <page_header></page_header> (CF Exemple 3)
-     
-     * <page_footer></page_footer> (CF Exemple 3)
-     
-     * <nobreak></nobreak> :
-         permet de forcer l'affichage d'une partie sur une même page.
-         Si cette partie ne rentre pas dans le reste de la page, un saut de page est
-         effectué avant.
- 
-    * <barcode></barcode>  (CF Exemples 0 et 9) :
-         permet d'inserer des barcodes dans les pdfs, CF Exemples 0 et 9
-         Les types de codebar possible sont : EAN13, UPCA, C39.
-         
-     * <qrcode></qrcode> (CF Exemple 13) :
-         permet d'inserer un codebar à 2 dimensions de type QRcode
-         voici un exemple d'utilisation :
-           <qrcode value="votre message ici" size="1mm" ec="M" style="color: black; background-color: white"></qrcode>
-         seul le parametre "value" est obligatoire
-         les différentes valeurs de type de correction sont L, M, Q, H
-         (QR Code is registered trademark of DENSO WAVE INCORPORATED | http://www.denso-wave.com/qrcode/)
-         ATTENTION : l'utilisation des QRCODE nécessite l'utilisation de PHP5
-
-     * <bookmark></bookmark>  (CF Exemples 7 et About) :
-         permet d'inserer des bookmark dans les pdfs, CF Exemple 7 et About.
-         Il est egalement possible de créer un index automatiquement en fin de
-         document, CF exemple About.
-
-     * propriété css "rotate" :
-         valeurs possibles : 0, 90, 180, 270
-         applicable uniquement sur les divs (cf exemple 8)
-                 
-change log :
------------
- regardez le fichier _changelog.txt
-
-Aide et Support :
-----------------
- pour toutes questions et rapport de bug, merci d'utiliser exclusivement le lien de support ci-dessous.
- Je ne répondrais à aucune question en dehors, afin que tout le monde puisse profiter des réponses.
-
-Informations :
--------------
- Programmeur :	Spipu
-      email   : webmaster@html2pdf.fr
-      site    : http://html2pdf.fr/
-      wiki    : http://html2pdf.fr/fr/wiki
-      support : http://html2pdf.fr/fr/forum
-		
-Remerciement :
--------------
- * Olivier Plathey pour avoir conçu FPDF
- * Nicola Asuni pour les modifications qu'il a accepté d'apporter à TCPDF
- * yAronet pour l'hebergement du forum de support
- * toutes les personnes qui m'ont aidé à développer cet librairie, et à traduire les différents textes
+*******************************************************
+** Ce programme est distribué sous la licence LGPL,  **
+** reportez-vous au fichier _LGPL.txt ou à           **
+** http://www.gnu.org/licenses/lgpl.html             **
+** pour en savoir plus.                              **
+**                                                   **
+**  Copyright 2000-2010 par Laurent Minguet          **
+*******************************************************
+*******************************
+* HTML2PDF v3.31 - 21/05/2010 *
+*******************************
+
+Utilisation :
+------------
+ - necessite au minimum PHP 4.3.10
+ 
+ - regardez les exemples fournis pour voir le fonctionnement.
+
+ - les formulaires ne marchent QUE avec ADOBE READER 8 et ADOBE READER 9.0
+ 
+ - il est TRES IMPORTANT de fournir du HTML 4.01 valide au convertisseur,
+   mais seulement ce que contient le <body>
+
+ - pour les borders : il est conseillé qu'ils soient au format "solid 1mm #000000"
+
+ - pour les paddings : ils ne sont applicables qu'aux balises table, th, td, div, li
+
+ - Vous pouvez préciser l'encodage. Une fonte compatible doit être utilisée. Ceux acceptés sont : 
+    cp1250, cp1251, cp1252, cp1253, cp1254, cp1255, cp1257, cp1258, cp874,
+    ISO-8859-1, ISO-8859-2, ISO-8859-4, ISO-8859-5, ISO-8859-7, ISO-8859-9,
+    ISO-8859-11, ISO-8859-15, ISO-8859-16, KOI8-R, KOI8-U
+  Pour l'utiliser : $html2pdf->setEncoding('cp1250');
+
+ - Une fonte par défaut peut être précisée,au cas ou la fonte demandée n'existe pas ou si aucune fonte n'est indiquée :
+     $html2pdf->setDefaultFont('Arial');
+
+ - la possibilité de protégé vos PDF est présente, CF Exemple 7.
+
+ - Certains tests peuvent être activés (true) ou de désactivés(false) :
+     * méthode setTestIsImage      : tester que les images doivent existent bien
+     * méthode setTestTdInOnePage  : tester que le contenu des TDs rentre sur une seule page
+     * méthode setTestIsDeprecated : tester que les anciennes proprietes des balises spécifiques ne sont plus presentes
+        
+ - Un mode DEBUG permettant de connaitre les ressources utilisées lors de la construction du PDF est présente.
+   Il est activable en rajoutant la commande suivante juste après le constructeur (cf exemple 0):
+      $htmlpdf->setModeDebug();
+     
+ - Certaines balises spécifiques ont été introduites :
+     * <page></page>  (CF Exemple 7) :
+      permet de définir le format, l'orientation, les marges left, right, top et bottom, l'image
+      et la couleur de fond d'une page, sa taille et position, le footer.
+      Il est egalement possible de garder les header et footer des pages précédentes,
+      grace à l'attribue pageset="old" (CF Exemple 3 et 4)
+ 
+     * <page_header></page_header> (CF Exemple 3)
+     
+     * <page_footer></page_footer> (CF Exemple 3)
+     
+     * <nobreak></nobreak> :
+         permet de forcer l'affichage d'une partie sur une même page.
+         Si cette partie ne rentre pas dans le reste de la page, un saut de page est
+         effectué avant.
+ 
+    * <barcode></barcode>  (CF Exemples 0 et 9) :
+         permet d'inserer des barcodes dans les pdfs, CF Exemples 0 et 9
+         Les types de codebar possible sont : EAN13, UPCA, C39.
+         
+     * <qrcode></qrcode> (CF Exemple 13) :
+         permet d'inserer un codebar à 2 dimensions de type QRcode
+         voici un exemple d'utilisation :
+           <qrcode value="votre message ici" size="1mm" ec="M" style="color: black; background-color: white"></qrcode>
+         seul le parametre "value" est obligatoire
+         les différentes valeurs de type de correction sont L, M, Q, H
+         (QR Code is registered trademark of DENSO WAVE INCORPORATED | http://www.denso-wave.com/qrcode/)
+         ATTENTION : l'utilisation des QRCODE nécessite l'utilisation de PHP5
+
+     * <bookmark></bookmark>  (CF Exemples 7 et About) :
+         permet d'inserer des bookmark dans les pdfs, CF Exemple 7 et About.
+         Il est egalement possible de créer un index automatiquement en fin de
+         document, CF exemple About.
+
+     * propriété css "rotate" :
+         valeurs possibles : 0, 90, 180, 270
+         applicable uniquement sur les divs (cf exemple 8)
+                 
+change log :
+-----------
+ regardez le fichier _changelog.txt
+
+Aide et Support :
+----------------
+ pour toutes questions et rapport de bug, merci d'utiliser exclusivement le lien de support ci-dessous.
+ Je ne répondrais à aucune question en dehors, afin que tout le monde puisse profiter des réponses.
+
+Informations :
+-------------
+ Programmeur :	Spipu
+      email   : webmaster@html2pdf.fr
+      site    : http://html2pdf.fr/
+      wiki    : http://html2pdf.fr/fr/wiki
+      support : http://html2pdf.fr/fr/forum
+		
+Remerciement :
+-------------
+ * Olivier Plathey pour avoir conçu FPDF
+ * Nicola Asuni pour les modifications qu'il a accepté d'apporter à TCPDF
+ * yAronet pour l'hebergement du forum de support
+ * toutes les personnes qui m'ont aidé à développer cet librairie, et à traduire les différents textes
diff --git a/library/html2pdf/_mypdf/00_fpdf_codebar.class.php b/library/html2pdf/_mypdf/00_fpdf_codebar.class.php
index adc9a2c5b..138f7abb7 100644
--- a/library/html2pdf/_mypdf/00_fpdf_codebar.class.php
+++ b/library/html2pdf/_mypdf/00_fpdf_codebar.class.php
@@ -1,249 +1,249 @@
-<?php
-/*************************************************************************
- * http://www.fpdf.org/en/script/script5.php
- * 
- * @author		Olivier
- * 
- * This script implements EAN13 and UPC-A barcodes (the second being a particular case of the first one). Bars are drawn directly in the PDF (no image is generated).
- * EAN13(float x, float y, string barcode [, float h [, float w]])
- * x: abscissa of barcode.
- * y: ordinate of barcode.
- * barcode: value of barcode.
- * h: height of barcode. Default value: 16.
- * w: width of a bar. Default value: 0.35.
- * 
- * UPC_A(float x, float y, string barcode [, float h [, float w]])
- * 
- * Same parameters.
- * 
- * An EAN13 barcode is made up of 13 digits, UPC-A of 12 (leading zeroes are added if necessary). The last digit is a check digit; if it's not supplied, it will be automatically computed. 
- ************************************************************************/
- 
-/*************************************************************************
- * http://www.fpdf.org/en/script/script46.php
- * 
- * @author		The-eh
- *
- * This script implements Code 39 barcodes. A Code 39 barcode can encode a string with the following characters: digits (0 to 9), uppercase letters (A to Z) and 8 additional characters (- . space $ / + % *).
- * Code39(float xpos, float ypos, string code [, float baseline [, float height]])
- * xpos: abscissa of barcode
- * ypos: ordinate of barcode
- * code: value of barcode
- * height: bar height
- * baseline: corresponds to the width of a wide bar
- ************************************************************************/
-
-
-if (!defined('__CLASS_FPDF_CODEBAR__'))
-{
-	define('__CLASS_FPDF_CODEBAR__', true);
-	
-	require_once(dirname(__FILE__).'/../_fpdf/fpdf.php');
-
-	class FPDF_Codebar extends FPDF
-	{
-		var $footer_param = array();
-		
-		function FPDF_Codebar($sens = 'P', $unit = 'mm', $format = 'A4')
-		{
-			$this->FPDF($sens, $unit, $format);
-		}
-		
-		function BARCODE_EAN13($x,$y,$w,$h, $barcode,$label=true)
-		{
-			return $this->Barcode($x,$y,$w,$h, $barcode,13,$label);
-		}
-		
-		function BARCODE_UPC_A($x,$y,$w,$h, $barcode,$label=true)
-		{
-			return $this->Barcode($x,$y,$w,$h, $barcode,12,$label);
-		}
-		
-		function GetCheckDigit($barcode)
-		{
-			//Compute the check digit
-			$sum=0;
-			for($i=1;$i<=11;$i+=2)
-				$sum+=3*$barcode{$i};
-			for($i=0;$i<=10;$i+=2)
-				$sum+=$barcode{$i};
-			$r=$sum%10;
-			if($r>0)
-				$r=10-$r;
-			return $r;
-		}
-		
-		function TestCheckDigit($barcode)
-		{
-			//Test validity of check digit
-			$sum=0;
-			for($i=1;$i<=11;$i+=2)
-				$sum+=3*$barcode{$i};
-			for($i=0;$i<=10;$i+=2)
-				$sum+=$barcode{$i};
-			return ($sum+$barcode{12})%10==0;
-		}
-		
-		function Barcode($x,$y,$code_w,$code_h,$barcode,$len, $label=true)
-		{
-			//Padding
-			$barcode=str_pad($barcode,$len-1,'0',STR_PAD_LEFT);
-			if($len==12)
-				$barcode='0'.$barcode;
-			//Add or control the check digit
-			if(strlen($barcode)==12)
-				$barcode.=$this->GetCheckDigit($barcode);
-			elseif(!$this->TestCheckDigit($barcode))
-				$this->Error('Incorrect check digit');
-			//Convert digits to bars
-			$codes=array(
-				'A'=>array(
-					'0'=>'0001101','1'=>'0011001','2'=>'0010011','3'=>'0111101','4'=>'0100011',
-					'5'=>'0110001','6'=>'0101111','7'=>'0111011','8'=>'0110111','9'=>'0001011'),
-				'B'=>array(
-					'0'=>'0100111','1'=>'0110011','2'=>'0011011','3'=>'0100001','4'=>'0011101',
-					'5'=>'0111001','6'=>'0000101','7'=>'0010001','8'=>'0001001','9'=>'0010111'),
-				'C'=>array(
-					'0'=>'1110010','1'=>'1100110','2'=>'1101100','3'=>'1000010','4'=>'1011100',
-					'5'=>'1001110','6'=>'1010000','7'=>'1000100','8'=>'1001000','9'=>'1110100')
-				);
-			$parities=array(
-				'0'=>array('A','A','A','A','A','A'),
-				'1'=>array('A','A','B','A','B','B'),
-				'2'=>array('A','A','B','B','A','B'),
-				'3'=>array('A','A','B','B','B','A'),
-				'4'=>array('A','B','A','A','B','B'),
-				'5'=>array('A','B','B','A','A','B'),
-				'6'=>array('A','B','B','B','A','A'),
-				'7'=>array('A','B','A','B','A','B'),
-				'8'=>array('A','B','A','B','B','A'),
-				'9'=>array('A','B','B','A','B','A')
-				);
-			$code='101';
-			$p=$parities[$barcode{0}];
-			for($i=1;$i<=6;$i++)
-				$code.=$codes[$p[$i-1]][$barcode{$i}];
-			$code.='01010';
-			for($i=7;$i<=12;$i++)
-				$code.=$codes['C'][$barcode{$i}];
-			$code.='101';
-			//Draw bars
-			if (strlen($code))
-			{
-				$w = $code_w / strlen($code);
-				for($i=0;$i<strlen($code);$i++)
-				{
-					if($code{$i}=='1')
-						$this->Rect($x+$i*$w,$y,$w,$code_h,'F');
-				}
-			
-				$code_t = substr($barcode,-$len);				
-				$code_f = $code_w/strlen($code_t)*$this->k/0.60;
-				
-				if ($label)
-				{
-					$this->SetFont('Arial','',$code_f);
-					$this->Text($x,$y+$code_h+0.90*$code_f/$this->k,$code_t);
-					//Print text uder barcode
-					$code_h+= $code_f/$this->k;
-				}
-			}
-			
-			return array($code_w, $code_h);
-		}
-		
-		function BARCODE_CODE39($x,$y,$w,$h, $barcode, $label=true)
-		{
-			$barChar['0'] = 'nnnwwnwnn';
-			$barChar['1'] = 'wnnwnnnnw';
-			$barChar['2'] = 'nnwwnnnnw';
-			$barChar['3'] = 'wnwwnnnnn';
-			$barChar['4'] = 'nnnwwnnnw';
-			$barChar['5'] = 'wnnwwnnnn';
-			$barChar['6'] = 'nnwwwnnnn';
-			$barChar['7'] = 'nnnwnnwnw';
-			$barChar['8'] = 'wnnwnnwnn';
-			$barChar['9'] = 'nnwwnnwnn';
-			$barChar['A'] = 'wnnnnwnnw';
-			$barChar['B'] = 'nnwnnwnnw';
-			$barChar['C'] = 'wnwnnwnnn';
-			$barChar['D'] = 'nnnnwwnnw';
-			$barChar['E'] = 'wnnnwwnnn';
-			$barChar['F'] = 'nnwnwwnnn';
-			$barChar['G'] = 'nnnnnwwnw';
-			$barChar['H'] = 'wnnnnwwnn';
-			$barChar['I'] = 'nnwnnwwnn';
-			$barChar['J'] = 'nnnnwwwnn';
-			$barChar['K'] = 'wnnnnnnww';
-			$barChar['L'] = 'nnwnnnnww';
-			$barChar['M'] = 'wnwnnnnwn';
-			$barChar['N'] = 'nnnnwnnww';
-			$barChar['O'] = 'wnnnwnnwn'; 
-			$barChar['P'] = 'nnwnwnnwn';
-			$barChar['Q'] = 'nnnnnnwww';
-			$barChar['R'] = 'wnnnnnwwn';
-			$barChar['S'] = 'nnwnnnwwn';
-			$barChar['T'] = 'nnnnwnwwn';
-			$barChar['U'] = 'wwnnnnnnw';
-			$barChar['V'] = 'nwwnnnnnw';
-			$barChar['W'] = 'wwwnnnnnn';
-			$barChar['X'] = 'nwnnwnnnw';
-			$barChar['Y'] = 'wwnnwnnnn';
-			$barChar['Z'] = 'nwwnwnnnn';
-			$barChar['-'] = 'nwnnnnwnw';
-			$barChar['.'] = 'wwnnnnwnn';
-			$barChar[' '] = 'nwwnnnwnn';
-			$barChar['*'] = 'nwnnwnwnn';
-			$barChar['$'] = 'nwnwnwnnn';
-			$barChar['/'] = 'nwnwnnnwn';
-			$barChar['+'] = 'nwnnnwnwn';
-			$barChar['%'] = 'nnnwnwnwn';
-		
-			$barcode = '*'.strtoupper($barcode).'*';
-			$code = '';
-			$w_wide=3; $w_narrow=1; $w_gap=1; $nb_w = 0;
-			for($i=0; $i<strlen($barcode); $i++)
-			{
-				$char = $barcode{$i};
-				if(!isset($barChar[$char]))
-					$this->Error('Invalid character in barcode: '.$char);
-				
-				$seq = $barChar[$char];
-				$code.= $seq;
-				
-				for($bar=0; $bar<9; $bar++)
-					$nb_w+= ($seq{$bar}=='n' ? $w_narrow : $w_wide);
-
-				$nb_w+= $w_gap;
-			}
-			
-			$w_wide		= $w/$nb_w*$w_wide;
-			$w_narrow	= $w/$nb_w*$w_narrow;
-			$w_gap		= $w/$nb_w*$w_gap;
-			$xt = $x;
-			for($i=0; $i<strlen($code); $i++)
-			{
-				$j = $i%9;
-				$w_line = ($code{$i}=='n' ? $w_narrow : $w_wide);
-				if(!($j%2)) $this->Rect($xt, $y, $w_line, $h, 'F');
-				$xt+= $w_line;
-				if ($j==8) $xt+= $w_gap;
-			}
-			
-			$code_w = $xt-$x;
-			$code_h = $h;
-			$code_t = $barcode;
-			$code_f = $code_w/strlen($code_t)*$this->k/0.60/2.5;
-			
-			if ($label)
-			{
-				//Print text uder barcode
-				$code_h+= $code_f/$this->k;		
-				$this->SetFont('Arial','',$code_f);
-				$this->Text($x,$y+$h+0.90*$code_f/$this->k,$code_t);
-			}
-			
-			return array($code_w, $code_h);
-		}
-	}
+<?php
+/*************************************************************************
+ * http://www.fpdf.org/en/script/script5.php
+ * 
+ * @author		Olivier
+ * 
+ * This script implements EAN13 and UPC-A barcodes (the second being a particular case of the first one). Bars are drawn directly in the PDF (no image is generated).
+ * EAN13(float x, float y, string barcode [, float h [, float w]])
+ * x: abscissa of barcode.
+ * y: ordinate of barcode.
+ * barcode: value of barcode.
+ * h: height of barcode. Default value: 16.
+ * w: width of a bar. Default value: 0.35.
+ * 
+ * UPC_A(float x, float y, string barcode [, float h [, float w]])
+ * 
+ * Same parameters.
+ * 
+ * An EAN13 barcode is made up of 13 digits, UPC-A of 12 (leading zeroes are added if necessary). The last digit is a check digit; if it's not supplied, it will be automatically computed. 
+ ************************************************************************/
+ 
+/*************************************************************************
+ * http://www.fpdf.org/en/script/script46.php
+ * 
+ * @author		The-eh
+ *
+ * This script implements Code 39 barcodes. A Code 39 barcode can encode a string with the following characters: digits (0 to 9), uppercase letters (A to Z) and 8 additional characters (- . space $ / + % *).
+ * Code39(float xpos, float ypos, string code [, float baseline [, float height]])
+ * xpos: abscissa of barcode
+ * ypos: ordinate of barcode
+ * code: value of barcode
+ * height: bar height
+ * baseline: corresponds to the width of a wide bar
+ ************************************************************************/
+
+
+if (!defined('__CLASS_FPDF_CODEBAR__'))
+{
+	define('__CLASS_FPDF_CODEBAR__', true);
+	
+	require_once(dirname(__FILE__).'/../_fpdf/fpdf.php');
+
+	class FPDF_Codebar extends FPDF
+	{
+		var $footer_param = array();
+		
+		function FPDF_Codebar($sens = 'P', $unit = 'mm', $format = 'A4')
+		{
+			$this->FPDF($sens, $unit, $format);
+		}
+		
+		function BARCODE_EAN13($x,$y,$w,$h, $barcode,$label=true)
+		{
+			return $this->Barcode($x,$y,$w,$h, $barcode,13,$label);
+		}
+		
+		function BARCODE_UPC_A($x,$y,$w,$h, $barcode,$label=true)
+		{
+			return $this->Barcode($x,$y,$w,$h, $barcode,12,$label);
+		}
+		
+		function GetCheckDigit($barcode)
+		{
+			//Compute the check digit
+			$sum=0;
+			for($i=1;$i<=11;$i+=2)
+				$sum+=3*$barcode{$i};
+			for($i=0;$i<=10;$i+=2)
+				$sum+=$barcode{$i};
+			$r=$sum%10;
+			if($r>0)
+				$r=10-$r;
+			return $r;
+		}
+		
+		function TestCheckDigit($barcode)
+		{
+			//Test validity of check digit
+			$sum=0;
+			for($i=1;$i<=11;$i+=2)
+				$sum+=3*$barcode{$i};
+			for($i=0;$i<=10;$i+=2)
+				$sum+=$barcode{$i};
+			return ($sum+$barcode{12})%10==0;
+		}
+		
+		function Barcode($x,$y,$code_w,$code_h,$barcode,$len, $label=true)
+		{
+			//Padding
+			$barcode=str_pad($barcode,$len-1,'0',STR_PAD_LEFT);
+			if($len==12)
+				$barcode='0'.$barcode;
+			//Add or control the check digit
+			if(strlen($barcode)==12)
+				$barcode.=$this->GetCheckDigit($barcode);
+			elseif(!$this->TestCheckDigit($barcode))
+				$this->Error('Incorrect check digit');
+			//Convert digits to bars
+			$codes=array(
+				'A'=>array(
+					'0'=>'0001101','1'=>'0011001','2'=>'0010011','3'=>'0111101','4'=>'0100011',
+					'5'=>'0110001','6'=>'0101111','7'=>'0111011','8'=>'0110111','9'=>'0001011'),
+				'B'=>array(
+					'0'=>'0100111','1'=>'0110011','2'=>'0011011','3'=>'0100001','4'=>'0011101',
+					'5'=>'0111001','6'=>'0000101','7'=>'0010001','8'=>'0001001','9'=>'0010111'),
+				'C'=>array(
+					'0'=>'1110010','1'=>'1100110','2'=>'1101100','3'=>'1000010','4'=>'1011100',
+					'5'=>'1001110','6'=>'1010000','7'=>'1000100','8'=>'1001000','9'=>'1110100')
+				);
+			$parities=array(
+				'0'=>array('A','A','A','A','A','A'),
+				'1'=>array('A','A','B','A','B','B'),
+				'2'=>array('A','A','B','B','A','B'),
+				'3'=>array('A','A','B','B','B','A'),
+				'4'=>array('A','B','A','A','B','B'),
+				'5'=>array('A','B','B','A','A','B'),
+				'6'=>array('A','B','B','B','A','A'),
+				'7'=>array('A','B','A','B','A','B'),
+				'8'=>array('A','B','A','B','B','A'),
+				'9'=>array('A','B','B','A','B','A')
+				);
+			$code='101';
+			$p=$parities[$barcode{0}];
+			for($i=1;$i<=6;$i++)
+				$code.=$codes[$p[$i-1]][$barcode{$i}];
+			$code.='01010';
+			for($i=7;$i<=12;$i++)
+				$code.=$codes['C'][$barcode{$i}];
+			$code.='101';
+			//Draw bars
+			if (strlen($code))
+			{
+				$w = $code_w / strlen($code);
+				for($i=0;$i<strlen($code);$i++)
+				{
+					if($code{$i}=='1')
+						$this->Rect($x+$i*$w,$y,$w,$code_h,'F');
+				}
+			
+				$code_t = substr($barcode,-$len);				
+				$code_f = $code_w/strlen($code_t)*$this->k/0.60;
+				
+				if ($label)
+				{
+					$this->SetFont('Arial','',$code_f);
+					$this->Text($x,$y+$code_h+0.90*$code_f/$this->k,$code_t);
+					//Print text uder barcode
+					$code_h+= $code_f/$this->k;
+				}
+			}
+			
+			return array($code_w, $code_h);
+		}
+		
+		function BARCODE_CODE39($x,$y,$w,$h, $barcode, $label=true)
+		{
+			$barChar['0'] = 'nnnwwnwnn';
+			$barChar['1'] = 'wnnwnnnnw';
+			$barChar['2'] = 'nnwwnnnnw';
+			$barChar['3'] = 'wnwwnnnnn';
+			$barChar['4'] = 'nnnwwnnnw';
+			$barChar['5'] = 'wnnwwnnnn';
+			$barChar['6'] = 'nnwwwnnnn';
+			$barChar['7'] = 'nnnwnnwnw';
+			$barChar['8'] = 'wnnwnnwnn';
+			$barChar['9'] = 'nnwwnnwnn';
+			$barChar['A'] = 'wnnnnwnnw';
+			$barChar['B'] = 'nnwnnwnnw';
+			$barChar['C'] = 'wnwnnwnnn';
+			$barChar['D'] = 'nnnnwwnnw';
+			$barChar['E'] = 'wnnnwwnnn';
+			$barChar['F'] = 'nnwnwwnnn';
+			$barChar['G'] = 'nnnnnwwnw';
+			$barChar['H'] = 'wnnnnwwnn';
+			$barChar['I'] = 'nnwnnwwnn';
+			$barChar['J'] = 'nnnnwwwnn';
+			$barChar['K'] = 'wnnnnnnww';
+			$barChar['L'] = 'nnwnnnnww';
+			$barChar['M'] = 'wnwnnnnwn';
+			$barChar['N'] = 'nnnnwnnww';
+			$barChar['O'] = 'wnnnwnnwn'; 
+			$barChar['P'] = 'nnwnwnnwn';
+			$barChar['Q'] = 'nnnnnnwww';
+			$barChar['R'] = 'wnnnnnwwn';
+			$barChar['S'] = 'nnwnnnwwn';
+			$barChar['T'] = 'nnnnwnwwn';
+			$barChar['U'] = 'wwnnnnnnw';
+			$barChar['V'] = 'nwwnnnnnw';
+			$barChar['W'] = 'wwwnnnnnn';
+			$barChar['X'] = 'nwnnwnnnw';
+			$barChar['Y'] = 'wwnnwnnnn';
+			$barChar['Z'] = 'nwwnwnnnn';
+			$barChar['-'] = 'nwnnnnwnw';
+			$barChar['.'] = 'wwnnnnwnn';
+			$barChar[' '] = 'nwwnnnwnn';
+			$barChar['*'] = 'nwnnwnwnn';
+			$barChar['$'] = 'nwnwnwnnn';
+			$barChar['/'] = 'nwnwnnnwn';
+			$barChar['+'] = 'nwnnnwnwn';
+			$barChar['%'] = 'nnnwnwnwn';
+		
+			$barcode = '*'.strtoupper($barcode).'*';
+			$code = '';
+			$w_wide=3; $w_narrow=1; $w_gap=1; $nb_w = 0;
+			for($i=0; $i<strlen($barcode); $i++)
+			{
+				$char = $barcode{$i};
+				if(!isset($barChar[$char]))
+					$this->Error('Invalid character in barcode: '.$char);
+				
+				$seq = $barChar[$char];
+				$code.= $seq;
+				
+				for($bar=0; $bar<9; $bar++)
+					$nb_w+= ($seq{$bar}=='n' ? $w_narrow : $w_wide);
+
+				$nb_w+= $w_gap;
+			}
+			
+			$w_wide		= $w/$nb_w*$w_wide;
+			$w_narrow	= $w/$nb_w*$w_narrow;
+			$w_gap		= $w/$nb_w*$w_gap;
+			$xt = $x;
+			for($i=0; $i<strlen($code); $i++)
+			{
+				$j = $i%9;
+				$w_line = ($code{$i}=='n' ? $w_narrow : $w_wide);
+				if(!($j%2)) $this->Rect($xt, $y, $w_line, $h, 'F');
+				$xt+= $w_line;
+				if ($j==8) $xt+= $w_gap;
+			}
+			
+			$code_w = $xt-$x;
+			$code_h = $h;
+			$code_t = $barcode;
+			$code_f = $code_w/strlen($code_t)*$this->k/0.60/2.5;
+			
+			if ($label)
+			{
+				//Print text uder barcode
+				$code_h+= $code_f/$this->k;		
+				$this->SetFont('Arial','',$code_f);
+				$this->Text($x,$y+$h+0.90*$code_f/$this->k,$code_t);
+			}
+			
+			return array($code_w, $code_h);
+		}
+	}
 }
\ No newline at end of file
diff --git a/library/html2pdf/_mypdf/99_fpdf_protection.class.php b/library/html2pdf/_mypdf/99_fpdf_protection.class.php
index ab091efb5..796e95ac9 100644
--- a/library/html2pdf/_mypdf/99_fpdf_protection.class.php
+++ b/library/html2pdf/_mypdf/99_fpdf_protection.class.php
@@ -1,228 +1,228 @@
-<?php
-/*************************************************************************
- * http://www.fpdf.org/fr/script/script37.php
- * 
- * @author		Klemen Vodopivec
- * 
- * Ce script permet de protéger le PDF, c'est-à-dire empêcher l'utilisateur de copier son contenu, de l'imprimer ou de le modifier.
- * 
- * SetProtection([array permissions [, string user_pass [, string owner_pass]]])
- * 
- * permissions : l'ensemble des permissions. Vide par défaut (seule la lecture est autorisée).
- * user_pass : mot de passe utilisateur. Vide par défaut.
- * owner_pass : mot de passe propriétaire. Par défaut, une valeur aléatoire est choisie.
- * 
- * Le tableau des permissions est composé de valeurs prises parmi les suivantes :
- *		* copy : copie du texte et des images dans le presse-papier
- *		* print : impression du document
- *		* modify : modification (autre ques les annotations et les formulaires)
- *		* annot-forms : ajout d'annotations ou de formulaires 
- * 
- * Remarque : la protection contre la modification concerne les personnes possédant la version complète d'Acrobat.
- * 
- * Si vous ne spécifiez pas de mot de passe, le document s'ouvrira normalement. Si vous indiquez un mot de passe utilisateur,
- * le lecteur de PDF le demandera avant d'afficher le document. Le mot de passe propriétaire, s'il est différent de celui utilisateur,
- * permet d'obtenir l'accès complet.
- * 
- * Note : protéger un document nécessite de le crypter, ce qui augmente le temps de traitement de manière importante.
- * Cela peut dans certains cas entraîner un time-out au niveau de PHP, en particulier si le document contient des
- * images ou des polices.
- ************************************************************************/
-
-if (!defined('__CLASS_FPDF_PROTECTION__'))
-{
-	define('__CLASS_FPDF_PROTECTION__', true);
-	
-	require_once(dirname(__FILE__).'/03_fpdf_alpha.class.php');
-	
-	class FPDF_Protection extends FPDF_Alpha
-	{
-		var $encrypted;			//whether document is protected
-		var $Uvalue;			//U entry in pdf document
-		var $Ovalue;			//O entry in pdf document
-		var $Pvalue;			//P entry in pdf document
-		var $enc_obj_id;		//encryption object id
-		var $last_rc4_key;		//last RC4 key encrypted (cached for optimisation)
-		var $last_rc4_key_c;	//last RC4 computed key
-	
-		function FPDF_Protection($orientation='P',$unit='mm',$format='A4')
-		{
-			$this->FPDF_Formulaire($orientation,$unit,$format);
-	
-			$this->encrypted=false;
-			$this->last_rc4_key='';
-			$this->padding="\x28\xBF\x4E\x5E\x4E\x75\x8A\x41\x64\x00\x4E\x56\xFF\xFA\x01\x08".
-							"\x2E\x2E\x00\xB6\xD0\x68\x3E\x80\x2F\x0C\xA9\xFE\x64\x53\x69\x7A";
-		}
-	
-		/**
-		* Function to set permissions as well as user and owner passwords
-		*
-		* - permissions is an array with values taken from the following list:
-		*	copy, print, modify, annot-forms
-		*	If a value is present it means that the permission is granted
-		* - If a user password is set, user will be prompted before document is opened
-		* - If an owner password is set, document can be opened in privilege mode with no
-		*	restriction if that password is entered
-		*/
-		function SetProtection($permissions=array(),$user_pass='',$owner_pass=null)
-		{
-			$options = array('print' => 4, 'modify' => 8, 'copy' => 16, 'annot-forms' => 32 );
-			$protection = 192;
-			foreach($permissions as $permission){
-				if (!isset($options[$permission]))
-					$this->Error('Incorrect permission: '.$permission);
-				$protection += $options[$permission];
-			}
-			if ($owner_pass === null)
-				$owner_pass = uniqid(rand());
-			$this->encrypted = true;
-			$this->_generateencryptionkey($user_pass, $owner_pass, $protection);
-		}
-
-/****************************************************************************
-*																			*
-*								Private methods								*
-*																			*
-****************************************************************************/
-
-		function _putstream($s)
-		{
-			if ($this->encrypted) {
-				$s = $this->_RC4($this->_objectkey($this->n), $s);
-			}
-			parent::_putstream($s);
-		}
-	
-		function _textstring($s)
-		{
-			if ($this->encrypted) {
-				$s = $this->_RC4($this->_objectkey($this->n), $s);
-			}
-			return parent::_textstring($s);
-		}
-	
-		/**
-		* Compute key depending on object number where the encrypted data is stored
-		*/
-		function _objectkey($n)
-		{
-			return substr($this->_md5_16($this->encryption_key.pack('VXxx',$n)),0,10);
-		}
-	
-		function _putresources()
-		{
-			parent::_putresources();
-			if ($this->encrypted) {
-				$this->_newobj();
-				$this->enc_obj_id = $this->n;
-				$this->_out('<<');
-				$this->_putencryption();
-				$this->_out('>>');
-				$this->_out('endobj');
-			}
-		}
-	
-		function _putencryption()
-		{
-			$this->_out('/Filter /Standard');
-			$this->_out('/V 1');
-			$this->_out('/R 2');
-			$this->_out('/O ('.$this->_escape($this->Ovalue).')');
-			$this->_out('/U ('.$this->_escape($this->Uvalue).')');
-			$this->_out('/P '.$this->Pvalue);
-		}
-	
-		function _puttrailer()
-		{
-			parent::_puttrailer();
-			if ($this->encrypted) {
-				$this->_out('/Encrypt '.$this->enc_obj_id.' 0 R');
-				$this->_out('/ID [()()]');
-			}
-		}
-	
-		/**
-		* RC4 is the standard encryption algorithm used in PDF format
-		*/
-		function _RC4($key, $text)
-		{
-			if ($this->last_rc4_key != $key) {
-				$k = str_repeat($key, 256/strlen($key)+1);
-				$rc4 = range(0,255);
-				$j = 0;
-				for ($i=0; $i<256; $i++){
-					$t = $rc4[$i];
-					$j = ($j + $t + ord($k{$i})) % 256;
-					$rc4[$i] = $rc4[$j];
-					$rc4[$j] = $t;
-				}
-				$this->last_rc4_key = $key;
-				$this->last_rc4_key_c = $rc4;
-			} else {
-				$rc4 = $this->last_rc4_key_c;
-			}
-	
-			$len = strlen($text);
-			$a = 0;
-			$b = 0;
-			$out = '';
-			for ($i=0; $i<$len; $i++){
-				$a = ($a+1)%256;
-				$t= $rc4[$a];
-				$b = ($b+$t)%256;
-				$rc4[$a] = $rc4[$b];
-				$rc4[$b] = $t;
-				$k = $rc4[($rc4[$a]+$rc4[$b])%256];
-				$out.=chr(ord($text{$i}) ^ $k);
-			}
-	
-			return $out;
-		}
-	
-		/**
-		* Get MD5 as binary string
-		*/
-		function _md5_16($string)
-		{
-			return pack('H*',md5($string));
-		}
-	
-		/**
-		* Compute O value
-		*/
-		function _Ovalue($user_pass, $owner_pass)
-		{
-			$tmp = $this->_md5_16($owner_pass);
-			$owner_RC4_key = substr($tmp,0,5);
-			return $this->_RC4($owner_RC4_key, $user_pass);
-		}
-	
-		/**
-		* Compute U value
-		*/
-		function _Uvalue()
-		{
-			return $this->_RC4($this->encryption_key, $this->padding);
-		}
-	
-		/**
-		* Compute encryption key
-		*/
-		function _generateencryptionkey($user_pass, $owner_pass, $protection)
-		{
-			// Pad passwords
-			$user_pass = substr($user_pass.$this->padding,0,32);
-			$owner_pass = substr($owner_pass.$this->padding,0,32);
-			// Compute O value
-			$this->Ovalue = $this->_Ovalue($user_pass,$owner_pass);
-			// Compute encyption key
-			$tmp = $this->_md5_16($user_pass.$this->Ovalue.chr($protection)."\xFF\xFF\xFF");
-			$this->encryption_key = substr($tmp,0,5);
-			// Compute U value
-			$this->Uvalue = $this->_Uvalue();
-			// Compute P value
-			$this->Pvalue = -(($protection^255)+1);
-		}
-	}
-}
+<?php
+/*************************************************************************
+ * http://www.fpdf.org/fr/script/script37.php
+ * 
+ * @author		Klemen Vodopivec
+ * 
+ * Ce script permet de protéger le PDF, c'est-à-dire empêcher l'utilisateur de copier son contenu, de l'imprimer ou de le modifier.
+ * 
+ * SetProtection([array permissions [, string user_pass [, string owner_pass]]])
+ * 
+ * permissions : l'ensemble des permissions. Vide par défaut (seule la lecture est autorisée).
+ * user_pass : mot de passe utilisateur. Vide par défaut.
+ * owner_pass : mot de passe propriétaire. Par défaut, une valeur aléatoire est choisie.
+ * 
+ * Le tableau des permissions est composé de valeurs prises parmi les suivantes :
+ *		* copy : copie du texte et des images dans le presse-papier
+ *		* print : impression du document
+ *		* modify : modification (autre ques les annotations et les formulaires)
+ *		* annot-forms : ajout d'annotations ou de formulaires 
+ * 
+ * Remarque : la protection contre la modification concerne les personnes possédant la version complète d'Acrobat.
+ * 
+ * Si vous ne spécifiez pas de mot de passe, le document s'ouvrira normalement. Si vous indiquez un mot de passe utilisateur,
+ * le lecteur de PDF le demandera avant d'afficher le document. Le mot de passe propriétaire, s'il est différent de celui utilisateur,
+ * permet d'obtenir l'accès complet.
+ * 
+ * Note : protéger un document nécessite de le crypter, ce qui augmente le temps de traitement de manière importante.
+ * Cela peut dans certains cas entraîner un time-out au niveau de PHP, en particulier si le document contient des
+ * images ou des polices.
+ ************************************************************************/
+
+if (!defined('__CLASS_FPDF_PROTECTION__'))
+{
+	define('__CLASS_FPDF_PROTECTION__', true);
+	
+	require_once(dirname(__FILE__).'/03_fpdf_alpha.class.php');
+	
+	class FPDF_Protection extends FPDF_Alpha
+	{
+		var $encrypted;			//whether document is protected
+		var $Uvalue;			//U entry in pdf document
+		var $Ovalue;			//O entry in pdf document
+		var $Pvalue;			//P entry in pdf document
+		var $enc_obj_id;		//encryption object id
+		var $last_rc4_key;		//last RC4 key encrypted (cached for optimisation)
+		var $last_rc4_key_c;	//last RC4 computed key
+	
+		function FPDF_Protection($orientation='P',$unit='mm',$format='A4')
+		{
+			$this->FPDF_Formulaire($orientation,$unit,$format);
+	
+			$this->encrypted=false;
+			$this->last_rc4_key='';
+			$this->padding="\x28\xBF\x4E\x5E\x4E\x75\x8A\x41\x64\x00\x4E\x56\xFF\xFA\x01\x08".
+							"\x2E\x2E\x00\xB6\xD0\x68\x3E\x80\x2F\x0C\xA9\xFE\x64\x53\x69\x7A";
+		}
+	
+		/**
+		* Function to set permissions as well as user and owner passwords
+		*
+		* - permissions is an array with values taken from the following list:
+		*	copy, print, modify, annot-forms
+		*	If a value is present it means that the permission is granted
+		* - If a user password is set, user will be prompted before document is opened
+		* - If an owner password is set, document can be opened in privilege mode with no
+		*	restriction if that password is entered
+		*/
+		function SetProtection($permissions=array(),$user_pass='',$owner_pass=null)
+		{
+			$options = array('print' => 4, 'modify' => 8, 'copy' => 16, 'annot-forms' => 32 );
+			$protection = 192;
+			foreach($permissions as $permission){
+				if (!isset($options[$permission]))
+					$this->Error('Incorrect permission: '.$permission);
+				$protection += $options[$permission];
+			}
+			if ($owner_pass === null)
+				$owner_pass = uniqid(rand());
+			$this->encrypted = true;
+			$this->_generateencryptionkey($user_pass, $owner_pass, $protection);
+		}
+
+/****************************************************************************
+*																			*
+*								Private methods								*
+*																			*
+****************************************************************************/
+
+		function _putstream($s)
+		{
+			if ($this->encrypted) {
+				$s = $this->_RC4($this->_objectkey($this->n), $s);
+			}
+			parent::_putstream($s);
+		}
+	
+		function _textstring($s)
+		{
+			if ($this->encrypted) {
+				$s = $this->_RC4($this->_objectkey($this->n), $s);
+			}
+			return parent::_textstring($s);
+		}
+	
+		/**
+		* Compute key depending on object number where the encrypted data is stored
+		*/
+		function _objectkey($n)
+		{
+			return substr($this->_md5_16($this->encryption_key.pack('VXxx',$n)),0,10);
+		}
+	
+		function _putresources()
+		{
+			parent::_putresources();
+			if ($this->encrypted) {
+				$this->_newobj();
+				$this->enc_obj_id = $this->n;
+				$this->_out('<<');
+				$this->_putencryption();
+				$this->_out('>>');
+				$this->_out('endobj');
+			}
+		}
+	
+		function _putencryption()
+		{
+			$this->_out('/Filter /Standard');
+			$this->_out('/V 1');
+			$this->_out('/R 2');
+			$this->_out('/O ('.$this->_escape($this->Ovalue).')');
+			$this->_out('/U ('.$this->_escape($this->Uvalue).')');
+			$this->_out('/P '.$this->Pvalue);
+		}
+	
+		function _puttrailer()
+		{
+			parent::_puttrailer();
+			if ($this->encrypted) {
+				$this->_out('/Encrypt '.$this->enc_obj_id.' 0 R');
+				$this->_out('/ID [()()]');
+			}
+		}
+	
+		/**
+		* RC4 is the standard encryption algorithm used in PDF format
+		*/
+		function _RC4($key, $text)
+		{
+			if ($this->last_rc4_key != $key) {
+				$k = str_repeat($key, 256/strlen($key)+1);
+				$rc4 = range(0,255);
+				$j = 0;
+				for ($i=0; $i<256; $i++){
+					$t = $rc4[$i];
+					$j = ($j + $t + ord($k{$i})) % 256;
+					$rc4[$i] = $rc4[$j];
+					$rc4[$j] = $t;
+				}
+				$this->last_rc4_key = $key;
+				$this->last_rc4_key_c = $rc4;
+			} else {
+				$rc4 = $this->last_rc4_key_c;
+			}
+	
+			$len = strlen($text);
+			$a = 0;
+			$b = 0;
+			$out = '';
+			for ($i=0; $i<$len; $i++){
+				$a = ($a+1)%256;
+				$t= $rc4[$a];
+				$b = ($b+$t)%256;
+				$rc4[$a] = $rc4[$b];
+				$rc4[$b] = $t;
+				$k = $rc4[($rc4[$a]+$rc4[$b])%256];
+				$out.=chr(ord($text{$i}) ^ $k);
+			}
+	
+			return $out;
+		}
+	
+		/**
+		* Get MD5 as binary string
+		*/
+		function _md5_16($string)
+		{
+			return pack('H*',md5($string));
+		}
+	
+		/**
+		* Compute O value
+		*/
+		function _Ovalue($user_pass, $owner_pass)
+		{
+			$tmp = $this->_md5_16($owner_pass);
+			$owner_RC4_key = substr($tmp,0,5);
+			return $this->_RC4($owner_RC4_key, $user_pass);
+		}
+	
+		/**
+		* Compute U value
+		*/
+		function _Uvalue()
+		{
+			return $this->_RC4($this->encryption_key, $this->padding);
+		}
+	
+		/**
+		* Compute encryption key
+		*/
+		function _generateencryptionkey($user_pass, $owner_pass, $protection)
+		{
+			// Pad passwords
+			$user_pass = substr($user_pass.$this->padding,0,32);
+			$owner_pass = substr($owner_pass.$this->padding,0,32);
+			// Compute O value
+			$this->Ovalue = $this->_Ovalue($user_pass,$owner_pass);
+			// Compute encyption key
+			$tmp = $this->_md5_16($user_pass.$this->Ovalue.chr($protection)."\xFF\xFF\xFF");
+			$this->encryption_key = substr($tmp,0,5);
+			// Compute U value
+			$this->Uvalue = $this->_Uvalue();
+			// Compute P value
+			$this->Pvalue = -(($protection^255)+1);
+		}
+	}
+}
diff --git a/library/html2pdf/_mypdf/htmlcolors.php b/library/html2pdf/_mypdf/htmlcolors.php
index 6893545f3..dd59fe2cd 100644
--- a/library/html2pdf/_mypdf/htmlcolors.php
+++ b/library/html2pdf/_mypdf/htmlcolors.php
@@ -1,210 +1,210 @@
-<?php
-//============================================================+
-// File name   : htmlcolors.php
-// Begin       : 2002-04-09
-// Last Update : 2010-04-20
-// Version     : 1.0.004
-// License     : GNU LGPL (http://www.gnu.org/copyleft/lesser.html)
-// 	----------------------------------------------------------------------------
-//  Copyright (C) 2002-2009  Nicola Asuni - Tecnick.com S.r.l.
-// 	
-// 	This program 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 2.1 of the License, or
-// 	(at your option) any later version.
-// 	
-// 	This program is distributed in the hope that it will be useful,
-// 	but WITHOUT ANY WARRANTY; without even the implied warranty of
-// 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// 	GNU Lesser General Public License for more details.
-// 	
-// 	You should have received a copy of the GNU Lesser General Public License
-// 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-// 	
-// 	See LICENSE.TXT file for more information.
-//  ----------------------------------------------------------------------------
-//
-// Description : Array of WEB safe colors
-//
-// Author: Nicola Asuni
-//
-// (c) Copyright:
-//               Nicola Asuni
-//               Tecnick.com S.r.l.
-//               Via della Pace, 11
-//               09044 Quartucciu (CA)
-//               ITALY
-//               www.tecnick.com
-//               info@tecnick.com
-//============================================================+
-
-/**
- * Array of WEB safe colors.
- * @author Nicola Asuni
- * @copyright 2004-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
- * @package com.tecnick.tcpdf
- * @link http://www.tcpdf.org
- * @license http://www.gnu.org/copyleft/lesser.html LGPL
- * @since 2.9.000 (2008-03-26)
-*/
-
-/**
- * Array of WEB safe colors
- */
-global $webcolor;
-$webcolor = array (
-'aliceblue' => 'f0f8ff',
-'antiquewhite' => 'faebd7',
-'aqua' => '00ffff',
-'aquamarine' => '7fffd4',
-'azure' => 'f0ffff',
-'beige' => 'f5f5dc',
-'bisque' => 'ffe4c4',
-'black' => '000000',
-'blanchedalmond' => 'ffebcd',
-'blue' => '0000ff',
-'blueviolet' => '8a2be2',
-'brown' => 'a52a2a',
-'burlywood' => 'deb887',
-'cadetblue' => '5f9ea0',
-'chartreuse' => '7fff00',
-'chocolate' => 'd2691e',
-'coral' => 'ff7f50',
-'cornflowerblue' => '6495ed',
-'cornsilk' => 'fff8dc',
-'crimson' => 'dc143c',
-'cyan' => '00ffff',
-'darkblue' => '00008b',
-'darkcyan' => '008b8b',
-'darkgoldenrod' => 'b8860b',
-'dkgray' => 'a9a9a9',
-'darkgray' => 'a9a9a9',
-'darkgrey' => 'a9a9a9',
-'darkgreen' => '006400',
-'darkkhaki' => 'bdb76b',
-'darkmagenta' => '8b008b',
-'darkolivegreen' => '556b2f',
-'darkorange' => 'ff8c00',
-'darkorchid' => '9932cc',
-'darkred' => '8b0000',
-'darksalmon' => 'e9967a',
-'darkseagreen' => '8fbc8f',
-'darkslateblue' => '483d8b',
-'darkslategray' => '2f4f4f',
-'darkslategrey' => '2f4f4f',
-'darkturquoise' => '00ced1',
-'darkviolet' => '9400d3',
-'deeppink' => 'ff1493',
-'deepskyblue' => '00bfff',
-'dimgray' => '696969',
-'dimgrey' => '696969',
-'dodgerblue' => '1e90ff',
-'firebrick' => 'b22222',
-'floralwhite' => 'fffaf0',
-'forestgreen' => '228b22',
-'fuchsia' => 'ff00ff',
-'gainsboro' => 'dcdcdc',
-'ghostwhite' => 'f8f8ff',
-'gold' => 'ffd700',
-'goldenrod' => 'daa520',
-'gray' => '808080',
-'grey' => '808080',
-'green' => '008000',
-'greenyellow' => 'adff2f',
-'honeydew' => 'f0fff0',
-'hotpink' => 'ff69b4',
-'indianred' => 'cd5c5c',
-'indigo' => '4b0082',
-'ivory' => 'fffff0',
-'khaki' => 'f0e68c',
-'lavender' => 'e6e6fa',
-'lavenderblush' => 'fff0f5',
-'lawngreen' => '7cfc00',
-'lemonchiffon' => 'fffacd',
-'lightblue' => 'add8e6',
-'lightcoral' => 'f08080',
-'lightcyan' => 'e0ffff',
-'lightgoldenrodyellow' => 'fafad2',
-'ltgray' => 'd3d3d3',
-'lightgray' => 'd3d3d3',
-'lightgrey' => 'd3d3d3',
-'lightgreen' => '90ee90',
-'lightpink' => 'ffb6c1',
-'lightsalmon' => 'ffa07a',
-'lightseagreen' => '20b2aa',
-'lightskyblue' => '87cefa',
-'lightslategray' => '778899',
-'lightslategrey' => '778899',
-'lightsteelblue' => 'b0c4de',
-'lightyellow' => 'ffffe0',
-'lime' => '00ff00',
-'limegreen' => '32cd32',
-'linen' => 'faf0e6',
-'magenta' => 'ff00ff',
-'maroon' => '800000',
-'mediumaquamarine' => '66cdaa',
-'mediumblue' => '0000cd',
-'mediumorchid' => 'ba55d3',
-'mediumpurple' => '9370d8',
-'mediumseagreen' => '3cb371',
-'mediumslateblue' => '7b68ee',
-'mediumspringgreen' => '00fa9a',
-'mediumturquoise' => '48d1cc',
-'mediumvioletred' => 'c71585',
-'midnightblue' => '191970',
-'mintcream' => 'f5fffa',
-'mistyrose' => 'ffe4e1',
-'moccasin' => 'ffe4b5',
-'navajowhite' => 'ffdead',
-'navy' => '000080',
-'oldlace' => 'fdf5e6',
-'olive' => '808000',
-'olivedrab' => '6b8e23',
-'orange' => 'ffa500',
-'orangered' => 'ff4500',
-'orchid' => 'da70d6',
-'palegoldenrod' => 'eee8aa',
-'palegreen' => '98fb98',
-'paleturquoise' => 'afeeee',
-'palevioletred' => 'd87093',
-'papayawhip' => 'ffefd5',
-'peachpuff' => 'ffdab9',
-'peru' => 'cd853f',
-'pink' => 'ffc0cb',
-'plum' => 'dda0dd',
-'powderblue' => 'b0e0e6',
-'purple' => '800080',
-'red' => 'ff0000',
-'rosybrown' => 'bc8f8f',
-'royalblue' => '4169e1',
-'saddlebrown' => '8b4513',
-'salmon' => 'fa8072',
-'sandybrown' => 'f4a460',
-'seagreen' => '2e8b57',
-'seashell' => 'fff5ee',
-'sienna' => 'a0522d',
-'silver' => 'c0c0c0',
-'skyblue' => '87ceeb',
-'slateblue' => '6a5acd',
-'slategray' => '708090',
-'slategrey' => '708090',
-'snow' => 'fffafa',
-'springgreen' => '00ff7f',
-'steelblue' => '4682b4',
-'tan' => 'd2b48c',
-'teal' => '008080',
-'thistle' => 'd8bfd8',
-'tomato' => 'ff6347',
-'turquoise' => '40e0d0',
-'violet' => 'ee82ee',
-'wheat' => 'f5deb3',
-'white' => 'ffffff',
-'whitesmoke' => 'f5f5f5',
-'yellow' => 'ffff00',
-'yellowgreen' => '9acd32'
-);
-
-//============================================================+
-// END OF FILE                                                 
-//============================================================+
-?>
+<?php
+//============================================================+
+// File name   : htmlcolors.php
+// Begin       : 2002-04-09
+// Last Update : 2010-04-20
+// Version     : 1.0.004
+// License     : GNU LGPL (http://www.gnu.org/copyleft/lesser.html)
+// 	----------------------------------------------------------------------------
+//  Copyright (C) 2002-2009  Nicola Asuni - Tecnick.com S.r.l.
+// 	
+// 	This program 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 2.1 of the License, or
+// 	(at your option) any later version.
+// 	
+// 	This program is distributed in the hope that it will be useful,
+// 	but WITHOUT ANY WARRANTY; without even the implied warranty of
+// 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// 	GNU Lesser General Public License for more details.
+// 	
+// 	You should have received a copy of the GNU Lesser General Public License
+// 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// 	
+// 	See LICENSE.TXT file for more information.
+//  ----------------------------------------------------------------------------
+//
+// Description : Array of WEB safe colors
+//
+// Author: Nicola Asuni
+//
+// (c) Copyright:
+//               Nicola Asuni
+//               Tecnick.com S.r.l.
+//               Via della Pace, 11
+//               09044 Quartucciu (CA)
+//               ITALY
+//               www.tecnick.com
+//               info@tecnick.com
+//============================================================+
+
+/**
+ * Array of WEB safe colors.
+ * @author Nicola Asuni
+ * @copyright 2004-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
+ * @package com.tecnick.tcpdf
+ * @link http://www.tcpdf.org
+ * @license http://www.gnu.org/copyleft/lesser.html LGPL
+ * @since 2.9.000 (2008-03-26)
+*/
+
+/**
+ * Array of WEB safe colors
+ */
+global $webcolor;
+$webcolor = array (
+'aliceblue' => 'f0f8ff',
+'antiquewhite' => 'faebd7',
+'aqua' => '00ffff',
+'aquamarine' => '7fffd4',
+'azure' => 'f0ffff',
+'beige' => 'f5f5dc',
+'bisque' => 'ffe4c4',
+'black' => '000000',
+'blanchedalmond' => 'ffebcd',
+'blue' => '0000ff',
+'blueviolet' => '8a2be2',
+'brown' => 'a52a2a',
+'burlywood' => 'deb887',
+'cadetblue' => '5f9ea0',
+'chartreuse' => '7fff00',
+'chocolate' => 'd2691e',
+'coral' => 'ff7f50',
+'cornflowerblue' => '6495ed',
+'cornsilk' => 'fff8dc',
+'crimson' => 'dc143c',
+'cyan' => '00ffff',
+'darkblue' => '00008b',
+'darkcyan' => '008b8b',
+'darkgoldenrod' => 'b8860b',
+'dkgray' => 'a9a9a9',
+'darkgray' => 'a9a9a9',
+'darkgrey' => 'a9a9a9',
+'darkgreen' => '006400',
+'darkkhaki' => 'bdb76b',
+'darkmagenta' => '8b008b',
+'darkolivegreen' => '556b2f',
+'darkorange' => 'ff8c00',
+'darkorchid' => '9932cc',
+'darkred' => '8b0000',
+'darksalmon' => 'e9967a',
+'darkseagreen' => '8fbc8f',
+'darkslateblue' => '483d8b',
+'darkslategray' => '2f4f4f',
+'darkslategrey' => '2f4f4f',
+'darkturquoise' => '00ced1',
+'darkviolet' => '9400d3',
+'deeppink' => 'ff1493',
+'deepskyblue' => '00bfff',
+'dimgray' => '696969',
+'dimgrey' => '696969',
+'dodgerblue' => '1e90ff',
+'firebrick' => 'b22222',
+'floralwhite' => 'fffaf0',
+'forestgreen' => '228b22',
+'fuchsia' => 'ff00ff',
+'gainsboro' => 'dcdcdc',
+'ghostwhite' => 'f8f8ff',
+'gold' => 'ffd700',
+'goldenrod' => 'daa520',
+'gray' => '808080',
+'grey' => '808080',
+'green' => '008000',
+'greenyellow' => 'adff2f',
+'honeydew' => 'f0fff0',
+'hotpink' => 'ff69b4',
+'indianred' => 'cd5c5c',
+'indigo' => '4b0082',
+'ivory' => 'fffff0',
+'khaki' => 'f0e68c',
+'lavender' => 'e6e6fa',
+'lavenderblush' => 'fff0f5',
+'lawngreen' => '7cfc00',
+'lemonchiffon' => 'fffacd',
+'lightblue' => 'add8e6',
+'lightcoral' => 'f08080',
+'lightcyan' => 'e0ffff',
+'lightgoldenrodyellow' => 'fafad2',
+'ltgray' => 'd3d3d3',
+'lightgray' => 'd3d3d3',
+'lightgrey' => 'd3d3d3',
+'lightgreen' => '90ee90',
+'lightpink' => 'ffb6c1',
+'lightsalmon' => 'ffa07a',
+'lightseagreen' => '20b2aa',
+'lightskyblue' => '87cefa',
+'lightslategray' => '778899',
+'lightslategrey' => '778899',
+'lightsteelblue' => 'b0c4de',
+'lightyellow' => 'ffffe0',
+'lime' => '00ff00',
+'limegreen' => '32cd32',
+'linen' => 'faf0e6',
+'magenta' => 'ff00ff',
+'maroon' => '800000',
+'mediumaquamarine' => '66cdaa',
+'mediumblue' => '0000cd',
+'mediumorchid' => 'ba55d3',
+'mediumpurple' => '9370d8',
+'mediumseagreen' => '3cb371',
+'mediumslateblue' => '7b68ee',
+'mediumspringgreen' => '00fa9a',
+'mediumturquoise' => '48d1cc',
+'mediumvioletred' => 'c71585',
+'midnightblue' => '191970',
+'mintcream' => 'f5fffa',
+'mistyrose' => 'ffe4e1',
+'moccasin' => 'ffe4b5',
+'navajowhite' => 'ffdead',
+'navy' => '000080',
+'oldlace' => 'fdf5e6',
+'olive' => '808000',
+'olivedrab' => '6b8e23',
+'orange' => 'ffa500',
+'orangered' => 'ff4500',
+'orchid' => 'da70d6',
+'palegoldenrod' => 'eee8aa',
+'palegreen' => '98fb98',
+'paleturquoise' => 'afeeee',
+'palevioletred' => 'd87093',
+'papayawhip' => 'ffefd5',
+'peachpuff' => 'ffdab9',
+'peru' => 'cd853f',
+'pink' => 'ffc0cb',
+'plum' => 'dda0dd',
+'powderblue' => 'b0e0e6',
+'purple' => '800080',
+'red' => 'ff0000',
+'rosybrown' => 'bc8f8f',
+'royalblue' => '4169e1',
+'saddlebrown' => '8b4513',
+'salmon' => 'fa8072',
+'sandybrown' => 'f4a460',
+'seagreen' => '2e8b57',
+'seashell' => 'fff5ee',
+'sienna' => 'a0522d',
+'silver' => 'c0c0c0',
+'skyblue' => '87ceeb',
+'slateblue' => '6a5acd',
+'slategray' => '708090',
+'slategrey' => '708090',
+'snow' => 'fffafa',
+'springgreen' => '00ff7f',
+'steelblue' => '4682b4',
+'tan' => 'd2b48c',
+'teal' => '008080',
+'thistle' => 'd8bfd8',
+'tomato' => 'ff6347',
+'turquoise' => '40e0d0',
+'violet' => 'ee82ee',
+'wheat' => 'f5deb3',
+'white' => 'ffffff',
+'whitesmoke' => 'f5f5f5',
+'yellow' => 'ffff00',
+'yellowgreen' => '9acd32'
+);
+
+//============================================================+
+// END OF FILE                                                 
+//============================================================+
+?>
diff --git a/library/html2pdf/_mypdf/mypdf.class.php b/library/html2pdf/_mypdf/mypdf.class.php
index 8b2b7ffae..ee604322c 100644
--- a/library/html2pdf/_mypdf/mypdf.class.php
+++ b/library/html2pdf/_mypdf/mypdf.class.php
@@ -1,950 +1,950 @@
-<?php
-/**
- * Logiciel : HTML2PDF - classe MyPDF
- * 
- * Convertisseur HTML => PDF
- * Distribué sous la licence LGPL. 
- *
- * @author		Laurent MINGUET <webmaster@html2pdf.fr>
- * @version		3.31
- */
-
-if (!defined('__CLASS_MYPDF__'))
-{
-	define('__CLASS_MYPDF__', true);
-	
-	require_once(dirname(__FILE__).'/htmlcolors.php');		// couleurs HTML, contient les memes que le fichier de TCPDF
-	require_once(dirname(__FILE__).'/99_fpdf_protection.class.php');		// classe fpdf_protection
-
-	class MyPDF extends FPDF_Protection
-	{
-		var $footer_param	= array();
-		var $transf		= array();
-		
-		var $underline		= false;
-		var $linethrough	= false;
-		var $overline		= false;
-		
-		function MyPDF($sens = 'P', $unit = 'mm', $format = 'A4')
-		{
-			$this->underline	= false;
-			$this->overline		= false;
-			$this->linethrough	= false;
-			
-			$this->FPDF_Protection($sens, $unit, $format);
-			$this->AliasNbPages();
-			$this->SetMyFooter();
-		}
-		
-		function SetMyFooter($page = null, $date = null, $heure = null, $form = null)
-		{
-			$page	= ($page ? true : false);
-			$date	= ($date ? true : false);
-			$heure	= ($heure ? true : false);
-			$form	= ($form ? true : false);
-			
-			$this->footer_param = array('page' => $page, 'date' => $date, 'heure' => $heure, 'form' => $form);
-		}
-		
-		function Footer()
-		{ 
-			$txt = '';
-			if ($this->footer_param['form'])	$txt = (HTML2PDF::textGET('pdf05'));
-			if ($this->footer_param['date'] && $this->footer_param['heure'])	$txt.= ($txt ? ' - ' : '').(HTML2PDF::textGET('pdf03'));
-			if ($this->footer_param['date'] && !$this->footer_param['heure'])	$txt.= ($txt ? ' - ' : '').(HTML2PDF::textGET('pdf01'));
-			if (!$this->footer_param['date'] && $this->footer_param['heure'])	$txt.= ($txt ? ' - ' : '').(HTML2PDF::textGET('pdf02'));
-			if ($this->footer_param['page'])	$txt.= ($txt ? ' - ' : '').(HTML2PDF::textGET('pdf04'));
-			
-			if (strlen($txt)>0)
-			{
-				$txt = str_replace('[[date_d]]',	date('d'),			$txt);
-				$txt = str_replace('[[date_m]]',	date('m'),			$txt);
-				$txt = str_replace('[[date_y]]',	date('Y'),			$txt);
-				$txt = str_replace('[[date_h]]',	date('H'),			$txt);
-				$txt = str_replace('[[date_i]]',	date('i'),			$txt);
-				$txt = str_replace('[[date_s]]',	date('s'),			$txt);
-				$txt = str_replace('[[current]]',	$this->PageNo(),	$txt);
-				$txt = str_replace('[[nb]]',		'{nb}',				$txt);
-				
-				parent::SetY(-11);
-			 	$this->setOverline(false);
-			 	$this->setLinethrough(false);
-        		$this->SetFont('helvetica', 'I', 8);
-				$this->Cell(0, 10, $txt, 0, 0, 'R');
-			}
-		}
-				
-		// Draw a polygon
-		// Auteur	: Andrew Meier
-		// Licence	: Freeware
-		function Polygon($points, $style='D')
-		{
-			if($style=='F')							$op='f';
-			elseif($style=='FD' or $style=='DF')	$op='b';
-			else									$op='s';
-		
-			$h = $this->h;
-			$k = $this->k;
-		
-			$points_string = '';
-			for($i=0; $i<count($points); $i+=2)
-			{
-				$points_string .= sprintf('%.2F %.2F', $points[$i]*$k, ($h-$points[$i+1])*$k);
-				if($i==0)	$points_string .= ' m ';
-				else		$points_string .= ' l ';
-			}
-			$this->_out($points_string . $op);
-		}
-		
-		function setOverline($value = true)
-		{
-			$this->overline = $value;
-		}
-
-		function setLinethrough($value = true)
-		{
-			$this->linethrough = $value;
-		}
-		
-		// redéfinition de la methode Text de FPDF afin de rajouter la gestion des overline et linethrough
-		function Text($x, $y, $txt)
-		{
-			//Output a string
-			$s=sprintf('BT %.2F %.2F Td (%s) Tj ET',$x*$this->k,($this->h-$y)*$this->k,$this->_escape($txt));
-
-			/* MODIFICATION HTML2PDF pour le support de underline, overline, linethrough */
-			if ($txt!='')
-			{
-				if($this->underline)	$s.=' '.$this->_dounderline($x,$y,$txt);
-				if($this->overline)		$s.=' '.$this->_dooverline($x,$y,$txt);
-				if($this->linethrough)	$s.=' '.$this->_dolinethrough($x,$y,$txt);
-			}
-			/* FIN MODIFICATION */
-
-			if($this->ColorFlag)
-				$s='q '.$this->TextColor.' '.$s.' Q';
-			$this->_out($s);
-		}
-
-		// redéfinition de la methode Cell de FPDF afin de rajouter la gestion des overline et linethrough
-		function Cell($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false, $link='')
-		{
-			//Output a cell
-			$k=$this->k;
-			if($this->y+$h>$this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())
-			{
-				//Automatic page break
-				$x=$this->x;
-				$ws=$this->ws;
-				if($ws>0) $this->setWordSpacing(0);
-				$this->AddPage($this->CurOrientation,$this->CurPageFormat);
-				$this->x=$x;
-				if($ws>0) $this->setWordSpacing($ws);
-			}
-			if($w==0)
-				$w=$this->w-$this->rMargin-$this->x;
-			$s='';
-			if($fill || $border==1)
-			{
-				if($fill)
-					$op=($border==1) ? 'B' : 'f';
-				else
-					$op='S';
-				$s=sprintf('%.2F %.2F %.2F %.2F re %s ',$this->x*$k,($this->h-$this->y)*$k,$w*$k,-$h*$k,$op);
-			}
-			if(is_string($border))
-			{
-				$x=$this->x;
-				$y=$this->y;
-				if(strpos($border,'L')!==false)
-					$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,$x*$k,($this->h-($y+$h))*$k);
-				if(strpos($border,'T')!==false)
-					$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-$y)*$k);
-				if(strpos($border,'R')!==false)
-					$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',($x+$w)*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
-				if(strpos($border,'B')!==false)
-					$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-($y+$h))*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
-			}
-			
-			if($txt!=='')
-			{
-				if($align=='R')
-					$dx=$w-$this->cMargin-$this->GetStringWidth($txt);
-				elseif($align=='C')
-					$dx=($w-$this->GetStringWidth($txt))/2;
-				else
-					$dx=$this->cMargin;
-				if($this->ColorFlag)
-					$s.='q '.$this->TextColor.' ';
-				$txt2=str_replace(')','\\)',str_replace('(','\\(',str_replace('\\','\\\\',$txt)));
-				$s.=sprintf('BT %.2F %.2F Td (%s) Tj ET',($this->x+$dx)*$k,($this->h-($this->y+.5*$h+.3*$this->FontSize))*$k,$txt2);
-				
-				/* MODIFICATION HTML2PDF pour le support de underline, overline, linethrough */
-				if($this->underline)	$s.=' '.$this->_dounderline($this->x+$dx,$this->y+.5*$h+.3*$this->FontSize,$txt);
-				if($this->overline)		$s.=' '.$this->_dooverline($this->x+$dx,$this->y+.5*$h+.3*$this->FontSize,$txt);
-				if($this->linethrough)	$s.=' '.$this->_dolinethrough($this->x+$dx,$this->y+.5*$h+.3*$this->FontSize,$txt);
-				/* FIN MODIFICATION */
-				
-				if($this->ColorFlag)
-					$s.=' Q';
-				if($link)
-					$this->Link($this->x+$dx,$this->y+.5*$h-.5*$this->FontSize,$this->GetStringWidth($txt),$this->FontSize,$link);
-			}
-			
-			if($s)
-				$this->_out($s);
-			$this->lasth=$h;
-			if($ln>0)
-			{
-				//Go to next line
-				$this->y+=$h;
-				if($ln==1)
-					$this->x=$this->lMargin;
-			}
-			else
-				$this->x+=$w;
-		}
-
-		function _dounderline($x, $y, $txt)
-		{
-			//Underline text
-			$up=$this->CurrentFont['up'];
-			$ut=$this->CurrentFont['ut'];
-
-			$p_x = $x*$this->k;
-			$p_y = ($this->h-($y-$up/1000*$this->FontSize))*$this->k;
-			$p_w = ($this->GetStringWidth($txt)+$this->ws*substr_count($txt,' '))*$this->k;
-			$p_h = -$ut/1000*$this->FontSizePt;
-
-			return sprintf('%.2F %.2F %.2F %.2F re f',$p_x,$p_y,$p_w,$p_h);
-		}
-		
-		function _dooverline($x, $y, $txt)
-		{
-			//Overline text
-			$up=$this->CurrentFont['up'];
-			$ut=$this->CurrentFont['ut'];
-
-			$p_x = $x*$this->k;
-			$p_y = ($this->h-($y-(1000+1.5*$up)/1000*$this->FontSize))*$this->k;
-			$p_w = ($this->GetStringWidth($txt)+$this->ws*substr_count($txt,' '))*$this->k;
-			$p_h = -$ut/1000*$this->FontSizePt;
-			
-			return sprintf('%.2F %.2F %.2F %.2F re f',$p_x,$p_y,$p_w,$p_h);
-		}
-		
-		function _dolinethrough($x, $y, $txt)
-		{
-			//Linethrough text
-			$up=$this->CurrentFont['up'];
-			$ut=$this->CurrentFont['ut'];
-
-			$p_x = $x*$this->k;
-			$p_y = ($this->h-($y-(1000+2.5*$up)/2000*$this->FontSize))*$this->k;
-			$p_w = ($this->GetStringWidth($txt)+$this->ws*substr_count($txt,' '))*$this->k;
-			$p_h = -$ut/1000*$this->FontSizePt;
-			
-			return sprintf('%.2F %.2F %.2F %.2F re f',$p_x,$p_y,$p_w,$p_h);
-		}
-		
-		function cloneFontFrom(&$pdf)
-		{
-			$this->fonts			= &$pdf->getFonts();
-			$this->FontFiles		= &$pdf->getFontFiles();
-			$this->diffs			= &$pdf->getDiffs();
-		}
-		
-		function &getFonts() 		{ return $this->fonts; }
-		function &getFontFiles()		{ return $this->FontFiles; }
-		function &getDiffs() 		{ return $this->diffs; }
-		
-		function isLoadedFont($fontkey)
-		{
-			if (isset($this->fonts[$fontkey]))
-				return true;
-				
-			if (isset($this->CoreFonts[$fontkey]))
-				return true;
-				
-			return false;
-		}
-		
-		function setWordSpacing($ws=0.)
-		{
-			$this->ws = $ws;
-			$this->_out(sprintf('%.3F Tw',$ws*$this->k));
-		}
-		
-		function clippingPathOpen($x = null, $y = null, $w = null, $h = null, $coin_TL=null, $coin_TR=null, $coin_BL=null, $coin_BR=null)
-		{
-			$path = '';
-			if ($x!==null && $y!==null && $w!==null && $h!==null)
-			{
-				$x1 = $x*$this->k;
-				$y1 = ($this->h-$y)*$this->k;
-
-				$x2 = ($x+$w)*$this->k;
-				$y2 = ($this->h-$y)*$this->k;
-
-				$x3 = ($x+$w)*$this->k;
-				$y3 = ($this->h-$y-$h)*$this->k;
-
-				$x4 = $x*$this->k;
-				$y4 = ($this->h-$y-$h)*$this->k;
-				
-				if ($coin_TL || $coin_TR || $coin_BL || $coin_BR)
-				{
-					if ($coin_TL) { $coin_TL[0] = $coin_TL[0]*$this->k; $coin_TL[1] =-$coin_TL[1]*$this->k; }
-					if ($coin_TR) { $coin_TR[0] = $coin_TR[0]*$this->k; $coin_TR[1] =-$coin_TR[1]*$this->k; }
-					if ($coin_BL) { $coin_BL[0] = $coin_BL[0]*$this->k; $coin_BL[1] =-$coin_BL[1]*$this->k; }
-					if ($coin_BR) { $coin_BR[0] = $coin_BR[0]*$this->k; $coin_BR[1] =-$coin_BR[1]*$this->k; }
-
-					$MyArc = 4/3 * (sqrt(2) - 1);
-					
-					if ($coin_TL)
-						$path.= sprintf('%.2F %.2F m ', $x1+$coin_TL[0], $y1);
-					else
-						$path.= sprintf('%.2F %.2F m ', $x1, $y1);
-					
-					if ($coin_TR)
-					{
-						$xt1 = ($x2-$coin_TR[0])+$coin_TR[0]*$MyArc;
-						$yt1 = ($y2+$coin_TR[1])-$coin_TR[1];
-						$xt2 = ($x2-$coin_TR[0])+$coin_TR[0];
-						$yt2 = ($y2+$coin_TR[1])-$coin_TR[1]*$MyArc;
-
-						$path.= sprintf('%.2F %.2F l ', $x2-$coin_TR[0], $y2);						
-						$path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x2, $y2+$coin_TR[1]);
-					}
-					else
-						$path.= sprintf('%.2F %.2F l ', $x2, $y2);
-
-					if ($coin_BR)
-					{
-						$xt1 = ($x3-$coin_BR[0])+$coin_BR[0];
-						$yt1 = ($y3-$coin_BR[1])+$coin_BR[1]*$MyArc;
-						$xt2 = ($x3-$coin_BR[0])+$coin_BR[0]*$MyArc;
-						$yt2 = ($y3-$coin_BR[1])+$coin_BR[1];
-
-						$path.= sprintf('%.2F %.2F l ', $x3, $y3-$coin_BR[1]);						
-						$path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x3-$coin_BR[0], $y3);
-					}
-					else
-						$path.= sprintf('%.2F %.2F l ', $x3, $y3);
-
-					if ($coin_BL)
-					{
-						$xt1 = ($x4+$coin_BL[0])-$coin_BL[0]*$MyArc;
-						$yt1 = ($y4-$coin_BL[1])+$coin_BL[1];
-						$xt2 = ($x4+$coin_BL[0])-$coin_BL[0];
-						$yt2 = ($y4-$coin_BL[1])+$coin_BL[1]*$MyArc;
-
-						$path.= sprintf('%.2F %.2F l ', $x4+$coin_BL[0], $y4);						
-						$path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x4, $y4-$coin_BL[1]);
-					}
-					else
-						$path.= sprintf('%.2F %.2F l ', $x4, $y4);
-				
-					if ($coin_TL)
-					{
-						$xt1 = ($x1+$coin_TL[0])-$coin_TL[0];
-						$yt1 = ($y1+$coin_TL[1])-$coin_TL[1]*$MyArc;
-						$xt2 = ($x1+$coin_TL[0])-$coin_TL[0]*$MyArc;
-						$yt2 = ($y1+$coin_TL[1])-$coin_TL[1];
-
-						$path.= sprintf('%.2F %.2F l ', $x1, $y1+$coin_TL[1]);						
-						$path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x1+$coin_TL[0], $y1);
-					}
-				}
-				else
-				{
-					$path.= sprintf('%.2F %.2F m ', $x1, $y1);
-					$path.= sprintf('%.2F %.2F l ', $x2, $y2);
-					$path.= sprintf('%.2F %.2F l ', $x3, $y3);
-					$path.= sprintf('%.2F %.2F l ', $x4, $y4);
-				}
-
-				$path.= ' h W n';
-			}
-			$this->_out('q '.$path.' ');			
-		}
-		
-		function clippingPathClose()
-		{
-			$this->_out(' Q');
-		}
-		
-		function drawCourbe($ext1_x, $ext1_y, $ext2_x, $ext2_y, $int1_x, $int1_y, $int2_x, $int2_y, $cen_x, $cen_y)
-		{
-			$MyArc = 4/3 * (sqrt(2) - 1);
-			
-			$ext1_x = $ext1_x*$this->k; $ext1_y = ($this->h-$ext1_y)*$this->k;
-			$ext2_x = $ext2_x*$this->k; $ext2_y = ($this->h-$ext2_y)*$this->k;
-			$int1_x = $int1_x*$this->k; $int1_y = ($this->h-$int1_y)*$this->k;
-			$int2_x = $int2_x*$this->k; $int2_y = ($this->h-$int2_y)*$this->k;
-			$cen_x	= $cen_x*$this->k;	$cen_y	= ($this->h-$cen_y) *$this->k;
-			
-			$path = '';
-			
-			if ($ext1_x-$cen_x!=0)
-			{
-				$xt1 = $cen_x+($ext1_x-$cen_x);
-				$yt1 = $cen_y+($ext2_y-$cen_y)*$MyArc;
-				$xt2 = $cen_x+($ext1_x-$cen_x)*$MyArc;
-				$yt2 = $cen_y+($ext2_y-$cen_y);
-			}
-			else
-			{
-				$xt1 = $cen_x+($ext2_x-$cen_x)*$MyArc;
-				$yt1 = $cen_y+($ext1_y-$cen_y);
-				$xt2 = $cen_x+($ext2_x-$cen_x);
-				$yt2 = $cen_y+($ext1_y-$cen_y)*$MyArc;
-
-			}
-
-			$path.= sprintf('%.2F %.2F m ', $ext1_x, $ext1_y);
-			$path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $ext2_x, $ext2_y);
-
-			if ($int1_x-$cen_x!=0)
-			{
-				$xt1 = $cen_x+($int1_x-$cen_x)*$MyArc;
-				$yt1 = $cen_y+($int2_y-$cen_y);
-				$xt2 = $cen_x+($int1_x-$cen_x);
-				$yt2 = $cen_y+($int2_y-$cen_y)*$MyArc;
-			}
-			else
-			{
-				$xt1 = $cen_x+($int2_x-$cen_x);
-				$yt1 = $cen_y+($int1_y-$cen_y)*$MyArc;
-				$xt2 = $cen_x+($int2_x-$cen_x)*$MyArc;
-				$yt2 = $cen_y+($int1_y-$cen_y);
-
-			}
-			
-			$path.= sprintf('%.2F %.2F l ', $int2_x, $int2_y);
-			$path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $int1_x, $int1_y);
-
-			$this->_out($path . 'f');
-		}
-		
-		function drawCoin($ext1_x, $ext1_y, $ext2_x, $ext2_y, $int_x, $int_y, $cen_x, $cen_y)
-		{
-			$MyArc = 4/3 * (sqrt(2) - 1);
-			
-			$ext1_x = $ext1_x*$this->k; $ext1_y = ($this->h-$ext1_y)*$this->k;
-			$ext2_x = $ext2_x*$this->k; $ext2_y = ($this->h-$ext2_y)*$this->k;
-			$int_x  = $int_x*$this->k;  $int_y  = ($this->h-$int_y)*$this->k;
-			$cen_x	= $cen_x*$this->k;	$cen_y	= ($this->h-$cen_y) *$this->k;
-			
-			$path = '';
-			
-			if ($ext1_x-$cen_x!=0)
-			{
-				$xt1 = $cen_x+($ext1_x-$cen_x);
-				$yt1 = $cen_y+($ext2_y-$cen_y)*$MyArc;
-				$xt2 = $cen_x+($ext1_x-$cen_x)*$MyArc;
-				$yt2 = $cen_y+($ext2_y-$cen_y);
-			}
-			else
-			{
-				$xt1 = $cen_x+($ext2_x-$cen_x)*$MyArc;
-				$yt1 = $cen_y+($ext1_y-$cen_y);
-				$xt2 = $cen_x+($ext2_x-$cen_x);
-				$yt2 = $cen_y+($ext1_y-$cen_y)*$MyArc;
-
-			}
-
-			$path.= sprintf('%.2F %.2F m ', $ext1_x, $ext1_y);
-			$path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $ext2_x, $ext2_y);
-			$path.= sprintf('%.2F %.2F l ', $int_x, $int_y);
-			$path.= sprintf('%.2F %.2F l ', $ext1_x, $ext1_y);
-			
-			$this->_out($path . 'f');
-		}
-				
-		function startTransform()
-		{
-			$this->_out('q');
-		}
-		
-		function stopTransform()
-		{
-			$this->_out('Q');
-		}
-
-		function setTranslate($t_x, $t_y)
-		{
-			// matrice de transformation
-			$tm[0]=1;
-			$tm[1]=0;
-			$tm[2]=0;
-			$tm[3]=1;
-			$tm[4]=$t_x*$this->k;
-			$tm[5]=-$t_y*$this->k;
-			
-			$this->_out(sprintf('%.3F %.3F %.3F %.3F %.3F %.3F cm', $tm[0],$tm[1],$tm[2],$tm[3],$tm[4],$tm[5]));
-		}
-		
-		function setRotation($angle, $x='', $y='')
-		{
-			if($x === '') $x=$this->x;
-			if($y === '') $y=$this->y;
-			
-			$y=($this->h-$y)*$this->k;
-			$x*=$this->k;
-			
-			// matrice de transformation
-			$tm[0]=cos(deg2rad($angle));
-			$tm[1]=sin(deg2rad($angle));
-			$tm[2]=-$tm[1];
-			$tm[3]=$tm[0];
-			$tm[4]=$x+$tm[1]*$y-$tm[0]*$x;
-			$tm[5]=$y-$tm[0]*$y-$tm[1]*$x;
-			
-			$this->_out(sprintf('%.3F %.3F %.3F %.3F %.3F %.3F cm', $tm[0],$tm[1],$tm[2],$tm[3],$tm[4],$tm[5]));
-		}
-		
-		function SetX($x)
-		{
-			$this->x=$x;
-		}
-		
-		function SetY($y, $resetx=true)
-		{
-			if ($resetx)
-				$this->x=$this->lMargin;
-				
-			$this->y=$y;
-		}
-		
-		function SetXY($x, $y)
-		{
-			$this->x=$x;
-			$this->y=$y;
-		}
-
-		function getK() { return $this->k; }
-		function getW() { return $this->w; }
-		function getH() { return $this->h; }
-		function getPage() { return $this->page; }
-		function getlMargin() { return $this->lMargin; }
-		function getrMargin() { return $this->rMargin; }
-		function gettMargin() { return $this->tMargin; }
-		function getbMargin() { return $this->bMargin; }
-		function setbMargin($v) { $this->bMargin=$v; }
-		function setcMargin($v) { $this->cMargin=$v; }
-		function setPage($v) { $this->page=$v; }
-		
-		function svgSetStyle($styles)
-		{
-			$style = '';
-			
-			if ($styles['fill'])
-			{
-				$this->setMyFillColor($styles['fill']);
-				$style.= 'F';
-			}
-			if ($styles['stroke'] && $styles['stroke-width'])
-			{
-				$this->SetMyDrawColor($styles['stroke']);
-				$this->SetLineWidth($styles['stroke-width']);
-				$style.= 'D';
-			}
-			if ($styles['fill-opacity'])
-			{
-//				$this->SetAlpha($styles['fill-opacity']);
-			}
-			
-			return $style;
-		}
-		
-		function svgRect($x, $y, $w, $h, $style)
-		{
-			$xa=$x; $xb=$x+$w; $xc=$x+$w; $xd=$x;
-			$ya=$y; $yb=$y; $yc=$y+$h; $yd=$y+$h;
-			
-			if($style=='F') $op='f';
-			elseif($style=='FD' || $style=='DF') $op='B';
-			else $op='S';
-			$this->_Point($xa, $ya, true);
-			$this->_Line($xb, $yb, true);
-			$this->_Line($xc, $yc, true);
-			$this->_Line($xd, $yd, true);
-			$this->_Line($xa, $ya, true);
-			$this->_out($op);
-		}
-
-		function svgLine($x1, $y1, $x2, $y2)
-		{
-			$op='S';
-			$this->_Point($x1, $y1, true);
-			$this->_Line($x2, $y2, true);
-			$this->_out($op);
-		}
-		
-		function svgEllipse($x0, $y0, $rx, $ry, $style)
-		{
-			if($style=='F') $op='f';
-			elseif($style=='FD' || $style=='DF') $op='B';
-			else $op='S';
-			
-			$this->_Arc($x0, $y0, $rx, $ry, 0, 2*M_PI, true, true, true);
-			$this->_out($op);
-		}
-
-		function svgPolygone($actions, $style)
-		{
-			if($style=='F') $op='f';
-			elseif($style=='FD' || $style=='DF') $op='B';
-			else $op='S';
-
-			$first = array('', 0, 0);
-			$last = array(0, 0, 0, 0);
-			
-			foreach($actions as $action)
-			{
-				switch($action[0])
-				{
-					case 'M':
-					case 'm':
-						$first = $action;
-						$x = $action[1]; $y = $action[2]; $xc = $x; $yc = $y;
-						$this->_Point($x, $y, true);
-						break;
-							
-					case 'Z':
-					case 'z':
-						$x = $first[1]; $y = $first[2]; $xc = $x; $yc = $y;
-						$this->_Line($x, $y, true);
-					break;	
-
-					case 'L':
-						$x = $action[1]; $y = $action[2]; $xc = $x; $yc = $y;
-						$this->_Line($x, $y, true);
-						break;
-						
-					case 'l':
-						$x = $last[0]+$action[1]; $y = $last[1]+$action[2]; $xc = $x; $yc = $y;
-						$this->_Line($x, $y, true);
-						break;
-						
-					case 'H':
-						$x = $action[1]; $y = $last[1]; $xc = $x; $yc = $y;
-						$this->_Line($x, $y, true);
-						break;	
-							
-					case 'h':
-						$x = $last[0]+$action[1]; $y = $last[1]; $xc = $x; $yc = $y;
-						$this->_Line($x, $y, true);
-						break;	
-							
-					case 'V':
-						$x = $last[0]; $y = $action[1]; $xc = $x; $yc = $y;
-						$this->_Line($x, $y, true);
-						break;	
-
-					case 'v':
-						$x = $last[0]; $y = $last[1]+$action[1]; $xc = $x; $yc = $y;
-						$this->_Line($x, $y, true);
-						break;	
-
-					case 'A':
-						$rx = $action[1];	// rx
-						$ry = $action[2];	// ry
-						$a = $action[3];	// angle de deviation de l'axe X
-						$l = $action[4];	// large-arc-flag 
-						$s = $action[5];	// sweep-flag
-						$x1 = $last[0];		// begin x
-						$y1 = $last[1];		// begin y
-						$x2 = $action[6];	// final x
-						$y2 = $action[7];	// final y
-						
-						$this->_Arc2($x1, $y1, $x2, $y2, $rx, $ry, $a, $l, $s, true);
-						
-						$x = $x2; $y = $y2; $xc = $x; $yc = $y;
-						break;
-
-					case 'a':
-						$rx = $action[1];	// rx
-						$ry = $action[2];	// ry
-						$a = $action[3];	// angle de deviation de l'axe X
-						$l = $action[4];	// large-arc-flag 
-						$s = $action[5];	// sweep-flag
-						$x1 = $last[0];		// begin x
-						$y1 = $last[1];		// begin y
-						$x2 = $last[0]+$action[6];	// final x
-						$y2 = $last[1]+$action[7];	// final y
-						
-						$this->_Arc2($x1, $y1, $x2, $y2, $rx, $ry, $a, $l, $s, true);
-						
-						$x = $x2; $y = $y2; $xc = $x; $yc = $y;
-						break;
-
-					case 'C':
-						$x1 = $action[1];
-						$y1 = $action[2];
-						$x2 = $action[3];
-						$y2 = $action[4];
-						$xf = $action[5];
-						$yf = $action[6];
-						$this->_Curve($x1, $y1, $x2, $y2,$xf, $yf, true);
-						$x = $xf; $y = $yf; $xc = $x2; $yc = $y2;
-						break;
-
-					case 'c':
-						$x1 = $last[0]+$action[1];
-						$y1 = $last[1]+$action[2];
-						$x2 = $last[0]+$action[3];
-						$y2 = $last[1]+$action[4];
-						$xf = $last[0]+$action[5];
-						$yf = $last[1]+$action[6];
-						$this->_Curve($x1, $y1, $x2, $y2,$xf, $yf, true);
-						$x = $xf; $y = $yf; $xc = $x2; $yc = $y2;
-						break;
-
-					default:
-						echo 'MyPDF Path : <b>'.$action[0].'</b> non reconnu...';
-						exit;
-				}
-				$last = array($x, $y, $xc, $yc);
-			}
-			$this->_out($op);
-		}
-
-		function _Point($x, $y, $trans = false)
-		{
-			if ($trans) $this->ptTransform($x, $y);
-			
-			$this->_out(sprintf('%.2F %.2F m', $x, $y));
-		}
-		
-		function _Line($x, $y, $trans = false)
-		{
-			if ($trans) $this->ptTransform($x, $y);
-
-			$this->_out(sprintf('%.2F %.2F l', $x, $y));
-		}
-		
-		function _Curve($x1, $y1, $x2, $y2, $x3, $y3, $trans = false)
-		{
-			if ($trans)
-			{
-				$this->ptTransform($x1, $y1);
-				$this->ptTransform($x2, $y2);
-				$this->ptTransform($x3, $y3);
-			}
-			$this->_out(sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c', $x1, $y1, $x2, $y2, $x3, $y3));
-		}
-		
-		function _Arc($xc, $yc, $rx, $ry, $a_debut, $a_fin, $sens = true, $draw_first = true, $trans=false)
-		{
-			$nSeg = 8;
-		
-			if (!$sens) $a_debut+= M_PI*2.;
-			 
-			$totalAngle = $a_fin - $a_debut;
-			$dt = $totalAngle/$nSeg;
-			$dtm = $dt/3;
-		
-			$x0 = $xc; $y0 = $yc;
-		
-			$t1 = $a_debut;
-			$a0 = $x0 + ($rx * cos($t1));
-			$b0 = $y0 + ($ry * sin($t1));
-			$c0 = -$rx * sin($t1);
-			$d0 = $ry * cos($t1);
-			if ($draw_first) $this->_Point($a0, $b0, $trans);
-			for ($i = 1; $i <= $nSeg; $i++)
-			{
-				// Draw this bit of the total curve
-				$t1 = ($i * $dt)+$a_debut;
-				$a1 = $x0 + ($rx * cos($t1));
-				$b1 = $y0 + ($ry * sin($t1));
-				$c1 = -$rx * sin($t1);
-				$d1 = $ry * cos($t1);
-				$this->_Curve(
-						$a0 + ($c0 * $dtm), $b0 + ($d0 * $dtm),
-						$a1 - ($c1 * $dtm), $b1 - ($d1 * $dtm),
-						$a1, $b1,
-						$trans
-					);
-				$a0 = $a1;
-				$b0 = $b1;
-				$c0 = $c1;
-				$d0 = $d1;
-			}
-		}
-		
-		function _Arc2($x1, $y1, $x2, $y2, $rx, $ry, $a=0, $l=0, $s=0, $trans = false)
-		{
-			$v = array();
-			$v['x1'] = $x1;
-			$v['y1'] = $y1;
-			$v['x2'] = $x2;
-			$v['y2'] = $y2;
-			$v['rx'] = $rx;
-			$v['ry'] = $ry;
-			$v['xr1'] = $v['x1']*cos($a) - $v['y1']*sin($a); 
-			$v['yr1'] = $v['x1']*sin($a) + $v['y1']*cos($a); 
-			$v['xr2'] = $v['x2']*cos($a) - $v['y2']*sin($a); 
-			$v['yr2'] = $v['x2']*sin($a) + $v['y2']*cos($a); 
-			$v['Xr1'] = $v['xr1']/$v['rx']; 
-			$v['Yr1'] = $v['yr1']/$v['ry']; 
-			$v['Xr2'] = $v['xr2']/$v['rx']; 
-			$v['Yr2'] = $v['yr2']/$v['ry']; 
-			$v['dXr'] = $v['Xr2'] - $v['Xr1'];
-			$v['dYr'] = $v['Yr2'] - $v['Yr1'];
-			$v['D'] = $v['dXr']*$v['dXr'] + $v['dYr']*$v['dYr']; 
-			
-			if ($v['D']==0 || $v['D']>4)
-			{
-				$this->_Line($x2, $y2, $trans);
-				return false;
-			}
-			
-			$v['s1'] = array();
-			$v['s2'] = array();
-			$v['s1']['t'] = sqrt((4.-$v['D'])/$v['D']);
-			$v['s1']['Xr'] = ($v['Xr1']+$v['Xr2'])/2. + $v['s1']['t']*($v['Yr2']-$v['Yr1'])/2.;
-			$v['s1']['Yr'] = ($v['Yr1']+$v['Yr2'])/2. + $v['s1']['t']*($v['Xr1']-$v['Xr2'])/2.;
-			$v['s1']['xr'] = $v['s1']['Xr']*$v['rx'];
-			$v['s1']['yr'] = $v['s1']['Yr']*$v['ry'];
-			$v['s1']['x'] = $v['s1']['xr']*cos($a)+$v['s1']['yr']*sin($a); 
-			$v['s1']['y'] =-$v['s1']['xr']*sin($a)+$v['s1']['yr']*cos($a); 
-			$v['s1']['a1'] = atan2($v['y1']-$v['s1']['y'], $v['x1']-$v['s1']['x']); 
-			$v['s1']['a2'] = atan2($v['y2']-$v['s1']['y'], $v['x2']-$v['s1']['x']); 
-			if ($v['s1']['a1']>$v['s1']['a2']) $v['s1']['a1']-=2*M_PI;
-			
-			$v['s2']['t'] = -$v['s1']['t'];
-			$v['s2']['Xr'] = ($v['Xr1']+$v['Xr2'])/2. + $v['s2']['t']*($v['Yr2']-$v['Yr1'])/2.;
-			$v['s2']['Yr'] = ($v['Yr1']+$v['Yr2'])/2. + $v['s2']['t']*($v['Xr1']-$v['Xr2'])/2.;
-			$v['s2']['xr'] = $v['s2']['Xr']*$v['rx']; 
-			$v['s2']['yr'] = $v['s2']['Yr']*$v['ry']; 
-			$v['s2']['x'] = $v['s2']['xr']*cos($a)+$v['s2']['yr']*sin($a); 
-			$v['s2']['y'] =-$v['s2']['xr']*sin($a)+$v['s2']['yr']*cos($a); 
-			$v['s2']['a1'] = atan2($v['y1']-$v['s2']['y'], $v['x1']-$v['s2']['x']); 
-			$v['s2']['a2'] = atan2($v['y2']-$v['s2']['y'], $v['x2']-$v['s2']['x']); 
-			if ($v['s2']['a1']>$v['s2']['a2']) $v['s2']['a1']-=2*M_PI;
-			
-			if (!$l)
-			{
-				if ($s)
-				{
-					$xc = $v['s2']['x'];
-					$yc = $v['s2']['y'];
-					$a1 = $v['s2']['a1'];
-					$a2 = $v['s2']['a2'];
-					$this->_Arc($xc, $yc, $rx, $ry, $a1, $a2, true, false, $trans);
-					
-				}
-				else
-				{
-					$xc = $v['s1']['x'];
-					$yc = $v['s1']['y'];
-					$a1 = $v['s1']['a1'];
-					$a2 = $v['s1']['a2'];
-					$this->_Arc($xc, $yc, $rx, $ry, $a1, $a2, false, false, $trans);
-				}
-			}
-			else
-			{
-				if ($s)
-				{
-					$xc = $v['s1']['x'];
-					$yc = $v['s1']['y'];
-					$a1 = $v['s1']['a1'];
-					$a2 = $v['s1']['a2'];
-					$this->_Arc($xc, $yc, $rx, $ry, $a1, $a2, true, false, $trans);
-				}
-				else
-				{
-					$xc = $v['s2']['x'];
-					$yc = $v['s2']['y'];
-					$a1 = $v['s2']['a1'];
-					$a2 = $v['s2']['a2'];
-					$this->_Arc($xc, $yc, $rx, $ry, $a1, $a2, false, false, $trans);
-				}
-			}
-		}
-		
-		function ptTransform(&$x,  &$y, $trans=true)
-		{
-			$nb = count($this->transf);
-			if ($nb)	$m = $this->transf[$nb-1];
-			else		$m = array(1,0,0,1,0,0);
-			
-			list($x,$y) = array(($x*$m[0]+$y*$m[2]+$m[4]),($x*$m[1]+$y*$m[3]+$m[5]));
-			
-			if ($trans)
-			{
-				$x = $x*$this->k;
-				$y = ($this->h-$y)*$this->k;
-			}
-			
-			return true;
-		}
-	
-		function doTransform($n = null)
-		{
-			$nb = count($this->transf);
-			if ($nb)	$m = $this->transf[$nb-1];
-			else		$m = array(1,0,0,1,0,0);
-			
-			if (!$n) $n = array(1,0,0,1,0,0);
-
-			$n = array(
-					$m[0]*$n[0]+$m[2]*$n[1],
-					$m[1]*$n[0]+$m[3]*$n[1],
-					$m[0]*$n[2]+$m[2]*$n[3],
-					$m[1]*$n[2]+$m[3]*$n[3],
-					$m[0]*$n[4]+$m[2]*$n[5]+$m[4],  
-					$m[1]*$n[4]+$m[3]*$n[5]+$m[5]  
-				);	
-				
-//			echo 'do-'.count($this->transf).' => '.print_r($n, true).'<br>';
-			$this->transf[] = $n;
-		}
-		
-		function undoTransform()
-		{
-			array_pop($this->transf);
-//			echo 'un-'.count($this->transf).'<br>';
-		}
-		
-		function setMyDrawColor($c)
-		{
-			$c = $this->setMyColor($c, true);
-			if (!$c) return false;
-
-			$this->DrawColor=$c;
-			if($this->page>0) $this->_out($this->DrawColor);
-		}
-		
-		function setMyFillColor($c)
-		{
-			$c = $this->setMyColor($c);
-			if (!$c) return false;
-
-			$this->FillColor=$c;
-			$this->ColorFlag=($this->FillColor!=$this->TextColor);
-			if($this->page>0) $this->_out($this->FillColor);
-		}
-			
-		function setMyTextColor($c)
-		{
-			$c = $this->setMyColor($c);
-			if (!$c) return false;
-
-			$this->TextColor=$c;
-			$this->ColorFlag=($this->FillColor!=$this->TextColor);
-		}
-		
-		function setMyColor($c, $mode = false)
-		{
-			if (!is_array($c))		return sprintf('%.3F ',$c).($mode ? 'G' : 'g');
-			elseif (count($c)==3)	return sprintf('%.3F %.3F %.3F ',$c[0],$c[1],$c[2]).($mode ? 'RG' : 'rg');
-			elseif (count($c)==4)	return sprintf('%.3F %.3F %.3F %.3F ',$c[0],$c[1],$c[2],$c[3]).($mode ? 'K' : 'k');
-			return null;
-		}
-	}
-}
+<?php
+/**
+ * Logiciel : HTML2PDF - classe MyPDF
+ * 
+ * Convertisseur HTML => PDF
+ * Distribué sous la licence LGPL. 
+ *
+ * @author		Laurent MINGUET <webmaster@html2pdf.fr>
+ * @version		3.31
+ */
+
+if (!defined('__CLASS_MYPDF__'))
+{
+	define('__CLASS_MYPDF__', true);
+	
+	require_once(dirname(__FILE__).'/htmlcolors.php');		// couleurs HTML, contient les memes que le fichier de TCPDF
+	require_once(dirname(__FILE__).'/99_fpdf_protection.class.php');		// classe fpdf_protection
+
+	class MyPDF extends FPDF_Protection
+	{
+		var $footer_param	= array();
+		var $transf		= array();
+		
+		var $underline		= false;
+		var $linethrough	= false;
+		var $overline		= false;
+		
+		function MyPDF($sens = 'P', $unit = 'mm', $format = 'A4')
+		{
+			$this->underline	= false;
+			$this->overline		= false;
+			$this->linethrough	= false;
+			
+			$this->FPDF_Protection($sens, $unit, $format);
+			$this->AliasNbPages();
+			$this->SetMyFooter();
+		}
+		
+		function SetMyFooter($page = null, $date = null, $heure = null, $form = null)
+		{
+			$page	= ($page ? true : false);
+			$date	= ($date ? true : false);
+			$heure	= ($heure ? true : false);
+			$form	= ($form ? true : false);
+			
+			$this->footer_param = array('page' => $page, 'date' => $date, 'heure' => $heure, 'form' => $form);
+		}
+		
+		function Footer()
+		{ 
+			$txt = '';
+			if ($this->footer_param['form'])	$txt = (HTML2PDF::textGET('pdf05'));
+			if ($this->footer_param['date'] && $this->footer_param['heure'])	$txt.= ($txt ? ' - ' : '').(HTML2PDF::textGET('pdf03'));
+			if ($this->footer_param['date'] && !$this->footer_param['heure'])	$txt.= ($txt ? ' - ' : '').(HTML2PDF::textGET('pdf01'));
+			if (!$this->footer_param['date'] && $this->footer_param['heure'])	$txt.= ($txt ? ' - ' : '').(HTML2PDF::textGET('pdf02'));
+			if ($this->footer_param['page'])	$txt.= ($txt ? ' - ' : '').(HTML2PDF::textGET('pdf04'));
+			
+			if (strlen($txt)>0)
+			{
+				$txt = str_replace('[[date_d]]',	date('d'),			$txt);
+				$txt = str_replace('[[date_m]]',	date('m'),			$txt);
+				$txt = str_replace('[[date_y]]',	date('Y'),			$txt);
+				$txt = str_replace('[[date_h]]',	date('H'),			$txt);
+				$txt = str_replace('[[date_i]]',	date('i'),			$txt);
+				$txt = str_replace('[[date_s]]',	date('s'),			$txt);
+				$txt = str_replace('[[current]]',	$this->PageNo(),	$txt);
+				$txt = str_replace('[[nb]]',		'{nb}',				$txt);
+				
+				parent::SetY(-11);
+			 	$this->setOverline(false);
+			 	$this->setLinethrough(false);
+        		$this->SetFont('helvetica', 'I', 8);
+				$this->Cell(0, 10, $txt, 0, 0, 'R');
+			}
+		}
+				
+		// Draw a polygon
+		// Auteur	: Andrew Meier
+		// Licence	: Freeware
+		function Polygon($points, $style='D')
+		{
+			if($style=='F')							$op='f';
+			elseif($style=='FD' or $style=='DF')	$op='b';
+			else									$op='s';
+		
+			$h = $this->h;
+			$k = $this->k;
+		
+			$points_string = '';
+			for($i=0; $i<count($points); $i+=2)
+			{
+				$points_string .= sprintf('%.2F %.2F', $points[$i]*$k, ($h-$points[$i+1])*$k);
+				if($i==0)	$points_string .= ' m ';
+				else		$points_string .= ' l ';
+			}
+			$this->_out($points_string . $op);
+		}
+		
+		function setOverline($value = true)
+		{
+			$this->overline = $value;
+		}
+
+		function setLinethrough($value = true)
+		{
+			$this->linethrough = $value;
+		}
+		
+		// redéfinition de la methode Text de FPDF afin de rajouter la gestion des overline et linethrough
+		function Text($x, $y, $txt)
+		{
+			//Output a string
+			$s=sprintf('BT %.2F %.2F Td (%s) Tj ET',$x*$this->k,($this->h-$y)*$this->k,$this->_escape($txt));
+
+			/* MODIFICATION HTML2PDF pour le support de underline, overline, linethrough */
+			if ($txt!='')
+			{
+				if($this->underline)	$s.=' '.$this->_dounderline($x,$y,$txt);
+				if($this->overline)		$s.=' '.$this->_dooverline($x,$y,$txt);
+				if($this->linethrough)	$s.=' '.$this->_dolinethrough($x,$y,$txt);
+			}
+			/* FIN MODIFICATION */
+
+			if($this->ColorFlag)
+				$s='q '.$this->TextColor.' '.$s.' Q';
+			$this->_out($s);
+		}
+
+		// redéfinition de la methode Cell de FPDF afin de rajouter la gestion des overline et linethrough
+		function Cell($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false, $link='')
+		{
+			//Output a cell
+			$k=$this->k;
+			if($this->y+$h>$this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())
+			{
+				//Automatic page break
+				$x=$this->x;
+				$ws=$this->ws;
+				if($ws>0) $this->setWordSpacing(0);
+				$this->AddPage($this->CurOrientation,$this->CurPageFormat);
+				$this->x=$x;
+				if($ws>0) $this->setWordSpacing($ws);
+			}
+			if($w==0)
+				$w=$this->w-$this->rMargin-$this->x;
+			$s='';
+			if($fill || $border==1)
+			{
+				if($fill)
+					$op=($border==1) ? 'B' : 'f';
+				else
+					$op='S';
+				$s=sprintf('%.2F %.2F %.2F %.2F re %s ',$this->x*$k,($this->h-$this->y)*$k,$w*$k,-$h*$k,$op);
+			}
+			if(is_string($border))
+			{
+				$x=$this->x;
+				$y=$this->y;
+				if(strpos($border,'L')!==false)
+					$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,$x*$k,($this->h-($y+$h))*$k);
+				if(strpos($border,'T')!==false)
+					$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-$y)*$k);
+				if(strpos($border,'R')!==false)
+					$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',($x+$w)*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
+				if(strpos($border,'B')!==false)
+					$s.=sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-($y+$h))*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
+			}
+			
+			if($txt!=='')
+			{
+				if($align=='R')
+					$dx=$w-$this->cMargin-$this->GetStringWidth($txt);
+				elseif($align=='C')
+					$dx=($w-$this->GetStringWidth($txt))/2;
+				else
+					$dx=$this->cMargin;
+				if($this->ColorFlag)
+					$s.='q '.$this->TextColor.' ';
+				$txt2=str_replace(')','\\)',str_replace('(','\\(',str_replace('\\','\\\\',$txt)));
+				$s.=sprintf('BT %.2F %.2F Td (%s) Tj ET',($this->x+$dx)*$k,($this->h-($this->y+.5*$h+.3*$this->FontSize))*$k,$txt2);
+				
+				/* MODIFICATION HTML2PDF pour le support de underline, overline, linethrough */
+				if($this->underline)	$s.=' '.$this->_dounderline($this->x+$dx,$this->y+.5*$h+.3*$this->FontSize,$txt);
+				if($this->overline)		$s.=' '.$this->_dooverline($this->x+$dx,$this->y+.5*$h+.3*$this->FontSize,$txt);
+				if($this->linethrough)	$s.=' '.$this->_dolinethrough($this->x+$dx,$this->y+.5*$h+.3*$this->FontSize,$txt);
+				/* FIN MODIFICATION */
+				
+				if($this->ColorFlag)
+					$s.=' Q';
+				if($link)
+					$this->Link($this->x+$dx,$this->y+.5*$h-.5*$this->FontSize,$this->GetStringWidth($txt),$this->FontSize,$link);
+			}
+			
+			if($s)
+				$this->_out($s);
+			$this->lasth=$h;
+			if($ln>0)
+			{
+				//Go to next line
+				$this->y+=$h;
+				if($ln==1)
+					$this->x=$this->lMargin;
+			}
+			else
+				$this->x+=$w;
+		}
+
+		function _dounderline($x, $y, $txt)
+		{
+			//Underline text
+			$up=$this->CurrentFont['up'];
+			$ut=$this->CurrentFont['ut'];
+
+			$p_x = $x*$this->k;
+			$p_y = ($this->h-($y-$up/1000*$this->FontSize))*$this->k;
+			$p_w = ($this->GetStringWidth($txt)+$this->ws*substr_count($txt,' '))*$this->k;
+			$p_h = -$ut/1000*$this->FontSizePt;
+
+			return sprintf('%.2F %.2F %.2F %.2F re f',$p_x,$p_y,$p_w,$p_h);
+		}
+		
+		function _dooverline($x, $y, $txt)
+		{
+			//Overline text
+			$up=$this->CurrentFont['up'];
+			$ut=$this->CurrentFont['ut'];
+
+			$p_x = $x*$this->k;
+			$p_y = ($this->h-($y-(1000+1.5*$up)/1000*$this->FontSize))*$this->k;
+			$p_w = ($this->GetStringWidth($txt)+$this->ws*substr_count($txt,' '))*$this->k;
+			$p_h = -$ut/1000*$this->FontSizePt;
+			
+			return sprintf('%.2F %.2F %.2F %.2F re f',$p_x,$p_y,$p_w,$p_h);
+		}
+		
+		function _dolinethrough($x, $y, $txt)
+		{
+			//Linethrough text
+			$up=$this->CurrentFont['up'];
+			$ut=$this->CurrentFont['ut'];
+
+			$p_x = $x*$this->k;
+			$p_y = ($this->h-($y-(1000+2.5*$up)/2000*$this->FontSize))*$this->k;
+			$p_w = ($this->GetStringWidth($txt)+$this->ws*substr_count($txt,' '))*$this->k;
+			$p_h = -$ut/1000*$this->FontSizePt;
+			
+			return sprintf('%.2F %.2F %.2F %.2F re f',$p_x,$p_y,$p_w,$p_h);
+		}
+		
+		function cloneFontFrom(&$pdf)
+		{
+			$this->fonts			= &$pdf->getFonts();
+			$this->FontFiles		= &$pdf->getFontFiles();
+			$this->diffs			= &$pdf->getDiffs();
+		}
+		
+		function &getFonts() 		{ return $this->fonts; }
+		function &getFontFiles()		{ return $this->FontFiles; }
+		function &getDiffs() 		{ return $this->diffs; }
+		
+		function isLoadedFont($fontkey)
+		{
+			if (isset($this->fonts[$fontkey]))
+				return true;
+				
+			if (isset($this->CoreFonts[$fontkey]))
+				return true;
+				
+			return false;
+		}
+		
+		function setWordSpacing($ws=0.)
+		{
+			$this->ws = $ws;
+			$this->_out(sprintf('%.3F Tw',$ws*$this->k));
+		}
+		
+		function clippingPathOpen($x = null, $y = null, $w = null, $h = null, $coin_TL=null, $coin_TR=null, $coin_BL=null, $coin_BR=null)
+		{
+			$path = '';
+			if ($x!==null && $y!==null && $w!==null && $h!==null)
+			{
+				$x1 = $x*$this->k;
+				$y1 = ($this->h-$y)*$this->k;
+
+				$x2 = ($x+$w)*$this->k;
+				$y2 = ($this->h-$y)*$this->k;
+
+				$x3 = ($x+$w)*$this->k;
+				$y3 = ($this->h-$y-$h)*$this->k;
+
+				$x4 = $x*$this->k;
+				$y4 = ($this->h-$y-$h)*$this->k;
+				
+				if ($coin_TL || $coin_TR || $coin_BL || $coin_BR)
+				{
+					if ($coin_TL) { $coin_TL[0] = $coin_TL[0]*$this->k; $coin_TL[1] =-$coin_TL[1]*$this->k; }
+					if ($coin_TR) { $coin_TR[0] = $coin_TR[0]*$this->k; $coin_TR[1] =-$coin_TR[1]*$this->k; }
+					if ($coin_BL) { $coin_BL[0] = $coin_BL[0]*$this->k; $coin_BL[1] =-$coin_BL[1]*$this->k; }
+					if ($coin_BR) { $coin_BR[0] = $coin_BR[0]*$this->k; $coin_BR[1] =-$coin_BR[1]*$this->k; }
+
+					$MyArc = 4/3 * (sqrt(2) - 1);
+					
+					if ($coin_TL)
+						$path.= sprintf('%.2F %.2F m ', $x1+$coin_TL[0], $y1);
+					else
+						$path.= sprintf('%.2F %.2F m ', $x1, $y1);
+					
+					if ($coin_TR)
+					{
+						$xt1 = ($x2-$coin_TR[0])+$coin_TR[0]*$MyArc;
+						$yt1 = ($y2+$coin_TR[1])-$coin_TR[1];
+						$xt2 = ($x2-$coin_TR[0])+$coin_TR[0];
+						$yt2 = ($y2+$coin_TR[1])-$coin_TR[1]*$MyArc;
+
+						$path.= sprintf('%.2F %.2F l ', $x2-$coin_TR[0], $y2);						
+						$path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x2, $y2+$coin_TR[1]);
+					}
+					else
+						$path.= sprintf('%.2F %.2F l ', $x2, $y2);
+
+					if ($coin_BR)
+					{
+						$xt1 = ($x3-$coin_BR[0])+$coin_BR[0];
+						$yt1 = ($y3-$coin_BR[1])+$coin_BR[1]*$MyArc;
+						$xt2 = ($x3-$coin_BR[0])+$coin_BR[0]*$MyArc;
+						$yt2 = ($y3-$coin_BR[1])+$coin_BR[1];
+
+						$path.= sprintf('%.2F %.2F l ', $x3, $y3-$coin_BR[1]);						
+						$path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x3-$coin_BR[0], $y3);
+					}
+					else
+						$path.= sprintf('%.2F %.2F l ', $x3, $y3);
+
+					if ($coin_BL)
+					{
+						$xt1 = ($x4+$coin_BL[0])-$coin_BL[0]*$MyArc;
+						$yt1 = ($y4-$coin_BL[1])+$coin_BL[1];
+						$xt2 = ($x4+$coin_BL[0])-$coin_BL[0];
+						$yt2 = ($y4-$coin_BL[1])+$coin_BL[1]*$MyArc;
+
+						$path.= sprintf('%.2F %.2F l ', $x4+$coin_BL[0], $y4);						
+						$path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x4, $y4-$coin_BL[1]);
+					}
+					else
+						$path.= sprintf('%.2F %.2F l ', $x4, $y4);
+				
+					if ($coin_TL)
+					{
+						$xt1 = ($x1+$coin_TL[0])-$coin_TL[0];
+						$yt1 = ($y1+$coin_TL[1])-$coin_TL[1]*$MyArc;
+						$xt2 = ($x1+$coin_TL[0])-$coin_TL[0]*$MyArc;
+						$yt2 = ($y1+$coin_TL[1])-$coin_TL[1];
+
+						$path.= sprintf('%.2F %.2F l ', $x1, $y1+$coin_TL[1]);						
+						$path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x1+$coin_TL[0], $y1);
+					}
+				}
+				else
+				{
+					$path.= sprintf('%.2F %.2F m ', $x1, $y1);
+					$path.= sprintf('%.2F %.2F l ', $x2, $y2);
+					$path.= sprintf('%.2F %.2F l ', $x3, $y3);
+					$path.= sprintf('%.2F %.2F l ', $x4, $y4);
+				}
+
+				$path.= ' h W n';
+			}
+			$this->_out('q '.$path.' ');			
+		}
+		
+		function clippingPathClose()
+		{
+			$this->_out(' Q');
+		}
+		
+		function drawCourbe($ext1_x, $ext1_y, $ext2_x, $ext2_y, $int1_x, $int1_y, $int2_x, $int2_y, $cen_x, $cen_y)
+		{
+			$MyArc = 4/3 * (sqrt(2) - 1);
+			
+			$ext1_x = $ext1_x*$this->k; $ext1_y = ($this->h-$ext1_y)*$this->k;
+			$ext2_x = $ext2_x*$this->k; $ext2_y = ($this->h-$ext2_y)*$this->k;
+			$int1_x = $int1_x*$this->k; $int1_y = ($this->h-$int1_y)*$this->k;
+			$int2_x = $int2_x*$this->k; $int2_y = ($this->h-$int2_y)*$this->k;
+			$cen_x	= $cen_x*$this->k;	$cen_y	= ($this->h-$cen_y) *$this->k;
+			
+			$path = '';
+			
+			if ($ext1_x-$cen_x!=0)
+			{
+				$xt1 = $cen_x+($ext1_x-$cen_x);
+				$yt1 = $cen_y+($ext2_y-$cen_y)*$MyArc;
+				$xt2 = $cen_x+($ext1_x-$cen_x)*$MyArc;
+				$yt2 = $cen_y+($ext2_y-$cen_y);
+			}
+			else
+			{
+				$xt1 = $cen_x+($ext2_x-$cen_x)*$MyArc;
+				$yt1 = $cen_y+($ext1_y-$cen_y);
+				$xt2 = $cen_x+($ext2_x-$cen_x);
+				$yt2 = $cen_y+($ext1_y-$cen_y)*$MyArc;
+
+			}
+
+			$path.= sprintf('%.2F %.2F m ', $ext1_x, $ext1_y);
+			$path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $ext2_x, $ext2_y);
+
+			if ($int1_x-$cen_x!=0)
+			{
+				$xt1 = $cen_x+($int1_x-$cen_x)*$MyArc;
+				$yt1 = $cen_y+($int2_y-$cen_y);
+				$xt2 = $cen_x+($int1_x-$cen_x);
+				$yt2 = $cen_y+($int2_y-$cen_y)*$MyArc;
+			}
+			else
+			{
+				$xt1 = $cen_x+($int2_x-$cen_x);
+				$yt1 = $cen_y+($int1_y-$cen_y)*$MyArc;
+				$xt2 = $cen_x+($int2_x-$cen_x)*$MyArc;
+				$yt2 = $cen_y+($int1_y-$cen_y);
+
+			}
+			
+			$path.= sprintf('%.2F %.2F l ', $int2_x, $int2_y);
+			$path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $int1_x, $int1_y);
+
+			$this->_out($path . 'f');
+		}
+		
+		function drawCoin($ext1_x, $ext1_y, $ext2_x, $ext2_y, $int_x, $int_y, $cen_x, $cen_y)
+		{
+			$MyArc = 4/3 * (sqrt(2) - 1);
+			
+			$ext1_x = $ext1_x*$this->k; $ext1_y = ($this->h-$ext1_y)*$this->k;
+			$ext2_x = $ext2_x*$this->k; $ext2_y = ($this->h-$ext2_y)*$this->k;
+			$int_x  = $int_x*$this->k;  $int_y  = ($this->h-$int_y)*$this->k;
+			$cen_x	= $cen_x*$this->k;	$cen_y	= ($this->h-$cen_y) *$this->k;
+			
+			$path = '';
+			
+			if ($ext1_x-$cen_x!=0)
+			{
+				$xt1 = $cen_x+($ext1_x-$cen_x);
+				$yt1 = $cen_y+($ext2_y-$cen_y)*$MyArc;
+				$xt2 = $cen_x+($ext1_x-$cen_x)*$MyArc;
+				$yt2 = $cen_y+($ext2_y-$cen_y);
+			}
+			else
+			{
+				$xt1 = $cen_x+($ext2_x-$cen_x)*$MyArc;
+				$yt1 = $cen_y+($ext1_y-$cen_y);
+				$xt2 = $cen_x+($ext2_x-$cen_x);
+				$yt2 = $cen_y+($ext1_y-$cen_y)*$MyArc;
+
+			}
+
+			$path.= sprintf('%.2F %.2F m ', $ext1_x, $ext1_y);
+			$path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $ext2_x, $ext2_y);
+			$path.= sprintf('%.2F %.2F l ', $int_x, $int_y);
+			$path.= sprintf('%.2F %.2F l ', $ext1_x, $ext1_y);
+			
+			$this->_out($path . 'f');
+		}
+				
+		function startTransform()
+		{
+			$this->_out('q');
+		}
+		
+		function stopTransform()
+		{
+			$this->_out('Q');
+		}
+
+		function setTranslate($t_x, $t_y)
+		{
+			// matrice de transformation
+			$tm[0]=1;
+			$tm[1]=0;
+			$tm[2]=0;
+			$tm[3]=1;
+			$tm[4]=$t_x*$this->k;
+			$tm[5]=-$t_y*$this->k;
+			
+			$this->_out(sprintf('%.3F %.3F %.3F %.3F %.3F %.3F cm', $tm[0],$tm[1],$tm[2],$tm[3],$tm[4],$tm[5]));
+		}
+		
+		function setRotation($angle, $x='', $y='')
+		{
+			if($x === '') $x=$this->x;
+			if($y === '') $y=$this->y;
+			
+			$y=($this->h-$y)*$this->k;
+			$x*=$this->k;
+			
+			// matrice de transformation
+			$tm[0]=cos(deg2rad($angle));
+			$tm[1]=sin(deg2rad($angle));
+			$tm[2]=-$tm[1];
+			$tm[3]=$tm[0];
+			$tm[4]=$x+$tm[1]*$y-$tm[0]*$x;
+			$tm[5]=$y-$tm[0]*$y-$tm[1]*$x;
+			
+			$this->_out(sprintf('%.3F %.3F %.3F %.3F %.3F %.3F cm', $tm[0],$tm[1],$tm[2],$tm[3],$tm[4],$tm[5]));
+		}
+		
+		function SetX($x)
+		{
+			$this->x=$x;
+		}
+		
+		function SetY($y, $resetx=true)
+		{
+			if ($resetx)
+				$this->x=$this->lMargin;
+				
+			$this->y=$y;
+		}
+		
+		function SetXY($x, $y)
+		{
+			$this->x=$x;
+			$this->y=$y;
+		}
+
+		function getK() { return $this->k; }
+		function getW() { return $this->w; }
+		function getH() { return $this->h; }
+		function getPage() { return $this->page; }
+		function getlMargin() { return $this->lMargin; }
+		function getrMargin() { return $this->rMargin; }
+		function gettMargin() { return $this->tMargin; }
+		function getbMargin() { return $this->bMargin; }
+		function setbMargin($v) { $this->bMargin=$v; }
+		function setcMargin($v) { $this->cMargin=$v; }
+		function setPage($v) { $this->page=$v; }
+		
+		function svgSetStyle($styles)
+		{
+			$style = '';
+			
+			if ($styles['fill'])
+			{
+				$this->setMyFillColor($styles['fill']);
+				$style.= 'F';
+			}
+			if ($styles['stroke'] && $styles['stroke-width'])
+			{
+				$this->SetMyDrawColor($styles['stroke']);
+				$this->SetLineWidth($styles['stroke-width']);
+				$style.= 'D';
+			}
+			if ($styles['fill-opacity'])
+			{
+//				$this->SetAlpha($styles['fill-opacity']);
+			}
+			
+			return $style;
+		}
+		
+		function svgRect($x, $y, $w, $h, $style)
+		{
+			$xa=$x; $xb=$x+$w; $xc=$x+$w; $xd=$x;
+			$ya=$y; $yb=$y; $yc=$y+$h; $yd=$y+$h;
+			
+			if($style=='F') $op='f';
+			elseif($style=='FD' || $style=='DF') $op='B';
+			else $op='S';
+			$this->_Point($xa, $ya, true);
+			$this->_Line($xb, $yb, true);
+			$this->_Line($xc, $yc, true);
+			$this->_Line($xd, $yd, true);
+			$this->_Line($xa, $ya, true);
+			$this->_out($op);
+		}
+
+		function svgLine($x1, $y1, $x2, $y2)
+		{
+			$op='S';
+			$this->_Point($x1, $y1, true);
+			$this->_Line($x2, $y2, true);
+			$this->_out($op);
+		}
+		
+		function svgEllipse($x0, $y0, $rx, $ry, $style)
+		{
+			if($style=='F') $op='f';
+			elseif($style=='FD' || $style=='DF') $op='B';
+			else $op='S';
+			
+			$this->_Arc($x0, $y0, $rx, $ry, 0, 2*M_PI, true, true, true);
+			$this->_out($op);
+		}
+
+		function svgPolygone($actions, $style)
+		{
+			if($style=='F') $op='f';
+			elseif($style=='FD' || $style=='DF') $op='B';
+			else $op='S';
+
+			$first = array('', 0, 0);
+			$last = array(0, 0, 0, 0);
+			
+			foreach($actions as $action)
+			{
+				switch($action[0])
+				{
+					case 'M':
+					case 'm':
+						$first = $action;
+						$x = $action[1]; $y = $action[2]; $xc = $x; $yc = $y;
+						$this->_Point($x, $y, true);
+						break;
+							
+					case 'Z':
+					case 'z':
+						$x = $first[1]; $y = $first[2]; $xc = $x; $yc = $y;
+						$this->_Line($x, $y, true);
+					break;	
+
+					case 'L':
+						$x = $action[1]; $y = $action[2]; $xc = $x; $yc = $y;
+						$this->_Line($x, $y, true);
+						break;
+						
+					case 'l':
+						$x = $last[0]+$action[1]; $y = $last[1]+$action[2]; $xc = $x; $yc = $y;
+						$this->_Line($x, $y, true);
+						break;
+						
+					case 'H':
+						$x = $action[1]; $y = $last[1]; $xc = $x; $yc = $y;
+						$this->_Line($x, $y, true);
+						break;	
+							
+					case 'h':
+						$x = $last[0]+$action[1]; $y = $last[1]; $xc = $x; $yc = $y;
+						$this->_Line($x, $y, true);
+						break;	
+							
+					case 'V':
+						$x = $last[0]; $y = $action[1]; $xc = $x; $yc = $y;
+						$this->_Line($x, $y, true);
+						break;	
+
+					case 'v':
+						$x = $last[0]; $y = $last[1]+$action[1]; $xc = $x; $yc = $y;
+						$this->_Line($x, $y, true);
+						break;	
+
+					case 'A':
+						$rx = $action[1];	// rx
+						$ry = $action[2];	// ry
+						$a = $action[3];	// angle de deviation de l'axe X
+						$l = $action[4];	// large-arc-flag 
+						$s = $action[5];	// sweep-flag
+						$x1 = $last[0];		// begin x
+						$y1 = $last[1];		// begin y
+						$x2 = $action[6];	// final x
+						$y2 = $action[7];	// final y
+						
+						$this->_Arc2($x1, $y1, $x2, $y2, $rx, $ry, $a, $l, $s, true);
+						
+						$x = $x2; $y = $y2; $xc = $x; $yc = $y;
+						break;
+
+					case 'a':
+						$rx = $action[1];	// rx
+						$ry = $action[2];	// ry
+						$a = $action[3];	// angle de deviation de l'axe X
+						$l = $action[4];	// large-arc-flag 
+						$s = $action[5];	// sweep-flag
+						$x1 = $last[0];		// begin x
+						$y1 = $last[1];		// begin y
+						$x2 = $last[0]+$action[6];	// final x
+						$y2 = $last[1]+$action[7];	// final y
+						
+						$this->_Arc2($x1, $y1, $x2, $y2, $rx, $ry, $a, $l, $s, true);
+						
+						$x = $x2; $y = $y2; $xc = $x; $yc = $y;
+						break;
+
+					case 'C':
+						$x1 = $action[1];
+						$y1 = $action[2];
+						$x2 = $action[3];
+						$y2 = $action[4];
+						$xf = $action[5];
+						$yf = $action[6];
+						$this->_Curve($x1, $y1, $x2, $y2,$xf, $yf, true);
+						$x = $xf; $y = $yf; $xc = $x2; $yc = $y2;
+						break;
+
+					case 'c':
+						$x1 = $last[0]+$action[1];
+						$y1 = $last[1]+$action[2];
+						$x2 = $last[0]+$action[3];
+						$y2 = $last[1]+$action[4];
+						$xf = $last[0]+$action[5];
+						$yf = $last[1]+$action[6];
+						$this->_Curve($x1, $y1, $x2, $y2,$xf, $yf, true);
+						$x = $xf; $y = $yf; $xc = $x2; $yc = $y2;
+						break;
+
+					default:
+						echo 'MyPDF Path : <b>'.$action[0].'</b> non reconnu...';
+						exit;
+				}
+				$last = array($x, $y, $xc, $yc);
+			}
+			$this->_out($op);
+		}
+
+		function _Point($x, $y, $trans = false)
+		{
+			if ($trans) $this->ptTransform($x, $y);
+			
+			$this->_out(sprintf('%.2F %.2F m', $x, $y));
+		}
+		
+		function _Line($x, $y, $trans = false)
+		{
+			if ($trans) $this->ptTransform($x, $y);
+
+			$this->_out(sprintf('%.2F %.2F l', $x, $y));
+		}
+		
+		function _Curve($x1, $y1, $x2, $y2, $x3, $y3, $trans = false)
+		{
+			if ($trans)
+			{
+				$this->ptTransform($x1, $y1);
+				$this->ptTransform($x2, $y2);
+				$this->ptTransform($x3, $y3);
+			}
+			$this->_out(sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c', $x1, $y1, $x2, $y2, $x3, $y3));
+		}
+		
+		function _Arc($xc, $yc, $rx, $ry, $a_debut, $a_fin, $sens = true, $draw_first = true, $trans=false)
+		{
+			$nSeg = 8;
+		
+			if (!$sens) $a_debut+= M_PI*2.;
+			 
+			$totalAngle = $a_fin - $a_debut;
+			$dt = $totalAngle/$nSeg;
+			$dtm = $dt/3;
+		
+			$x0 = $xc; $y0 = $yc;
+		
+			$t1 = $a_debut;
+			$a0 = $x0 + ($rx * cos($t1));
+			$b0 = $y0 + ($ry * sin($t1));
+			$c0 = -$rx * sin($t1);
+			$d0 = $ry * cos($t1);
+			if ($draw_first) $this->_Point($a0, $b0, $trans);
+			for ($i = 1; $i <= $nSeg; $i++)
+			{
+				// Draw this bit of the total curve
+				$t1 = ($i * $dt)+$a_debut;
+				$a1 = $x0 + ($rx * cos($t1));
+				$b1 = $y0 + ($ry * sin($t1));
+				$c1 = -$rx * sin($t1);
+				$d1 = $ry * cos($t1);
+				$this->_Curve(
+						$a0 + ($c0 * $dtm), $b0 + ($d0 * $dtm),
+						$a1 - ($c1 * $dtm), $b1 - ($d1 * $dtm),
+						$a1, $b1,
+						$trans
+					);
+				$a0 = $a1;
+				$b0 = $b1;
+				$c0 = $c1;
+				$d0 = $d1;
+			}
+		}
+		
+		function _Arc2($x1, $y1, $x2, $y2, $rx, $ry, $a=0, $l=0, $s=0, $trans = false)
+		{
+			$v = array();
+			$v['x1'] = $x1;
+			$v['y1'] = $y1;
+			$v['x2'] = $x2;
+			$v['y2'] = $y2;
+			$v['rx'] = $rx;
+			$v['ry'] = $ry;
+			$v['xr1'] = $v['x1']*cos($a) - $v['y1']*sin($a); 
+			$v['yr1'] = $v['x1']*sin($a) + $v['y1']*cos($a); 
+			$v['xr2'] = $v['x2']*cos($a) - $v['y2']*sin($a); 
+			$v['yr2'] = $v['x2']*sin($a) + $v['y2']*cos($a); 
+			$v['Xr1'] = $v['xr1']/$v['rx']; 
+			$v['Yr1'] = $v['yr1']/$v['ry']; 
+			$v['Xr2'] = $v['xr2']/$v['rx']; 
+			$v['Yr2'] = $v['yr2']/$v['ry']; 
+			$v['dXr'] = $v['Xr2'] - $v['Xr1'];
+			$v['dYr'] = $v['Yr2'] - $v['Yr1'];
+			$v['D'] = $v['dXr']*$v['dXr'] + $v['dYr']*$v['dYr']; 
+			
+			if ($v['D']==0 || $v['D']>4)
+			{
+				$this->_Line($x2, $y2, $trans);
+				return false;
+			}
+			
+			$v['s1'] = array();
+			$v['s2'] = array();
+			$v['s1']['t'] = sqrt((4.-$v['D'])/$v['D']);
+			$v['s1']['Xr'] = ($v['Xr1']+$v['Xr2'])/2. + $v['s1']['t']*($v['Yr2']-$v['Yr1'])/2.;
+			$v['s1']['Yr'] = ($v['Yr1']+$v['Yr2'])/2. + $v['s1']['t']*($v['Xr1']-$v['Xr2'])/2.;
+			$v['s1']['xr'] = $v['s1']['Xr']*$v['rx'];
+			$v['s1']['yr'] = $v['s1']['Yr']*$v['ry'];
+			$v['s1']['x'] = $v['s1']['xr']*cos($a)+$v['s1']['yr']*sin($a); 
+			$v['s1']['y'] =-$v['s1']['xr']*sin($a)+$v['s1']['yr']*cos($a); 
+			$v['s1']['a1'] = atan2($v['y1']-$v['s1']['y'], $v['x1']-$v['s1']['x']); 
+			$v['s1']['a2'] = atan2($v['y2']-$v['s1']['y'], $v['x2']-$v['s1']['x']); 
+			if ($v['s1']['a1']>$v['s1']['a2']) $v['s1']['a1']-=2*M_PI;
+			
+			$v['s2']['t'] = -$v['s1']['t'];
+			$v['s2']['Xr'] = ($v['Xr1']+$v['Xr2'])/2. + $v['s2']['t']*($v['Yr2']-$v['Yr1'])/2.;
+			$v['s2']['Yr'] = ($v['Yr1']+$v['Yr2'])/2. + $v['s2']['t']*($v['Xr1']-$v['Xr2'])/2.;
+			$v['s2']['xr'] = $v['s2']['Xr']*$v['rx']; 
+			$v['s2']['yr'] = $v['s2']['Yr']*$v['ry']; 
+			$v['s2']['x'] = $v['s2']['xr']*cos($a)+$v['s2']['yr']*sin($a); 
+			$v['s2']['y'] =-$v['s2']['xr']*sin($a)+$v['s2']['yr']*cos($a); 
+			$v['s2']['a1'] = atan2($v['y1']-$v['s2']['y'], $v['x1']-$v['s2']['x']); 
+			$v['s2']['a2'] = atan2($v['y2']-$v['s2']['y'], $v['x2']-$v['s2']['x']); 
+			if ($v['s2']['a1']>$v['s2']['a2']) $v['s2']['a1']-=2*M_PI;
+			
+			if (!$l)
+			{
+				if ($s)
+				{
+					$xc = $v['s2']['x'];
+					$yc = $v['s2']['y'];
+					$a1 = $v['s2']['a1'];
+					$a2 = $v['s2']['a2'];
+					$this->_Arc($xc, $yc, $rx, $ry, $a1, $a2, true, false, $trans);
+					
+				}
+				else
+				{
+					$xc = $v['s1']['x'];
+					$yc = $v['s1']['y'];
+					$a1 = $v['s1']['a1'];
+					$a2 = $v['s1']['a2'];
+					$this->_Arc($xc, $yc, $rx, $ry, $a1, $a2, false, false, $trans);
+				}
+			}
+			else
+			{
+				if ($s)
+				{
+					$xc = $v['s1']['x'];
+					$yc = $v['s1']['y'];
+					$a1 = $v['s1']['a1'];
+					$a2 = $v['s1']['a2'];
+					$this->_Arc($xc, $yc, $rx, $ry, $a1, $a2, true, false, $trans);
+				}
+				else
+				{
+					$xc = $v['s2']['x'];
+					$yc = $v['s2']['y'];
+					$a1 = $v['s2']['a1'];
+					$a2 = $v['s2']['a2'];
+					$this->_Arc($xc, $yc, $rx, $ry, $a1, $a2, false, false, $trans);
+				}
+			}
+		}
+		
+		function ptTransform(&$x,  &$y, $trans=true)
+		{
+			$nb = count($this->transf);
+			if ($nb)	$m = $this->transf[$nb-1];
+			else		$m = array(1,0,0,1,0,0);
+			
+			list($x,$y) = array(($x*$m[0]+$y*$m[2]+$m[4]),($x*$m[1]+$y*$m[3]+$m[5]));
+			
+			if ($trans)
+			{
+				$x = $x*$this->k;
+				$y = ($this->h-$y)*$this->k;
+			}
+			
+			return true;
+		}
+	
+		function doTransform($n = null)
+		{
+			$nb = count($this->transf);
+			if ($nb)	$m = $this->transf[$nb-1];
+			else		$m = array(1,0,0,1,0,0);
+			
+			if (!$n) $n = array(1,0,0,1,0,0);
+
+			$n = array(
+					$m[0]*$n[0]+$m[2]*$n[1],
+					$m[1]*$n[0]+$m[3]*$n[1],
+					$m[0]*$n[2]+$m[2]*$n[3],
+					$m[1]*$n[2]+$m[3]*$n[3],
+					$m[0]*$n[4]+$m[2]*$n[5]+$m[4],  
+					$m[1]*$n[4]+$m[3]*$n[5]+$m[5]  
+				);	
+				
+//			echo 'do-'.count($this->transf).' => '.print_r($n, true).'<br>';
+			$this->transf[] = $n;
+		}
+		
+		function undoTransform()
+		{
+			array_pop($this->transf);
+//			echo 'un-'.count($this->transf).'<br>';
+		}
+		
+		function setMyDrawColor($c)
+		{
+			$c = $this->setMyColor($c, true);
+			if (!$c) return false;
+
+			$this->DrawColor=$c;
+			if($this->page>0) $this->_out($this->DrawColor);
+		}
+		
+		function setMyFillColor($c)
+		{
+			$c = $this->setMyColor($c);
+			if (!$c) return false;
+
+			$this->FillColor=$c;
+			$this->ColorFlag=($this->FillColor!=$this->TextColor);
+			if($this->page>0) $this->_out($this->FillColor);
+		}
+			
+		function setMyTextColor($c)
+		{
+			$c = $this->setMyColor($c);
+			if (!$c) return false;
+
+			$this->TextColor=$c;
+			$this->ColorFlag=($this->FillColor!=$this->TextColor);
+		}
+		
+		function setMyColor($c, $mode = false)
+		{
+			if (!is_array($c))		return sprintf('%.3F ',$c).($mode ? 'G' : 'g');
+			elseif (count($c)==3)	return sprintf('%.3F %.3F %.3F ',$c[0],$c[1],$c[2]).($mode ? 'RG' : 'rg');
+			elseif (count($c)==4)	return sprintf('%.3F %.3F %.3F %.3F ',$c[0],$c[1],$c[2],$c[3]).($mode ? 'K' : 'k');
+			return null;
+		}
+	}
+}
diff --git a/library/html2pdf/_read_me.txt b/library/html2pdf/_read_me.txt
index 668002d36..9a6031f40 100644
--- a/library/html2pdf/_read_me.txt
+++ b/library/html2pdf/_read_me.txt
@@ -1,106 +1,106 @@
-*********************************************************
-** This program is distributed under the LGPL License, **
-** for more information see file _LGPL.txt or          **
-** http://www.gnu.org/licenses/lgpl.html               **
-**                                                     **
-**  Copyright 2000-2010 by Laurent Minguet             **
-*********************************************************
-*******************************
-* HTML2PDF v3.31 - 2010-05-21 *
-*******************************
-
-How to use :
-------------
- - You need at least PHP 4.3.10
- 
- - Look at the examples provided to see how it works.
-
- - forms work only with ADOBE READER 8 and 9.0
- 
- - It is very important to provide valid HTML 4.01 to the converter,
-   but only what is in the <body>
-
- - for borders: it is advised that they are like "solid 1mm #000000"
-
- - for padding, they are applicable only on tags table, th, td, div, li
-
- - You can chose the encoding. A specific font must be used. The encodings available are: 
-    cp1250, cp1251, cp1252, cp1253, cp1254, cp1255, cp1257, cp1258, cp874,
-    ISO-8859-1, ISO-8859-2, ISO-8859-4, ISO-8859-5, ISO-8859-7, ISO-8859-9,
-    ISO-8859-11, ISO-8859-15, ISO-8859-16, KOI8-R, KOI8-U
-  To use it: $html2pdf->setEncoding('cp1250');
-  
- - A default font can be specified, if the requested font does not exist or if no font is specified:
-     $html2pdf->setDefaultFont('Arial');
-
- - The possibility to protect your PDF is present, CF Example 7.
-       
- - Some tests can be enabled (true) or disabled (false) :
-     * setTestIsImage method:      test that images must exist
-     * setTestTdInOnePage method:  test that the contents of TDs fit on one page
-     * setTestIsDeprecated method: test that old properties of specific tags are not used anymore
-
-  - A DEBUG mode to know the resources used is present
-   It is activated by adding the following command just after the contructor (see Example 0):
-      $htmlpdf->setModeDebug();
-      
- - Some specific tags have been introduced:
-     * <page></page>  (CF Exemple 7) :
-       determines the orientation, margins left, right, top and bottom, the background image
-       and the background color of a page, its size and position, the footer.
-       It is also possible to keep the header and footer of the previous pages,
-       through the attribut pageset="old" (see Example 3)
- 
-     * <page_header></page_header> (CF Example 3)
-     
-     * <page_footer></page_footer> (CF Example 3)
-     
-     * <nobreak></nobreak> :
-         used to force the display of a section on the same page.
-         If this section does not fit into the rest of the page, a page break is done before.
- 
-     * <barcode></barcode>  (CF Examples 0 et 9) :
-         can insert barcodes in pdfs, CF Examples 0 and 9
-         The possible types od codebar are: EAN13, UPCA, C39.
-
-     * <qrcode></qrcode> (CF Exemple 13) :
-         permet d'inserer un codebar à 2 dimensions de type QRcode
-         voici un exemple d'utilisation :
-           <qrcode value="votre message ici" size="1mm" ec="M" style="color: black; background-color: white"></qrcode>
-         seul le parametre "value" est obligatoire
-         les différentes valeurs de type de correction sont L, M, Q, H
-         (QR Code is registered trademark of DENSO WAVE INCORPORATED | http://www.denso-wave.com/qrcode/)
-         ATTENTION : l'utilisation des QRCODE nécessite l'utilisation de PHP5
-
-     * <bookmark></bookmark>  (CF Examples 7 et About) :
-         can insert bookmark in pdfs, CF Example 7 and About.
-         It is also possible to automatically create an index at the end of
-         documentv  CF Example About.
-          
-     * css property "rotate" :
-         values : 0, 90, 180, 270
-         works only on div (cf example 8)
-                 
-change log :
------------
- see on this page : http://html2pdf.fr/en/download
-
-Help & Support :
----------------
- For questions and bug reports, thank you to use only the support link below.
- I will answer to your questions only on it... 
-
-Informations :
--------------
- Programmer : Spipu
-      email    : webmaster@html2pdf.fr
-      web site : http://html2pdf.fr/
-      wiki     : http://html2pdf.fr/en/wiki
-      support  : http://html2pdf.fr/en/forum
-
-Thanks :
--------
- * Olivier Plathey: for have made FPDF
- * Nicola Asuni: for the changes he has agreed to make to TCPDF
- * yAronet: for hosting support forum
- * everyone who helped me to develop this library and to bring the texts
+*********************************************************
+** This program is distributed under the LGPL License, **
+** for more information see file _LGPL.txt or          **
+** http://www.gnu.org/licenses/lgpl.html               **
+**                                                     **
+**  Copyright 2000-2010 by Laurent Minguet             **
+*********************************************************
+*******************************
+* HTML2PDF v3.31 - 2010-05-21 *
+*******************************
+
+How to use :
+------------
+ - You need at least PHP 4.3.10
+ 
+ - Look at the examples provided to see how it works.
+
+ - forms work only with ADOBE READER 8 and 9.0
+ 
+ - It is very important to provide valid HTML 4.01 to the converter,
+   but only what is in the <body>
+
+ - for borders: it is advised that they are like "solid 1mm #000000"
+
+ - for padding, they are applicable only on tags table, th, td, div, li
+
+ - You can chose the encoding. A specific font must be used. The encodings available are: 
+    cp1250, cp1251, cp1252, cp1253, cp1254, cp1255, cp1257, cp1258, cp874,
+    ISO-8859-1, ISO-8859-2, ISO-8859-4, ISO-8859-5, ISO-8859-7, ISO-8859-9,
+    ISO-8859-11, ISO-8859-15, ISO-8859-16, KOI8-R, KOI8-U
+  To use it: $html2pdf->setEncoding('cp1250');
+  
+ - A default font can be specified, if the requested font does not exist or if no font is specified:
+     $html2pdf->setDefaultFont('Arial');
+
+ - The possibility to protect your PDF is present, CF Example 7.
+       
+ - Some tests can be enabled (true) or disabled (false) :
+     * setTestIsImage method:      test that images must exist
+     * setTestTdInOnePage method:  test that the contents of TDs fit on one page
+     * setTestIsDeprecated method: test that old properties of specific tags are not used anymore
+
+  - A DEBUG mode to know the resources used is present
+   It is activated by adding the following command just after the contructor (see Example 0):
+      $htmlpdf->setModeDebug();
+      
+ - Some specific tags have been introduced:
+     * <page></page>  (CF Exemple 7) :
+       determines the orientation, margins left, right, top and bottom, the background image
+       and the background color of a page, its size and position, the footer.
+       It is also possible to keep the header and footer of the previous pages,
+       through the attribut pageset="old" (see Example 3)
+ 
+     * <page_header></page_header> (CF Example 3)
+     
+     * <page_footer></page_footer> (CF Example 3)
+     
+     * <nobreak></nobreak> :
+         used to force the display of a section on the same page.
+         If this section does not fit into the rest of the page, a page break is done before.
+ 
+     * <barcode></barcode>  (CF Examples 0 et 9) :
+         can insert barcodes in pdfs, CF Examples 0 and 9
+         The possible types od codebar are: EAN13, UPCA, C39.
+
+     * <qrcode></qrcode> (CF Exemple 13) :
+         permet d'inserer un codebar à 2 dimensions de type QRcode
+         voici un exemple d'utilisation :
+           <qrcode value="votre message ici" size="1mm" ec="M" style="color: black; background-color: white"></qrcode>
+         seul le parametre "value" est obligatoire
+         les différentes valeurs de type de correction sont L, M, Q, H
+         (QR Code is registered trademark of DENSO WAVE INCORPORATED | http://www.denso-wave.com/qrcode/)
+         ATTENTION : l'utilisation des QRCODE nécessite l'utilisation de PHP5
+
+     * <bookmark></bookmark>  (CF Examples 7 et About) :
+         can insert bookmark in pdfs, CF Example 7 and About.
+         It is also possible to automatically create an index at the end of
+         documentv  CF Example About.
+          
+     * css property "rotate" :
+         values : 0, 90, 180, 270
+         works only on div (cf example 8)
+                 
+change log :
+-----------
+ see on this page : http://html2pdf.fr/en/download
+
+Help & Support :
+---------------
+ For questions and bug reports, thank you to use only the support link below.
+ I will answer to your questions only on it... 
+
+Informations :
+-------------
+ Programmer : Spipu
+      email    : webmaster@html2pdf.fr
+      web site : http://html2pdf.fr/
+      wiki     : http://html2pdf.fr/en/wiki
+      support  : http://html2pdf.fr/en/forum
+
+Thanks :
+-------
+ * Olivier Plathey: for have made FPDF
+ * Nicola Asuni: for the changes he has agreed to make to TCPDF
+ * yAronet: for hosting support forum
+ * everyone who helped me to develop this library and to bring the texts
diff --git a/library/html2pdf/fpdi/filters/FilterASCII85_FPDI.php b/library/html2pdf/fpdi/filters/FilterASCII85_FPDI.php
index fb5600116..d672d584f 100644
--- a/library/html2pdf/fpdi/filters/FilterASCII85_FPDI.php
+++ b/library/html2pdf/fpdi/filters/FilterASCII85_FPDI.php
@@ -1,33 +1,33 @@
-<?php
-//
-//  FPDI - Version 1.4.2
-//
-//    Copyright 2004-2011 Setasign - Jan Slabon
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-require_once('FilterASCII85.php');
-
-class FilterASCII85_FPDI extends FilterASCII85 {
-
-    var $fpdi;
-    
-    function FilterASCII85_FPDI(&$fpdi) {
-        $this->fpdi =& $fpdi;
-    }
-
-    function error($msg) {
-        $this->fpdi->error($msg);
-    }
+<?php
+//
+//  FPDI - Version 1.4.2
+//
+//    Copyright 2004-2011 Setasign - Jan Slabon
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+require_once('FilterASCII85.php');
+
+class FilterASCII85_FPDI extends FilterASCII85 {
+
+    var $fpdi;
+    
+    function FilterASCII85_FPDI(&$fpdi) {
+        $this->fpdi =& $fpdi;
+    }
+
+    function error($msg) {
+        $this->fpdi->error($msg);
+    }
 }
\ No newline at end of file
diff --git a/library/html2pdf/fpdi/filters/FilterLZW_FPDI.php b/library/html2pdf/fpdi/filters/FilterLZW_FPDI.php
index e7a88119f..13ff1eb8e 100644
--- a/library/html2pdf/fpdi/filters/FilterLZW_FPDI.php
+++ b/library/html2pdf/fpdi/filters/FilterLZW_FPDI.php
@@ -1,33 +1,33 @@
-<?php
-//
-//  FPDI - Version 1.4.2
-//
-//    Copyright 2004-2011 Setasign - Jan Slabon
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-require_once('FilterLZW.php');
-
-class FilterLZW_FPDI extends FilterLZW {
-
-    var $fpdi;
-
-    function FilterLZW_FPDI(&$fpdi) {
-        $this->fpdi =& $fpdi;
-    }
-    
-    function error($msg) {
-        $this->fpdi->error($msg);
-    }
+<?php
+//
+//  FPDI - Version 1.4.2
+//
+//    Copyright 2004-2011 Setasign - Jan Slabon
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+require_once('FilterLZW.php');
+
+class FilterLZW_FPDI extends FilterLZW {
+
+    var $fpdi;
+
+    function FilterLZW_FPDI(&$fpdi) {
+        $this->fpdi =& $fpdi;
+    }
+    
+    function error($msg) {
+        $this->fpdi->error($msg);
+    }
 }
\ No newline at end of file
diff --git a/library/html2pdf/fpdi/fpdf_tpl.php b/library/html2pdf/fpdi/fpdf_tpl.php
index d6c760cec..4105c32a5 100644
--- a/library/html2pdf/fpdi/fpdf_tpl.php
+++ b/library/html2pdf/fpdi/fpdf_tpl.php
@@ -1,449 +1,449 @@
-<?php
-//
-//  FPDF_TPL - Version 1.2
-//
-//    Copyright 2004-2010 Setasign - Jan Slabon
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-class FPDF_TPL extends MyPDF {
-    /**
-     * Array of Tpl-Data
-     * @var array
-     */
-    var $tpls = array();
-
-    /**
-     * Current Template-ID
-     * @var int
-     */
-    var $tpl = 0;
-    
-    /**
-     * "In Template"-Flag
-     * @var boolean
-     */
-    var $_intpl = false;
-    
-    /**
-     * Nameprefix of Templates used in Resources-Dictonary
-     * @var string A String defining the Prefix used as Template-Object-Names. Have to beginn with an /
-     */
-    var $tplprefix = "/TPL";
-
-    /**
-     * Resources used By Templates and Pages
-     * @var array
-     */
-    var $_res = array();
-    
-    /**
-     * Last used Template data
-     *
-     * @var array
-     */
-    var $lastUsedTemplateData = array();
-    
-    /**
-     * Start a Template
-     *
-     * This method starts a template. You can give own coordinates to build an own sized
-     * Template. Pay attention, that the margins are adapted to the new templatesize.
-     * If you want to write outside the template, for example to build a clipped Template,
-     * you have to set the Margins and "Cursor"-Position manual after beginTemplate-Call.
-     *
-     * If no parameter is given, the template uses the current page-size.
-     * The Method returns an ID of the current Template. This ID is used later for using this template.
-     * Warning: A created Template is used in PDF at all events. Still if you don't use it after creation!
-     *
-     * @param int $x The x-coordinate given in user-unit
-     * @param int $y The y-coordinate given in user-unit
-     * @param int $w The width given in user-unit
-     * @param int $h The height given in user-unit
-     * @return int The ID of new created Template
-     */
-    function beginTemplate($x = null, $y = null, $w = null, $h = null) {
-    	if (is_subclass_of($this, 'TCPDF')) {
-    		$this->Error('This method is only usable with FPDF. Use TCPDF methods startTemplate() instead.');
-    		return;
-    	}
-    	
-        if ($this->page <= 0)
-            $this->error("You have to add a page to fpdf first!");
-
-        if ($x == null)
-            $x = 0;
-        if ($y == null)
-            $y = 0;
-        if ($w == null)
-            $w = $this->w;
-        if ($h == null)
-            $h = $this->h;
-
-        // Save settings
-        $this->tpl++;
-        $tpl =& $this->tpls[$this->tpl];
-        $tpl = array(
-            'o_x' => $this->x,
-            'o_y' => $this->y,
-            'o_AutoPageBreak' => $this->AutoPageBreak,
-            'o_bMargin' => $this->bMargin,
-            'o_tMargin' => $this->tMargin,
-            'o_lMargin' => $this->lMargin,
-            'o_rMargin' => $this->rMargin,
-            'o_h' => $this->h,
-            'o_w' => $this->w,
-            'buffer' => '',
-            'x' => $x,
-            'y' => $y,
-            'w' => $w,
-            'h' => $h
-        );
-
-        $this->SetAutoPageBreak(false);
-        
-        // Define own high and width to calculate possitions correct
-        $this->h = $h;
-        $this->w = $w;
-
-        $this->_intpl = true;
-        $this->SetXY($x + $this->lMargin, $y + $this->tMargin);
-        $this->SetRightMargin($this->w - $w + $this->rMargin);
-
-        return $this->tpl;
-    }
-    
-    /**
-     * End Template
-     *
-     * This method ends a template and reset initiated variables on beginTemplate.
-     *
-     * @return mixed If a template is opened, the ID is returned. If not a false is returned.
-     */
-    function endTemplate() {
-    	if (is_subclass_of($this, 'TCPDF')) {
-        	$args = func_get_args();
-        	return call_user_func_array(array($this, 'TCPDF::endTemplate'), $args);
-        }
-        
-        if ($this->_intpl) {
-            $this->_intpl = false; 
-            $tpl =& $this->tpls[$this->tpl];
-            $this->SetXY($tpl['o_x'], $tpl['o_y']);
-            $this->tMargin = $tpl['o_tMargin'];
-            $this->lMargin = $tpl['o_lMargin'];
-            $this->rMargin = $tpl['o_rMargin'];
-            $this->h = $tpl['o_h'];
-            $this->w = $tpl['o_w'];
-            $this->SetAutoPageBreak($tpl['o_AutoPageBreak'], $tpl['o_bMargin']);
-            
-            return $this->tpl;
-        } else {
-            return false;
-        }
-    }
-    
-    /**
-     * Use a Template in current Page or other Template
-     *
-     * You can use a template in a page or in another template.
-     * You can give the used template a new size like you use the Image()-method.
-     * All parameters are optional. The width or height is calculated automaticaly
-     * if one is given. If no parameter is given the origin size as defined in
-     * beginTemplate() is used.
-     * The calculated or used width and height are returned as an array.
-     *
-     * @param int $tplidx A valid template-Id
-     * @param int $_x The x-position
-     * @param int $_y The y-position
-     * @param int $_w The new width of the template
-     * @param int $_h The new height of the template
-     * @retrun array The height and width of the template
-     */
-    function useTemplate($tplidx, $_x = null, $_y = null, $_w = 0, $_h = 0) {
-        if ($this->page <= 0)
-        	$this->error('You have to add a page first!');
-        
-        if (!isset($this->tpls[$tplidx]))
-            $this->error('Template does not exist!');
-            
-        if ($this->_intpl) {
-            $this->_res['tpl'][$this->tpl]['tpls'][$tplidx] =& $this->tpls[$tplidx];
-        }
-        
-        $tpl =& $this->tpls[$tplidx];
-        $w = $tpl['w'];
-        $h = $tpl['h'];
-        
-        if ($_x == null)
-            $_x = 0;
-        if ($_y == null)
-            $_y = 0;
-            
-        $_x += $tpl['x'];
-        $_y += $tpl['y'];
-        
-        $wh = $this->getTemplateSize($tplidx, $_w, $_h);
-        $_w = $wh['w'];
-        $_h = $wh['h'];
-    
-        $tData = array(
-            'x' => $this->x,
-            'y' => $this->y,
-            'w' => $_w,
-            'h' => $_h,
-            'scaleX' => ($_w / $w),
-            'scaleY' => ($_h / $h),
-            'tx' => $_x,
-            'ty' =>  ($this->h - $_y - $_h),
-            'lty' => ($this->h - $_y - $_h) - ($this->h - $h) * ($_h / $h)
-        );
-        
-        $this->_out(sprintf('q %.4F 0 0 %.4F %.4F %.4F cm', $tData['scaleX'], $tData['scaleY'], $tData['tx'] * $this->k, $tData['ty'] * $this->k)); // Translate 
-        $this->_out(sprintf('%s%d Do Q', $this->tplprefix, $tplidx));
-
-        // reset font in the outer graphic state
-        if ($this->FontFamily) {
-	        $family = $this->FontFamily;
-	        $this->FontFamily = '';
-	        $this->SetFont($family);
-        }
-        
-        $this->lastUsedTemplateData = $tData;
-        
-        return array('w' => $_w, 'h' => $_h);
-    }
-    
-    /**
-     * Get The calculated Size of a Template
-     *
-     * If one size is given, this method calculates the other one.
-     *
-     * @param int $tplidx A valid template-Id
-     * @param int $_w The width of the template
-     * @param int $_h The height of the template
-     * @return array The height and width of the template
-     */
-    function getTemplateSize($tplidx, $_w = 0, $_h = 0) {
-        if (!$this->tpls[$tplidx])
-            return false;
-
-        $tpl =& $this->tpls[$tplidx];
-        $w = $tpl['w'];
-        $h = $tpl['h'];
-        
-        if ($_w == 0 and $_h == 0) {
-            $_w = $w;
-            $_h = $h;
-        }
-
-    	if($_w == 0)
-    		$_w = $_h * $w / $h;
-    	if($_h == 0)
-    		$_h = $_w * $h / $w;
-    		
-        return array("w" => $_w, "h" => $_h);
-    }
-    
-    /**
-     * See FPDF/TCPDF-Documentation ;-)
-     */
-    public function SetFont($family, $style = '', $size = 0) {
-        if (is_subclass_of($this, 'TCPDF')) {
-        	$args = func_get_args();
-        	return call_user_func_array(array($this, 'TCPDF::SetFont'), $args);
-        }
-        
-        /**
-         * force the resetting of font changes in a template
-         */
-        if ($this->_intpl)
-            $this->FontFamily = '';
-            
-        parent::SetFont($family, $style, $size);
-       
-        $fontkey = $this->FontFamily . $this->FontStyle;
-        
-        if ($this->_intpl) {
-            $this->_res['tpl'][$this->tpl]['fonts'][$fontkey] =& $this->fonts[$fontkey];
-        } else {
-            $this->_res['page'][$this->page]['fonts'][$fontkey] =& $this->fonts[$fontkey];
-        }
-    }
-    
-    /**
-     * See FPDF/TCPDF-Documentation ;-)
-     */
-    function Image($file, $x = null, $y = null, $w = 0, $h = 0, $type = '', $link = '') {
-        if (is_subclass_of($this, 'TCPDF')) {
-        	$args = func_get_args();
-			return call_user_func_array(array($this, 'TCPDF::Image'), $args);
-        }
-        
-        $ret = parent::Image($file, $x, $y, $w, $h, $type, $link);
-        if ($this->_intpl) {
-            $this->_res['tpl'][$this->tpl]['images'][$file] =& $this->images[$file];
-        } else {
-            $this->_res['page'][$this->page]['images'][$file] =& $this->images[$file];
-        }
-        
-        return $ret;
-    }
-    
-    /**
-     * See FPDF-Documentation ;-)
-     *
-     * AddPage is not available when you're "in" a template.
-     */
-    function AddPage($orientation = '', $format = '') {
-    	if (is_subclass_of($this, 'TCPDF')) {
-        	$args = func_get_args();
-        	return call_user_func_array(array($this, 'TCPDF::AddPage'), $args);
-        }
-        
-        if ($this->_intpl)
-            $this->Error('Adding pages in templates isn\'t possible!');
-            
-        parent::AddPage($orientation, $format);
-    }
-
-    /**
-     * Preserve adding Links in Templates ...won't work
-     */
-    function Link($x, $y, $w, $h, $link) {
-        if (is_subclass_of($this, 'TCPDF')) {
-        	$args = func_get_args();
-			return call_user_func_array(array($this, 'TCPDF::Link'), $args);
-        }
-        
-        if ($this->_intpl)
-            $this->Error('Using links in templates aren\'t possible!');
-            
-        parent::Link($x, $y, $w, $h, $link);
-    }
-    
-    function AddLink() {
-    	if (is_subclass_of($this, 'TCPDF')) {
-        	$args = func_get_args();
-			return call_user_func_array(array($this, 'TCPDF::AddLink'), $args);
-        }
-        
-        if ($this->_intpl)
-            $this->Error('Adding links in templates aren\'t possible!');
-        return parent::AddLink();
-    }
-    
-    function SetLink($link, $y = 0, $page = -1) {
-    	if (is_subclass_of($this, 'TCPDF')) {
-        	$args = func_get_args();
-			return call_user_func_array(array($this, 'TCPDF::SetLink'), $args);
-        }
-        
-        if ($this->_intpl)
-            $this->Error('Setting links in templates aren\'t possible!');
-        parent::SetLink($link, $y, $page);
-    }
-    
-    /**
-     * Private Method that writes the form xobjects
-     */
-    function _putformxobjects() {
-        $filter=($this->compress) ? '/Filter /FlateDecode ' : '';
-	    reset($this->tpls);
-        foreach($this->tpls AS $tplidx => $tpl) {
-
-            $p=($this->compress) ? gzcompress($tpl['buffer']) : $tpl['buffer'];
-    		$this->_newobj();
-    		$this->tpls[$tplidx]['n'] = $this->n;
-    		$this->_out('<<'.$filter.'/Type /XObject');
-            $this->_out('/Subtype /Form');
-            $this->_out('/FormType 1');
-            $this->_out(sprintf('/BBox [%.2F %.2F %.2F %.2F]',
-                // llx
-                $tpl['x'] * $this->k,
-                // lly
-                -$tpl['y'] * $this->k,
-                // urx
-                ($tpl['w'] + $tpl['x']) * $this->k,
-                // ury
-                ($tpl['h'] - $tpl['y']) * $this->k
-            ));
-            
-            if ($tpl['x'] != 0 || $tpl['y'] != 0) {
-                $this->_out(sprintf('/Matrix [1 0 0 1 %.5F %.5F]',
-                     -$tpl['x'] * $this->k * 2, $tpl['y'] * $this->k * 2
-                ));
-            }
-            
-            $this->_out('/Resources ');
-
-            $this->_out('<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');
-        	if (isset($this->_res['tpl'][$tplidx]['fonts']) && count($this->_res['tpl'][$tplidx]['fonts'])) {
-            	$this->_out('/Font <<');
-                foreach($this->_res['tpl'][$tplidx]['fonts'] as $font)
-            		$this->_out('/F' . $font['i'] . ' ' . $font['n'] . ' 0 R');
-            	$this->_out('>>');
-            }
-        	if(isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images']) || 
-        	   isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls']))
-        	{
-                $this->_out('/XObject <<');
-                if (isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images'])) {
-                    foreach($this->_res['tpl'][$tplidx]['images'] as $image)
-              			$this->_out('/I' . $image['i'] . ' ' . $image['n'] . ' 0 R');
-                }
-                if (isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls'])) {
-                    foreach($this->_res['tpl'][$tplidx]['tpls'] as $i => $tpl)
-                        $this->_out($this->tplprefix . $i . ' ' . $tpl['n'] . ' 0 R');
-                }
-                $this->_out('>>');
-        	}
-        	$this->_out('>>');
-        	
-        	$this->_out('/Length ' . strlen($p) . ' >>');
-    		$this->_putstream($p);
-    		$this->_out('endobj');
-        }
-    }
-    
-    /**
-     * Overwritten to add _putformxobjects() after _putimages()
-     *
-     */
-    function _putimages() {
-        parent::_putimages();
-        $this->_putformxobjects();
-    }
-    
-    function _putxobjectdict() {
-        parent::_putxobjectdict();
-        
-        if (count($this->tpls)) {
-            foreach($this->tpls as $tplidx => $tpl) {
-                $this->_out(sprintf('%s%d %d 0 R', $this->tplprefix, $tplidx, $tpl['n']));
-            }
-        }
-    }
-
-    /**
-     * Private Method
-     */
-    function _out($s) {
-        if ($this->state == 2 && $this->_intpl) {
-            $this->tpls[$this->tpl]['buffer'] .= $s . "\n";
-        } else {
-            parent::_out($s);
-        }
-    }
-}
+<?php
+//
+//  FPDF_TPL - Version 1.2
+//
+//    Copyright 2004-2010 Setasign - Jan Slabon
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+class FPDF_TPL extends MyPDF {
+    /**
+     * Array of Tpl-Data
+     * @var array
+     */
+    var $tpls = array();
+
+    /**
+     * Current Template-ID
+     * @var int
+     */
+    var $tpl = 0;
+    
+    /**
+     * "In Template"-Flag
+     * @var boolean
+     */
+    var $_intpl = false;
+    
+    /**
+     * Nameprefix of Templates used in Resources-Dictonary
+     * @var string A String defining the Prefix used as Template-Object-Names. Have to beginn with an /
+     */
+    var $tplprefix = "/TPL";
+
+    /**
+     * Resources used By Templates and Pages
+     * @var array
+     */
+    var $_res = array();
+    
+    /**
+     * Last used Template data
+     *
+     * @var array
+     */
+    var $lastUsedTemplateData = array();
+    
+    /**
+     * Start a Template
+     *
+     * This method starts a template. You can give own coordinates to build an own sized
+     * Template. Pay attention, that the margins are adapted to the new templatesize.
+     * If you want to write outside the template, for example to build a clipped Template,
+     * you have to set the Margins and "Cursor"-Position manual after beginTemplate-Call.
+     *
+     * If no parameter is given, the template uses the current page-size.
+     * The Method returns an ID of the current Template. This ID is used later for using this template.
+     * Warning: A created Template is used in PDF at all events. Still if you don't use it after creation!
+     *
+     * @param int $x The x-coordinate given in user-unit
+     * @param int $y The y-coordinate given in user-unit
+     * @param int $w The width given in user-unit
+     * @param int $h The height given in user-unit
+     * @return int The ID of new created Template
+     */
+    function beginTemplate($x = null, $y = null, $w = null, $h = null) {
+    	if (is_subclass_of($this, 'TCPDF')) {
+    		$this->Error('This method is only usable with FPDF. Use TCPDF methods startTemplate() instead.');
+    		return;
+    	}
+    	
+        if ($this->page <= 0)
+            $this->error("You have to add a page to fpdf first!");
+
+        if ($x == null)
+            $x = 0;
+        if ($y == null)
+            $y = 0;
+        if ($w == null)
+            $w = $this->w;
+        if ($h == null)
+            $h = $this->h;
+
+        // Save settings
+        $this->tpl++;
+        $tpl =& $this->tpls[$this->tpl];
+        $tpl = array(
+            'o_x' => $this->x,
+            'o_y' => $this->y,
+            'o_AutoPageBreak' => $this->AutoPageBreak,
+            'o_bMargin' => $this->bMargin,
+            'o_tMargin' => $this->tMargin,
+            'o_lMargin' => $this->lMargin,
+            'o_rMargin' => $this->rMargin,
+            'o_h' => $this->h,
+            'o_w' => $this->w,
+            'buffer' => '',
+            'x' => $x,
+            'y' => $y,
+            'w' => $w,
+            'h' => $h
+        );
+
+        $this->SetAutoPageBreak(false);
+        
+        // Define own high and width to calculate possitions correct
+        $this->h = $h;
+        $this->w = $w;
+
+        $this->_intpl = true;
+        $this->SetXY($x + $this->lMargin, $y + $this->tMargin);
+        $this->SetRightMargin($this->w - $w + $this->rMargin);
+
+        return $this->tpl;
+    }
+    
+    /**
+     * End Template
+     *
+     * This method ends a template and reset initiated variables on beginTemplate.
+     *
+     * @return mixed If a template is opened, the ID is returned. If not a false is returned.
+     */
+    function endTemplate() {
+    	if (is_subclass_of($this, 'TCPDF')) {
+        	$args = func_get_args();
+        	return call_user_func_array(array($this, 'TCPDF::endTemplate'), $args);
+        }
+        
+        if ($this->_intpl) {
+            $this->_intpl = false; 
+            $tpl =& $this->tpls[$this->tpl];
+            $this->SetXY($tpl['o_x'], $tpl['o_y']);
+            $this->tMargin = $tpl['o_tMargin'];
+            $this->lMargin = $tpl['o_lMargin'];
+            $this->rMargin = $tpl['o_rMargin'];
+            $this->h = $tpl['o_h'];
+            $this->w = $tpl['o_w'];
+            $this->SetAutoPageBreak($tpl['o_AutoPageBreak'], $tpl['o_bMargin']);
+            
+            return $this->tpl;
+        } else {
+            return false;
+        }
+    }
+    
+    /**
+     * Use a Template in current Page or other Template
+     *
+     * You can use a template in a page or in another template.
+     * You can give the used template a new size like you use the Image()-method.
+     * All parameters are optional. The width or height is calculated automaticaly
+     * if one is given. If no parameter is given the origin size as defined in
+     * beginTemplate() is used.
+     * The calculated or used width and height are returned as an array.
+     *
+     * @param int $tplidx A valid template-Id
+     * @param int $_x The x-position
+     * @param int $_y The y-position
+     * @param int $_w The new width of the template
+     * @param int $_h The new height of the template
+     * @retrun array The height and width of the template
+     */
+    function useTemplate($tplidx, $_x = null, $_y = null, $_w = 0, $_h = 0) {
+        if ($this->page <= 0)
+        	$this->error('You have to add a page first!');
+        
+        if (!isset($this->tpls[$tplidx]))
+            $this->error('Template does not exist!');
+            
+        if ($this->_intpl) {
+            $this->_res['tpl'][$this->tpl]['tpls'][$tplidx] =& $this->tpls[$tplidx];
+        }
+        
+        $tpl =& $this->tpls[$tplidx];
+        $w = $tpl['w'];
+        $h = $tpl['h'];
+        
+        if ($_x == null)
+            $_x = 0;
+        if ($_y == null)
+            $_y = 0;
+            
+        $_x += $tpl['x'];
+        $_y += $tpl['y'];
+        
+        $wh = $this->getTemplateSize($tplidx, $_w, $_h);
+        $_w = $wh['w'];
+        $_h = $wh['h'];
+    
+        $tData = array(
+            'x' => $this->x,
+            'y' => $this->y,
+            'w' => $_w,
+            'h' => $_h,
+            'scaleX' => ($_w / $w),
+            'scaleY' => ($_h / $h),
+            'tx' => $_x,
+            'ty' =>  ($this->h - $_y - $_h),
+            'lty' => ($this->h - $_y - $_h) - ($this->h - $h) * ($_h / $h)
+        );
+        
+        $this->_out(sprintf('q %.4F 0 0 %.4F %.4F %.4F cm', $tData['scaleX'], $tData['scaleY'], $tData['tx'] * $this->k, $tData['ty'] * $this->k)); // Translate 
+        $this->_out(sprintf('%s%d Do Q', $this->tplprefix, $tplidx));
+
+        // reset font in the outer graphic state
+        if ($this->FontFamily) {
+	        $family = $this->FontFamily;
+	        $this->FontFamily = '';
+	        $this->SetFont($family);
+        }
+        
+        $this->lastUsedTemplateData = $tData;
+        
+        return array('w' => $_w, 'h' => $_h);
+    }
+    
+    /**
+     * Get The calculated Size of a Template
+     *
+     * If one size is given, this method calculates the other one.
+     *
+     * @param int $tplidx A valid template-Id
+     * @param int $_w The width of the template
+     * @param int $_h The height of the template
+     * @return array The height and width of the template
+     */
+    function getTemplateSize($tplidx, $_w = 0, $_h = 0) {
+        if (!$this->tpls[$tplidx])
+            return false;
+
+        $tpl =& $this->tpls[$tplidx];
+        $w = $tpl['w'];
+        $h = $tpl['h'];
+        
+        if ($_w == 0 and $_h == 0) {
+            $_w = $w;
+            $_h = $h;
+        }
+
+    	if($_w == 0)
+    		$_w = $_h * $w / $h;
+    	if($_h == 0)
+    		$_h = $_w * $h / $w;
+    		
+        return array("w" => $_w, "h" => $_h);
+    }
+    
+    /**
+     * See FPDF/TCPDF-Documentation ;-)
+     */
+    public function SetFont($family, $style = '', $size = 0) {
+        if (is_subclass_of($this, 'TCPDF')) {
+        	$args = func_get_args();
+        	return call_user_func_array(array($this, 'TCPDF::SetFont'), $args);
+        }
+        
+        /**
+         * force the resetting of font changes in a template
+         */
+        if ($this->_intpl)
+            $this->FontFamily = '';
+            
+        parent::SetFont($family, $style, $size);
+       
+        $fontkey = $this->FontFamily . $this->FontStyle;
+        
+        if ($this->_intpl) {
+            $this->_res['tpl'][$this->tpl]['fonts'][$fontkey] =& $this->fonts[$fontkey];
+        } else {
+            $this->_res['page'][$this->page]['fonts'][$fontkey] =& $this->fonts[$fontkey];
+        }
+    }
+    
+    /**
+     * See FPDF/TCPDF-Documentation ;-)
+     */
+    function Image($file, $x = null, $y = null, $w = 0, $h = 0, $type = '', $link = '') {
+        if (is_subclass_of($this, 'TCPDF')) {
+        	$args = func_get_args();
+			return call_user_func_array(array($this, 'TCPDF::Image'), $args);
+        }
+        
+        $ret = parent::Image($file, $x, $y, $w, $h, $type, $link);
+        if ($this->_intpl) {
+            $this->_res['tpl'][$this->tpl]['images'][$file] =& $this->images[$file];
+        } else {
+            $this->_res['page'][$this->page]['images'][$file] =& $this->images[$file];
+        }
+        
+        return $ret;
+    }
+    
+    /**
+     * See FPDF-Documentation ;-)
+     *
+     * AddPage is not available when you're "in" a template.
+     */
+    function AddPage($orientation = '', $format = '') {
+    	if (is_subclass_of($this, 'TCPDF')) {
+        	$args = func_get_args();
+        	return call_user_func_array(array($this, 'TCPDF::AddPage'), $args);
+        }
+        
+        if ($this->_intpl)
+            $this->Error('Adding pages in templates isn\'t possible!');
+            
+        parent::AddPage($orientation, $format);
+    }
+
+    /**
+     * Preserve adding Links in Templates ...won't work
+     */
+    function Link($x, $y, $w, $h, $link) {
+        if (is_subclass_of($this, 'TCPDF')) {
+        	$args = func_get_args();
+			return call_user_func_array(array($this, 'TCPDF::Link'), $args);
+        }
+        
+        if ($this->_intpl)
+            $this->Error('Using links in templates aren\'t possible!');
+            
+        parent::Link($x, $y, $w, $h, $link);
+    }
+    
+    function AddLink() {
+    	if (is_subclass_of($this, 'TCPDF')) {
+        	$args = func_get_args();
+			return call_user_func_array(array($this, 'TCPDF::AddLink'), $args);
+        }
+        
+        if ($this->_intpl)
+            $this->Error('Adding links in templates aren\'t possible!');
+        return parent::AddLink();
+    }
+    
+    function SetLink($link, $y = 0, $page = -1) {
+    	if (is_subclass_of($this, 'TCPDF')) {
+        	$args = func_get_args();
+			return call_user_func_array(array($this, 'TCPDF::SetLink'), $args);
+        }
+        
+        if ($this->_intpl)
+            $this->Error('Setting links in templates aren\'t possible!');
+        parent::SetLink($link, $y, $page);
+    }
+    
+    /**
+     * Private Method that writes the form xobjects
+     */
+    function _putformxobjects() {
+        $filter=($this->compress) ? '/Filter /FlateDecode ' : '';
+	    reset($this->tpls);
+        foreach($this->tpls AS $tplidx => $tpl) {
+
+            $p=($this->compress) ? gzcompress($tpl['buffer']) : $tpl['buffer'];
+    		$this->_newobj();
+    		$this->tpls[$tplidx]['n'] = $this->n;
+    		$this->_out('<<'.$filter.'/Type /XObject');
+            $this->_out('/Subtype /Form');
+            $this->_out('/FormType 1');
+            $this->_out(sprintf('/BBox [%.2F %.2F %.2F %.2F]',
+                // llx
+                $tpl['x'] * $this->k,
+                // lly
+                -$tpl['y'] * $this->k,
+                // urx
+                ($tpl['w'] + $tpl['x']) * $this->k,
+                // ury
+                ($tpl['h'] - $tpl['y']) * $this->k
+            ));
+            
+            if ($tpl['x'] != 0 || $tpl['y'] != 0) {
+                $this->_out(sprintf('/Matrix [1 0 0 1 %.5F %.5F]',
+                     -$tpl['x'] * $this->k * 2, $tpl['y'] * $this->k * 2
+                ));
+            }
+            
+            $this->_out('/Resources ');
+
+            $this->_out('<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');
+        	if (isset($this->_res['tpl'][$tplidx]['fonts']) && count($this->_res['tpl'][$tplidx]['fonts'])) {
+            	$this->_out('/Font <<');
+                foreach($this->_res['tpl'][$tplidx]['fonts'] as $font)
+            		$this->_out('/F' . $font['i'] . ' ' . $font['n'] . ' 0 R');
+            	$this->_out('>>');
+            }
+        	if(isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images']) || 
+        	   isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls']))
+        	{
+                $this->_out('/XObject <<');
+                if (isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images'])) {
+                    foreach($this->_res['tpl'][$tplidx]['images'] as $image)
+              			$this->_out('/I' . $image['i'] . ' ' . $image['n'] . ' 0 R');
+                }
+                if (isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls'])) {
+                    foreach($this->_res['tpl'][$tplidx]['tpls'] as $i => $tpl)
+                        $this->_out($this->tplprefix . $i . ' ' . $tpl['n'] . ' 0 R');
+                }
+                $this->_out('>>');
+        	}
+        	$this->_out('>>');
+        	
+        	$this->_out('/Length ' . strlen($p) . ' >>');
+    		$this->_putstream($p);
+    		$this->_out('endobj');
+        }
+    }
+    
+    /**
+     * Overwritten to add _putformxobjects() after _putimages()
+     *
+     */
+    function _putimages() {
+        parent::_putimages();
+        $this->_putformxobjects();
+    }
+    
+    function _putxobjectdict() {
+        parent::_putxobjectdict();
+        
+        if (count($this->tpls)) {
+            foreach($this->tpls as $tplidx => $tpl) {
+                $this->_out(sprintf('%s%d %d 0 R', $this->tplprefix, $tplidx, $tpl['n']));
+            }
+        }
+    }
+
+    /**
+     * Private Method
+     */
+    function _out($s) {
+        if ($this->state == 2 && $this->_intpl) {
+            $this->tpls[$this->tpl]['buffer'] .= $s . "\n";
+        } else {
+            parent::_out($s);
+        }
+    }
+}
diff --git a/library/html2pdf/fpdi/fpdi.php b/library/html2pdf/fpdi/fpdi.php
index 0ae2c6374..f6ba91f96 100644
--- a/library/html2pdf/fpdi/fpdi.php
+++ b/library/html2pdf/fpdi/fpdi.php
@@ -1,571 +1,571 @@
-<?php
-//
-//  FPDI - Version 1.4.2
-//
-//    Copyright 2004-2011 Setasign - Jan Slabon
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-define('FPDI_VERSION', '1.4.2');
-
-// Check for TCPDF and remap TCPDF to FPDF
-if (class_exists('TCPDF', false)) {
-    require_once('fpdi2tcpdf_bridge.php');
-}
-
-require_once('fpdf_tpl.php');
-require_once('fpdi_pdf_parser.php');
-
-
-class FPDI extends FPDF_TPL {
-    /**
-     * Actual filename
-     * @var string
-     */
-    var $current_filename;
-
-    /**
-     * Parser-Objects
-     * @var array
-     */
-    var $parsers;
-    
-    /**
-     * Current parser
-     * @var object
-     */
-    var $current_parser;
-    
-    /**
-     * object stack
-     * @var array
-     */
-    var $_obj_stack;
-    
-    /**
-     * done object stack
-     * @var array
-     */
-    var $_don_obj_stack;
-
-    /**
-     * Current Object Id.
-     * @var integer
-     */
-    var $_current_obj_id;
-    
-    /**
-     * The name of the last imported page box
-     * @var string
-     */
-    var $lastUsedPageBox;
-    
-    /**
-     * Cache for imported pages/template ids
-     * @var array
-     */
-    var $_importedPages = array();
-    
-    /**
-     * Set a source-file
-     *
-     * @param string $filename a valid filename
-     * @return int number of available pages
-     */
-    function setSourceFile($filename) {
-        $this->current_filename = $filename;
-        
-        if (!isset($this->parsers[$filename]))
-            $this->parsers[$filename] = $this->_getPdfParser($filename);
-        $this->current_parser =& $this->parsers[$filename];
-        
-        return $this->parsers[$filename]->getPageCount();
-    }
-    
-    /**
-     * Returns a PDF parser object
-     *
-     * @param string $filename
-     * @return fpdi_pdf_parser
-     */
-    function _getPdfParser($filename) {
-    	return new fpdi_pdf_parser($filename, $this);
-    }
-    
-    /**
-     * Get the current PDF version
-     *
-     * @return string
-     */
-    function getPDFVersion() {
-		return $this->PDFVersion;
-	}
-    
-	/**
-     * Set the PDF version
-     *
-     * @return string
-     */
-	function setPDFVersion($version = '1.3') {
-		$this->PDFVersion = $version;
-	}
-	
-    /**
-     * Import a page
-     *
-     * @param int $pageno pagenumber
-     * @return int Index of imported page - to use with fpdf_tpl::useTemplate()
-     */
-    function importPage($pageno, $boxName = '/CropBox') {
-        if ($this->_intpl) {
-            return $this->error('Please import the desired pages before creating a new template.');
-        }
-        
-        $fn = $this->current_filename;
-        
-        // check if page already imported
-        $pageKey = $fn . '-' . ((int)$pageno) . $boxName;
-        if (isset($this->_importedPages[$pageKey]))
-            return $this->_importedPages[$pageKey];
-        
-        $parser =& $this->parsers[$fn];
-        $parser->setPageno($pageno);
-
-        if (!in_array($boxName, $parser->availableBoxes))
-            return $this->Error(sprintf('Unknown box: %s', $boxName));
-            
-        $pageboxes = $parser->getPageBoxes($pageno, $this->k);
-        
-        /**
-         * MediaBox
-         * CropBox: Default -> MediaBox
-         * BleedBox: Default -> CropBox
-         * TrimBox: Default -> CropBox
-         * ArtBox: Default -> CropBox
-         */
-        if (!isset($pageboxes[$boxName]) && ($boxName == '/BleedBox' || $boxName == '/TrimBox' || $boxName == '/ArtBox'))
-            $boxName = '/CropBox';
-        if (!isset($pageboxes[$boxName]) && $boxName == '/CropBox')
-            $boxName = '/MediaBox';
-        
-        if (!isset($pageboxes[$boxName]))
-            return false;
-            
-        $this->lastUsedPageBox = $boxName;
-        
-        $box = $pageboxes[$boxName];
-        
-        $this->tpl++;
-        $this->tpls[$this->tpl] = array();
-        $tpl =& $this->tpls[$this->tpl];
-        $tpl['parser'] =& $parser;
-        $tpl['resources'] = $parser->getPageResources();
-        $tpl['buffer'] = $parser->getContent();
-        $tpl['box'] = $box;
-        
-        // To build an array that can be used by PDF_TPL::useTemplate()
-        $this->tpls[$this->tpl] = array_merge($this->tpls[$this->tpl], $box);
-        
-        // An imported page will start at 0,0 everytime. Translation will be set in _putformxobjects()
-        $tpl['x'] = 0;
-        $tpl['y'] = 0;
-        
-        // handle rotated pages
-        $rotation = $parser->getPageRotation($pageno);
-        $tpl['_rotationAngle'] = 0;
-        if (isset($rotation[1]) && ($angle = $rotation[1] % 360) != 0) {
-        	$steps = $angle / 90;
-                
-            $_w = $tpl['w'];
-            $_h = $tpl['h'];
-            $tpl['w'] = $steps % 2 == 0 ? $_w : $_h;
-            $tpl['h'] = $steps % 2 == 0 ? $_h : $_w;
-            
-            if ($angle < 0)
-            	$angle += 360;
-            
-        	$tpl['_rotationAngle'] = $angle * -1;
-        }
-        
-        $this->_importedPages[$pageKey] = $this->tpl;
-        
-        return $this->tpl;
-    }
-    
-    /**
-     * Returns the last used page box
-     *
-     * @return string
-     */
-    function getLastUsedPageBox() {
-        return $this->lastUsedPageBox;
-    }
-    
-    
-    function useTemplate($tplidx, $_x = null, $_y = null, $_w = 0, $_h = 0, $adjustPageSize = false) {
-        if ($adjustPageSize == true && is_null($_x) && is_null($_y)) {
-            $size = $this->getTemplateSize($tplidx, $_w, $_h);
-            $orientation = $size['w'] > $size['h'] ? 'L' : 'P';
-            $size = array($size['w'], $size['h']);
-            
-            if (is_subclass_of($this, 'TCPDF')) {
-            	$this->setPageFormat($size, $orientation);
-            } else {
-            	$size = $this->_getpagesize($size);
-            	
-            	if($orientation!=$this->CurOrientation || $size[0]!=$this->CurPageSize[0] || $size[1]!=$this->CurPageSize[1])
-				{
-					// New size or orientation
-					if($orientation=='P')
-					{
-						$this->w = $size[0];
-						$this->h = $size[1];
-					}
-					else
-					{
-						$this->w = $size[1];
-						$this->h = $size[0];
-					}
-					$this->wPt = $this->w*$this->k;
-					$this->hPt = $this->h*$this->k;
-					$this->PageBreakTrigger = $this->h-$this->bMargin;
-					$this->CurOrientation = $orientation;
-					$this->CurPageSize = $size;
-					$this->PageSizes[$this->page] = array($this->wPt, $this->hPt);
-				}
-            } 
-        }
-        
-        $this->_out('q 0 J 1 w 0 j 0 G 0 g'); // reset standard values
-        $s = parent::useTemplate($tplidx, $_x, $_y, $_w, $_h);
-        $this->_out('Q');
-        
-        return $s;
-    }
-    
-    /**
-     * Private method, that rebuilds all needed objects of source files
-     */
-    function _putimportedobjects() {
-        if (is_array($this->parsers) && count($this->parsers) > 0) {
-            foreach($this->parsers AS $filename => $p) {
-                $this->current_parser =& $this->parsers[$filename];
-                if (isset($this->_obj_stack[$filename]) && is_array($this->_obj_stack[$filename])) {
-                    while(($n = key($this->_obj_stack[$filename])) !== null) {
-                        $nObj = $this->current_parser->pdf_resolve_object($this->current_parser->c, $this->_obj_stack[$filename][$n][1]);
-						
-                        $this->_newobj($this->_obj_stack[$filename][$n][0]);
-                        
-                        if ($nObj[0] == PDF_TYPE_STREAM) {
-							$this->pdf_write_value($nObj);
-                        } else {
-                            $this->pdf_write_value($nObj[1]);
-                        }
-                        
-                        $this->_out('endobj');
-                        $this->_obj_stack[$filename][$n] = null; // free memory
-                        unset($this->_obj_stack[$filename][$n]);
-                        reset($this->_obj_stack[$filename]);
-                    }
-                }
-            }
-        }
-    }
-    
-    
-    /**
-     * Private Method that writes the form xobjects
-     */
-    function _putformxobjects() {
-        $filter=($this->compress) ? '/Filter /FlateDecode ' : '';
-	    reset($this->tpls);
-        foreach($this->tpls AS $tplidx => $tpl) {
-            $p=($this->compress) ? gzcompress($tpl['buffer']) : $tpl['buffer'];
-    		$this->_newobj();
-    		$cN = $this->n; // TCPDF/Protection: rem current "n"
-    		
-    		$this->tpls[$tplidx]['n'] = $this->n;
-    		$this->_out('<<' . $filter . '/Type /XObject');
-            $this->_out('/Subtype /Form');
-            $this->_out('/FormType 1');
-            
-            $this->_out(sprintf('/BBox [%.2F %.2F %.2F %.2F]', 
-                (isset($tpl['box']['llx']) ? $tpl['box']['llx'] : $tpl['x']) * $this->k,
-                (isset($tpl['box']['lly']) ? $tpl['box']['lly'] : -$tpl['y']) * $this->k,
-                (isset($tpl['box']['urx']) ? $tpl['box']['urx'] : $tpl['w'] + $tpl['x']) * $this->k,
-                (isset($tpl['box']['ury']) ? $tpl['box']['ury'] : $tpl['h'] - $tpl['y']) * $this->k
-            ));
-            
-            $c = 1;
-            $s = 0;
-            $tx = 0;
-            $ty = 0;
-            
-            if (isset($tpl['box'])) {
-                $tx = -$tpl['box']['llx'];
-                $ty = -$tpl['box']['lly']; 
-                
-                if ($tpl['_rotationAngle'] <> 0) {
-                    $angle = $tpl['_rotationAngle'] * M_PI/180;
-                    $c=cos($angle);
-                    $s=sin($angle);
-                    
-                    switch($tpl['_rotationAngle']) {
-                        case -90:
-                           $tx = -$tpl['box']['lly'];
-                           $ty = $tpl['box']['urx'];
-                           break;
-                        case -180:
-                            $tx = $tpl['box']['urx'];
-                            $ty = $tpl['box']['ury'];
-                            break;
-                        case -270:
-                        	$tx = $tpl['box']['ury'];
-                            $ty = -$tpl['box']['llx'];
-                            break;
-                    }
-                }
-            } else if ($tpl['x'] != 0 || $tpl['y'] != 0) {
-                $tx = -$tpl['x'] * 2;
-                $ty = $tpl['y'] * 2;
-            }
-            
-            $tx *= $this->k;
-            $ty *= $this->k;
-            
-            if ($c != 1 || $s != 0 || $tx != 0 || $ty != 0) {
-                $this->_out(sprintf('/Matrix [%.5F %.5F %.5F %.5F %.5F %.5F]',
-                    $c, $s, -$s, $c, $tx, $ty
-                ));
-            }
-            
-            $this->_out('/Resources ');
-
-            if (isset($tpl['resources'])) {
-                $this->current_parser =& $tpl['parser'];
-                $this->pdf_write_value($tpl['resources']); // "n" will be changed
-            } else {
-                $this->_out('<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');
-            	if (isset($this->_res['tpl'][$tplidx]['fonts']) && count($this->_res['tpl'][$tplidx]['fonts'])) {
-                	$this->_out('/Font <<');
-                    foreach($this->_res['tpl'][$tplidx]['fonts'] as $font)
-                		$this->_out('/F' . $font['i'] . ' ' . $font['n'] . ' 0 R');
-                	$this->_out('>>');
-                }
-            	if(isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images']) || 
-            	   isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls']))
-            	{
-                    $this->_out('/XObject <<');
-                    if (isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images'])) {
-                        foreach($this->_res['tpl'][$tplidx]['images'] as $image)
-                  			$this->_out('/I' . $image['i'] . ' ' . $image['n'] . ' 0 R');
-                    }
-                    if (isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls'])) {
-                        foreach($this->_res['tpl'][$tplidx]['tpls'] as $i => $tpl)
-                            $this->_out($this->tplprefix . $i . ' ' . $tpl['n'] . ' 0 R');
-                    }
-                    $this->_out('>>');
-            	}
-            	$this->_out('>>');
-            }
-
-            $nN = $this->n; // TCPDF: rem new "n"
-            $this->n = $cN; // TCPDF: reset to current "n"
-            if (is_subclass_of($this, 'TCPDF')) {
-            	$p = $this->_getrawstream($p);
-            	$this->_out('/Length ' . strlen($p) . ' >>');
-            	$this->_out("stream\n" . $p . "\nendstream");
-            } else {
-	            $this->_out('/Length ' . strlen($p) . ' >>');
-	    		$this->_putstream($p);
-            }
-    		$this->_out('endobj');
-    		$this->n = $nN; // TCPDF: reset to new "n"
-        }
-        
-        $this->_putimportedobjects();
-    }
-
-    /**
-     * Rewritten to handle existing own defined objects
-     */
-    function _newobj($obj_id = false, $onlynewobj = false) {
-        if (!$obj_id) {
-            $obj_id = ++$this->n;
-        }
-
-        //Begin a new object
-        if (!$onlynewobj) {
-            $this->offsets[$obj_id] = is_subclass_of($this, 'TCPDF') ? $this->bufferlen : strlen($this->buffer);
-            $this->_out($obj_id . ' 0 obj');
-            $this->_current_obj_id = $obj_id; // for later use with encryption
-        }
-        
-        return $obj_id;
-    }
-
-    /**
-     * Writes a value
-     * Needed to rebuild the source document
-     *
-     * @param mixed $value A PDF-Value. Structure of values see cases in this method
-     */
-    function pdf_write_value(&$value)
-    {
-        if (is_subclass_of($this, 'TCPDF')) {
-            parent::pdf_write_value($value);
-        }
-        
-        switch ($value[0]) {
-
-    		case PDF_TYPE_TOKEN:
-                $this->_straightOut($value[1] . ' ');
-    			break;
-		    case PDF_TYPE_NUMERIC:
-    		case PDF_TYPE_REAL:
-                if (is_float($value[1]) && $value[1] != 0) {
-    			    $this->_straightOut(rtrim(rtrim(sprintf('%F', $value[1]), '0'), '.') . ' ');
-    			} else {
-        			$this->_straightOut($value[1] . ' ');
-    			}
-    			break;
-    			
-    		case PDF_TYPE_ARRAY:
-
-    			// An array. Output the proper
-    			// structure and move on.
-
-    			$this->_straightOut('[');
-                for ($i = 0; $i < count($value[1]); $i++) {
-    				$this->pdf_write_value($value[1][$i]);
-    			}
-
-    			$this->_out(']');
-    			break;
-
-    		case PDF_TYPE_DICTIONARY:
-
-    			// A dictionary.
-    			$this->_straightOut('<<');
-
-    			reset ($value[1]);
-
-    			while (list($k, $v) = each($value[1])) {
-    				$this->_straightOut($k . ' ');
-    				$this->pdf_write_value($v);
-    			}
-
-    			$this->_straightOut('>>');
-    			break;
-
-    		case PDF_TYPE_OBJREF:
-
-    			// An indirect object reference
-    			// Fill the object stack if needed
-    			$cpfn =& $this->current_parser->filename;
-    			
-    			if (!isset($this->_don_obj_stack[$cpfn][$value[1]])) {
-    			    $this->_newobj(false, true);
-    			    $this->_obj_stack[$cpfn][$value[1]] = array($this->n, $value);
-                    $this->_don_obj_stack[$cpfn][$value[1]] = array($this->n, $value); // Value is maybee obsolete!!!
-                }
-                $objid = $this->_don_obj_stack[$cpfn][$value[1]][0];
-
-    			$this->_out($objid . ' 0 R');
-    			break;
-
-    		case PDF_TYPE_STRING:
-
-    			// A string.
-                $this->_straightOut('(' . $value[1] . ')');
-
-    			break;
-
-    		case PDF_TYPE_STREAM:
-
-    			// A stream. First, output the
-    			// stream dictionary, then the
-    			// stream data itself.
-                $this->pdf_write_value($value[1]);
-    			$this->_out('stream');
-    			$this->_out($value[2][1]);
-    			$this->_out('endstream');
-    			break;
-    			
-            case PDF_TYPE_HEX:
-                $this->_straightOut('<' . $value[1] . '>');
-                break;
-
-            case PDF_TYPE_BOOLEAN:
-    		    $this->_straightOut($value[1] ? 'true ' : 'false ');
-    		    break;
-            
-    		case PDF_TYPE_NULL:
-                // The null object.
-
-    			$this->_straightOut('null ');
-    			break;
-    	}
-    }
-    
-    
-    /**
-     * Modified so not each call will add a newline to the output.
-     */
-    function _straightOut($s) {
-        if (!is_subclass_of($this, 'TCPDF')) {
-            if($this->state==2)
-        		$this->pages[$this->page] .= $s;
-        	else
-        		$this->buffer .= $s;
-        } else {
-            if ($this->state == 2) {
-				if (isset($this->footerlen[$this->page]) AND ($this->footerlen[$this->page] > 0)) {
-					// puts data before page footer
-					$page = substr($this->getPageBuffer($this->page), 0, -$this->footerlen[$this->page]);
-					$footer = substr($this->getPageBuffer($this->page), -$this->footerlen[$this->page]);
-					$this->setPageBuffer($this->page, $page . ' ' . $s . "\n" . $footer);
-				} else {
-					$this->setPageBuffer($this->page, $s, true);
-				}
-			} else {
-				$this->setBuffer($s);
-			}
-        }
-    }
-
-    /**
-     * rewritten to close opened parsers
-     *
-     */
-    function _enddoc() {
-        parent::_enddoc();
-        $this->_closeParsers();
-    }
-    
-    /**
-     * close all files opened by parsers
-     */
-    function _closeParsers() {
-        if ($this->state > 2 && count($this->parsers) > 0) {
-          	foreach ($this->parsers as $k => $_){
-            	$this->parsers[$k]->closeFile();
-            	$this->parsers[$k] = null;
-            	unset($this->parsers[$k]);
-            }
-            return true;
-        }
-        return false;
-    }
+<?php
+//
+//  FPDI - Version 1.4.2
+//
+//    Copyright 2004-2011 Setasign - Jan Slabon
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+define('FPDI_VERSION', '1.4.2');
+
+// Check for TCPDF and remap TCPDF to FPDF
+if (class_exists('TCPDF', false)) {
+    require_once('fpdi2tcpdf_bridge.php');
+}
+
+require_once('fpdf_tpl.php');
+require_once('fpdi_pdf_parser.php');
+
+
+class FPDI extends FPDF_TPL {
+    /**
+     * Actual filename
+     * @var string
+     */
+    var $current_filename;
+
+    /**
+     * Parser-Objects
+     * @var array
+     */
+    var $parsers;
+    
+    /**
+     * Current parser
+     * @var object
+     */
+    var $current_parser;
+    
+    /**
+     * object stack
+     * @var array
+     */
+    var $_obj_stack;
+    
+    /**
+     * done object stack
+     * @var array
+     */
+    var $_don_obj_stack;
+
+    /**
+     * Current Object Id.
+     * @var integer
+     */
+    var $_current_obj_id;
+    
+    /**
+     * The name of the last imported page box
+     * @var string
+     */
+    var $lastUsedPageBox;
+    
+    /**
+     * Cache for imported pages/template ids
+     * @var array
+     */
+    var $_importedPages = array();
+    
+    /**
+     * Set a source-file
+     *
+     * @param string $filename a valid filename
+     * @return int number of available pages
+     */
+    function setSourceFile($filename) {
+        $this->current_filename = $filename;
+        
+        if (!isset($this->parsers[$filename]))
+            $this->parsers[$filename] = $this->_getPdfParser($filename);
+        $this->current_parser =& $this->parsers[$filename];
+        
+        return $this->parsers[$filename]->getPageCount();
+    }
+    
+    /**
+     * Returns a PDF parser object
+     *
+     * @param string $filename
+     * @return fpdi_pdf_parser
+     */
+    function _getPdfParser($filename) {
+    	return new fpdi_pdf_parser($filename, $this);
+    }
+    
+    /**
+     * Get the current PDF version
+     *
+     * @return string
+     */
+    function getPDFVersion() {
+		return $this->PDFVersion;
+	}
+    
+	/**
+     * Set the PDF version
+     *
+     * @return string
+     */
+	function setPDFVersion($version = '1.3') {
+		$this->PDFVersion = $version;
+	}
+	
+    /**
+     * Import a page
+     *
+     * @param int $pageno pagenumber
+     * @return int Index of imported page - to use with fpdf_tpl::useTemplate()
+     */
+    function importPage($pageno, $boxName = '/CropBox') {
+        if ($this->_intpl) {
+            return $this->error('Please import the desired pages before creating a new template.');
+        }
+        
+        $fn = $this->current_filename;
+        
+        // check if page already imported
+        $pageKey = $fn . '-' . ((int)$pageno) . $boxName;
+        if (isset($this->_importedPages[$pageKey]))
+            return $this->_importedPages[$pageKey];
+        
+        $parser =& $this->parsers[$fn];
+        $parser->setPageno($pageno);
+
+        if (!in_array($boxName, $parser->availableBoxes))
+            return $this->Error(sprintf('Unknown box: %s', $boxName));
+            
+        $pageboxes = $parser->getPageBoxes($pageno, $this->k);
+        
+        /**
+         * MediaBox
+         * CropBox: Default -> MediaBox
+         * BleedBox: Default -> CropBox
+         * TrimBox: Default -> CropBox
+         * ArtBox: Default -> CropBox
+         */
+        if (!isset($pageboxes[$boxName]) && ($boxName == '/BleedBox' || $boxName == '/TrimBox' || $boxName == '/ArtBox'))
+            $boxName = '/CropBox';
+        if (!isset($pageboxes[$boxName]) && $boxName == '/CropBox')
+            $boxName = '/MediaBox';
+        
+        if (!isset($pageboxes[$boxName]))
+            return false;
+            
+        $this->lastUsedPageBox = $boxName;
+        
+        $box = $pageboxes[$boxName];
+        
+        $this->tpl++;
+        $this->tpls[$this->tpl] = array();
+        $tpl =& $this->tpls[$this->tpl];
+        $tpl['parser'] =& $parser;
+        $tpl['resources'] = $parser->getPageResources();
+        $tpl['buffer'] = $parser->getContent();
+        $tpl['box'] = $box;
+        
+        // To build an array that can be used by PDF_TPL::useTemplate()
+        $this->tpls[$this->tpl] = array_merge($this->tpls[$this->tpl], $box);
+        
+        // An imported page will start at 0,0 everytime. Translation will be set in _putformxobjects()
+        $tpl['x'] = 0;
+        $tpl['y'] = 0;
+        
+        // handle rotated pages
+        $rotation = $parser->getPageRotation($pageno);
+        $tpl['_rotationAngle'] = 0;
+        if (isset($rotation[1]) && ($angle = $rotation[1] % 360) != 0) {
+        	$steps = $angle / 90;
+                
+            $_w = $tpl['w'];
+            $_h = $tpl['h'];
+            $tpl['w'] = $steps % 2 == 0 ? $_w : $_h;
+            $tpl['h'] = $steps % 2 == 0 ? $_h : $_w;
+            
+            if ($angle < 0)
+            	$angle += 360;
+            
+        	$tpl['_rotationAngle'] = $angle * -1;
+        }
+        
+        $this->_importedPages[$pageKey] = $this->tpl;
+        
+        return $this->tpl;
+    }
+    
+    /**
+     * Returns the last used page box
+     *
+     * @return string
+     */
+    function getLastUsedPageBox() {
+        return $this->lastUsedPageBox;
+    }
+    
+    
+    function useTemplate($tplidx, $_x = null, $_y = null, $_w = 0, $_h = 0, $adjustPageSize = false) {
+        if ($adjustPageSize == true && is_null($_x) && is_null($_y)) {
+            $size = $this->getTemplateSize($tplidx, $_w, $_h);
+            $orientation = $size['w'] > $size['h'] ? 'L' : 'P';
+            $size = array($size['w'], $size['h']);
+            
+            if (is_subclass_of($this, 'TCPDF')) {
+            	$this->setPageFormat($size, $orientation);
+            } else {
+            	$size = $this->_getpagesize($size);
+            	
+            	if($orientation!=$this->CurOrientation || $size[0]!=$this->CurPageSize[0] || $size[1]!=$this->CurPageSize[1])
+				{
+					// New size or orientation
+					if($orientation=='P')
+					{
+						$this->w = $size[0];
+						$this->h = $size[1];
+					}
+					else
+					{
+						$this->w = $size[1];
+						$this->h = $size[0];
+					}
+					$this->wPt = $this->w*$this->k;
+					$this->hPt = $this->h*$this->k;
+					$this->PageBreakTrigger = $this->h-$this->bMargin;
+					$this->CurOrientation = $orientation;
+					$this->CurPageSize = $size;
+					$this->PageSizes[$this->page] = array($this->wPt, $this->hPt);
+				}
+            } 
+        }
+        
+        $this->_out('q 0 J 1 w 0 j 0 G 0 g'); // reset standard values
+        $s = parent::useTemplate($tplidx, $_x, $_y, $_w, $_h);
+        $this->_out('Q');
+        
+        return $s;
+    }
+    
+    /**
+     * Private method, that rebuilds all needed objects of source files
+     */
+    function _putimportedobjects() {
+        if (is_array($this->parsers) && count($this->parsers) > 0) {
+            foreach($this->parsers AS $filename => $p) {
+                $this->current_parser =& $this->parsers[$filename];
+                if (isset($this->_obj_stack[$filename]) && is_array($this->_obj_stack[$filename])) {
+                    while(($n = key($this->_obj_stack[$filename])) !== null) {
+                        $nObj = $this->current_parser->pdf_resolve_object($this->current_parser->c, $this->_obj_stack[$filename][$n][1]);
+						
+                        $this->_newobj($this->_obj_stack[$filename][$n][0]);
+                        
+                        if ($nObj[0] == PDF_TYPE_STREAM) {
+							$this->pdf_write_value($nObj);
+                        } else {
+                            $this->pdf_write_value($nObj[1]);
+                        }
+                        
+                        $this->_out('endobj');
+                        $this->_obj_stack[$filename][$n] = null; // free memory
+                        unset($this->_obj_stack[$filename][$n]);
+                        reset($this->_obj_stack[$filename]);
+                    }
+                }
+            }
+        }
+    }
+    
+    
+    /**
+     * Private Method that writes the form xobjects
+     */
+    function _putformxobjects() {
+        $filter=($this->compress) ? '/Filter /FlateDecode ' : '';
+	    reset($this->tpls);
+        foreach($this->tpls AS $tplidx => $tpl) {
+            $p=($this->compress) ? gzcompress($tpl['buffer']) : $tpl['buffer'];
+    		$this->_newobj();
+    		$cN = $this->n; // TCPDF/Protection: rem current "n"
+    		
+    		$this->tpls[$tplidx]['n'] = $this->n;
+    		$this->_out('<<' . $filter . '/Type /XObject');
+            $this->_out('/Subtype /Form');
+            $this->_out('/FormType 1');
+            
+            $this->_out(sprintf('/BBox [%.2F %.2F %.2F %.2F]', 
+                (isset($tpl['box']['llx']) ? $tpl['box']['llx'] : $tpl['x']) * $this->k,
+                (isset($tpl['box']['lly']) ? $tpl['box']['lly'] : -$tpl['y']) * $this->k,
+                (isset($tpl['box']['urx']) ? $tpl['box']['urx'] : $tpl['w'] + $tpl['x']) * $this->k,
+                (isset($tpl['box']['ury']) ? $tpl['box']['ury'] : $tpl['h'] - $tpl['y']) * $this->k
+            ));
+            
+            $c = 1;
+            $s = 0;
+            $tx = 0;
+            $ty = 0;
+            
+            if (isset($tpl['box'])) {
+                $tx = -$tpl['box']['llx'];
+                $ty = -$tpl['box']['lly']; 
+                
+                if ($tpl['_rotationAngle'] <> 0) {
+                    $angle = $tpl['_rotationAngle'] * M_PI/180;
+                    $c=cos($angle);
+                    $s=sin($angle);
+                    
+                    switch($tpl['_rotationAngle']) {
+                        case -90:
+                           $tx = -$tpl['box']['lly'];
+                           $ty = $tpl['box']['urx'];
+                           break;
+                        case -180:
+                            $tx = $tpl['box']['urx'];
+                            $ty = $tpl['box']['ury'];
+                            break;
+                        case -270:
+                        	$tx = $tpl['box']['ury'];
+                            $ty = -$tpl['box']['llx'];
+                            break;
+                    }
+                }
+            } else if ($tpl['x'] != 0 || $tpl['y'] != 0) {
+                $tx = -$tpl['x'] * 2;
+                $ty = $tpl['y'] * 2;
+            }
+            
+            $tx *= $this->k;
+            $ty *= $this->k;
+            
+            if ($c != 1 || $s != 0 || $tx != 0 || $ty != 0) {
+                $this->_out(sprintf('/Matrix [%.5F %.5F %.5F %.5F %.5F %.5F]',
+                    $c, $s, -$s, $c, $tx, $ty
+                ));
+            }
+            
+            $this->_out('/Resources ');
+
+            if (isset($tpl['resources'])) {
+                $this->current_parser =& $tpl['parser'];
+                $this->pdf_write_value($tpl['resources']); // "n" will be changed
+            } else {
+                $this->_out('<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');
+            	if (isset($this->_res['tpl'][$tplidx]['fonts']) && count($this->_res['tpl'][$tplidx]['fonts'])) {
+                	$this->_out('/Font <<');
+                    foreach($this->_res['tpl'][$tplidx]['fonts'] as $font)
+                		$this->_out('/F' . $font['i'] . ' ' . $font['n'] . ' 0 R');
+                	$this->_out('>>');
+                }
+            	if(isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images']) || 
+            	   isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls']))
+            	{
+                    $this->_out('/XObject <<');
+                    if (isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images'])) {
+                        foreach($this->_res['tpl'][$tplidx]['images'] as $image)
+                  			$this->_out('/I' . $image['i'] . ' ' . $image['n'] . ' 0 R');
+                    }
+                    if (isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls'])) {
+                        foreach($this->_res['tpl'][$tplidx]['tpls'] as $i => $tpl)
+                            $this->_out($this->tplprefix . $i . ' ' . $tpl['n'] . ' 0 R');
+                    }
+                    $this->_out('>>');
+            	}
+            	$this->_out('>>');
+            }
+
+            $nN = $this->n; // TCPDF: rem new "n"
+            $this->n = $cN; // TCPDF: reset to current "n"
+            if (is_subclass_of($this, 'TCPDF')) {
+            	$p = $this->_getrawstream($p);
+            	$this->_out('/Length ' . strlen($p) . ' >>');
+            	$this->_out("stream\n" . $p . "\nendstream");
+            } else {
+	            $this->_out('/Length ' . strlen($p) . ' >>');
+	    		$this->_putstream($p);
+            }
+    		$this->_out('endobj');
+    		$this->n = $nN; // TCPDF: reset to new "n"
+        }
+        
+        $this->_putimportedobjects();
+    }
+
+    /**
+     * Rewritten to handle existing own defined objects
+     */
+    function _newobj($obj_id = false, $onlynewobj = false) {
+        if (!$obj_id) {
+            $obj_id = ++$this->n;
+        }
+
+        //Begin a new object
+        if (!$onlynewobj) {
+            $this->offsets[$obj_id] = is_subclass_of($this, 'TCPDF') ? $this->bufferlen : strlen($this->buffer);
+            $this->_out($obj_id . ' 0 obj');
+            $this->_current_obj_id = $obj_id; // for later use with encryption
+        }
+        
+        return $obj_id;
+    }
+
+    /**
+     * Writes a value
+     * Needed to rebuild the source document
+     *
+     * @param mixed $value A PDF-Value. Structure of values see cases in this method
+     */
+    function pdf_write_value(&$value)
+    {
+        if (is_subclass_of($this, 'TCPDF')) {
+            parent::pdf_write_value($value);
+        }
+        
+        switch ($value[0]) {
+
+    		case PDF_TYPE_TOKEN:
+                $this->_straightOut($value[1] . ' ');
+    			break;
+		    case PDF_TYPE_NUMERIC:
+    		case PDF_TYPE_REAL:
+                if (is_float($value[1]) && $value[1] != 0) {
+    			    $this->_straightOut(rtrim(rtrim(sprintf('%F', $value[1]), '0'), '.') . ' ');
+    			} else {
+        			$this->_straightOut($value[1] . ' ');
+    			}
+    			break;
+    			
+    		case PDF_TYPE_ARRAY:
+
+    			// An array. Output the proper
+    			// structure and move on.
+
+    			$this->_straightOut('[');
+                for ($i = 0; $i < count($value[1]); $i++) {
+    				$this->pdf_write_value($value[1][$i]);
+    			}
+
+    			$this->_out(']');
+    			break;
+
+    		case PDF_TYPE_DICTIONARY:
+
+    			// A dictionary.
+    			$this->_straightOut('<<');
+
+    			reset ($value[1]);
+
+    			while (list($k, $v) = each($value[1])) {
+    				$this->_straightOut($k . ' ');
+    				$this->pdf_write_value($v);
+    			}
+
+    			$this->_straightOut('>>');
+    			break;
+
+    		case PDF_TYPE_OBJREF:
+
+    			// An indirect object reference
+    			// Fill the object stack if needed
+    			$cpfn =& $this->current_parser->filename;
+    			
+    			if (!isset($this->_don_obj_stack[$cpfn][$value[1]])) {
+    			    $this->_newobj(false, true);
+    			    $this->_obj_stack[$cpfn][$value[1]] = array($this->n, $value);
+                    $this->_don_obj_stack[$cpfn][$value[1]] = array($this->n, $value); // Value is maybee obsolete!!!
+                }
+                $objid = $this->_don_obj_stack[$cpfn][$value[1]][0];
+
+    			$this->_out($objid . ' 0 R');
+    			break;
+
+    		case PDF_TYPE_STRING:
+
+    			// A string.
+                $this->_straightOut('(' . $value[1] . ')');
+
+    			break;
+
+    		case PDF_TYPE_STREAM:
+
+    			// A stream. First, output the
+    			// stream dictionary, then the
+    			// stream data itself.
+                $this->pdf_write_value($value[1]);
+    			$this->_out('stream');
+    			$this->_out($value[2][1]);
+    			$this->_out('endstream');
+    			break;
+    			
+            case PDF_TYPE_HEX:
+                $this->_straightOut('<' . $value[1] . '>');
+                break;
+
+            case PDF_TYPE_BOOLEAN:
+    		    $this->_straightOut($value[1] ? 'true ' : 'false ');
+    		    break;
+            
+    		case PDF_TYPE_NULL:
+                // The null object.
+
+    			$this->_straightOut('null ');
+    			break;
+    	}
+    }
+    
+    
+    /**
+     * Modified so not each call will add a newline to the output.
+     */
+    function _straightOut($s) {
+        if (!is_subclass_of($this, 'TCPDF')) {
+            if($this->state==2)
+        		$this->pages[$this->page] .= $s;
+        	else
+        		$this->buffer .= $s;
+        } else {
+            if ($this->state == 2) {
+				if (isset($this->footerlen[$this->page]) AND ($this->footerlen[$this->page] > 0)) {
+					// puts data before page footer
+					$page = substr($this->getPageBuffer($this->page), 0, -$this->footerlen[$this->page]);
+					$footer = substr($this->getPageBuffer($this->page), -$this->footerlen[$this->page]);
+					$this->setPageBuffer($this->page, $page . ' ' . $s . "\n" . $footer);
+				} else {
+					$this->setPageBuffer($this->page, $s, true);
+				}
+			} else {
+				$this->setBuffer($s);
+			}
+        }
+    }
+
+    /**
+     * rewritten to close opened parsers
+     *
+     */
+    function _enddoc() {
+        parent::_enddoc();
+        $this->_closeParsers();
+    }
+    
+    /**
+     * close all files opened by parsers
+     */
+    function _closeParsers() {
+        if ($this->state > 2 && count($this->parsers) > 0) {
+          	foreach ($this->parsers as $k => $_){
+            	$this->parsers[$k]->closeFile();
+            	$this->parsers[$k] = null;
+            	unset($this->parsers[$k]);
+            }
+            return true;
+        }
+        return false;
+    }
 }
\ No newline at end of file
diff --git a/library/html2pdf/fpdi/fpdi_pdf_parser.php b/library/html2pdf/fpdi/fpdi_pdf_parser.php
index fd2b4414c..9da790507 100644
--- a/library/html2pdf/fpdi/fpdi_pdf_parser.php
+++ b/library/html2pdf/fpdi/fpdi_pdf_parser.php
@@ -1,408 +1,408 @@
-<?php
-//
-//  FPDI - Version 1.4.2
-//
-//    Copyright 2004-2011 Setasign - Jan Slabon
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-require_once('pdf_parser.php');
-
-class fpdi_pdf_parser extends pdf_parser {
-
-    /**
-     * Pages
-     * Index beginns at 0
-     *
-     * @var array
-     */
-    var $pages;
-    
-    /**
-     * Page count
-     * @var integer
-     */
-    var $page_count;
-    
-    /**
-     * actual page number
-     * @var integer
-     */
-    var $pageno;
-    
-    /**
-     * PDF Version of imported Document
-     * @var string
-     */
-    var $pdfVersion;
-    
-    /**
-     * FPDI Reference
-     * @var object
-     */
-    var $fpdi;
-    
-    /**
-     * Available BoxTypes
-     *
-     * @var array
-     */
-    var $availableBoxes = array('/MediaBox', '/CropBox', '/BleedBox', '/TrimBox', '/ArtBox');
-        
-    /**
-     * Constructor
-     *
-     * @param string $filename  Source-Filename
-     * @param object $fpdi      Object of type fpdi
-     */
-    function fpdi_pdf_parser($filename, &$fpdi) {
-        $this->fpdi =& $fpdi;
-		
-        parent::pdf_parser($filename);
-
-        // resolve Pages-Dictonary
-        $pages = $this->pdf_resolve_object($this->c, $this->root[1][1]['/Pages']);
-
-        // Read pages
-        $this->read_pages($this->c, $pages, $this->pages);
-        
-        // count pages;
-        $this->page_count = count($this->pages);
-    }
-    
-    /**
-     * Overwrite parent::error()
-     *
-     * @param string $msg  Error-Message
-     */
-    function error($msg) {
-    	$this->fpdi->error($msg);	
-    }
-    
-    /**
-     * Get pagecount from sourcefile
-     *
-     * @return int
-     */
-    function getPageCount() {
-        return $this->page_count;
-    }
-
-
-    /**
-     * Set pageno
-     *
-     * @param int $pageno Pagenumber to use
-     */
-    function setPageno($pageno) {
-        $pageno = ((int) $pageno) - 1;
-
-        if ($pageno < 0 || $pageno >= $this->getPageCount()) {
-            $this->fpdi->error('Pagenumber is wrong!');
-        }
-
-        $this->pageno = $pageno;
-    }
-    
-    /**
-     * Get page-resources from current page
-     *
-     * @return array
-     */
-    function getPageResources() {
-        return $this->_getPageResources($this->pages[$this->pageno]);
-    }
-    
-    /**
-     * Get page-resources from /Page
-     *
-     * @param array $obj Array of pdf-data
-     */
-    function _getPageResources ($obj) { // $obj = /Page
-    	$obj = $this->pdf_resolve_object($this->c, $obj);
-
-        // If the current object has a resources
-    	// dictionary associated with it, we use
-    	// it. Otherwise, we move back to its
-    	// parent object.
-        if (isset ($obj[1][1]['/Resources'])) {
-    		$res = $this->pdf_resolve_object($this->c, $obj[1][1]['/Resources']);
-    		if ($res[0] == PDF_TYPE_OBJECT)
-                return $res[1];
-            return $res;
-    	} else {
-    		if (!isset ($obj[1][1]['/Parent'])) {
-    			return false;
-    		} else {
-                $res = $this->_getPageResources($obj[1][1]['/Parent']);
-                if ($res[0] == PDF_TYPE_OBJECT)
-                    return $res[1];
-                return $res;
-    		}
-    	}
-    }
-
-
-    /**
-     * Get content of current page
-     *
-     * If more /Contents is an array, the streams are concated
-     *
-     * @return string
-     */
-    function getContent() {
-        $buffer = '';
-        
-        if (isset($this->pages[$this->pageno][1][1]['/Contents'])) {
-            $contents = $this->_getPageContent($this->pages[$this->pageno][1][1]['/Contents']);
-            foreach($contents AS $tmp_content) {
-                $buffer .= $this->_rebuildContentStream($tmp_content) . ' ';
-            }
-        }
-        
-        return $buffer;
-    }
-    
-    
-    /**
-     * Resolve all content-objects
-     *
-     * @param array $content_ref
-     * @return array
-     */
-    function _getPageContent($content_ref) {
-        $contents = array();
-        
-        if ($content_ref[0] == PDF_TYPE_OBJREF) {
-            $content = $this->pdf_resolve_object($this->c, $content_ref);
-            if ($content[1][0] == PDF_TYPE_ARRAY) {
-                $contents = $this->_getPageContent($content[1]);
-            } else {
-                $contents[] = $content;
-            }
-        } else if ($content_ref[0] == PDF_TYPE_ARRAY) {
-            foreach ($content_ref[1] AS $tmp_content_ref) {
-                $contents = array_merge($contents,$this->_getPageContent($tmp_content_ref));
-            }
-        }
-
-        return $contents;
-    }
-
-
-    /**
-     * Rebuild content-streams
-     *
-     * @param array $obj
-     * @return string
-     */
-    function _rebuildContentStream($obj) {
-        $filters = array();
-        
-        if (isset($obj[1][1]['/Filter'])) {
-            $_filter = $obj[1][1]['/Filter'];
-
-            if ($_filter[0] == PDF_TYPE_OBJREF) {
-                $tmpFilter = $this->pdf_resolve_object($this->c, $_filter);
-                $_filter = $tmpFilter[1];
-            }
-            
-            if ($_filter[0] == PDF_TYPE_TOKEN) {
-                $filters[] = $_filter;
-            } else if ($_filter[0] == PDF_TYPE_ARRAY) {
-                $filters = $_filter[1];
-            }
-        }
-
-        $stream = $obj[2][1];
-
-        foreach ($filters AS $_filter) {
-            switch ($_filter[1]) {
-                case '/FlateDecode':
-                case '/Fl':
-                	// $stream .= "\x0F\x0D"; // in an errorious stream this suffix could work
-                	// $stream .= "\x0A";
-                	// $stream .= "\x0D";
-                	if (function_exists('gzuncompress')) {
-                        $stream = (strlen($stream) > 0) ? @gzuncompress($stream) : '';
-                    } else {
-                        $this->error(sprintf('To handle %s filter, please compile php with zlib support.',$_filter[1]));
-                    }
-                    
-                    if ($stream === false) {
-                    	$this->error('Error while decompressing stream.');
-                    }
-                break;
-                case '/LZWDecode':
-                    include_once('filters/FilterLZW_FPDI.php');
-                    $decoder = new FilterLZW_FPDI($this->fpdi);
-                    $stream = $decoder->decode($stream);
-                    break;
-                case '/ASCII85Decode':
-                    include_once('filters/FilterASCII85_FPDI.php');
-                    $decoder = new FilterASCII85_FPDI($this->fpdi);
-                    $stream = $decoder->decode($stream);
-                    break;
-                case null:
-                    $stream = $stream;
-                break;
-                default:
-                    $this->error(sprintf('Unsupported Filter: %s',$_filter[1]));
-            }
-        }
-        
-        return $stream;
-    }
-    
-    
-    /**
-     * Get a Box from a page
-     * Arrayformat is same as used by fpdf_tpl
-     *
-     * @param array $page a /Page
-     * @param string $box_index Type of Box @see $availableBoxes
-     * @param float Scale factor from user space units to points
-     * @return array
-     */
-    function getPageBox($page, $box_index, $k) {
-        $page = $this->pdf_resolve_object($this->c, $page);
-        $box = null;
-        if (isset($page[1][1][$box_index]))
-            $box =& $page[1][1][$box_index];
-        
-        if (!is_null($box) && $box[0] == PDF_TYPE_OBJREF) {
-            $tmp_box = $this->pdf_resolve_object($this->c, $box);
-            $box = $tmp_box[1];
-        }
-            
-        if (!is_null($box) && $box[0] == PDF_TYPE_ARRAY) {
-            $b =& $box[1];
-            return array('x' => $b[0][1] / $k,
-                         'y' => $b[1][1] / $k,
-                         'w' => abs($b[0][1] - $b[2][1]) / $k,
-                         'h' => abs($b[1][1] - $b[3][1]) / $k,
-                         'llx' => min($b[0][1], $b[2][1]) / $k,
-                         'lly' => min($b[1][1], $b[3][1]) / $k,
-                         'urx' => max($b[0][1], $b[2][1]) / $k,
-                         'ury' => max($b[1][1], $b[3][1]) / $k,
-                         );
-        } else if (!isset ($page[1][1]['/Parent'])) {
-            return false;
-        } else {
-            return $this->getPageBox($this->pdf_resolve_object($this->c, $page[1][1]['/Parent']), $box_index, $k);
-        }
-    }
-
-    /**
-     * Get all page boxes by page no
-     * 
-     * @param int The page number
-     * @param float Scale factor from user space units to points
-     * @return array
-     */
-     function getPageBoxes($pageno, $k) {
-        return $this->_getPageBoxes($this->pages[$pageno - 1], $k);
-    }
-    
-    /**
-     * Get all boxes from /Page
-     *
-     * @param array a /Page
-     * @return array
-     */
-    function _getPageBoxes($page, $k) {
-        $boxes = array();
-
-        foreach($this->availableBoxes AS $box) {
-            if ($_box = $this->getPageBox($page, $box, $k)) {
-                $boxes[$box] = $_box;
-            }
-        }
-
-        return $boxes;
-    }
-
-    /**
-     * Get the page rotation by pageno
-     *
-     * @param integer $pageno
-     * @return array
-     */
-    function getPageRotation($pageno) {
-        return $this->_getPageRotation($this->pages[$pageno - 1]);
-    }
-    
-    function _getPageRotation($obj) { // $obj = /Page
-    	$obj = $this->pdf_resolve_object($this->c, $obj);
-    	if (isset ($obj[1][1]['/Rotate'])) {
-    		$res = $this->pdf_resolve_object($this->c, $obj[1][1]['/Rotate']);
-    		if ($res[0] == PDF_TYPE_OBJECT)
-                return $res[1];
-            return $res;
-    	} else {
-    		if (!isset ($obj[1][1]['/Parent'])) {
-    			return false;
-    		} else {
-                $res = $this->_getPageRotation($obj[1][1]['/Parent']);
-                if ($res[0] == PDF_TYPE_OBJECT)
-                    return $res[1];
-                return $res;
-    		}
-    	}
-    }
-    
-    /**
-     * Read all /Page(es)
-     *
-     * @param object pdf_context
-     * @param array /Pages
-     * @param array the result-array
-     */
-    function read_pages(&$c, &$pages, &$result) {
-        // Get the kids dictionary
-    	$_kids = $this->pdf_resolve_object ($c, $pages[1][1]['/Kids']);
-        
-        if (!is_array($_kids))
-            $this->error('Cannot find /Kids in current /Page-Dictionary');
-            
-        if ($_kids[1][0] == PDF_TYPE_ARRAY) {
-            $kids = $_kids[1][1];
-        } else {
-            $kids = $_kids[1];
-        }
-        
-        foreach ($kids as $v) {
-    		$pg = $this->pdf_resolve_object ($c, $v);
-            if ($pg[1][1]['/Type'][1] === '/Pages') {
-                // If one of the kids is an embedded
-    			// /Pages array, resolve it as well.
-                $this->read_pages($c, $pg, $result);
-    		} else {
-    			$result[] = $pg;
-    		}
-    	}
-    }
-
-    
-    
-    /**
-     * Get PDF-Version
-     *
-     * And reset the PDF Version used in FPDI if needed
-     */
-    function getPDFVersion() {
-        parent::getPDFVersion();
-        $this->fpdi->setPDFVersion(max($this->fpdi->getPDFVersion(), $this->pdfVersion));
-    }
+<?php
+//
+//  FPDI - Version 1.4.2
+//
+//    Copyright 2004-2011 Setasign - Jan Slabon
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+require_once('pdf_parser.php');
+
+class fpdi_pdf_parser extends pdf_parser {
+
+    /**
+     * Pages
+     * Index beginns at 0
+     *
+     * @var array
+     */
+    var $pages;
+    
+    /**
+     * Page count
+     * @var integer
+     */
+    var $page_count;
+    
+    /**
+     * actual page number
+     * @var integer
+     */
+    var $pageno;
+    
+    /**
+     * PDF Version of imported Document
+     * @var string
+     */
+    var $pdfVersion;
+    
+    /**
+     * FPDI Reference
+     * @var object
+     */
+    var $fpdi;
+    
+    /**
+     * Available BoxTypes
+     *
+     * @var array
+     */
+    var $availableBoxes = array('/MediaBox', '/CropBox', '/BleedBox', '/TrimBox', '/ArtBox');
+        
+    /**
+     * Constructor
+     *
+     * @param string $filename  Source-Filename
+     * @param object $fpdi      Object of type fpdi
+     */
+    function fpdi_pdf_parser($filename, &$fpdi) {
+        $this->fpdi =& $fpdi;
+		
+        parent::pdf_parser($filename);
+
+        // resolve Pages-Dictonary
+        $pages = $this->pdf_resolve_object($this->c, $this->root[1][1]['/Pages']);
+
+        // Read pages
+        $this->read_pages($this->c, $pages, $this->pages);
+        
+        // count pages;
+        $this->page_count = count($this->pages);
+    }
+    
+    /**
+     * Overwrite parent::error()
+     *
+     * @param string $msg  Error-Message
+     */
+    function error($msg) {
+    	$this->fpdi->error($msg);	
+    }
+    
+    /**
+     * Get pagecount from sourcefile
+     *
+     * @return int
+     */
+    function getPageCount() {
+        return $this->page_count;
+    }
+
+
+    /**
+     * Set pageno
+     *
+     * @param int $pageno Pagenumber to use
+     */
+    function setPageno($pageno) {
+        $pageno = ((int) $pageno) - 1;
+
+        if ($pageno < 0 || $pageno >= $this->getPageCount()) {
+            $this->fpdi->error('Pagenumber is wrong!');
+        }
+
+        $this->pageno = $pageno;
+    }
+    
+    /**
+     * Get page-resources from current page
+     *
+     * @return array
+     */
+    function getPageResources() {
+        return $this->_getPageResources($this->pages[$this->pageno]);
+    }
+    
+    /**
+     * Get page-resources from /Page
+     *
+     * @param array $obj Array of pdf-data
+     */
+    function _getPageResources ($obj) { // $obj = /Page
+    	$obj = $this->pdf_resolve_object($this->c, $obj);
+
+        // If the current object has a resources
+    	// dictionary associated with it, we use
+    	// it. Otherwise, we move back to its
+    	// parent object.
+        if (isset ($obj[1][1]['/Resources'])) {
+    		$res = $this->pdf_resolve_object($this->c, $obj[1][1]['/Resources']);
+    		if ($res[0] == PDF_TYPE_OBJECT)
+                return $res[1];
+            return $res;
+    	} else {
+    		if (!isset ($obj[1][1]['/Parent'])) {
+    			return false;
+    		} else {
+                $res = $this->_getPageResources($obj[1][1]['/Parent']);
+                if ($res[0] == PDF_TYPE_OBJECT)
+                    return $res[1];
+                return $res;
+    		}
+    	}
+    }
+
+
+    /**
+     * Get content of current page
+     *
+     * If more /Contents is an array, the streams are concated
+     *
+     * @return string
+     */
+    function getContent() {
+        $buffer = '';
+        
+        if (isset($this->pages[$this->pageno][1][1]['/Contents'])) {
+            $contents = $this->_getPageContent($this->pages[$this->pageno][1][1]['/Contents']);
+            foreach($contents AS $tmp_content) {
+                $buffer .= $this->_rebuildContentStream($tmp_content) . ' ';
+            }
+        }
+        
+        return $buffer;
+    }
+    
+    
+    /**
+     * Resolve all content-objects
+     *
+     * @param array $content_ref
+     * @return array
+     */
+    function _getPageContent($content_ref) {
+        $contents = array();
+        
+        if ($content_ref[0] == PDF_TYPE_OBJREF) {
+            $content = $this->pdf_resolve_object($this->c, $content_ref);
+            if ($content[1][0] == PDF_TYPE_ARRAY) {
+                $contents = $this->_getPageContent($content[1]);
+            } else {
+                $contents[] = $content;
+            }
+        } else if ($content_ref[0] == PDF_TYPE_ARRAY) {
+            foreach ($content_ref[1] AS $tmp_content_ref) {
+                $contents = array_merge($contents,$this->_getPageContent($tmp_content_ref));
+            }
+        }
+
+        return $contents;
+    }
+
+
+    /**
+     * Rebuild content-streams
+     *
+     * @param array $obj
+     * @return string
+     */
+    function _rebuildContentStream($obj) {
+        $filters = array();
+        
+        if (isset($obj[1][1]['/Filter'])) {
+            $_filter = $obj[1][1]['/Filter'];
+
+            if ($_filter[0] == PDF_TYPE_OBJREF) {
+                $tmpFilter = $this->pdf_resolve_object($this->c, $_filter);
+                $_filter = $tmpFilter[1];
+            }
+            
+            if ($_filter[0] == PDF_TYPE_TOKEN) {
+                $filters[] = $_filter;
+            } else if ($_filter[0] == PDF_TYPE_ARRAY) {
+                $filters = $_filter[1];
+            }
+        }
+
+        $stream = $obj[2][1];
+
+        foreach ($filters AS $_filter) {
+            switch ($_filter[1]) {
+                case '/FlateDecode':
+                case '/Fl':
+                	// $stream .= "\x0F\x0D"; // in an errorious stream this suffix could work
+                	// $stream .= "\x0A";
+                	// $stream .= "\x0D";
+                	if (function_exists('gzuncompress')) {
+                        $stream = (strlen($stream) > 0) ? @gzuncompress($stream) : '';
+                    } else {
+                        $this->error(sprintf('To handle %s filter, please compile php with zlib support.',$_filter[1]));
+                    }
+                    
+                    if ($stream === false) {
+                    	$this->error('Error while decompressing stream.');
+                    }
+                break;
+                case '/LZWDecode':
+                    include_once('filters/FilterLZW_FPDI.php');
+                    $decoder = new FilterLZW_FPDI($this->fpdi);
+                    $stream = $decoder->decode($stream);
+                    break;
+                case '/ASCII85Decode':
+                    include_once('filters/FilterASCII85_FPDI.php');
+                    $decoder = new FilterASCII85_FPDI($this->fpdi);
+                    $stream = $decoder->decode($stream);
+                    break;
+                case null:
+                    $stream = $stream;
+                break;
+                default:
+                    $this->error(sprintf('Unsupported Filter: %s',$_filter[1]));
+            }
+        }
+        
+        return $stream;
+    }
+    
+    
+    /**
+     * Get a Box from a page
+     * Arrayformat is same as used by fpdf_tpl
+     *
+     * @param array $page a /Page
+     * @param string $box_index Type of Box @see $availableBoxes
+     * @param float Scale factor from user space units to points
+     * @return array
+     */
+    function getPageBox($page, $box_index, $k) {
+        $page = $this->pdf_resolve_object($this->c, $page);
+        $box = null;
+        if (isset($page[1][1][$box_index]))
+            $box =& $page[1][1][$box_index];
+        
+        if (!is_null($box) && $box[0] == PDF_TYPE_OBJREF) {
+            $tmp_box = $this->pdf_resolve_object($this->c, $box);
+            $box = $tmp_box[1];
+        }
+            
+        if (!is_null($box) && $box[0] == PDF_TYPE_ARRAY) {
+            $b =& $box[1];
+            return array('x' => $b[0][1] / $k,
+                         'y' => $b[1][1] / $k,
+                         'w' => abs($b[0][1] - $b[2][1]) / $k,
+                         'h' => abs($b[1][1] - $b[3][1]) / $k,
+                         'llx' => min($b[0][1], $b[2][1]) / $k,
+                         'lly' => min($b[1][1], $b[3][1]) / $k,
+                         'urx' => max($b[0][1], $b[2][1]) / $k,
+                         'ury' => max($b[1][1], $b[3][1]) / $k,
+                         );
+        } else if (!isset ($page[1][1]['/Parent'])) {
+            return false;
+        } else {
+            return $this->getPageBox($this->pdf_resolve_object($this->c, $page[1][1]['/Parent']), $box_index, $k);
+        }
+    }
+
+    /**
+     * Get all page boxes by page no
+     * 
+     * @param int The page number
+     * @param float Scale factor from user space units to points
+     * @return array
+     */
+     function getPageBoxes($pageno, $k) {
+        return $this->_getPageBoxes($this->pages[$pageno - 1], $k);
+    }
+    
+    /**
+     * Get all boxes from /Page
+     *
+     * @param array a /Page
+     * @return array
+     */
+    function _getPageBoxes($page, $k) {
+        $boxes = array();
+
+        foreach($this->availableBoxes AS $box) {
+            if ($_box = $this->getPageBox($page, $box, $k)) {
+                $boxes[$box] = $_box;
+            }
+        }
+
+        return $boxes;
+    }
+
+    /**
+     * Get the page rotation by pageno
+     *
+     * @param integer $pageno
+     * @return array
+     */
+    function getPageRotation($pageno) {
+        return $this->_getPageRotation($this->pages[$pageno - 1]);
+    }
+    
+    function _getPageRotation($obj) { // $obj = /Page
+    	$obj = $this->pdf_resolve_object($this->c, $obj);
+    	if (isset ($obj[1][1]['/Rotate'])) {
+    		$res = $this->pdf_resolve_object($this->c, $obj[1][1]['/Rotate']);
+    		if ($res[0] == PDF_TYPE_OBJECT)
+                return $res[1];
+            return $res;
+    	} else {
+    		if (!isset ($obj[1][1]['/Parent'])) {
+    			return false;
+    		} else {
+                $res = $this->_getPageRotation($obj[1][1]['/Parent']);
+                if ($res[0] == PDF_TYPE_OBJECT)
+                    return $res[1];
+                return $res;
+    		}
+    	}
+    }
+    
+    /**
+     * Read all /Page(es)
+     *
+     * @param object pdf_context
+     * @param array /Pages
+     * @param array the result-array
+     */
+    function read_pages(&$c, &$pages, &$result) {
+        // Get the kids dictionary
+    	$_kids = $this->pdf_resolve_object ($c, $pages[1][1]['/Kids']);
+        
+        if (!is_array($_kids))
+            $this->error('Cannot find /Kids in current /Page-Dictionary');
+            
+        if ($_kids[1][0] == PDF_TYPE_ARRAY) {
+            $kids = $_kids[1][1];
+        } else {
+            $kids = $_kids[1];
+        }
+        
+        foreach ($kids as $v) {
+    		$pg = $this->pdf_resolve_object ($c, $v);
+            if ($pg[1][1]['/Type'][1] === '/Pages') {
+                // If one of the kids is an embedded
+    			// /Pages array, resolve it as well.
+                $this->read_pages($c, $pg, $result);
+    		} else {
+    			$result[] = $pg;
+    		}
+    	}
+    }
+
+    
+    
+    /**
+     * Get PDF-Version
+     *
+     * And reset the PDF Version used in FPDI if needed
+     */
+    function getPDFVersion() {
+        parent::getPDFVersion();
+        $this->fpdi->setPDFVersion(max($this->fpdi->getPDFVersion(), $this->pdfVersion));
+    }
 }
\ No newline at end of file
diff --git a/library/html2pdf/fpdi/pdf_context.php b/library/html2pdf/fpdi/pdf_context.php
index 435df1e83..78b7b4ae6 100644
--- a/library/html2pdf/fpdi/pdf_context.php
+++ b/library/html2pdf/fpdi/pdf_context.php
@@ -1,104 +1,104 @@
-<?php
-//
-//  FPDI - Version 1.4.2
-//
-//    Copyright 2004-2011 Setasign - Jan Slabon
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-if (!class_exists('pdf_context', false)) {
-    
-    class pdf_context {
-    
-        /**
-         * Modi
-         *
-         * @var integer 0 = file | 1 = string
-         */
-        var $_mode = 0;
-        
-    	var $file;
-    	var $buffer;
-    	var $offset;
-    	var $length;
-    
-    	var $stack;
-    
-    	// Constructor
-    
-    	function pdf_context(&$f) {
-    		$this->file =& $f;
-    		if (is_string($this->file))
-    		    $this->_mode = 1;
-    		$this->reset();
-    	}
-    
-    	// Optionally move the file
-    	// pointer to a new location
-    	// and reset the buffered data
-    
-    	function reset($pos = null, $l = 100) {
-    	    if ($this->_mode == 0) {
-            	if (!is_null ($pos)) {
-        			fseek ($this->file, $pos);
-        		}
-        
-        		$this->buffer = $l > 0 ? fread($this->file, $l) : '';
-        		$this->length = strlen($this->buffer);
-        		if ($this->length < $l)
-                    $this->increase_length($l - $this->length);
-    	    } else {
-    	        $this->buffer = $this->file;
-    	        $this->length = strlen($this->buffer);
-    	    }
-    		$this->offset = 0;
-    		$this->stack = array();
-    	}
-    
-    	// Make sure that there is at least one
-    	// character beyond the current offset in
-    	// the buffer to prevent the tokenizer
-    	// from attempting to access data that does
-    	// not exist
-    
-    	function ensure_content() {
-    		if ($this->offset >= $this->length - 1) {
-    			return $this->increase_length();
-    		} else {
-    			return true;
-    		}
-    	}
-    
-    	// Forcefully read more data into the buffer
-    
-    	function increase_length($l = 100) {
-			if ($this->_mode == 0 && feof($this->file)) {
-				return false;
-			} else if ($this->_mode == 0) {
-			    $totalLength = $this->length + $l;
-			    do {
-			    	$toRead = $totalLength - $this->length;
-			    	if ($toRead < 1)
-			    		break;
-			    
-			    	$this->buffer .= fread($this->file, $toRead);
-	            } while ((($this->length = strlen($this->buffer)) != $totalLength) && !feof($this->file));
-				
-				return true;
-			} else {
-		        return false;
-			}
-		}
-    }
+<?php
+//
+//  FPDI - Version 1.4.2
+//
+//    Copyright 2004-2011 Setasign - Jan Slabon
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+if (!class_exists('pdf_context', false)) {
+    
+    class pdf_context {
+    
+        /**
+         * Modi
+         *
+         * @var integer 0 = file | 1 = string
+         */
+        var $_mode = 0;
+        
+    	var $file;
+    	var $buffer;
+    	var $offset;
+    	var $length;
+    
+    	var $stack;
+    
+    	// Constructor
+    
+    	function pdf_context(&$f) {
+    		$this->file =& $f;
+    		if (is_string($this->file))
+    		    $this->_mode = 1;
+    		$this->reset();
+    	}
+    
+    	// Optionally move the file
+    	// pointer to a new location
+    	// and reset the buffered data
+    
+    	function reset($pos = null, $l = 100) {
+    	    if ($this->_mode == 0) {
+            	if (!is_null ($pos)) {
+        			fseek ($this->file, $pos);
+        		}
+        
+        		$this->buffer = $l > 0 ? fread($this->file, $l) : '';
+        		$this->length = strlen($this->buffer);
+        		if ($this->length < $l)
+                    $this->increase_length($l - $this->length);
+    	    } else {
+    	        $this->buffer = $this->file;
+    	        $this->length = strlen($this->buffer);
+    	    }
+    		$this->offset = 0;
+    		$this->stack = array();
+    	}
+    
+    	// Make sure that there is at least one
+    	// character beyond the current offset in
+    	// the buffer to prevent the tokenizer
+    	// from attempting to access data that does
+    	// not exist
+    
+    	function ensure_content() {
+    		if ($this->offset >= $this->length - 1) {
+    			return $this->increase_length();
+    		} else {
+    			return true;
+    		}
+    	}
+    
+    	// Forcefully read more data into the buffer
+    
+    	function increase_length($l = 100) {
+			if ($this->_mode == 0 && feof($this->file)) {
+				return false;
+			} else if ($this->_mode == 0) {
+			    $totalLength = $this->length + $l;
+			    do {
+			    	$toRead = $totalLength - $this->length;
+			    	if ($toRead < 1)
+			    		break;
+			    
+			    	$this->buffer .= fread($this->file, $toRead);
+	            } while ((($this->length = strlen($this->buffer)) != $totalLength) && !feof($this->file));
+				
+				return true;
+			} else {
+		        return false;
+			}
+		}
+    }
 }
\ No newline at end of file
diff --git a/library/html2pdf/fpdi/pdf_parser.php b/library/html2pdf/fpdi/pdf_parser.php
index 4c6dd8e83..238e10c0d 100644
--- a/library/html2pdf/fpdi/pdf_parser.php
+++ b/library/html2pdf/fpdi/pdf_parser.php
@@ -1,719 +1,719 @@
-<?php
-//
-//  FPDI - Version 1.4.2
-//
-//    Copyright 2004-2011 Setasign - Jan Slabon
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-if (!defined ('PDF_TYPE_NULL'))
-    define ('PDF_TYPE_NULL', 0);
-if (!defined ('PDF_TYPE_NUMERIC'))
-    define ('PDF_TYPE_NUMERIC', 1);
-if (!defined ('PDF_TYPE_TOKEN'))
-    define ('PDF_TYPE_TOKEN', 2);
-if (!defined ('PDF_TYPE_HEX'))
-    define ('PDF_TYPE_HEX', 3);
-if (!defined ('PDF_TYPE_STRING'))
-    define ('PDF_TYPE_STRING', 4);
-if (!defined ('PDF_TYPE_DICTIONARY'))
-    define ('PDF_TYPE_DICTIONARY', 5);
-if (!defined ('PDF_TYPE_ARRAY'))
-    define ('PDF_TYPE_ARRAY', 6);
-if (!defined ('PDF_TYPE_OBJDEC'))
-    define ('PDF_TYPE_OBJDEC', 7);
-if (!defined ('PDF_TYPE_OBJREF'))
-    define ('PDF_TYPE_OBJREF', 8);
-if (!defined ('PDF_TYPE_OBJECT'))
-    define ('PDF_TYPE_OBJECT', 9);
-if (!defined ('PDF_TYPE_STREAM'))
-    define ('PDF_TYPE_STREAM', 10);
-if (!defined ('PDF_TYPE_BOOLEAN'))
-    define ('PDF_TYPE_BOOLEAN', 11);
-if (!defined ('PDF_TYPE_REAL'))
-    define ('PDF_TYPE_REAL', 12);
-    
-require_once('pdf_context.php');
-
-if (!class_exists('pdf_parser', false)) {
-    
-    class pdf_parser {
-    	
-    	/**
-         * Filename
-         * @var string
-         */
-        var $filename;
-        
-        /**
-         * File resource
-         * @var resource
-         */
-        var $f;
-        
-        /**
-         * PDF Context
-         * @var object pdf_context-Instance
-         */
-        var $c;
-        
-        /**
-         * xref-Data
-         * @var array
-         */
-        var $xref;
-    
-        /**
-         * root-Object
-         * @var array
-         */
-        var $root;
-    	
-        /**
-         * PDF version of the loaded document
-         * @var string
-         */
-        var $pdfVersion;
-        
-        /**
-	     * For reading encrypted documents and xref/objectstreams are in use
-	     *
-	     * @var boolean
-	     */
-	    var $readPlain = true;
-	    
-        /**
-         * Constructor
-         *
-         * @param string $filename  Source-Filename
-         */
-    	function pdf_parser($filename) {
-            $this->filename = $filename;
-            
-            $this->f = @fopen($this->filename, 'rb');
-    
-            if (!$this->f)
-                $this->error(sprintf('Cannot open %s !', $filename));
-    
-            $this->getPDFVersion();
-    
-            $this->c = new pdf_context($this->f);
-            
-            // Read xref-Data
-            $this->xref = array();
-            $this->pdf_read_xref($this->xref, $this->pdf_find_xref());
-            
-            // Check for Encryption
-            $this->getEncryption();
-    
-            // Read root
-            $this->pdf_read_root();
-        }
-        
-        /**
-         * Close the opened file
-         */
-        function closeFile() {
-        	if (isset($this->f) && is_resource($this->f)) {
-        	    fclose($this->f);	
-        		unset($this->f);
-        	}	
-        }
-        
-        /**
-         * Print Error and die
-         *
-         * @param string $msg  Error-Message
-         */
-        function error($msg) {
-        	die('<b>PDF-Parser Error:</b> ' . $msg);	
-        }
-        
-        /**
-         * Check Trailer for Encryption
-         */
-        function getEncryption() {
-            if (isset($this->xref['trailer'][1]['/Encrypt'])) {
-            	$this->error('File is encrypted!');
-            }
-        }
-        
-    	/**
-         * Find/Return /Root
-         *
-         * @return array
-         */
-        function pdf_find_root() {
-            if ($this->xref['trailer'][1]['/Root'][0] != PDF_TYPE_OBJREF) {
-                $this->error('Wrong Type of Root-Element! Must be an indirect reference');
-            }
-            
-            return $this->xref['trailer'][1]['/Root'];
-        }
-    
-        /**
-         * Read the /Root
-         */
-        function pdf_read_root() {
-            // read root
-            $this->root = $this->pdf_resolve_object($this->c, $this->pdf_find_root());
-        }
-        
-        /**
-         * Get PDF-Version
-         *
-         * And reset the PDF Version used in FPDI if needed
-         */
-        function getPDFVersion() {
-            fseek($this->f, 0);
-            preg_match('/\d\.\d/',fread($this->f, 16), $m);
-            if (isset($m[0]))
-                $this->pdfVersion = $m[0];
-            return $this->pdfVersion;
-        }
-        
-        /**
-         * Find the xref-Table
-         */
-        function pdf_find_xref() {
-           	$toRead = 1500;
-                    
-            $stat = fseek ($this->f, -$toRead, SEEK_END);
-            if ($stat === -1) {
-                fseek ($this->f, 0);
-            }
-           	$data = fread($this->f, $toRead);
-            
-            $pos = strlen($data) - strpos(strrev($data), strrev('startxref')); 
-            $data = substr($data, $pos);
-            
-            if (!preg_match('/\s*(\d+).*$/s', $data, $matches)) {
-                $this->error('Unable to find pointer to xref table');
-        	}
-    
-        	return (int) $matches[1];
-        }
-    
-        /**
-         * Read xref-table
-         *
-         * @param array $result Array of xref-table
-         * @param integer $offset of xref-table
-         */
-        function pdf_read_xref(&$result, $offset) {
-            $o_pos = $offset-min(20, $offset);
-        	fseek($this->f, $o_pos); // set some bytes backwards to fetch errorious docs
-                
-            $data = fread($this->f, 100);
-            
-            $xrefPos = strrpos($data, 'xref');
-    
-            if ($xrefPos === false) {
-                fseek($this->f, $offset);
-                $c = new pdf_context($this->f);
-                $xrefStreamObjDec = $this->pdf_read_value($c);
-                
-                if (is_array($xrefStreamObjDec) && isset($xrefStreamObjDec[0]) && $xrefStreamObjDec[0] == PDF_TYPE_OBJDEC) {
-                    $this->error(sprintf('This document (%s) probably uses a compression technique which is not supported by the free parser shipped with FPDI.', $this->filename));
-                } else {            
-                    $this->error('Unable to find xref table.');
-                }
-            }
-            
-            if (!isset($result['xref_location'])) {
-                $result['xref_location'] = $o_pos + $xrefPos;
-                $result['max_object'] = 0;
-        	}
-    
-        	$cylces = -1;
-            $bytesPerCycle = 100;
-            
-        	fseek($this->f, $o_pos = $o_pos + $xrefPos + 4); // set the handle directly after the "xref"-keyword
-            $data = fread($this->f, $bytesPerCycle);
-            
-            while (($trailerPos = strpos($data, 'trailer', max($bytesPerCycle * $cylces++, 0))) === false && !feof($this->f)) {
-                $data .= fread($this->f, $bytesPerCycle);
-            }
-            
-            if ($trailerPos === false) {
-                $this->error('Trailer keyword not found after xref table');
-            }
-            
-            $data = substr($data, 0, $trailerPos);
-            
-            // get Line-Ending
-            preg_match_all("/(\r\n|\n|\r)/", substr($data, 0, 100), $m); // check the first 100 bytes for linebreaks
-    
-            $differentLineEndings = count(array_unique($m[0]));
-            if ($differentLineEndings > 1) {
-                $lines = preg_split("/(\r\n|\n|\r)/", $data, -1, PREG_SPLIT_NO_EMPTY);
-            } else {
-                $lines = explode($m[0][1], $data);
-            }
-            
-            $data = $differentLineEndings = $m = null;
-            unset($data, $differentLineEndings, $m);
-            
-            $linesCount = count($lines);
-            
-            $start = 1;
-            
-            for ($i = 0; $i < $linesCount; $i++) {
-                $line = trim($lines[$i]);
-                if ($line) {
-                    $pieces = explode(' ', $line);
-                    $c = count($pieces);
-                    switch($c) {
-                        case 2:
-                            $start = (int)$pieces[0];
-                            $end   = $start + (int)$pieces[1];
-                            if ($end > $result['max_object'])
-                                $result['max_object'] = $end;
-                            break;
-                        case 3:
-                            if (!isset($result['xref'][$start]))
-                                $result['xref'][$start] = array();
-                            
-                            if (!array_key_exists($gen = (int) $pieces[1], $result['xref'][$start])) {
-                    	        $result['xref'][$start][$gen] = $pieces[2] == 'n' ? (int) $pieces[0] : null;
-                    	    }
-                            $start++;
-                            break;
-                        default:
-                            $this->error('Unexpected data in xref table');
-                    }
-                }
-            }
-            
-            $lines = $pieces = $line = $start = $end = $gen = null;
-            unset($lines, $pieces, $line, $start, $end, $gen);
-            
-            fseek($this->f, $o_pos + $trailerPos + 7);
-            
-            $c = new pdf_context($this->f);
-    	    $trailer = $this->pdf_read_value($c);
-    	    
-    	    $c = null;
-    	    unset($c);
-    	    
-    	    if (!isset($result['trailer'])) {
-                $result['trailer'] = $trailer;          
-    	    }
-    	    
-    	    if (isset($trailer[1]['/Prev'])) {
-    	        $this->pdf_read_xref($result, $trailer[1]['/Prev'][1]);
-    	    } 
-    	    
-    	    $trailer = null;
-    	    unset($trailer);
-            
-            return true;
-        }
-        
-        /**
-         * Reads an Value
-         *
-         * @param object $c pdf_context
-         * @param string $token a Token
-         * @return mixed
-         */
-        function pdf_read_value(&$c, $token = null) {
-        	if (is_null($token)) {
-        	    $token = $this->pdf_read_token($c);
-        	}
-        	
-            if ($token === false) {
-        	    return false;
-        	}
-    
-        	switch ($token) {
-                case	'<':
-        			// This is a hex string.
-        			// Read the value, then the terminator
-    
-                    $pos = $c->offset;
-    
-        			while(1) {
-    
-                        $match = strpos ($c->buffer, '>', $pos);
-    				
-        				// If you can't find it, try
-        				// reading more data from the stream
-    
-        				if ($match === false) {
-        					if (!$c->increase_length()) {
-        						return false;
-        					} else {
-                            	continue;
-                        	}
-        				}
-    
-        				$result = substr ($c->buffer, $c->offset, $match - $c->offset);
-        				$c->offset = $match + 1;
-        				
-        				return array (PDF_TYPE_HEX, $result);
-                    }
-                    
-                    break;
-        		case	'<<':
-        			// This is a dictionary.
-    
-        			$result = array();
-    
-        			// Recurse into this function until we reach
-        			// the end of the dictionary.
-        			while (($key = $this->pdf_read_token($c)) !== '>>') {
-        				if ($key === false) {
-        					return false;
-        				}
-        				
-        				if (($value =   $this->pdf_read_value($c)) === false) {
-        					return false;
-        				}
-        				
-        				// Catch missing value
-        				if ($value[0] == PDF_TYPE_TOKEN && $value[1] == '>>') {
-        				    $result[$key] = array(PDF_TYPE_NULL);
-        				    break;
-        				}
-        				
-        				$result[$key] = $value;
-        			}
-    				
-        			return array (PDF_TYPE_DICTIONARY, $result);
-    
-        		case	'[':
-        			// This is an array.
-    
-        			$result = array();
-    
-        			// Recurse into this function until we reach
-        			// the end of the array.
-        			while (($token = $this->pdf_read_token($c)) !== ']') {
-                        if ($token === false) {
-        					return false;
-        				}
-    					
-        				if (($value = $this->pdf_read_value($c, $token)) === false) {
-                            return false;
-        				}
-    					
-        				$result[] = $value;
-        			}
-        			
-                    return array (PDF_TYPE_ARRAY, $result);
-    
-        		case	'('		:
-                    // This is a string
-                    $pos = $c->offset;
-                    
-                    $openBrackets = 1;
-        			do {
-                        for (; $openBrackets != 0 && $pos < $c->length; $pos++) {
-                            switch (ord($c->buffer[$pos])) {
-                                case 0x28: // '('
-                                    $openBrackets++;
-                                    break;
-                                case 0x29: // ')'
-                                    $openBrackets--;
-                                    break;
-                                case 0x5C: // backslash
-                                    $pos++;
-                            }
-                        }
-        			} while($openBrackets != 0 && $c->increase_length());
-        			
-        			$result = substr($c->buffer, $c->offset, $pos - $c->offset - 1);
-        			$c->offset = $pos;
-        			
-        			return array (PDF_TYPE_STRING, $result);
-    
-                case 'stream':
-                	$o_pos = ftell($c->file)-strlen($c->buffer);
-    		        $o_offset = $c->offset;
-    		        
-    		        $c->reset($startpos = $o_pos + $o_offset);
-    		        
-    		        $e = 0; // ensure line breaks in front of the stream
-    		        if ($c->buffer[0] == chr(10) || $c->buffer[0] == chr(13))
-    		        	$e++;
-    		        if ($c->buffer[1] == chr(10) && $c->buffer[0] != chr(10))
-    		        	$e++;
-    		        
-    		        if ($this->actual_obj[1][1]['/Length'][0] == PDF_TYPE_OBJREF) {
-    		        	$tmp_c = new pdf_context($this->f);
-    		        	$tmp_length = $this->pdf_resolve_object($tmp_c, $this->actual_obj[1][1]['/Length']);
-    		        	$length = $tmp_length[1][1];
-    		        } else {
-    		        	$length = $this->actual_obj[1][1]['/Length'][1];	
-    		        }
-    		        	
-    		        if ($length > 0) {
-        		        $c->reset($startpos + $e,$length);
-        		        $v = $c->buffer;
-    		        } else {
-    		            $v = '';   
-    		        }
-    		        $c->reset($startpos + $e + $length + 9); // 9 = strlen("endstream")
-    		        
-    		        return array(PDF_TYPE_STREAM, $v);
-    		        
-    	        default	:
-                	if (is_numeric ($token)) {
-                        // A numeric token. Make sure that
-        				// it is not part of something else.
-        				if (($tok2 = $this->pdf_read_token ($c)) !== false) {
-                            if (is_numeric ($tok2)) {
-    
-        						// Two numeric tokens in a row.
-        						// In this case, we're probably in
-        						// front of either an object reference
-        						// or an object specification.
-        						// Determine the case and return the data
-        						if (($tok3 = $this->pdf_read_token ($c)) !== false) {
-                                    switch ($tok3) {
-        								case 'obj':
-                                            return array (PDF_TYPE_OBJDEC, (int) $token, (int) $tok2);
-        								case 'R':
-        									return array (PDF_TYPE_OBJREF, (int) $token, (int) $tok2);
-        							}
-        							// If we get to this point, that numeric value up
-        							// there was just a numeric value. Push the extra
-        							// tokens back into the stack and return the value.
-        							array_push ($c->stack, $tok3);
-        						}
-        					}
-    
-        					array_push ($c->stack, $tok2);
-        				}
-    
-        				if ($token === (string)((int)$token))
-            				return array (PDF_TYPE_NUMERIC, (int)$token);
-        				else 
-        					return array (PDF_TYPE_REAL, (float)$token);
-        			} else if ($token == 'true' || $token == 'false') {
-                        return array (PDF_TYPE_BOOLEAN, $token == 'true');
-        			} else if ($token == 'null') {
-        			   return array (PDF_TYPE_NULL);
-        			} else {
-                        // Just a token. Return it.
-        				return array (PDF_TYPE_TOKEN, $token);
-        			}
-             }
-        }
-        
-        /**
-         * Resolve an object
-         *
-         * @param object $c pdf_context
-         * @param array $obj_spec The object-data
-         * @param boolean $encapsulate Must set to true, cause the parsing and fpdi use this method only without this para
-         */
-        function pdf_resolve_object(&$c, $obj_spec, $encapsulate = true) {
-            // Exit if we get invalid data
-        	if (!is_array($obj_spec)) {
-                $ret = false;
-        	    return $ret;
-        	}
-    
-        	if ($obj_spec[0] == PDF_TYPE_OBJREF) {
-    
-        		// This is a reference, resolve it
-        		if (isset($this->xref['xref'][$obj_spec[1]][$obj_spec[2]])) {
-    
-        			// Save current file position
-        			// This is needed if you want to resolve
-        			// references while you're reading another object
-        			// (e.g.: if you need to determine the length
-        			// of a stream)
-    
-        			$old_pos = ftell($c->file);
-    
-        			// Reposition the file pointer and
-        			// load the object header.
-    				
-        			$c->reset($this->xref['xref'][$obj_spec[1]][$obj_spec[2]]);
-    
-        			$header = $this->pdf_read_value($c);
-    
-        			if ($header[0] != PDF_TYPE_OBJDEC || $header[1] != $obj_spec[1] || $header[2] != $obj_spec[2]) {
-        				$toSearchFor = $obj_spec[1] . ' ' . $obj_spec[2] . ' obj';
-        				if (preg_match('/' . $toSearchFor . '/', $c->buffer)) {
-        					$c->offset = strpos($c->buffer, $toSearchFor) + strlen($toSearchFor);
-        					// reset stack
-        					$c->stack = array();
-        				} else {
-	        				$this->error("Unable to find object ({$obj_spec[1]}, {$obj_spec[2]}) at expected location");
-        				}
-        			}
-    
-        			// If we're being asked to store all the information
-        			// about the object, we add the object ID and generation
-        			// number for later use
-    				$result = array();
-    				$this->actual_obj =& $result;
-        			if ($encapsulate) {
-        				$result = array (
-        					PDF_TYPE_OBJECT,
-        					'obj' => $obj_spec[1],
-        					'gen' => $obj_spec[2]
-        				);
-        			} 
-    
-        			// Now simply read the object data until
-        			// we encounter an end-of-object marker
-        			while(1) {
-                        $value = $this->pdf_read_value($c);
-    					if ($value === false || count($result) > 4) {
-    						// in this case the parser coudn't find an endobj so we break here
-    						break;
-        				}
-    
-        				if ($value[0] == PDF_TYPE_TOKEN && $value[1] === 'endobj') {
-        					break;
-        				}
-    
-                        $result[] = $value;
-        			}
-    
-        			$c->reset($old_pos);
-    
-                    if (isset($result[2][0]) && $result[2][0] == PDF_TYPE_STREAM) {
-                        $result[0] = PDF_TYPE_STREAM;
-                    }
-    
-        			return $result;
-        		}
-        	} else {
-        		return $obj_spec;
-        	}
-        }
-    
-        
-        
-        /**
-         * Reads a token from the file
-         *
-         * @param object $c pdf_context
-         * @return mixed
-         */
-        function pdf_read_token(&$c)
-        {
-        	// If there is a token available
-        	// on the stack, pop it out and
-        	// return it.
-    
-        	if (count($c->stack)) {
-        		return array_pop($c->stack);
-        	}
-    
-        	// Strip away any whitespace
-    
-        	do {
-        		if (!$c->ensure_content()) {
-        			return false;
-        		}
-        		$c->offset += strspn($c->buffer, " \n\r\t", $c->offset);
-        	} while ($c->offset >= $c->length - 1);
-    
-        	// Get the first character in the stream
-    
-        	$char = $c->buffer[$c->offset++];
-    
-        	switch ($char) {
-    
-        		case '[':
-        		case ']':
-        		case '(':
-        		case ')':
-        		
-        			// This is either an array or literal string
-        			// delimiter, Return it
-    
-        			return $char;
-    
-        		case '<':
-        		case '>':
-    
-        			// This could either be a hex string or
-        			// dictionary delimiter. Determine the
-        			// appropriate case and return the token
-    
-        			if ($c->buffer[$c->offset] == $char) {
-        				if (!$c->ensure_content()) {
-        				    return false;
-        				}
-        				$c->offset++;
-        				return $char . $char;
-        			} else {
-        				return $char;
-        			}
-    
-    			case '%':
-    			    
-    			    // This is a comment - jump over it!
-    			    
-                    $pos = $c->offset;
-        			while(1) {
-        			    $match = preg_match("/(\r\n|\r|\n)/", $c->buffer, $m, PREG_OFFSET_CAPTURE, $pos);
-                        if ($match === 0) {
-        					if (!$c->increase_length()) {
-        						return false;
-        					} else {
-                            	continue;
-                        	}
-        				}
-    
-        				$c->offset = $m[0][1]+strlen($m[0][0]);
-        				
-        				return $this->pdf_read_token($c);
-                    }
-                    
-    			default:
-    
-        			// This is "another" type of token (probably
-        			// a dictionary entry or a numeric value)
-        			// Find the end and return it.
-    
-        			if (!$c->ensure_content()) {
-        				return false;
-        			}
-    
-        			while(1) {
-    
-        				// Determine the length of the token
-    
-        				$pos = strcspn($c->buffer, " %[]<>()\r\n\t/", $c->offset);
-        				
-        				if ($c->offset + $pos <= $c->length - 1) {
-        					break;
-        				} else {
-        					// If the script reaches this point,
-        					// the token may span beyond the end
-        					// of the current buffer. Therefore,
-        					// we increase the size of the buffer
-        					// and try again--just to be safe.
-    
-        					$c->increase_length();
-        				}
-        			}
-    
-        			$result = substr($c->buffer, $c->offset - 1, $pos + 1);
-    
-        			$c->offset += $pos;
-        			return $result;
-        	}
-        }
-    }
-}
+<?php
+//
+//  FPDI - Version 1.4.2
+//
+//    Copyright 2004-2011 Setasign - Jan Slabon
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+if (!defined ('PDF_TYPE_NULL'))
+    define ('PDF_TYPE_NULL', 0);
+if (!defined ('PDF_TYPE_NUMERIC'))
+    define ('PDF_TYPE_NUMERIC', 1);
+if (!defined ('PDF_TYPE_TOKEN'))
+    define ('PDF_TYPE_TOKEN', 2);
+if (!defined ('PDF_TYPE_HEX'))
+    define ('PDF_TYPE_HEX', 3);
+if (!defined ('PDF_TYPE_STRING'))
+    define ('PDF_TYPE_STRING', 4);
+if (!defined ('PDF_TYPE_DICTIONARY'))
+    define ('PDF_TYPE_DICTIONARY', 5);
+if (!defined ('PDF_TYPE_ARRAY'))
+    define ('PDF_TYPE_ARRAY', 6);
+if (!defined ('PDF_TYPE_OBJDEC'))
+    define ('PDF_TYPE_OBJDEC', 7);
+if (!defined ('PDF_TYPE_OBJREF'))
+    define ('PDF_TYPE_OBJREF', 8);
+if (!defined ('PDF_TYPE_OBJECT'))
+    define ('PDF_TYPE_OBJECT', 9);
+if (!defined ('PDF_TYPE_STREAM'))
+    define ('PDF_TYPE_STREAM', 10);
+if (!defined ('PDF_TYPE_BOOLEAN'))
+    define ('PDF_TYPE_BOOLEAN', 11);
+if (!defined ('PDF_TYPE_REAL'))
+    define ('PDF_TYPE_REAL', 12);
+    
+require_once('pdf_context.php');
+
+if (!class_exists('pdf_parser', false)) {
+    
+    class pdf_parser {
+    	
+    	/**
+         * Filename
+         * @var string
+         */
+        var $filename;
+        
+        /**
+         * File resource
+         * @var resource
+         */
+        var $f;
+        
+        /**
+         * PDF Context
+         * @var object pdf_context-Instance
+         */
+        var $c;
+        
+        /**
+         * xref-Data
+         * @var array
+         */
+        var $xref;
+    
+        /**
+         * root-Object
+         * @var array
+         */
+        var $root;
+    	
+        /**
+         * PDF version of the loaded document
+         * @var string
+         */
+        var $pdfVersion;
+        
+        /**
+	     * For reading encrypted documents and xref/objectstreams are in use
+	     *
+	     * @var boolean
+	     */
+	    var $readPlain = true;
+	    
+        /**
+         * Constructor
+         *
+         * @param string $filename  Source-Filename
+         */
+    	function pdf_parser($filename) {
+            $this->filename = $filename;
+            
+            $this->f = @fopen($this->filename, 'rb');
+    
+            if (!$this->f)
+                $this->error(sprintf('Cannot open %s !', $filename));
+    
+            $this->getPDFVersion();
+    
+            $this->c = new pdf_context($this->f);
+            
+            // Read xref-Data
+            $this->xref = array();
+            $this->pdf_read_xref($this->xref, $this->pdf_find_xref());
+            
+            // Check for Encryption
+            $this->getEncryption();
+    
+            // Read root
+            $this->pdf_read_root();
+        }
+        
+        /**
+         * Close the opened file
+         */
+        function closeFile() {
+        	if (isset($this->f) && is_resource($this->f)) {
+        	    fclose($this->f);	
+        		unset($this->f);
+        	}	
+        }
+        
+        /**
+         * Print Error and die
+         *
+         * @param string $msg  Error-Message
+         */
+        function error($msg) {
+        	die('<b>PDF-Parser Error:</b> ' . $msg);	
+        }
+        
+        /**
+         * Check Trailer for Encryption
+         */
+        function getEncryption() {
+            if (isset($this->xref['trailer'][1]['/Encrypt'])) {
+            	$this->error('File is encrypted!');
+            }
+        }
+        
+    	/**
+         * Find/Return /Root
+         *
+         * @return array
+         */
+        function pdf_find_root() {
+            if ($this->xref['trailer'][1]['/Root'][0] != PDF_TYPE_OBJREF) {
+                $this->error('Wrong Type of Root-Element! Must be an indirect reference');
+            }
+            
+            return $this->xref['trailer'][1]['/Root'];
+        }
+    
+        /**
+         * Read the /Root
+         */
+        function pdf_read_root() {
+            // read root
+            $this->root = $this->pdf_resolve_object($this->c, $this->pdf_find_root());
+        }
+        
+        /**
+         * Get PDF-Version
+         *
+         * And reset the PDF Version used in FPDI if needed
+         */
+        function getPDFVersion() {
+            fseek($this->f, 0);
+            preg_match('/\d\.\d/',fread($this->f, 16), $m);
+            if (isset($m[0]))
+                $this->pdfVersion = $m[0];
+            return $this->pdfVersion;
+        }
+        
+        /**
+         * Find the xref-Table
+         */
+        function pdf_find_xref() {
+           	$toRead = 1500;
+                    
+            $stat = fseek ($this->f, -$toRead, SEEK_END);
+            if ($stat === -1) {
+                fseek ($this->f, 0);
+            }
+           	$data = fread($this->f, $toRead);
+            
+            $pos = strlen($data) - strpos(strrev($data), strrev('startxref')); 
+            $data = substr($data, $pos);
+            
+            if (!preg_match('/\s*(\d+).*$/s', $data, $matches)) {
+                $this->error('Unable to find pointer to xref table');
+        	}
+    
+        	return (int) $matches[1];
+        }
+    
+        /**
+         * Read xref-table
+         *
+         * @param array $result Array of xref-table
+         * @param integer $offset of xref-table
+         */
+        function pdf_read_xref(&$result, $offset) {
+            $o_pos = $offset-min(20, $offset);
+        	fseek($this->f, $o_pos); // set some bytes backwards to fetch errorious docs
+                
+            $data = fread($this->f, 100);
+            
+            $xrefPos = strrpos($data, 'xref');
+    
+            if ($xrefPos === false) {
+                fseek($this->f, $offset);
+                $c = new pdf_context($this->f);
+                $xrefStreamObjDec = $this->pdf_read_value($c);
+                
+                if (is_array($xrefStreamObjDec) && isset($xrefStreamObjDec[0]) && $xrefStreamObjDec[0] == PDF_TYPE_OBJDEC) {
+                    $this->error(sprintf('This document (%s) probably uses a compression technique which is not supported by the free parser shipped with FPDI.', $this->filename));
+                } else {            
+                    $this->error('Unable to find xref table.');
+                }
+            }
+            
+            if (!isset($result['xref_location'])) {
+                $result['xref_location'] = $o_pos + $xrefPos;
+                $result['max_object'] = 0;
+        	}
+    
+        	$cylces = -1;
+            $bytesPerCycle = 100;
+            
+        	fseek($this->f, $o_pos = $o_pos + $xrefPos + 4); // set the handle directly after the "xref"-keyword
+            $data = fread($this->f, $bytesPerCycle);
+            
+            while (($trailerPos = strpos($data, 'trailer', max($bytesPerCycle * $cylces++, 0))) === false && !feof($this->f)) {
+                $data .= fread($this->f, $bytesPerCycle);
+            }
+            
+            if ($trailerPos === false) {
+                $this->error('Trailer keyword not found after xref table');
+            }
+            
+            $data = substr($data, 0, $trailerPos);
+            
+            // get Line-Ending
+            preg_match_all("/(\r\n|\n|\r)/", substr($data, 0, 100), $m); // check the first 100 bytes for linebreaks
+    
+            $differentLineEndings = count(array_unique($m[0]));
+            if ($differentLineEndings > 1) {
+                $lines = preg_split("/(\r\n|\n|\r)/", $data, -1, PREG_SPLIT_NO_EMPTY);
+            } else {
+                $lines = explode($m[0][1], $data);
+            }
+            
+            $data = $differentLineEndings = $m = null;
+            unset($data, $differentLineEndings, $m);
+            
+            $linesCount = count($lines);
+            
+            $start = 1;
+            
+            for ($i = 0; $i < $linesCount; $i++) {
+                $line = trim($lines[$i]);
+                if ($line) {
+                    $pieces = explode(' ', $line);
+                    $c = count($pieces);
+                    switch($c) {
+                        case 2:
+                            $start = (int)$pieces[0];
+                            $end   = $start + (int)$pieces[1];
+                            if ($end > $result['max_object'])
+                                $result['max_object'] = $end;
+                            break;
+                        case 3:
+                            if (!isset($result['xref'][$start]))
+                                $result['xref'][$start] = array();
+                            
+                            if (!array_key_exists($gen = (int) $pieces[1], $result['xref'][$start])) {
+                    	        $result['xref'][$start][$gen] = $pieces[2] == 'n' ? (int) $pieces[0] : null;
+                    	    }
+                            $start++;
+                            break;
+                        default:
+                            $this->error('Unexpected data in xref table');
+                    }
+                }
+            }
+            
+            $lines = $pieces = $line = $start = $end = $gen = null;
+            unset($lines, $pieces, $line, $start, $end, $gen);
+            
+            fseek($this->f, $o_pos + $trailerPos + 7);
+            
+            $c = new pdf_context($this->f);
+    	    $trailer = $this->pdf_read_value($c);
+    	    
+    	    $c = null;
+    	    unset($c);
+    	    
+    	    if (!isset($result['trailer'])) {
+                $result['trailer'] = $trailer;          
+    	    }
+    	    
+    	    if (isset($trailer[1]['/Prev'])) {
+    	        $this->pdf_read_xref($result, $trailer[1]['/Prev'][1]);
+    	    } 
+    	    
+    	    $trailer = null;
+    	    unset($trailer);
+            
+            return true;
+        }
+        
+        /**
+         * Reads an Value
+         *
+         * @param object $c pdf_context
+         * @param string $token a Token
+         * @return mixed
+         */
+        function pdf_read_value(&$c, $token = null) {
+        	if (is_null($token)) {
+        	    $token = $this->pdf_read_token($c);
+        	}
+        	
+            if ($token === false) {
+        	    return false;
+        	}
+    
+        	switch ($token) {
+                case	'<':
+        			// This is a hex string.
+        			// Read the value, then the terminator
+    
+                    $pos = $c->offset;
+    
+        			while(1) {
+    
+                        $match = strpos ($c->buffer, '>', $pos);
+    				
+        				// If you can't find it, try
+        				// reading more data from the stream
+    
+        				if ($match === false) {
+        					if (!$c->increase_length()) {
+        						return false;
+        					} else {
+                            	continue;
+                        	}
+        				}
+    
+        				$result = substr ($c->buffer, $c->offset, $match - $c->offset);
+        				$c->offset = $match + 1;
+        				
+        				return array (PDF_TYPE_HEX, $result);
+                    }
+                    
+                    break;
+        		case	'<<':
+        			// This is a dictionary.
+    
+        			$result = array();
+    
+        			// Recurse into this function until we reach
+        			// the end of the dictionary.
+        			while (($key = $this->pdf_read_token($c)) !== '>>') {
+        				if ($key === false) {
+        					return false;
+        				}
+        				
+        				if (($value =   $this->pdf_read_value($c)) === false) {
+        					return false;
+        				}
+        				
+        				// Catch missing value
+        				if ($value[0] == PDF_TYPE_TOKEN && $value[1] == '>>') {
+        				    $result[$key] = array(PDF_TYPE_NULL);
+        				    break;
+        				}
+        				
+        				$result[$key] = $value;
+        			}
+    				
+        			return array (PDF_TYPE_DICTIONARY, $result);
+    
+        		case	'[':
+        			// This is an array.
+    
+        			$result = array();
+    
+        			// Recurse into this function until we reach
+        			// the end of the array.
+        			while (($token = $this->pdf_read_token($c)) !== ']') {
+                        if ($token === false) {
+        					return false;
+        				}
+    					
+        				if (($value = $this->pdf_read_value($c, $token)) === false) {
+                            return false;
+        				}
+    					
+        				$result[] = $value;
+        			}
+        			
+                    return array (PDF_TYPE_ARRAY, $result);
+    
+        		case	'('		:
+                    // This is a string
+                    $pos = $c->offset;
+                    
+                    $openBrackets = 1;
+        			do {
+                        for (; $openBrackets != 0 && $pos < $c->length; $pos++) {
+                            switch (ord($c->buffer[$pos])) {
+                                case 0x28: // '('
+                                    $openBrackets++;
+                                    break;
+                                case 0x29: // ')'
+                                    $openBrackets--;
+                                    break;
+                                case 0x5C: // backslash
+                                    $pos++;
+                            }
+                        }
+        			} while($openBrackets != 0 && $c->increase_length());
+        			
+        			$result = substr($c->buffer, $c->offset, $pos - $c->offset - 1);
+        			$c->offset = $pos;
+        			
+        			return array (PDF_TYPE_STRING, $result);
+    
+                case 'stream':
+                	$o_pos = ftell($c->file)-strlen($c->buffer);
+    		        $o_offset = $c->offset;
+    		        
+    		        $c->reset($startpos = $o_pos + $o_offset);
+    		        
+    		        $e = 0; // ensure line breaks in front of the stream
+    		        if ($c->buffer[0] == chr(10) || $c->buffer[0] == chr(13))
+    		        	$e++;
+    		        if ($c->buffer[1] == chr(10) && $c->buffer[0] != chr(10))
+    		        	$e++;
+    		        
+    		        if ($this->actual_obj[1][1]['/Length'][0] == PDF_TYPE_OBJREF) {
+    		        	$tmp_c = new pdf_context($this->f);
+    		        	$tmp_length = $this->pdf_resolve_object($tmp_c, $this->actual_obj[1][1]['/Length']);
+    		        	$length = $tmp_length[1][1];
+    		        } else {
+    		        	$length = $this->actual_obj[1][1]['/Length'][1];	
+    		        }
+    		        	
+    		        if ($length > 0) {
+        		        $c->reset($startpos + $e,$length);
+        		        $v = $c->buffer;
+    		        } else {
+    		            $v = '';   
+    		        }
+    		        $c->reset($startpos + $e + $length + 9); // 9 = strlen("endstream")
+    		        
+    		        return array(PDF_TYPE_STREAM, $v);
+    		        
+    	        default	:
+                	if (is_numeric ($token)) {
+                        // A numeric token. Make sure that
+        				// it is not part of something else.
+        				if (($tok2 = $this->pdf_read_token ($c)) !== false) {
+                            if (is_numeric ($tok2)) {
+    
+        						// Two numeric tokens in a row.
+        						// In this case, we're probably in
+        						// front of either an object reference
+        						// or an object specification.
+        						// Determine the case and return the data
+        						if (($tok3 = $this->pdf_read_token ($c)) !== false) {
+                                    switch ($tok3) {
+        								case 'obj':
+                                            return array (PDF_TYPE_OBJDEC, (int) $token, (int) $tok2);
+        								case 'R':
+        									return array (PDF_TYPE_OBJREF, (int) $token, (int) $tok2);
+        							}
+        							// If we get to this point, that numeric value up
+        							// there was just a numeric value. Push the extra
+        							// tokens back into the stack and return the value.
+        							array_push ($c->stack, $tok3);
+        						}
+        					}
+    
+        					array_push ($c->stack, $tok2);
+        				}
+    
+        				if ($token === (string)((int)$token))
+            				return array (PDF_TYPE_NUMERIC, (int)$token);
+        				else 
+        					return array (PDF_TYPE_REAL, (float)$token);
+        			} else if ($token == 'true' || $token == 'false') {
+                        return array (PDF_TYPE_BOOLEAN, $token == 'true');
+        			} else if ($token == 'null') {
+        			   return array (PDF_TYPE_NULL);
+        			} else {
+                        // Just a token. Return it.
+        				return array (PDF_TYPE_TOKEN, $token);
+        			}
+             }
+        }
+        
+        /**
+         * Resolve an object
+         *
+         * @param object $c pdf_context
+         * @param array $obj_spec The object-data
+         * @param boolean $encapsulate Must set to true, cause the parsing and fpdi use this method only without this para
+         */
+        function pdf_resolve_object(&$c, $obj_spec, $encapsulate = true) {
+            // Exit if we get invalid data
+        	if (!is_array($obj_spec)) {
+                $ret = false;
+        	    return $ret;
+        	}
+    
+        	if ($obj_spec[0] == PDF_TYPE_OBJREF) {
+    
+        		// This is a reference, resolve it
+        		if (isset($this->xref['xref'][$obj_spec[1]][$obj_spec[2]])) {
+    
+        			// Save current file position
+        			// This is needed if you want to resolve
+        			// references while you're reading another object
+        			// (e.g.: if you need to determine the length
+        			// of a stream)
+    
+        			$old_pos = ftell($c->file);
+    
+        			// Reposition the file pointer and
+        			// load the object header.
+    				
+        			$c->reset($this->xref['xref'][$obj_spec[1]][$obj_spec[2]]);
+    
+        			$header = $this->pdf_read_value($c);
+    
+        			if ($header[0] != PDF_TYPE_OBJDEC || $header[1] != $obj_spec[1] || $header[2] != $obj_spec[2]) {
+        				$toSearchFor = $obj_spec[1] . ' ' . $obj_spec[2] . ' obj';
+        				if (preg_match('/' . $toSearchFor . '/', $c->buffer)) {
+        					$c->offset = strpos($c->buffer, $toSearchFor) + strlen($toSearchFor);
+        					// reset stack
+        					$c->stack = array();
+        				} else {
+	        				$this->error("Unable to find object ({$obj_spec[1]}, {$obj_spec[2]}) at expected location");
+        				}
+        			}
+    
+        			// If we're being asked to store all the information
+        			// about the object, we add the object ID and generation
+        			// number for later use
+    				$result = array();
+    				$this->actual_obj =& $result;
+        			if ($encapsulate) {
+        				$result = array (
+        					PDF_TYPE_OBJECT,
+        					'obj' => $obj_spec[1],
+        					'gen' => $obj_spec[2]
+        				);
+        			} 
+    
+        			// Now simply read the object data until
+        			// we encounter an end-of-object marker
+        			while(1) {
+                        $value = $this->pdf_read_value($c);
+    					if ($value === false || count($result) > 4) {
+    						// in this case the parser coudn't find an endobj so we break here
+    						break;
+        				}
+    
+        				if ($value[0] == PDF_TYPE_TOKEN && $value[1] === 'endobj') {
+        					break;
+        				}
+    
+                        $result[] = $value;
+        			}
+    
+        			$c->reset($old_pos);
+    
+                    if (isset($result[2][0]) && $result[2][0] == PDF_TYPE_STREAM) {
+                        $result[0] = PDF_TYPE_STREAM;
+                    }
+    
+        			return $result;
+        		}
+        	} else {
+        		return $obj_spec;
+        	}
+        }
+    
+        
+        
+        /**
+         * Reads a token from the file
+         *
+         * @param object $c pdf_context
+         * @return mixed
+         */
+        function pdf_read_token(&$c)
+        {
+        	// If there is a token available
+        	// on the stack, pop it out and
+        	// return it.
+    
+        	if (count($c->stack)) {
+        		return array_pop($c->stack);
+        	}
+    
+        	// Strip away any whitespace
+    
+        	do {
+        		if (!$c->ensure_content()) {
+        			return false;
+        		}
+        		$c->offset += strspn($c->buffer, " \n\r\t", $c->offset);
+        	} while ($c->offset >= $c->length - 1);
+    
+        	// Get the first character in the stream
+    
+        	$char = $c->buffer[$c->offset++];
+    
+        	switch ($char) {
+    
+        		case '[':
+        		case ']':
+        		case '(':
+        		case ')':
+        		
+        			// This is either an array or literal string
+        			// delimiter, Return it
+    
+        			return $char;
+    
+        		case '<':
+        		case '>':
+    
+        			// This could either be a hex string or
+        			// dictionary delimiter. Determine the
+        			// appropriate case and return the token
+    
+        			if ($c->buffer[$c->offset] == $char) {
+        				if (!$c->ensure_content()) {
+        				    return false;
+        				}
+        				$c->offset++;
+        				return $char . $char;
+        			} else {
+        				return $char;
+        			}
+    
+    			case '%':
+    			    
+    			    // This is a comment - jump over it!
+    			    
+                    $pos = $c->offset;
+        			while(1) {
+        			    $match = preg_match("/(\r\n|\r|\n)/", $c->buffer, $m, PREG_OFFSET_CAPTURE, $pos);
+                        if ($match === 0) {
+        					if (!$c->increase_length()) {
+        						return false;
+        					} else {
+                            	continue;
+                        	}
+        				}
+    
+        				$c->offset = $m[0][1]+strlen($m[0][0]);
+        				
+        				return $this->pdf_read_token($c);
+                    }
+                    
+    			default:
+    
+        			// This is "another" type of token (probably
+        			// a dictionary entry or a numeric value)
+        			// Find the end and return it.
+    
+        			if (!$c->ensure_content()) {
+        				return false;
+        			}
+    
+        			while(1) {
+    
+        				// Determine the length of the token
+    
+        				$pos = strcspn($c->buffer, " %[]<>()\r\n\t/", $c->offset);
+        				
+        				if ($c->offset + $pos <= $c->length - 1) {
+        					break;
+        				} else {
+        					// If the script reaches this point,
+        					// the token may span beyond the end
+        					// of the current buffer. Therefore,
+        					// we increase the size of the buffer
+        					// and try again--just to be safe.
+    
+        					$c->increase_length();
+        				}
+        			}
+    
+        			$result = substr($c->buffer, $c->offset - 1, $pos + 1);
+    
+        			$c->offset += $pos;
+        			return $result;
+        	}
+        }
+    }
+}
diff --git a/library/html2pdf/html2pdf.class.php b/library/html2pdf/html2pdf.class.php
index ef1de505a..30e256e33 100644
--- a/library/html2pdf/html2pdf.class.php
+++ b/library/html2pdf/html2pdf.class.php
@@ -1,6109 +1,6109 @@
-<?php
-/**
- * Logiciel : HTML2PDF
- * 
- * Convertisseur HTML => PDF, utilise FPDF
- * Distribué sous la licence LGPL. 
- *
- * @author		Laurent MINGUET <webmaster@html2pdf.fr>
- * @version		3.31
- */
-
-if (!defined('__CLASS_HTML2PDF__'))
-{
-	define('__CLASS_HTML2PDF__', '3.31');
-
-	require_once(dirname(__FILE__).'/_mypdf/mypdf.class.php');	// classe mypdf
-	require_once(dirname(__FILE__).'/fpdi/fpdi.php');         // Added by Rod
-	require_once(dirname(__FILE__).'/parsingHTML.class.php');	// classe de parsing HTML
-	require_once(dirname(__FILE__).'/styleHTML.class.php');		// classe de gestion des styles
-
-	global $HTML2PDF_TABLEAU;	$HTML2PDF_TABLEAU = array();	// tableau global necessaire à la gestion des tables imbriquées 
-	global $HTML2PDF_TEXTES;	$HTML2PDF_TEXTES = array(); 	// tableau comprennant le fichier de langue
-	
-	class HTML2PDF
-	{
-		var	$pdf				= null;		// objet PDF
-		var	$style				= null;		// objet de style
-		var	$parsing			= null;		// objet de parsing
-		
-		var	$langue				= 'fr';		// langue des messages
-		var	$sens				= 'P';		// sens d'affichage Portrait ou Landscape
-		var	$format				= 'A4';		// format de la page : A4, A3, ...
-		var	$encoding			= '';		// charset encoding
-		
-		var	$background			= array();	// informations sur le background
-		var	$testTDin1page		= true;		// activer le test de TD ne devant pas depasser une page
-		var	$testIsImage		= true;		// test si les images existes ou non
-		var $testIsDeprecated	= false;	// test si certaines fonctions sont deprecated
-		var	$isSubPart			= false;	// indique que le convertisseur courant est un sous html
-		
-		var	$parse_pos			= 0;		// position du parsing
-		var	$temp_pos			= 0;		// position temporaire pour multi tableau
-		var	$page				= 0;		// numero de la page courante
-		
-		var	$sub_html			= null;		// sous html
-		var	$sub_part			= false;	// indicateur de sous html
-		
-		var	$maxX				= 0;		// zone maxi X
-		var	$maxY				= 0;		// zone maxi Y
-		var	$maxE				= 0;		// nomre d'elements dans la zone
-		var	$maxH				= 0;		// plus grande hauteur dans la ligne, pour saut de ligne à corriger
-		var	$maxSave			= array();	// tableau de sauvegarde des maximaux
-		var	$currentH			= 0;		// hauteur de la ligne courante
-		
-		var	$firstPage			= true;		// premier page
-		
-		var	$defaultLeft		= 0;		// marges par default de la page
-		var	$defaultTop			= 0;
-		var	$defaultRight		= 0;
-		var	$defaultBottom		= 0;
-		
-		var	$margeLeft			= 0;		//marges réelles de la page
-		var	$margeTop			= 0;
-		var	$margeRight			= 0;
-		var	$margeBottom		= 0;
-		var	$marges				= array();	// tableau de sauvegarde des differents etats des marges de la page courante
-		
-		var	$inLink				= '';		// indique si on est à l'interieur d'un lien
-		var	$lstAncre			= array();	// liste des ancres détectées ou créées
-		var	$subHEADER			= array();	// tableau des sous commandes pour faire l'HEADER
-		var	$subFOOTER			= array();	// tableau des sous commandes pour faire le FOOTER
-		var	$subSTATES			= array();	// tableau de sauvegarde de certains paramètres
-		var	$defLIST			= array();	// tableau de sauvegarde de l'etat des UL et OL
-		
-		var	$lstChamps			= array();	// liste des champs
-		var	$lstSelect			= array();	// options du select en cours
-		var	$previousCall		= null;		// dernier appel
-		var	$pageMarges			= array();	// marges spécifiques dues aux floats
-		var	$isInThead			= false;	// indique si on est dans un thead
-		var	$isInTfoot			= false;	// indique si on est dans un tfoot
-		var	$isInOverflow		= false;	// indique si on est dans une div overflow
-		var	$isInFooter			= false;	// indique si on est dans un footer ou non
-		var	$isInDraw			= null;		// indique si on est en mode dessin
-		var	$isAfterFloat		= false;	// indique si on est apres un float
-		var	$forOneLine			= false;	// indique si on est dans un sous HTML ne servant qu'a calculer la taille de la prochaine ligne
-		var	$isInForm			= false;	// indique si on est dans un formulaire. Contient dans ce cas là l'action de celui-ci
-		
-		var	$DEBUG_actif		= false;	// indique si on est en mode debug
-		var	$DEBUG_ok_usage		= false;	// indique l'existance de la fonction memory_get_usage
-		var	$DEBUG_ok_peak		= false;	// indique l'existance de la fonction memory_get_peak_usage
-		var	$DEBUG_level		= 0;		// niveau du debug
-		var	$DEBUG_start_time	= 0;		// 
-		var	$DEBUG_last_time	= 0;		// 
-		var	$defaultFont		= null;		// fonte par défaut si la fonte demandée n'existe pas
-
-		/**
-		 * Constructeur
-		 *
-		 * @param	string		sens portrait ou landscape
-		 * @param	string		format A4, A5, ...
-		 * @param	string		langue : fr, en, it...
-		 * @param	array		marges par defaut, dans l'ordre (left, top, right, bottom)
-		 * @return	null
-		 */
-		function HTML2PDF($sens = 'P', $format = 'A4', $langue='fr', $marges = array(5, 5, 5, 8))
-		{
-			// sauvegarde des paramètres
-			$this->page 		= 0;
-			$this->sens			= $sens;
-			$this->format		= $format;
-			$this->encoding		= 'ISO-8859-15';
-			
-			$this->firstPage	= true;
-			$this->langue		= strtolower($langue);
-			
-			// chargement du fichier de langue
-			HTML2PDF::textLOAD($this->langue);
-			
-			// création de l' objet PDF
-			$this->pdf = new FPDI($sens, 'mm', $format);
-
-			// initialisation des styles
-			$this->style = new styleHTML($this->pdf);
-			$this->style->FontSet();
-			$this->defLIST = array();
-			
-			// initialisations diverses
-			$this->setTestTdInOnePage(true);
-			$this->setTestIsImage(true);
-			$this->setTestIsDeprecated(true);
-			$this->setDefaultFont(null);
-			
-			// initialisation du parsing
-			$this->parsing = new parsingHTML($this->encoding);
-			$this->sub_html = null; 
-			$this->sub_part	= false;
-			
-			// initialisation des marges
-			if (!is_array($marges)) $marges = array($marges, $marges, $marges, $marges);	
-			$this->setDefaultMargins($marges[0], $marges[1], $marges[2], $marges[3]);
-			$this->setMargins();
-			$this->marges = array();
-
-			// initialisation des champs de formulaire
-			$this->lstChamps = array();
-		}
-		
-		/**
-		* activer le debug mode
-		*
-		* @return	null
-		*/
-		function setModeDebug()
-		{
-			list($usec, $sec) = explode(' ', microtime());
-			
-			$this->DEBUG_actif = true;
-			$this->DEBUG_ok_usage = function_exists('memory_get_usage');
-			$this->DEBUG_ok_peak = function_exists('memory_get_peak_usage');
-			$this->DEBUG_start_time		= (float)$sec + (float)$usec;
-			$this->DEBUG_last_time		= (float)$sec + (float)$usec;
-			
-			$this->DEBUG_stepline('step', 'time', 'delta', 'memory', 'peak');
-			$this->DEBUG_add('Init debug');
-		}
-		
-		/**
-		* rajouter une ligne de debug
-		*
-		* @param	string	nom de l'etape
-		* @param	boolean true=monter d'un niveau, false=descendre d'un niveau, null : ne rien faire
-		* @return	null
-		*/
-		function DEBUG_add($nom, $level=null)
-		{
-			list($usec, $sec) = explode(' ', microtime());
-			if ($level===true) $this->DEBUG_level++;
-
-			$nom	= str_repeat('  ',$this->DEBUG_level). $nom.($level===true ? ' Begin' : ($level===false ? ' End' : ''));
-			$time	= (float)$sec + (float)$usec;
-			$usage	= ($this->DEBUG_ok_usage ? memory_get_usage() : 0);
-			$peak	= ($this->DEBUG_ok_peak ? memory_get_peak_usage() : 0);
-
-			$this->DEBUG_stepline(
-						$nom,
-						number_format(($time - $this->DEBUG_start_time)*1000, 1, '.', ' ').' ms',
-						number_format(($time - $this->DEBUG_last_time)*1000, 1, '.', ' ').' ms',
-						number_format($usage/1024, 1, '.', ' ').' Ko',
-						number_format($peak/1024, 1, '.', ' ').' Ko');
-						
-			$this->DEBUG_last_time = $time;
-			if ($level===false) $this->DEBUG_level--;
-			return true;
-		}
-		
-		/**
-		* affiche une ligne de debug
-		*
-		* @param	string	nom de l'etape
-		* @param	string	valeur 1
-		* @param	string	valeur 2
-		* @param	string	valeur 3
-		* @param	string	valeur 4
-		* @return	null
-		*/
-		function DEBUG_stepline($nom, $val1, $val2, $val3, $val4)
-		{
-			$txt = str_pad($nom, 30, ' ', STR_PAD_RIGHT).
-					str_pad($val1, 12, ' ', STR_PAD_LEFT).
-					str_pad($val2, 12, ' ', STR_PAD_LEFT).
-					str_pad($val3, 15, ' ', STR_PAD_LEFT).
-					str_pad($val4, 15, ' ', STR_PAD_LEFT);
-			
-			echo '<pre style="padding:0; margin:0">'.$txt.'</pre>';
-		}
-		
-		/**
-		* renseigner l'encoding à utiliser
-
-		*
-		* @param	string	nouvel encoding
-		* @return	string	ancien encoding
-		*/
-		function setEncoding($encoding = 'ISO-8859-15')
-		{
-			$old = $this->encoding;
-			$this->encoding = $encoding;
-			$this->parsing->setEncoding($this->encoding);
-			return $old;
-		}
-		
-		/**
-		* activer ou desactiver le test de TD ne devant pas depasser une page
-		*
-		* @param	boolean	nouvel etat
-		* @return	boolean ancien etat
-		*/
-		function setTestTdInOnePage($mode = true)
-		{
-			$old = $this->testTDin1page;
-			$this->testTDin1page = $mode ? true : false;
-			return $old;
-		}
-		
-		/**
-		* activer ou desactiver le test sur la présence des images
-		*
-		* @param	boolean	nouvel etat
-		* @return	boolean ancien etat
-		*/
-		function setTestIsImage($mode = true)
-		{
-			$old = $this->testIsImage;
-			$this->testIsImage = $mode ? true : false;
-			return $old;
-		}
-		
-		/**
-		* activer ou desactiver le test sur les fonctions deprecated
-		*
-		* @param	boolean	nouvel etat
-		* @return	boolean ancien etat
-		*/
-		function setTestIsDeprecated($mode = true)
-		{
-			$old = $this->testIsDeprecated;
-			$this->testIsDeprecated = $mode ? true : false;
-			return $old;
-		}
-
-		/**
-		* définit la fonte par défaut si aucun fonte n'est spécifiée, ou si la fonte demandée n'existe pas
-		*
-		* @param	string	nom de la fonte par defaut. si null : Arial pour fonte non spécifiée, et erreur pour fonte non existante 
-		* @return	string	nom de l'ancienne fonte par defaut
-		*/
-		function setDefaultFont($default = null)
-		{
-			$old = $this->defaultFont;
-			$this->defaultFont = $default;
-			$this->style->setDefaultFont($default);
-			return $old;
-		}
-			
-		/**
-		* définir les marges par défault
-		*
-		* @param	int		en mm, marge left
-		* @param	int		en mm, marge top
-		* @param	int		en mm, marge right. si null, left=right
-		* @param	int		en mm, marge bottom. si null, bottom=8
-		* @return	null
-		*/
-		function setDefaultMargins($left, $top, $right = null, $bottom = null)
-		{
-			if ($right===null)	$right = $left;
-			if ($bottom===null)	$bottom = 8;
-			
-			$this->defaultLeft		= $this->style->ConvertToMM($left.'mm');
-			$this->defaultTop		= $this->style->ConvertToMM($top.'mm');
-			$this->defaultRight		= $this->style->ConvertToMM($right.'mm');
-			$this->defaultBottom	= $this->style->ConvertToMM($bottom.'mm');
-		}
-
-		/**
-		* définir les marges réelles, fonctions de la balise page
-		*
-		* @return	null
-		*/
-		function setMargins()
-		{
-			$this->margeLeft	= $this->defaultLeft	+ (isset($this->background['left'])		? $this->background['left']		: 0);
-			$this->margeRight	= $this->defaultRight	+ (isset($this->background['right'])	? $this->background['right']	: 0);
-			$this->margeTop		= $this->defaultTop 	+ (isset($this->background['top'])		? $this->background['top']		: 0);
-			$this->margeBottom	= $this->defaultBottom	+ (isset($this->background['bottom'])	? $this->background['bottom']	: 0);
-			
-			$this->pdf->SetMargins($this->margeLeft, $this->margeTop, $this->margeRight);
-			$this->pdf->setcMargin(0);
-			$this->pdf->SetAutoPageBreak(false, $this->margeBottom);
-			
-			$this->pageMarges = array();
-			$this->pageMarges[floor($this->margeTop*100)] = array($this->margeLeft, $this->pdf->getW()-$this->margeRight);
-		}
-		
-		/**
-		* recuperer les positions x minimales et maximales en fonction d'une hauteur
-		*
-		* @param	float	y
-		* @return	array(float, float)
-		*/
-		function getMargins($y)
-		{
-			$y = floor($y*100);
-			$x = array($this->pdf->getlMargin(), $this->pdf->getW()-$this->pdf->getrMargin());
-			
-			foreach($this->pageMarges as $m_y => $m_x)
-				if ($m_y<=$y) $x = $m_x;
-			
-			return $x;
-		}
-		
-		/**
-		* ajouter une marge suite a un float
-		*
-		* @param	string	left ou right
-		* @param	float	x1
-		* @param	float	y1
-		* @param	float	x2
-		* @param	float	y2
-		* @return	null
-		*/
-		function addMargins($float, $x1, $y1, $x2, $y2)
-		{
-			$old1 = $this->getMargins($y1);
-			$old2 = $this->getMargins($y2);
-			if ($float=='left') $old1[0] = $x2;
-			if ($float=='right') $old1[1] = $x1;
-			
-			$y1 = floor($y1*100);
-			$y2 = floor($y2*100);
-
-			foreach($this->pageMarges as $m_y => $m_x)
-			{
-				if ($m_y<$y1) continue;				
-				if ($m_y>$y2) break;	
-				if ($float=='left' && $this->pageMarges[$m_y][0]<$x2) unset($this->pageMarges[$m_y]);
-				if ($float=='right' && $this->pageMarges[$m_y][1]>$x1) unset($this->pageMarges[$m_y]);
-			}
-
-			$this->pageMarges[$y1] = $old1;
-			$this->pageMarges[$y2] = $old2;
-			
-			ksort($this->pageMarges);
-			
-			$this->isAfterFloat = true;
-		}
-	
-		/**
-		* définir des nouvelles marges et sauvegarder les anciennes
-		*
-		* @param	float	marge left
-		* @param	float	marge top
-		* @param	float	marge right
-		* @return	null
-		*/
-		function saveMargin($ml, $mt, $mr)
-		{
-			$this->marges[] = array('l' => $this->pdf->getlMargin(), 't' => $this->pdf->gettMargin(), 'r' => $this->pdf->getrMargin(), 'page' => $this->pageMarges);
-			$this->pdf->SetMargins($ml, $mt, $mr);
-
-			$this->pageMarges = array();
-			$this->pageMarges[floor($mt*100)] = array($ml, $this->pdf->getW()-$mr);
-		}
-		
-		/**
-		* récuperer les dernières marches sauvées
-		*
-		* @return	null
-		*/
-		function loadMargin()
-		{
-			$old = array_pop($this->marges);
-			if ($old)
-			{
-				$ml = $old['l'];
-				$mt = $old['t'];
-				$mr = $old['r'];
-				$mP = $old['page'];
-			}
-			else
-			{
-				$ml = $this->margeLeft;
-				$mt = 0;
-				$mr = $this->margeRight;
-				$mP = array($mt => array($ml, $this->pdf->getW()-$mr));
-			}
-			
-			$this->pdf->SetMargins($ml, $mt, $mr);
-			$this->pageMarges = $mP;
-		}
-		
-		/**
-		* permet d'ajouter une fonte.
-		*
-		* @param	string nom de la fonte
-		* @param	string style de la fonte
-		* @param	string fichier de la fonte
-		* @return	null
-		*/
-		function addFont($family, $style='', $file='')
-		{
-			$this->pdf->AddFont($family, $style, $file);
-		}
-		
-		/**
-		* sauvegarder l'état actuelle des maximums
-		*
-		* @return	null
-		*/
-		function saveMax()
-		{
-			$this->maxSave[] = array($this->maxX, $this->maxY, $this->maxH, $this->maxE);
-		}
-				
-		/**
-		* charger le dernier état sauvé des maximums
-		*
-		* @return	null
-		*/
-		function loadMax()
-		{
-			$old = array_pop($this->maxSave);
-
-			if ($old)
-			{
-				$this->maxX = $old[0];
-				$this->maxY = $old[1];
-				$this->maxH = $old[2];
-				$this->maxE = $old[3];
-			}
-			else
-			{
-				$this->maxX = 0;
-				$this->maxY = 0;
-				$this->maxH = 0;
-				$this->maxE = 0;
-			}
-		}
-		
-		/**
-		* afficher l'header contenu dans page_header
-		*
-		* @return	null
-		*/
-		function setPageHeader()
-		{
-			if (!count($this->subHEADER)) return false;
-
-			$OLD_parse_pos = $this->parse_pos;
-			$OLD_parse_code = $this->parsing->code;
-			
-			$this->parse_pos = 0;
-			$this->parsing->code = $this->subHEADER;
-			$this->makeHTMLcode();
-			
-			$this->parse_pos = 	$OLD_parse_pos;
-			$this->parsing->code = $OLD_parse_code;
-		}
-
-		/**
-		* afficher le footer contenu dans page_footer
-		*
-		* @return	null
-		*/
-		function setPageFooter()
-		{
-			if (!count($this->subFOOTER)) return false;
-
-			$OLD_parse_pos = $this->parse_pos;
-			$OLD_parse_code = $this->parsing->code;
-			
-			$this->parse_pos = 0;
-			$this->parsing->code = $this->subFOOTER;
-			$this->isInFooter = true;
-			$this->makeHTMLcode();
-			$this->isInFooter = false;
-			
-			$this->parse_pos = 	$OLD_parse_pos;
-			$this->parsing->code = $OLD_parse_code;
-		}
-		
-		/**
-		* saut de ligne avec une hauteur spécifique
-		*
-		* @param	float	hauteur de la ligne
-		* @param	integer	position reelle courante si saut de ligne pendant l'ecriture d'un texte 
-		* @return	null
-		*/
-		function setNewLine($h, $curr = null)
-		{
-			$this->pdf->Ln($h);
-			
-			$this->setNewPositionForNewLine($curr);
-		}
-			
-		/**
-		* création d'une nouvelle page avec le format et l'orientation spécifies
-		*
-		* @param	mixed	format de la page : A5, A4, array(width, height)
-		* @param	string	sens P=portrait ou L=landscape
-		* @param	array	tableau des propriétés du fond de la page
-		* @param	integer	position reelle courante si saut de ligne pendant l'ecriture d'un texte 
-		* @return	null
-		*/
-		function setNewPage($format = null, $orientation = '', $background = null, $curr = null)
-		{
-			$this->firstPage = false;
-
-			$this->format = $format ? $format : $this->format;
-			$this->sens = $orientation ? $orientation : $this->sens;
-			$this->background = $background!==null ? $background : $this->background;
-			$this->maxY = 0;	
-			$this->maxX = 0;
-			$this->maxH = 0;
-			
-			$this->pdf->SetMargins($this->defaultLeft, $this->defaultTop, $this->defaultRight);
-			$this->pdf->AddPage($this->sens, $this->format);
-			$this->page++;
-			
-			if (!$this->sub_part && !$this->isSubPart)
-			{
-				if (is_array($this->background))
-				{
-					if (isset($this->background['color']) && $this->background['color'])
-					{
-						$this->pdf->setMyFillColor($this->background['color']);
-						$this->pdf->Rect(0, 0, $this->pdf->getW(), $this->pdf->getH(), 'F');
-					}
-
-					if (isset($this->background['img']) && $this->background['img'])
-						$this->pdf->Image($this->background['img'], $this->background['posX'], $this->background['posY'], $this->background['width']);
-				}	
-				
-				$this->setPageHeader();
-				$this->setPageFooter();
-			}
-			
-			$this->setMargins();
-			$this->pdf->setY($this->margeTop);
-			
-			$this->setNewPositionForNewLine($curr);
-			$this->maxH = 0;
-		}
-		
-		/**
-		* calcul de la position de debut de la prochaine ligne en fonction de l'alignement voulu
-		*
-		* @param	integer	position reelle courante si saut de ligne pendant l'ecriture d'un texte 
-		* @return	null
-		*/
-		function setNewPositionForNewLine($curr = null)
-		{
-			list($lx, $rx) = $this->getMargins($this->pdf->getY());
-			$this->pdf->setX($lx);
-			$wMax = $rx-$lx;
-			$this->currentH = 0;
-			
-			if ($this->sub_part || $this->isSubPart || $this->forOneLine)
-			{
-//				$this->pdf->setWordSpacing(0);
-				return null;
-			}
-/*
-			if (
-				$this->style->value['text-align']!='right' && 
-				$this->style->value['text-align']!='center' && 
-				$this->style->value['text-align']!='justify'
-				)
-			{
-//				$this->pdf->setWordSpacing(0);
-				return null;
-			}
-*/			
-			$sub = null;
-			$this->createSubHTML($sub);
-			$sub->saveMargin(0, 0, $sub->pdf->getW()-$wMax);
-			$sub->forOneLine = true;
-			$sub->parse_pos = $this->parse_pos;
-			$sub->parsing->code = $this->parsing->code;
-			
-			if ($curr!==null && $sub->parsing->code[$this->parse_pos]['name']=='write')
-			{
-				$txt = $sub->parsing->code[$this->parse_pos]['param']['txt'];
-				$txt = str_replace('[[page_cu]]',	$sub->page,	$txt);
-				$sub->parsing->code[$this->parse_pos]['param']['txt'] = substr($txt, $curr);
-			}
-			else
-				$sub->parse_pos++;
-				
-			// pour chaque element identifié par le parsing
-			$res = null;
-			for($sub->parse_pos; $sub->parse_pos<count($sub->parsing->code); $sub->parse_pos++)
-			{
-				$todo = $sub->parsing->code[$sub->parse_pos];
-				$res = $sub->loadAction($todo);
-				if (!$res) break;
-			}
-
-			$w = $sub->maxX; // largeur maximale
-			$h = $sub->maxH; // hauteur maximale
-			$e = ($res===null ? $sub->maxE : 0); // nombre d'éléments maximal
-			$this->destroySubHTML($sub);
-			
-			if ($this->style->value['text-align']=='center')
-				$this->pdf->setX(($rx+$this->pdf->getX()-$w)*0.5-0.01);
-			elseif ($this->style->value['text-align']=='right')
-				$this->pdf->setX($rx-$w-0.01);
-			else
-				$this->pdf->setX($lx);
-			
-			$this->currentH = $h;
-/*				
-			if ($this->style->value['text-align']=='justify' && $e>1)
-				$this->pdf->setWordSpacing(($wMax-$w)/($e-1));
-			else
-				$this->pdf->setWordSpacing(0);
-*/
-		}
-		
-		/** 
-		* récupération du PDF 
-		* 
-		* @param	string	nom du fichier PDF 
-		* @param	boolean	destination 
-		* @return	string	contenu éventuel du pdf
-		* 
-		*
-		* Destination où envoyer le document. Le paramètre peut prendre les valeurs suivantes :
-		* true	: equivalent à I
-		* false	: equivalent à S
-		* I : envoyer en inline au navigateur. Le plug-in est utilisé s'il est installé. Le nom indiqué dans name est utilisé lorsque l'on sélectionne "Enregistrer sous" sur le lien générant le PDF.
-		* D : envoyer au navigateur en forçant le téléchargement, avec le nom indiqué dans name.
-		* F : sauver dans un fichier local, avec le nom indiqué dans name (peut inclure un répertoire).
-		* S : renvoyer le document sous forme de chaîne. name est ignoré.
-		*/
-		function Output($name = '', $dest = false)
-		{
-			// nettoyage
-			global $HTML2PDF_TABLEAU; $HTML2PDF_TABLEAU = array();
-
-			if ($this->DEBUG_actif)
-			{
-				$this->DEBUG_add('Before output');
-				$this->pdf->Close();
-				exit;
-			}
-			
-			// interpretation des paramètres
-			if ($dest===false)	$dest = 'I';
-			if ($dest===true)	$dest = 'S';
-			if ($dest==='')		$dest = 'I';
-			if ($name=='')		$name='document.pdf';
-			
-			// verification de la destination
-			$dest = strtoupper($dest);
-			if (!in_array($dest, array('I', 'D', 'F', 'S'))) $dest = 'I';
-	
-			// verification du nom
-			if (strtolower(substr($name, -4))!='.pdf')
-			{
-				echo 'ERROR : The output document name "'.$name.'" is not a PDF name';
-				exit;
-			}
-			
-			return $this->pdf->Output($name, $dest);
-		}
-		
-		/**
-		* création d'un sous HTML2PDF pour la gestion des tableaux imbriqués
-		*
-		* @param	HTML2PDF	futur sous HTML2PDF passé en référence pour création
-		* @param	integer		marge eventuelle de l'objet si simulation d'un TD
-		* @return	null
-		*/		
-		function createSubHTML(&$sub_html, $cellmargin=0)
-		{
-			// calcul de la largueur
-			if ($this->style->value['width'])
-			{
-				$marge = $cellmargin*2;
-				$marge+= $this->style->value['padding']['l'] + $this->style->value['padding']['r'];
-				$marge+= $this->style->value['border']['l']['width'] + $this->style->value['border']['r']['width'];
-				$marge = $this->pdf->getW() - $this->style->value['width'] + $marge;
-			}
-			else
-				$marge = $this->margeLeft+$this->margeRight;
-			
-			//clonage
-			$sub_html = new HTML2PDF(
-										$this->sens,
-										$this->format,
-										$this->langue,
-										array($this->defaultLeft,$this->defaultTop,$this->defaultRight,$this->defaultBottom)
-									);
-			$sub_html->setIsSubPart();
-			$sub_html->setEncoding($this->encoding);
-			$sub_html->setTestTdInOnePage($this->testTDin1page);
-			$sub_html->setTestIsImage($this->testIsImage);
-			$sub_html->setTestIsDeprecated($this->testIsDeprecated);
-			$sub_html->setDefaultFont($this->defaultFont);
-			$sub_html->style->css		= $this->style->css;
-			$sub_html->style->css_keys	= $this->style->css_keys;
-			$sub_html->pdf->cloneFontFrom($this->pdf);
-			
-			$sub_html->style->table			= $this->style->table;
-			$sub_html->style->value			= $this->style->value;
-			$sub_html->style->setOnlyLeft();
-			$sub_html->setNewPage($this->format, $this->sens);
-			$sub_html->initSubHtml($marge, $this->page, $this->defLIST);
-			
-			// initialisation des positions et autre
-			$sub_html->maxX = 0;
-			$sub_html->maxY = 0;
-			$sub_html->maxH = 0;
-			$sub_html->pdf->setXY(0, 0);
-		}
-		
-		/**
-		* initialise le sous HTML2PDF. Ne pas utiliser directement. seul la fonction createSubHTML doit l'utiliser
-		*
-		* @return	null
-		*/	
-		function initSubHtml($marge, $page, $defLIST)
-		{
-			$this->saveMargin(0, 0, $marge);
-			$this->defLIST = $defLIST;
-			
-			$this->page = $page;
-			$this->pdf->setXY(0, 0);
-			$this->style->FontSet();
-		}
-		
-		function setIsSubPart()
-		{
-			$this->isSubPart = true;
-		}
-		
-		/**
-		* destruction d'un sous HTML2PDF pour la gestion des tableaux imbriqués
-		*
-		* @return	null
-		*/	
-		function destroySubHTML(&$sub_html)
-		{
-			unset($sub_html);
-			$sub_html = null;	
-		}
-		
-		/**
-		* Convertir un nombre arabe en nombre romain
-		*
-		* @param	integer	nombre à convertir
-		* @return	string	nombre converti
-		*/
-		function listeArab2Rom($nb_ar)
-		{
-			$nb_b10	= array('I','X','C','M');
-			$nb_b5	= array('V','L','D');
-			$nb_ro	= '';
-
-			if ($nb_ar<1)		return $nb_ar;
-			if ($nb_ar>3999)	return $nb_ar;
-
-			for($i=3; $i>=0 ; $i--)
-			{
-				$chiffre=floor($nb_ar/pow(10,$i));
-				if($chiffre>=1)
-				{
-					$nb_ar=$nb_ar-$chiffre*pow(10,$i);
-					if($chiffre<=3)
-					{
-						for($j=$chiffre; $j>=1; $j--)
-						{
-							$nb_ro=$nb_ro.$nb_b10[$i];
-						}
-					}
-					else if($chiffre==9)
-					{
-						$nb_ro=$nb_ro.$nb_b10[$i].$nb_b10[$i+1];
-					}
-					elseif($chiffre==4)
-					{
-					$nb_ro=$nb_ro.$nb_b10[$i].$nb_b5[$i];
-					}
-					else
-					{
-						$nb_ro=$nb_ro.$nb_b5[$i];
-						for($j=$chiffre-5; $j>=1; $j--)
-						{
-							$nb_ro=$nb_ro.$nb_b10[$i];
-						}
-					}
-				}
-			}
-			return $nb_ro;
-		}
-		
-		/**
-		* Ajouter un LI au niveau actuel
-		*
-		* @return	null
-		*/
-		function listeAddLi()
-		{
-			$this->defLIST[count($this->defLIST)-1]['nb']++;
-		}
-
-		function listeGetWidth() { return '7mm'; }
-		function listeGetPadding() { return '1mm'; }
-
-		/**
-		* Recuperer le LI du niveau actuel
-		*
-		* @return	string	chaine à afficher
-		*/
-		function listeGetLi()
-		{
-			$im = $this->defLIST[count($this->defLIST)-1]['img'];
-			$st = $this->defLIST[count($this->defLIST)-1]['style'];
-			$nb = $this->defLIST[count($this->defLIST)-1]['nb'];
-			$up = (substr($st, 0, 6)=='upper-');
-			
-			if ($im) return array(false, false, $im);
-			
-			switch($st)
-			{
-				case 'none':
-					return array('helvetica', true, ' ');
-					
-				case 'upper-alpha':
-				case 'lower-alpha':
-					$str = '';
-					while($nb>26)
-					{
-						$str = chr(96+$nb%26).$str; 
-						$nb = floor($nb/26);	
-					}
-					$str = chr(96+$nb).$str; 
-					
-					return array('helvetica', false, ($up ? strtoupper($str) : $str).'.');
-
-				case 'upper-roman':
-				case 'lower-roman':
-					$str = $this->listeArab2Rom($nb);
-					
-					return array('helvetica', false, ($up ? strtoupper($str) : $str).'.');
-					
-				case 'decimal':
-					return array('helvetica', false, $nb.'.');
-
-				case 'square':
-					return array('zapfdingbats', true, chr(110));
-
-				case 'circle':
-					return array('zapfdingbats', true, chr(109));
-
-				case 'disc':
-				default:
-					return array('zapfdingbats', true, chr(108));
-			}
-		}
-				
-		/**
-		* Ajouter un niveau de liste
-		*
-		* @param	string	type de liste : ul, ol
-		* @param	string	style de la liste
-		* @return	null
-		*/
-		function listeAddLevel($type = 'ul', $style = '', $img = null)
-		{
-			if ($img)
-			{
-				if (preg_match('/^url\(([^)]+)\)$/isU', trim($img), $match))
-					$img = $match[1];
-				else
-					$img = null;
-			}
-			else
-				$img = null;
-			
-			if (!in_array($type, array('ul', 'ol'))) $type = 'ul';
-			if (!in_array($style, array('lower-alpha', 'upper-alpha', 'upper-roman', 'lower-roman', 'decimal', 'square', 'circle', 'disc', 'none'))) $style = '';
-			
-			if (!$style)
-			{
-				if ($type=='ul')	$style = 'disc';
-				else				$style = 'decimal';
-			}
-			$this->defLIST[count($this->defLIST)] = array('style' => $style, 'nb' => 0, 'img' => $img);
-		}
-		
-		/**
-		* Supprimer un niveau de liste
-		*
-		* @return	null
-		*/
-		function listeDelLevel()
-		{
-			if (count($this->defLIST))
-			{
-				unset($this->defLIST[count($this->defLIST)-1]);
-				$this->defLIST = array_values($this->defLIST);
-			}
-		}
-		
-		/**
-		* traitement d'un code HTML fait pour HTML2PDF
-		*
-		* @param	string	code HTML à convertir
-		* @param	boolean	afficher en pdf (false) ou en html adapté (true)
-		* @return	null
-		*/
-		function writeHTML($html, $vue = false)
-		{
-			// si c'est une vrai page HTML, une conversion s'impose
-			if (preg_match('/<body/isU', $html))
-				$html = $this->getHtmlFromPage($html);
-				
-			$html = str_replace('[[page_nb]]',	'{nb}',	 $html);
-			
-			$html = str_replace('[[date_y]]',	date('Y'),	 $html);
-			$html = str_replace('[[date_m]]',	date('m'),	 $html);
-			$html = str_replace('[[date_d]]',	date('d'),	 $html);
-
-			$html = str_replace('[[date_h]]',	date('H'),	 $html);
-			$html = str_replace('[[date_i]]',	date('i'),	 $html);
-			$html = str_replace('[[date_s]]',	date('s'),	 $html);
-			
-			// si on veut voir le résultat en HTML => on appelle la fonction
-			if ($vue)	$this->vueHTML($html);	
-
-			// sinon, traitement pour conversion en PDF :
-			// parsing
-			$this->sub_pdf = false;
-			$this->style->readStyle($html);
-			$this->parsing->setHTML($html);
-			$this->parsing->parse();
-			$this->makeHTMLcode();
-		}
-			
-		/**
-		* traitement du code d'une vrai page HTML pour l'adapter à HTML2PDF
-		*
-		* @param	string	code HTML à adapter
-		* @return	string	code HTML adapté
-		*/
-		function getHtmlFromPage($html)
-		{
-			$html = str_replace('<BODY', '<body', $html);
-			$html = str_replace('</BODY', '</body', $html);
-			
-			// extraction du contenu
-			$res = explode('<body', $html);
-			if (count($res)<2) return $html;
-			$content = '<page'.$res[1];
-			$content = explode('</body', $content);
-			$content = $content[0].'</page>';
-
-			// extraction des balises link
-			preg_match_all('/<link([^>]*)>/isU', $html, $match);
-			foreach($match[0] as $src)
-				$content = $src.'</link>'.$content;	
-			
-			// extraction des balises style
-			preg_match_all('/<style[^>]*>(.*)<\/style[^>]*>/isU', $html, $match);
-			foreach($match[0] as $src)
-				$content = $src.$content;	
-						
-			return $content;	
-		}
-		
-		/**
-		* execute les différentes actions du code HTML
-		*
-		* @return	null
-		*/
-		function makeHTMLcode()
-		{
-			// pour chaque element identifié par le parsing
-			for($this->parse_pos=0; $this->parse_pos<count($this->parsing->code); $this->parse_pos++)
-			{
-				// récupération de l'élément
-				$todo = $this->parsing->code[$this->parse_pos];
-				
-				// si c'est une ouverture de tableau
-				if (in_array($todo['name'], array('table', 'ul', 'ol')) && !$todo['close'])
-				{
-					// on va créer un sous HTML, et on va travailler sur une position temporaire
-					$tag_open = $todo['name'];
-
-					$this->sub_part = true;
-					$this->temp_pos = $this->parse_pos;
-					
-					// pour tous les éléments jusqu'à la fermeture de la table afin de préparer les dimensions
-					while(isset($this->parsing->code[$this->temp_pos]) && !($this->parsing->code[$this->temp_pos]['name']==$tag_open && $this->parsing->code[$this->temp_pos]['close']))
-					{
-						$this->loadAction($this->parsing->code[$this->temp_pos]);
-						$this->temp_pos++;
-					}
-					if (isset($this->parsing->code[$this->temp_pos])) 	$this->loadAction($this->parsing->code[$this->temp_pos]);
-					$this->sub_part = false;
-				}
-				
-				// chargement de l'action correspondant à l'élément
-				$this->loadAction($todo);
-			}
-		} 
-
-
-	
-		/**
-		* affichage en mode HTML du contenu
-		*
-		* @param	string	contenu
-		* @return	null
-		*/	
-		function vueHTML($content)
-		{
-			$content = preg_replace('/<page_header([^>]*)>/isU',	'<hr>'.HTML2PDF::textGET('vue01').' : $1<hr><div$1>', $content);
-			$content = preg_replace('/<page_footer([^>]*)>/isU',	'<hr>'.HTML2PDF::textGET('vue02').' : $1<hr><div$1>', $content);
-			$content = preg_replace('/<page([^>]*)>/isU',			'<hr>'.HTML2PDF::textGET('vue03').' : $1<hr><div$1>', $content);
-			$content = preg_replace('/<\/page([^>]*)>/isU',			'</div><hr>', $content);
-			$content = preg_replace('/<bookmark([^>]*)>/isU',		'<hr>bookmark : $1<hr>', $content);
-			$content = preg_replace('/<\/bookmark([^>]*)>/isU',		'', $content);
-			$content = preg_replace('/<barcode([^>]*)>/isU',		'<hr>barcode : $1<hr>', $content);
-			$content = preg_replace('/<\/barcode([^>]*)>/isU',		'', $content);
-			$content = preg_replace('/<qrcode([^>]*)>/isU',		'<hr>qrcode : $1<hr>', $content);
-			$content = preg_replace('/<\/qrcode([^>]*)>/isU',		'', $content);
-			
-			echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-	<head>
-		<title>'.HTML2PDF::textGET('vue04').' HTML</title>
-		<meta http-equiv="Content-Type" content="text/html; charset='.$this->encoding.'" >
-	</head>
-	<body style="padding: 10px; font-size: 10pt;font-family:	Verdana;">
-'.$content.'
-	</body>
-</html>';
-			exit;	
-		}
-
-		/**
-		* chargement de l'action correspondante à un element de parsing
-		*
-		* @param	array	élément de parsing
-		* @return	null
-		*/		
-		function loadAction($row)
-		{
-			// nom de l'action
-			$fnc	= ($row['close'] ? 'c_' : 'o_').strtoupper($row['name']);
-			
-			// parametres de l'action
-			$param	= $row['param'];
-			
-			// si aucune page n'est créé, on la créé
-			if ($fnc!='o_PAGE' && $this->firstPage)
-			{
-				$this->setNewPage();
-			}
-			
-			// lancement de l'action
-			if (is_callable(array(&$this, $fnc)))
-			{
-				$res = $this->{$fnc}($param);
-				$this->previousCall = $fnc;
-				return $res;
-			}
-			else
-			{
-				HTML2PDF::makeError(1, __FILE__, __LINE__, strtoupper($row['name']), $this->parsing->getHtmlErrorCode($row['html_pos']));
-				return false;
-			}
-		}
-		
-		/**
-		* balise	: PAGE
-		* mode		: OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_PAGE($param)
-		{
-			if ($this->forOneLine) return false;
-			if ($this->DEBUG_actif) $this->DEBUG_add('PAGE n°'.($this->page+1), true);
-
-			$newPageSet= (!isset($param['pageset']) || $param['pageset']!='old');
-			
-			$this->maxH = 0;
-			if ($newPageSet)
-			{
-				$this->subHEADER = array();
-				$this->subFOOTER = array();
-						
-				// identification de l'orientation demandée
-				$orientation = '';
-				if (isset($param['orientation']))
-				{
-					$param['orientation'] = strtolower($param['orientation']);
-					if ($param['orientation']=='p')			$orientation = 'P';
-					if ($param['orientation']=='portrait')	$orientation = 'P';
-	
-					if ($param['orientation']=='l')			$orientation = 'L';
-					if ($param['orientation']=='paysage')	$orientation = 'L';
-					if ($param['orientation']=='landscape')	$orientation = 'L';
-				}
-				
-				// identification de l'orientation demandée
-				$format = null;
-				if (isset($param['format']))
-				{
-					$format = strtolower($param['format']);
-					if (preg_match('/^([0-9]+)x([0-9]+)$/isU', $format, $match))
-					{
-						$format = array(intval($match[1]), intval($match[2]));
-					}
-				}
-					
-				// identification des propriétés du background
-				$background = array();
-				if (isset($param['backimg']))
-				{
-					$background['img']		= isset($param['backimg'])	? $param['backimg']		: '';		// nom de l'image
-					$background['posX']		= isset($param['backimgx'])	? $param['backimgx']	: 'center'; // position horizontale de l'image
-					$background['posY']		= isset($param['backimgy'])	? $param['backimgy']	: 'middle'; // position verticale de l'image
-					$background['width']	= isset($param['backimgw'])	? $param['backimgw']	: '100%';	// taille de l'image (100% = largueur de la feuille)
-					
-					// conversion du nom de l'image, en cas de paramètres en _GET
-					$background['img'] = str_replace('&amp;', '&', $background['img']);
-					// conversion des positions
-					if ($background['posX']=='left')	$background['posX'] = '0%';
-					if ($background['posX']=='center')	$background['posX'] = '50%';
-					if ($background['posX']=='right')	$background['posX'] = '100%';
-					if ($background['posY']=='top')		$background['posY'] = '0%';
-					if ($background['posY']=='middle')	$background['posY'] = '50%';
-					if ($background['posY']=='bottom')	$background['posY'] = '100%';
-	
-	
-					// si il y a une image de précisé
-					if ($background['img'])	
-					{
-						// est-ce que c'est une image ?
-						$infos=@GetImageSize($background['img']);
-						if (count($infos)>1)
-						{
-							// taille de l'image, en fonction de la taille spécifiée. 
-							$Wi = $this->style->ConvertToMM($background['width'], $this->pdf->getW());
-							$Hi = $Wi*$infos[1]/$infos[0];
-							
-							// récupération des dimensions et positions de l'image
-							$background['width']	= $Wi;	
-							$background['posX']		= $this->style->ConvertToMM($background['posX'], $this->pdf->getW() - $Wi);
-							$background['posY']		= $this->style->ConvertToMM($background['posY'], $this->pdf->getH() - $Hi);
-						}
-						else
-							$background = array();	
-					}
-					else
-						$background = array();
-				}
-				
-				// marges TOP et BOTTOM pour le texte.
-				$background['top']		= isset($param['backtop'])			? $param['backtop'] 		: '0';
-				$background['bottom']	= isset($param['backbottom'])		? $param['backbottom']		: '0';
-				$background['left']		= isset($param['backleft'])			? $param['backleft'] 		: '0';
-				$background['right']	= isset($param['backright'])		? $param['backright']		: '0';
-
-				if (preg_match('/^([0-9]*)$/isU', $background['top']))		$background['top']		.= 'mm';
-				if (preg_match('/^([0-9]*)$/isU', $background['bottom']))	$background['bottom']	.= 'mm';
-				if (preg_match('/^([0-9]*)$/isU', $background['left']))		$background['left']		.= 'mm';
-				if (preg_match('/^([0-9]*)$/isU', $background['right']))	$background['right']	.= 'mm';
-
-				$background['top']		= $this->style->ConvertToMM($background['top'],		$this->pdf->getH());
-				$background['bottom']	= $this->style->ConvertToMM($background['bottom'],	$this->pdf->getH());
-				$background['left']		= $this->style->ConvertToMM($background['left'],	$this->pdf->getW());
-				$background['right']	= $this->style->ConvertToMM($background['right'],	$this->pdf->getW());
-
-				$res = false;
-				$background['color']	= isset($param['backcolor'])	? $this->style->ConvertToColor($param['backcolor'], $res) : null;
-				if (!$res) $background['color'] = null;
-
-				$this->style->save();
-				$this->style->analyse('PAGE', $param);
-				$this->style->setPosition();
-				$this->style->FontSet();
-				
-				// nouvelle page
-				$this->setNewPage($format, $orientation, $background);
-	
-				// footer automatique
-				if (isset($param['footer']))
-				{
-					$lst = explode(';', $param['footer']);
-					foreach($lst as $key => $val) $lst[$key] = trim(strtolower($val));
-					$page	= in_array('page', $lst);
-					$date	= in_array('date', $lst);
-					$heure	= in_array('heure', $lst);
-					$form	= in_array('form', $lst);
-				}
-				else
-				{
-					$page	= null;
-					$date	= null;
-					$heure	= null;
-					$form	= null;
-				}
-				$this->pdf->SetMyFooter($page, $date, $heure, $form);
-			}
-			else
-			{
-				$this->style->save();
-				$this->style->analyse('PAGE', $param);
-				$this->style->setPosition();
-				$this->style->FontSet();
-				
-				$this->setNewPage();
-			}			
-			
-			return true;
-		}
-
-		/**
-		* balise : PAGE
-		* mode : FERMETURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function c_PAGE($param)
-		{
-			if ($this->forOneLine) return false;
-
-			$this->maxH = 0;
-
-			$this->style->load();
-			$this->style->FontSet();
-			
-			if ($this->DEBUG_actif) $this->DEBUG_add('PAGE n°'.$this->page, false);
-			
-			return true;
-		}
-		
-		
-		function o_PAGE_HEADER($param)
-		{
-			if ($this->forOneLine) return false;
-
-			$this->subHEADER = array();
-			for($this->parse_pos; $this->parse_pos<count($this->parsing->code); $this->parse_pos++)
-			{
-				$todo = $this->parsing->code[$this->parse_pos];
-				if ($todo['name']=='page_header') $todo['name']='page_header_sub';
-				$this->subHEADER[] = $todo;
-				if (strtolower($todo['name'])=='page_header_sub' && $todo['close']) break;
-			}
-
-			$this->setPageHeader();
-			
-			return true;
-		}
-		
-		function o_PAGE_FOOTER($param)
-		{
-			if ($this->forOneLine) return false;
-
-			$this->subFOOTER = array();
-			for($this->parse_pos; $this->parse_pos<count($this->parsing->code); $this->parse_pos++)
-			{
-				$todo = $this->parsing->code[$this->parse_pos];
-				if ($todo['name']=='page_footer') $todo['name']='page_footer_sub';
-				$this->subFOOTER[] = $todo;
-				if (strtolower($todo['name'])=='page_footer_sub' && $todo['close']) break;
-			}
-			
-			$this->setPageFooter();
-			
-			return true;
-		}
-
-		function o_PAGE_HEADER_SUB($param)
-		{
-			if ($this->forOneLine) return false;
-
-			// sauvegarde de l'état
-			$this->subSTATES = array();
-			$this->subSTATES['x']	= $this->pdf->getX();
-			$this->subSTATES['y']	= $this->pdf->getY();
-			$this->subSTATES['s']	= $this->style->value;
-			$this->subSTATES['t']	= $this->style->table;
-			$this->subSTATES['ml']	= $this->margeLeft;
-			$this->subSTATES['mr']	= $this->margeRight;
-			$this->subSTATES['mt']	= $this->margeTop;
-			$this->subSTATES['mb']	= $this->margeBottom;
-			$this->subSTATES['mp']	= $this->pageMarges;
-	
-			// nouvel etat pour le footer
-			$this->pageMarges = array();
-			$this->margeLeft	= $this->defaultLeft;
-			$this->margeRight	= $this->defaultRight;
-			$this->margeTop		= $this->defaultTop;
-			$this->margeBottom	= $this->defaultBottom;
-			$this->pdf->SetMargins($this->margeLeft, $this->margeTop, $this->margeRight);
-			$this->pdf->SetAutoPageBreak(false, $this->margeBottom);
-			$this->pdf->setXY($this->defaultLeft, $this->defaultTop);
-			
-			$this->style->initStyle();
-			$this->style->resetStyle();
-			$this->style->value['width']	= $this->pdf->getW() - $this->defaultLeft - $this->defaultRight;
-			$this->style->table				= array();
-
-			$this->style->save();
-			$this->style->analyse('page_header_sub', $param);
-			$this->style->setPosition();
-			$this->style->FontSet();
-			$this->setNewPositionForNewLine();				
-			return true;
-		}
-
-		function c_PAGE_HEADER_SUB($param)
-		{
-			if ($this->forOneLine) return false;
-
-			$this->style->load();
-
-			// retablissement de l'etat
-			$this->style->value				= $this->subSTATES['s'];
-			$this->style->table				= $this->subSTATES['t'];
-			$this->pageMarges				= $this->subSTATES['mp'];
-			$this->margeLeft				= $this->subSTATES['ml'];
-			$this->margeRight				= $this->subSTATES['mr'];
-			$this->margeTop					= $this->subSTATES['mt'];
-			$this->margeBottom				= $this->subSTATES['mb'];
-			$this->pdf->SetMargins($this->margeLeft, $this->margeTop, $this->margeRight);
-			$this->pdf->setbMargin($this->margeBottom);
-			$this->pdf->SetAutoPageBreak(false, $this->margeBottom);
-			$this->pdf->setXY($this->subSTATES['x'], $this->subSTATES['y']);
-			
-			$this->style->FontSet();			
-			$this->maxH = 0;		
-			
-			return true;
-		}
-				
-		function o_PAGE_FOOTER_SUB($param)
-		{
-			if ($this->forOneLine) return false;
-
-			$this->subSTATES = array();
-			$this->subSTATES['x']	= $this->pdf->getX();
-			$this->subSTATES['y']	= $this->pdf->getY();
-			$this->subSTATES['s']	= $this->style->value;
-			$this->subSTATES['t']	= $this->style->table;
-			$this->subSTATES['ml']	= $this->margeLeft;
-			$this->subSTATES['mr']	= $this->margeRight;
-			$this->subSTATES['mt']	= $this->margeTop;
-			$this->subSTATES['mb']	= $this->margeBottom;
-			$this->subSTATES['mp']	= $this->pageMarges;
-	
-			// nouvel etat pour le footer
-			$this->pageMarges = array();
-			$this->margeLeft	= $this->defaultLeft;
-			$this->margeRight	= $this->defaultRight;
-			$this->margeTop		= $this->defaultTop;
-			$this->margeBottom	= $this->defaultBottom;
-			$this->pdf->SetMargins($this->margeLeft, $this->margeTop, $this->margeRight);
-			$this->pdf->SetAutoPageBreak(false, $this->margeBottom);
-			$this->pdf->setXY($this->defaultLeft, $this->defaultTop);
-			
-	
-			$this->style->initStyle();
-			$this->style->resetStyle();
-			$this->style->value['width']	= $this->pdf->getW() - $this->defaultLeft - $this->defaultRight;
-			$this->style->table				= array();			
-
-			// on en créé un sous HTML que l'on transforme en PDF
-			// pour récupérer la hauteur
-			// on extrait tout ce qui est contenu dans le FOOTER
-			$sub = null;
-			$this->CreateSubHTML($sub);
-			$sub->parsing->code = $this->parsing->getLevel($this->parse_pos);
-			$sub->MakeHTMLcode();
-			$this->pdf->setY($this->pdf->getH() - $sub->maxY - $this->defaultBottom - 0.01);
-			$this->destroySubHTML($sub);
-			
-			$this->style->save();			
-			$this->style->analyse('page_footer_sub', $param);
-			$this->style->setPosition();
-			$this->style->FontSet();
-			$this->setNewPositionForNewLine();		
-			
-			return true;
-		}
-
-		function c_PAGE_FOOTER_SUB($param)
-		{
-			if ($this->forOneLine) return false;
-
-			$this->style->load();
-
-			$this->style->value				= $this->subSTATES['s'];
-			$this->style->table				= $this->subSTATES['t'];
-			$this->pageMarges 				= $this->subSTATES['mp'];
-			$this->margeLeft				= $this->subSTATES['ml'];
-			$this->margeRight				= $this->subSTATES['mr'];
-			$this->margeTop					= $this->subSTATES['mt'];
-			$this->margeBottom				= $this->subSTATES['mb'];
-			$this->pdf->SetMargins($this->margeLeft, $this->margeTop, $this->margeRight);
-			$this->pdf->SetAutoPageBreak(false, $this->margeBottom);
-			$this->pdf->setXY($this->subSTATES['x'], $this->subSTATES['y']);
-
-			$this->style->FontSet();	
-			$this->maxH = 0;		
-			
-			return true;
-		}
-		
-		/**
-		* balise : NOBREAK
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/
-		function o_NOBREAK($param)
-		{
-			if ($this->forOneLine) return false;
-
-			$this->maxH = 0;
-
-			// on en créé un sous HTML que l'on transforme en PDF
-			// pour analyse les dimensions
-			// et voir si ca rentre
-			$sub = null;
-			$this->CreateSubHTML($sub);
-			$sub->parsing->code = $this->parsing->getLevel($this->parse_pos);
-			$sub->MakeHTMLcode();
-			
-			$y = $this->pdf->getY();
-			if (
-					$sub->maxY < ($this->pdf->getH() - $this->pdf->gettMargin()-$this->pdf->getbMargin()) &&
-					$y + $sub->maxY>=($this->pdf->getH() - $this->pdf->getbMargin())
-				)
-				$this->setNewPage();
-			$this->destroySubHTML($sub);
-			
-			return true;
-		}
-		
-
-		/**
-		* balise : NOBREAK
-		* mode : FERMETURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function c_NOBREAK($param)
-		{
-			if ($this->forOneLine) return false;
-
-			$this->maxH = 0;
-					
-			return true;
-		}
-		
-		/**
-		* balise : DIV
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_DIV($param, $other = 'div')
-		{
-			if ($this->forOneLine) return false;
-			if ($this->DEBUG_actif) $this->DEBUG_add(strtoupper($other), true);
-			
-			$this->style->save();
-			$this->style->analyse($other, $param);
-			$this->style->FontSet();
-			
-			// gestion specifique a la balise legend pour l'afficher au bon endroit
-			if (in_array($other, array('fieldset', 'legend')))
-			{
-				if (isset($param['moveTop']))	$this->style->value['margin']['t']	+= $param['moveTop'];
-				if (isset($param['moveLeft']))	$this->style->value['margin']['l']	+= $param['moveLeft'];
-				if (isset($param['moveDown']))	$this->style->value['margin']['b']	+= $param['moveDown'];
-			}
-			
-			$align_object = null;
-			if ($this->style->value['margin-auto']) $align_object = 'center';
-
-			$marge = array();
-			$marge['l'] = $this->style->value['border']['l']['width'] + $this->style->value['padding']['l']+0.03;
-			$marge['r'] = $this->style->value['border']['r']['width'] + $this->style->value['padding']['r']+0.03;
-			$marge['t'] = $this->style->value['border']['t']['width'] + $this->style->value['padding']['t']+0.03;
-			$marge['b'] = $this->style->value['border']['b']['width'] + $this->style->value['padding']['b']+0.03;
-			
-			// on extrait tout ce qui est contenu dans la DIV
-			$level = $this->parsing->getLevel($this->parse_pos);
-
-			// on en créé un sous HTML que l'on transforme en PDF
-			// pour analyse les dimensions
-			$w = 0; $h = 0;
-			if (count($level))
-			{
-				$sub = null;
-				$this->CreateSubHTML($sub);
-				$sub->parsing->code = $level;
-				$sub->MakeHTMLcode();
-				$w = $sub->maxX;
-				$h = $sub->maxY;
-				$this->destroySubHTML($sub);
-			}
-			$w_reel = $w;
-			$h_reel = $h;
-			
-//			if (($w==0 && $this->style->value['width']==0) || ($w>$this->style->value['width']) || $this->style->value['position']=='absolute')
-				$w+= $marge['l']+$marge['r']+0.001;
-
-			$h+= $marge['t']+$marge['b']+0.001;
-			
-			if ($this->style->value['overflow']=='hidden')
-			{
-				$over_w = max($w, $this->style->value['width']);
-				$over_h = max($h, $this->style->value['height']);
-				$overflow = true;
-				$this->style->value['old_maxX'] = $this->maxX;
-				$this->style->value['old_maxY'] = $this->maxY;
-				$this->style->value['old_maxH'] = $this->maxH;
-				$this->style->value['old_overflow'] = $this->isInOverflow;
-				$this->isInOverflow = true;
-			}
-			else
-			{
-				$over_w = null;
-				$over_h = null;
-				$overflow = false;
-				$this->style->value['width']	= max($w, $this->style->value['width']);
-				$this->style->value['height']	= max($h, $this->style->value['height']);
-			}
-			
-			switch($this->style->value['rotate'])
-			{
-				case 90:
-					$tmp = $over_h; $over_h = $over_w; $over_w = $tmp;
-					$tmp = $h_reel; $h_reel = $w_reel; $w_reel = $tmp;
-					unset($tmp);
-					$w = $this->style->value['height'];
-					$h = $this->style->value['width'];
-					$t_x =-$h;
-					$t_y = 0;
-					break;
-					
-				case 180:
-					$w = $this->style->value['width'];
-					$h = $this->style->value['height'];
-					$t_x = -$w;
-					$t_y = -$h;
-					break;
-					
-				case 270:
-					$tmp = $over_h; $over_h = $over_w; $over_w = $tmp;
-					$tmp = $h_reel; $h_reel = $w_reel; $w_reel = $tmp;
-					unset($tmp);
-					$w = $this->style->value['height'];
-					$h = $this->style->value['width'];
-					$t_x = 0;
-					$t_y =-$w;
-					break;
-					
-				default:
-					$w = $this->style->value['width'];
-					$h = $this->style->value['height'];
-					$t_x = 0;
-					$t_y = 0;
-					break;
-			}
-
-			if (!$this->style->value['position'])
-			{
-				if (
-					$w < ($this->pdf->getW() - $this->pdf->getlMargin()-$this->pdf->getrMargin()) &&
-					$this->pdf->getX() + $w>=($this->pdf->getW() - $this->pdf->getrMargin())
-					)
-					$this->o_BR(array());
-	
-				if (
-						($h < ($this->pdf->getH() - $this->pdf->gettMargin()-$this->pdf->getbMargin())) &&
-						($this->pdf->getY() + $h>=($this->pdf->getH() - $this->pdf->getbMargin())) && 
-						!$this->isInOverflow
-					)
-					$this->setNewPage();
-				
-				// en cas d'alignement => correction
-				$old = $this->style->getOldValues();
-				$parent_w = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
-				
-				if ($parent_w>$w)
-				{				
-					if ($align_object=='center')		$this->pdf->setX($this->pdf->getX() + ($parent_w-$w)*0.5);
-					else if ($align_object=='right')	$this->pdf->setX($this->pdf->getX() + $parent_w-$w);
-				}
-				
-				$this->style->setPosition();
-			}
-			else
-			{
-				// en cas d'alignement => correction
-				$old = $this->style->getOldValues();
-				$parent_w = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
-				
-				if ($parent_w>$w)
-				{
-					if ($align_object=='center')		$this->pdf->setX($this->pdf->getX() + ($parent_w-$w)*0.5);
-					else if ($align_object=='right')	$this->pdf->setX($this->pdf->getX() + $parent_w-$w);
-				}
-				
-				$this->style->setPosition();
-				$this->saveMax();
-				$this->maxX = 0;
-				$this->maxY = 0;
-				$this->maxH = 0;
-				$this->maxE = 0;
-			}		
-			
-			if ($this->style->value['rotate'])
-			{
-				$this->pdf->startTransform();
-				$this->pdf->setRotation($this->style->value['rotate']);
-				$this->pdf->setTranslate($t_x, $t_y);
-			}
-			
-			// initialisation du style des bordures de la div
-			$this->drawRectangle(
-					$this->style->value['x'],
-					$this->style->value['y'],
-					$this->style->value['width'],
-					$this->style->value['height'],
-					$this->style->value['border'],
-					$this->style->value['padding'],
-					0,
-					$this->style->value['background']
-				);
-
-			$marge = array();
-			$marge['l'] = $this->style->value['border']['l']['width'] + $this->style->value['padding']['l']+0.03;
-			$marge['r'] = $this->style->value['border']['r']['width'] + $this->style->value['padding']['r']+0.03;
-			$marge['t'] = $this->style->value['border']['t']['width'] + $this->style->value['padding']['t']+0.03;
-			$marge['b'] = $this->style->value['border']['b']['width'] + $this->style->value['padding']['b']+0.03;
-
-			$this->style->value['width'] -= $marge['l']+$marge['r'];
-			$this->style->value['height']-= $marge['t']+$marge['b'];
-		
-			// positionnement en fonction des alignements
-			$x_corr = 0;
-			$y_corr = 0;
-			if (!$this->sub_part && !$this->isSubPart)
-			{
-				switch($this->style->value['text-align'])
-				{
-					case 'right':	$x_corr = ($this->style->value['width']-$w_reel); break;
-					case 'center':	$x_corr = ($this->style->value['width']-$w_reel)*0.5; break;
-				}
-				if ($x_corr>0) $x_corr=0;
-				switch($this->style->value['vertical-align'])
-				{
-					case 'bottom':	$y_corr = ($this->style->value['height']-$h_reel); break;
-					case 'middle':	$y_corr = ($this->style->value['height']-$h_reel)*0.5; break;
-				}
-			}
-			
-			if ($overflow)
-			{
-				$over_w-= $marge['l']+$marge['r'];
-				$over_h-= $marge['t']+$marge['b'];
-				$this->pdf->clippingPathOpen(
-					$this->style->value['x']+$marge['l'],
-					$this->style->value['y']+$marge['t'],
-					$this->style->value['width'],
-					$this->style->value['height']
-				);
-
-				$this->style->value['x']+= $x_corr;
-				// limitation des marges aux dimensions du contenu
-				$mL = $this->style->value['x']+$marge['l'];
-				$mR = $this->pdf->getW() - $mL - $over_w;
-			}
-			else
-			{
-				// limitation des marges aux dimensions de la div
-				$mL = $this->style->value['x']+$marge['l'];
-				$mR = $this->pdf->getW() - $mL - $this->style->value['width'];
-			}
-			
-			$x = $this->style->value['x']+$marge['l'];
-			$y = $this->style->value['y']+$marge['t']+$y_corr;
-			$this->saveMargin($mL, 0, $mR);
-			$this->pdf->setXY($x, $y);
-			
-			$this->setNewPositionForNewLine();
-			
-			return true;
-		}
-		function o_BLOCKQUOTE($param) { return $this->o_DIV($param, 'blockquote'); }
-		function o_LEGEND($param) { return $this->o_DIV($param, 'legend'); }
-		
-		/**
-		* balise : FIELDSET
-		* mode : OUVERTURE
-		* ecrite par Pavel Kochman
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_FIELDSET($param)
-		{
-
-			$this->style->save();
-			$this->style->analyse('fieldset', $param);
-
-			// get height of LEGEND element and make fieldset corrections
-			for($temp_pos = $this->parse_pos + 1; $temp_pos<count($this->parsing->code); $temp_pos++)
-			{
-				$todo = $this->parsing->code[$temp_pos];
-				if($todo['name'] == 'fieldset') break;
-				if($todo['name'] == 'legend' && !$todo['close'])
-				{
-					$legend_open_pos = $temp_pos;
-
-					$sub = null;
-					$this->CreateSubHTML($sub);
-					$sub->parsing->code = $this->parsing->getLevel($temp_pos - 1);
-
-					// pour chaque element identifié par le parsing
-					$res = null;
-					for($sub->parse_pos = 0; $sub->parse_pos<count($sub->parsing->code); $sub->parse_pos++)
-					{
-						$todo = $sub->parsing->code[$sub->parse_pos];
-						$sub->loadAction($todo);
-						
-						if ($todo['name'] == 'legend' && $todo['close'])
-							break;
-					}
-
-					$legendH = $sub->maxY;
-					$this->destroySubHTML($sub);
-
-					$move = $this->style->value['padding']['t'] + $this->style->value['border']['t']['width'] + 0.03;
-					
-					$param['moveTop'] = $legendH / 2;
-					
-					$this->parsing->code[$legend_open_pos]['param']['moveTop'] = - ($legendH / 2 + $move);
-					$this->parsing->code[$legend_open_pos]['param']['moveLeft'] = 2 - $this->style->value['border']['l']['width'] - $this->style->value['padding']['l'];
-					$this->parsing->code[$legend_open_pos]['param']['moveDown'] = $move;
-					break;
-				}
-			}
-			$this->style->load();
-			
-			return $this->o_DIV($param, 'fieldset');
-		}
-				
-		/**
-		* balise : DIV
-		* mode : FERMETURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function c_DIV($param, $other='div')
-		{
-			if ($this->forOneLine) return false;
-			
-			if ($this->style->value['overflow']=='hidden')
-			{
-				$this->maxX = $this->style->value['old_maxX'];
-				$this->maxY = $this->style->value['old_maxY'];
-				$this->maxH = $this->style->value['old_maxH'];
-				$this->isInOverflow = $this->style->value['old_overflow'];
-				$this->pdf->clippingPathClose();
-			}
-				
-			if ($this->style->value['rotate'])
-				$this->pdf->stopTransform();
-			
-			$marge = array();
-			$marge['l'] = $this->style->value['border']['l']['width'] + $this->style->value['padding']['l']+0.03;
-			$marge['r'] = $this->style->value['border']['r']['width'] + $this->style->value['padding']['r']+0.03;
-			$marge['t'] = $this->style->value['border']['t']['width'] + $this->style->value['padding']['t']+0.03;
-			$marge['b'] = $this->style->value['border']['b']['width'] + $this->style->value['padding']['b']+0.03;
-			
-			$x = $this->style->value['x'];
-			$y = $this->style->value['y'];
-			$w = $this->style->value['width']+$marge['l']+$marge['r']+$this->style->value['margin']['r'];
-			$h = $this->style->value['height']+$marge['t']+$marge['b']+$this->style->value['margin']['b'];
-			
-			switch($this->style->value['rotate'])
-			{
-				case 90:
-					$t = $w; $w = $h; $h = $t;
-					break;
-					
-				case 270:
-					$t = $w; $w = $h; $h = $t;
-					break;
-				
-				default:
-					break;
-			}
-
-
-			if ($this->style->value['position']!='absolute')
-			{
-				// position
-				$this->pdf->setXY($x+$w, $y); 	
-				
-				// position MAX
-				$this->maxX = max($this->maxX, $x+$w);
-				$this->maxY = max($this->maxY, $y+$h);
-		 		$this->maxH = max($this->maxH, $h);
-			}
-			else
-			{
-				// position
-				$this->pdf->setXY($this->style->value['xc'], $this->style->value['yc']); 	
-				 	
-				$this->loadMax();
-			}
-	 	
-	 		$block = ($this->style->value['display']!='inline' && $this->style->value['position']!='absolute');
-	 		
-	 		$this->style->load();
-			$this->style->FontSet();
-			$this->loadMargin();
-			
-			if ($block) $this->o_BR(array());
-			if ($this->DEBUG_actif) $this->DEBUG_add(strtoupper($other), false);
-			
-			return true;
-		}
-		function c_BLOCKQUOTE($param) { return $this->c_DIV($param, 'blockquote'); }
-		function c_FIELDSET($param) { return $this->c_DIV($param, 'fieldset'); }
-		function c_LEGEND($param) { return $this->c_DIV($param, 'legend'); }
-
-		/**
-		* balise : BARCODE
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_BARCODE($param)
-		{
-			if (!isset($param['type'])) 	$param['type'] = '';
-			if (!isset($param['value']))	$param['value']	= 0;
-			if (!isset($param['label']))	$param['label']	= 'label';
-			
-			if ($this->testIsDeprecated && (isset($param['bar_h']) || isset($param['bar_w'])))
-				HTML2PDF::makeError(9, __FILE__, __LINE__, array('BARCODE', 'bar_h, bar_w'));
-
-			// les différents types de barcode
-			$lst_barcode = array();
-			$lst_barcode['EAN13']	= 'EAN13';
-			$lst_barcode['UPCA']	= 'UPC_A';
-			$lst_barcode['C39']		= 'CODE39';
-			
-			// pour compatibilité < 3.29
-			$lst_barcode['UPC_A']	= 'UPC_A';
-			$lst_barcode['CODE39']	= 'CODE39';
-
-			$param['type'] = strtoupper($param['type']);
-			if (!isset($lst_barcode[$param['type']])) $param['type']=='C39';
-			$param['type'] = $lst_barcode[$param['type']];
-		
-			if (!isset($param['style']['color'])) $param['style']['color'] = '#000000';
-			$param['style']['background-color'] = $param['style']['color'];
-			
-			$this->style->save();
-			$this->style->analyse('barcode', $param);
-			$this->style->setPosition();
-			$this->style->FontSet();
-			
-			$x = $this->pdf->getX();
-			$y = $this->pdf->getY();
-			$w = $this->style->value['width'];	if (!$w) $w = $this->style->ConvertToMM('50mm');
-			$h = $this->style->value['height'];	if (!$h) $h = $this->style->ConvertToMM('10mm');
-			$txt = ($param['label']!=='none');
-			$infos = $this->pdf->{'BARCODE_'.$param['type']}($x, $y, $w, $h, $param['value'], $txt);
-			
-			// position maximale globale
-			$this->maxX = max($this->maxX, $x+$infos[0]);
-			$this->maxY = max($this->maxY, $y+$infos[1]);
- 			$this->maxH = max($this->maxH, $infos[1]);
- 			$this->maxE++;
- 			
-			$this->pdf->setXY($x+$infos[0], $y);
- 			
-			$this->style->load();
-			$this->style->FontSet();
-			
-			return true;
-		}
-
-		/**
-		* balise : BARCODE
-		* mode : FERMETURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function c_BARCODE($param)
-		{
-			// completement inutile
-			
-			return true;
-		}
-		
-			
-		/**
-		* balise : QRCODE
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_QRCODE($param)
-		{
-			if ($this->testIsDeprecated && (isset($param['size']) || isset($param['noborder'])))
-				HTML2PDF::makeError(9, __FILE__, __LINE__, array('QRCODE', 'size, noborder'));
-			
-			$msg = '
-<h1>QRCODE Tag</h1>
-<pre>
-	<b>ATTENTION :</b> 
-		Vous devez télécharger la librairie "QR-code generator >=0.99" (sous licence LGPL)
- 		a cette adresse : <a href="http://prgm.spipu.net/php_qrcode" target="_blank">http://prgm.spipu.net/php_qrcode</a>
- 		et mettre tout son contenu dans ce repertoire : '.str_replace('\\', '/', dirname(__FILE__)).'/qrcode
- 		
- 	<b>WARNING:</b> 
- 		You have to download the librairy "QR-code generator >=0.99" (under LGPL licence)
- 		at this url : <a href="http://prgm.spipu.net/php_qrcode" target="_blank">http://prgm.spipu.net/php_qrcode</a>
- 		and to put all his contents in this folder '.str_replace('\\', '/', dirname(__FILE__)).'/qrcode
- </pre>';
-			
-			$file_class = dirname(__FILE__).'/qrcode/qrcode.class.php';
-			if (!is_file($file_class))	{ echo $msg; exit; }
-			require_once($file_class);
-			if (__CLASS_QRCODE__<'0.99') { echo $msg; exit; }
-			
-			if ($this->DEBUG_actif) $this->DEBUG_add('QRCODE', true);
-			if (!isset($param['value']))						$param['value']	= '';
-			if (!isset($param['ec']))							$param['ec']	= 'H';
-			if (!isset($param['style']['color']))				$param['style']['color'] = '#000000';
-			if (!isset($param['style']['background-color']))	$param['style']['background-color'] = '#FFFFFF';
-			if (isset($param['style']['border']))
-			{
-				$borders = $param['style']['border']!='none';
-				unset($param['style']['border']);
-			}
-			else
-				$borders = true;
-			
-			if ($param['value']==='') return true;
-			if (!in_array($param['ec'], array('L', 'M', 'Q', 'H'))) $param['ec'] = 'H';
-			
-			$this->style->save();
-			$this->style->analyse('qrcode', $param);
-			$this->style->setPosition();
-			$this->style->FontSet();
-			
-			$x = $this->pdf->getX();
-			$y = $this->pdf->getY();
-			$w = $this->style->value['width'];
-			$h = $this->style->value['height'];
-			$size = max($w, $h); if (!$size) $size = $this->style->ConvertToMM('50mm');
-
-			$color = $this->style->value['color'];
-			if (count($color)==4) $color = array(0, 0, 0);
-			$color[0] = floor($color[0]*255.);
-			$color[1] = floor($color[1]*255.);
-			$color[2] = floor($color[2]*255.);
-			
-			$background = $this->style->value['background']['color'];
-			if (count($background)==4) $background = array(0, 0, 0);
-			$background[0] = floor($background[0]*255.);
-			$background[1] = floor($background[1]*255.);
-			$background[2] = floor($background[2]*255.);
-			
-			if (!$this->sub_part && !$this->isSubPart)
-			{
-				$qrcode = new QRcode($param['value'], $param['ec']);
-				if (!$borders) $qrcode->disableBorder();
-				$qrcode->displayFPDF($this->pdf, $x, $y, $size, $background, $color);
-				unset($qrcode);
-			}
-			
-			// position maximale globale
-			$this->maxX = max($this->maxX, $x+$size);
-			$this->maxY = max($this->maxY, $y+$size);
- 			$this->maxH = max($this->maxH, $size);
- 			
- 			$this->pdf->setX($x+$size);
- 			
-			$this->style->load();
-			$this->style->FontSet();
-			
-			return true;
-		}
-		
-		/**
-		* balise : QRCODE
-		* mode : FERMETURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function c_QRCODE($param)
-		{
-			if ($this->DEBUG_actif) $this->DEBUG_add('QRCODE', false);
-			// completement inutile
-			return true;
-		}
-				
-		/**
-		* balise : BOOKMARK
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_BOOKMARK($param)
-		{
-			$titre = isset($param['title']) ? trim($param['title']) : '';
-			$level = isset($param['level']) ? floor($param['level']) : 0;
-			
-			if ($level<0) $level = 0;
-			if ($titre) $this->pdf->Bookmark($titre, $level, -1);
-			
-			return true;
-		}
-			
-		/**
-		* balise : BOOKMARK
-		* mode : FERMETURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function c_BOOKMARK($param)
-		{
-			// completement inutile
-			
-			return true;
-		}
-		
-		function getElementY($h)
-		{
-			if ($this->sub_part || $this->isSubPart || !$this->currentH || $this->currentH<$h)
-				return 0;
-				
-			return ($this->currentH-$h)*0.8;
-		}
-		
-		/**
-		* balise : WRITE
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_WRITE($param)
-		{
-			$fill = ($this->style->value['background']['color']!==null && $this->style->value['background']['image']===null);
-			if (in_array($this->style->value['id_balise'], array('fieldset', 'legend', 'div', 'table', 'tr', 'td', 'th')))
-				$fill = false;
-			
-			// récupération du texte à écrire, et conversion
-			$txt = $param['txt'];
-			
-			if ($this->isAfterFloat)
-			{
-				$txt = ltrim($txt);
-				$this->isAfterFloat = false;
-			}
-
-			$txt = str_replace('[[page_cu]]',	$this->page,	$txt);
-			
-			if ($this->style->value['text-transform']!='none')
-			{
-				if ($this->style->value['text-transform']=='capitalize')
-					$txt = ucwords($txt);
-				else if ($this->style->value['text-transform']=='uppercase')
-					$txt = strtoupper($txt);
-				else if ($this->style->value['text-transform']=='lowercase')
-					$txt = strtolower($txt);
-			}
-			
-			// tailles du texte
-			$h	= 1.08*$this->style->value['font-size'];
-			$dh	= $h*$this->style->value['mini-decal'];
-			$lh = $this->style->getLineHeight();
-			
-			// identification de l'alignement
-			$align = 'L';
-			if ($this->style->value['text-align']=='li_right')
-			{
-				$w = $this->style->value['width'];
-				$align = 'R';
-			}
-
-			// pré calcul de la taille de chaque mot et de la phrase complete
-			$w = 0;
-			$words = explode(' ', $txt);
-			foreach($words as $k => $word)
-			{
-				$words[$k] = array($word, $this->pdf->GetStringWidth($word));
-				$w+= $words[$k][1];
-			}
-			$space = $this->pdf->GetStringWidth(' ');
-			$w+= $space*(count($words)-1);
-
-			$curr_pos = 0;									// position dans le texte
-			$curr_max = strlen($txt);						// taille maxi du texte
-			$maxX = 0;										// plus grande largeur du texte apres retour à la ligne
-			$x = $this->pdf->getX();						// position du texte
-			$y = $this->pdf->getY();
-			$dy = $this->getElementY($lh);
-						
-			list($left, $right) = $this->getMargins($y);	// marges autorisees
-			$nb = 0;										// nbr de lignes découpées
-			
-			// tant que ca ne rentre pas sur la ligne et qu'on a du texte => on découpe
-			while($x+$w>$right && $x<$right && count($words))
-			{
-				// trouver une phrase qui rentre dans la largeur, en ajoutant les mots 1 à 1
-				$i=0;
-				$old = array('', 0);
-				$str = $words[0];
-				$add = false;
-				while(($x+$str[1])<$right)
-				{
-					$i++;
-					$add = true;
-					
-					array_shift($words);
-					$old = $str;
-
-					if (!count($words)) break;
-					$str[0].= ' '.$words[0][0];
-					$str[1]+= $space+$words[0][1];
-				}
-				$str = $old;
-				
-				// si rien de rentre, et que le premier mot ne rentre de toute facon pas dans une ligne, on le force...
-				if ($i==0 && (($left+$words[0][1])>=$right))
-				{
-					$str = $words[0];
-					array_shift($words);
-					$i++;
-					$add = true;
-				}
-				$curr_pos+= ($curr_pos ? 1 : 0)+strlen($str[0]);
-				
-				// ecriture du bout de phrase extrait et qui rentre
-				$wc = ($align=='L' ? $str[1] : $this->style->value['width']);
-				if ($right - $left<$wc) $wc = $right - $left;
-/*
-				if ($this->pdf->ws)
-				{
-					$oldSpace = $this->pdf->CurrentFont['cw'][' '];
-					$this->pdf->CurrentFont['cw'][' ']*=(1.+$this->pdf->ws);
-					$wc = $str[1];
-					$this->pdf->CurrentFont['cw'][' '] = $oldSpace;
-				}
-*/
-				if (strlen($str[0]))
-				{
-					$this->pdf->setXY($this->pdf->getX(), $y+$dh+$dy);
-					$this->pdf->Cell($wc, $h, $str[0], 0, 0, $align, $fill, $this->inLink);
-					$this->pdf->setXY($this->pdf->getX(), $y);
-				}
-				$this->maxH = max($this->maxH, $lh);
-				
-				// détermination de la largeur max
-				$maxX = max($maxX, $this->pdf->getX());
-
-				// nouvelle position et nouvelle largeur pour la boucle
-				$w-= $str[1];
-				$y = $this->pdf->getY();
-				$x = $this->pdf->getX();
-				$dy = $this->getElementY($lh);
-				
-				// si il reste du text à afficher
-				if (count($words))
-				{
-					if ($add) $w-= $space;
-					if ($this->forOneLine)
-					{
-						$this->maxE+= $i+1;
-						$this->maxX = max($this->maxX, $maxX);
-						return null;
-					}
-					
-					// retour à la ligne
-					$this->o_BR(array('style' => ''), $curr_pos);
-					
-					$y = $this->pdf->getY();
-					$x = $this->pdf->getX();
-					$dy = $this->getElementY($lh);
-					
-					// si la prochaine ligne ne rentre pas dans la page => nouvelle page 
-					if ($y + $h>=$this->pdf->getH() - $this->pdf->getbMargin())
-					{
-						if (!$this->isInOverflow && !$this->isInFooter)
-						{
-							$this->setNewPage(null, '', null, $curr_pos);
-							$y = $this->pdf->getY();
-							$x = $this->pdf->getX();
-							$dy = $this->getElementY($lh);
-						}
-					}
-				
-					// ligne suplémentaire. au bout de 1000 : trop long => erreur
-					$nb++;
-					if ($nb>1000)
-					{
-						$txt = ''; foreach($words as $k => $word) $txt.= ($k ? ' ' : '').$word[0];
-						HTML2PDF::makeError(2, __FILE__, __LINE__, array($txt, $right-$left, $w));
-					}
-
-					list($left, $right) = $this->getMargins($y);	// marges autorisees
-				}
-			}
-				
-			// si il reste du text apres découpe, c'est qu'il rentre direct => on l'affiche
-			if (count($words))
-			{
-				$txt = ''; foreach($words as $k => $word) $txt.= ($k ? ' ' : '').$word[0];
-/*
-				if ($this->pdf->ws)
-				{
-					$oldSpace = $this->pdf->CurrentFont['cw'][' '];
-					$this->pdf->CurrentFont['cw'][' ']*=(1.+$this->pdf->ws);
-					$w = $this->pdf->GetStringWidth($txt);
-					$this->pdf->CurrentFont['cw'][' '] = $oldSpace;
-				}
-*/
-				$this->pdf->setXY($this->pdf->getX(), $y+$dh+$dy);
-				$this->pdf->Cell(($align=='L' ? $w : $this->style->value['width']), $h, $txt, 0, 0, $align, $fill, $this->inLink);
-				$this->pdf->setXY($this->pdf->getX(), $y);	
-				$this->maxH = max($this->maxH, $lh);
-				$this->maxE+= count($words);
-			}
-			
-			// détermination des positions MAX
-			$maxX = max($maxX, $this->pdf->getX());
-			$maxY = $this->pdf->getY()+$h;
-			
-			// position maximale globale
-			$this->maxX = max($this->maxX, $maxX);
-			$this->maxY = max($this->maxY, $maxY);
-			
-			return true;
-		}
-
-		/**
-		* tracer une image
-		* 
-		* @param	string	nom du fichier source
-		* @return	null
-		*/	
-		function Image($src, $sub_li=false)
-		{
-			// est-ce que c'est une image ?
-			$infos=@GetImageSize($src);
-
-			if (count($infos)<2)
-			{
-				if ($this->testIsImage)
-				{
-					HTML2PDF::makeError(6, __FILE__, __LINE__, $src);
-					return false;
-				}
-				$src = null;
-				$infos = array(16, 16);
-			}
-			
-			// récupération des dimensions dans l'unité du PDF
-			$wi = $infos[0]/$this->pdf->getK();
-			$hi = $infos[1]/$this->pdf->getK();
-			
-			// détermination des dimensions d'affichage en fonction du style
-			if ($this->style->value['width'] && $this->style->value['height'])
-			{
-				$w = $this->style->value['width'];
-				$h = $this->style->value['height'];
-			}
-			else if ($this->style->value['width'])
-			{
-				$w = $this->style->value['width'];
-				$h = $hi*$w/$wi;
-				
-			}
-			else if ($this->style->value['height'])
-			{
-				$h = $this->style->value['height'];
-				$w = $wi*$h/$hi;
-			}
-			else
-			{
-				$w = 72./96.*$wi;
-				$h = 72./96.*$hi;					
-			}
-			
-			// detection du float
-			$float = $this->style->getFloat();
-			if ($float && $this->maxH)
-				if (!$this->o_BR(array()))
-					return false;
-
-			// position d'affichage
-			$x = $this->pdf->getX();
-			$y = $this->pdf->getY();
-			
-			// si l'image ne rentre pas dans la ligne => nouvelle ligne 
-			if (!$float && ($x + $w>$this->pdf->getW() - $this->pdf->getrMargin()) && $this->maxH)
-			{
-				if ($this->forOneLine) return null;
-
-				$hnl = max($this->maxH, $this->style->getLineHeight());
-				$this->setNewLine($hnl);
-				$x = $this->pdf->getX();
-				$y = $this->pdf->getY();
-			}
-			
-			// si l'image ne rentre pas dans la page => nouvelle page 
-			if (
-					($y + $h>$this->pdf->getH() - $this->pdf->getbMargin()) && 
-					!$this->isInOverflow
-				)
-			{
-				$this->setNewPage();
-				$x = $this->pdf->getX();
-				$y = $this->pdf->getY();
-			}
-
-			// correction pour l'affichage d'une puce image
-			$hT = 0.80*$this->style->value['font-size'];
-			if ($sub_li && $h<$hT)
-			{
-				$y+=($hT-$h);
-			}
-
-			$yc = $y-$this->style->value['margin']['t'];
-
-			// détermination de la position réelle d'affichage en fonction du text-align du parent
-			$old = $this->style->getOldValues();
-
-			if ( $old['width'])
-			{
-				$parent_w = $old['width'];
-				$parent_x = $x;
-			}
-			else
-			{
- 				$parent_w = $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
-				$parent_x = $this->pdf->getlMargin();
-			}
-			
-			if ($float)
-			{
-				list($lx, $rx) = $this->getMargins($yc);
-				$parent_x = $lx;
-				$parent_w = $rx-$lx;
-			}
-
-			if ($parent_w>$w && $float!='left')
-			{
-				if ($float=='right' || $this->style->value['text-align']=='li_right')	$x = $parent_x + $parent_w - $w-$this->style->value['margin']['r']-$this->style->value['margin']['l'];
-			}
-			
-			// affichage de l'image, et positionnement à la suite
-			if (!$this->sub_part && !$this->isSubPart)
-			{
-				if ($src) $this->pdf->Image($src, $x, $y, $w, $h, '', $this->inLink);
-				else
-				{
-					$this->pdf->setMyFillColor(array(0.94, 0.86, 0.86));
-					$this->pdf->Rect($x, $y, $w, $h, 'F');
-				}
-			}
-
-			$x-= $this->style->value['margin']['l'];
-			$y-= $this->style->value['margin']['t'];
-			$w+= $this->style->value['margin']['l'] + $this->style->value['margin']['r'];
-			$h+= $this->style->value['margin']['t'] + $this->style->value['margin']['b'];
-
-			if ($float=='left')
-			{
-				$this->maxX = max($this->maxX, $x+$w);
-				$this->maxY = max($this->maxY, $y+$h);
-
-				$this->addMargins($float, $x, $y, $x+$w, $y+$h);
-
-				list($lx, $rx) = $this->getMargins($yc);
-				$this->pdf->setXY($lx, $yc);
-	 		}
-			else if ($float=='right')
-			{
-//				$this->maxX = max($this->maxX, $x+$w);
-				$this->maxY = max($this->maxY, $y+$h);
-
-				$this->addMargins($float, $x, $y, $x+$w, $y+$h);
-
-				list($lx, $rx) = $this->getMargins($yc);
-				$this->pdf->setXY($lx, $yc);
-			}
-			else
-			{
-				$this->pdf->setX($x+$w);
-				$this->maxX = max($this->maxX, $x+$w);
-				$this->maxY = max($this->maxY, $y+$h);
-	 			$this->maxH = max($this->maxH, $h);
-			}
-			return true;
-		}
-		
-		/**
-		* Tracer un rectanble
-		* 
-		* @param	float	position X
-		* @param	float	position Y
-		* @param	float	Largeur
-		* @param	float	Hauteur
-		* @param	array	Tableau de style de définition des borders
-		* @param	float	padding - marge intérieur au rectangle => non utile mais on le passe en paramètre
-		* @param	float	margin - marge exterieur au rectangle
-		* @param	array	Tableau de style de définition du background
-		* @return	null
-		*/	
-		function drawRectangle($x, $y, $w, $h, $border, $padding, $margin, $background)
-		{
-			if ($this->sub_part || $this->isSubPart) return false;
-			if ($h===null) return false;
-			
-			$x+= $margin;
-			$y+= $margin;
-			$w-= $margin*2;
-			$h-= $margin*2;
-			
-			// récupération des radius
-			$out_TL = $border['radius']['tl'];
-			$out_TR = $border['radius']['tr'];
-			$out_BR = $border['radius']['br'];
-			$out_BL = $border['radius']['bl'];
-			
-			// verification des coins en radius
-			$out_TL = ($out_TL[0] && $out_TL[1]) ? $out_TL : null;
-			$out_TR = ($out_TR[0] && $out_TR[1]) ? $out_TR : null;
-			$out_BR = ($out_BR[0] && $out_BR[1]) ? $out_BR : null;
-			$out_BL = ($out_BL[0] && $out_BL[1]) ? $out_BL : null;
-
-			
-			$in_TL = $out_TL;
-			$in_TR = $out_TR;
-			$in_BR = $out_BR;
-			$in_BL = $out_BL;
-			
-			if (is_array($in_TL)) { $in_TL[0]-= $border['l']['width']; $in_TL[1]-= $border['t']['width']; }
-			if (is_array($in_TR)) { $in_TR[0]-= $border['r']['width']; $in_TR[1]-= $border['t']['width']; }
-			if (is_array($in_BR)) { $in_BR[0]-= $border['r']['width']; $in_BR[1]-= $border['b']['width']; }
-			if (is_array($in_BL)) { $in_BL[0]-= $border['l']['width']; $in_BL[1]-= $border['b']['width']; }
-			
-			if ($in_TL[0]<=0 || $in_TL[1]<=0) $in_TL = null;
-			if ($in_TR[0]<=0 || $in_TR[1]<=0) $in_TR = null;
-			if ($in_BR[0]<=0 || $in_BR[1]<=0) $in_BR = null;
-			if ($in_BL[0]<=0 || $in_BL[1]<=0) $in_BL = null;
-					
-			// traitement de la couleur de fond
-			$STYLE = '';
-			if ($background['color'])
-			{
-				$this->pdf->setMyFillColor($background['color']);
-				$STYLE.= 'F';		
-			}
-			
-			if ($STYLE)
-			{
-				$this->pdf->clippingPathOpen($x, $y, $w, $h, $out_TL,$out_TR, $out_BL, $out_BR);		
-				$this->pdf->Rect($x, $y, $w, $h, $STYLE);
-				$this->pdf->clippingPathClose();		
-			}
-			
-			// traitement de l'image de fond
-			if ($background['image'])
-			{
-				$i_name		= $background['image'];
-				$i_position	= $background['position']!==null	? $background['position']	: array(0, 0);
-				$i_repeat	= $background['repeat']!==null		? $background['repeat']		: array(true, true);
-				
-				// taile du fond (il faut retirer les borders
-				$b_x = $x;
-				$b_y = $y;
-				$b_w = $w;
-				$b_h = $h;
-				
-				if ($border['b']['width']) { $b_h-= $border['b']['width']; }
-				if ($border['l']['width']) { $b_w-= $border['l']['width']; $b_x+= $border['l']['width']; }
-				if ($border['t']['width']) { $b_h-= $border['t']['width']; $b_y+= $border['t']['width']; }
-				if ($border['r']['width']) { $b_w-= $border['r']['width']; }
-
-				// est-ce que c'est une image ?
-				$i_infos=@GetImageSize($i_name);
-	
-				if (count($i_infos)<2)
-				{
-					if ($this->testIsImage)
-					{
-						HTML2PDF::makeError(6, __FILE__, __LINE__, $i_name);
-						return false;
-					}
-				}
-				else
-				{
-					// récupération des dimensions dans l'unité du PDF
-					$i_width	= 72./96.*$i_infos[0]/$this->pdf->getK();
-					$i_height	= 72./96.*$i_infos[1]/$this->pdf->getK();
-					
-					if ($i_repeat[0]) $i_position[0] = $b_x;
-					else if(preg_match('/^([-]?[0-9\.]+)%/isU', $i_position[0], $match)) $i_position[0] = $b_x + $match[1]*($b_w-$i_width)/100;
-					else $i_position[0] = $b_x+$i_position[0];
-				
-					if ($i_repeat[1]) $i_position[1] = $b_y;
-					else if(preg_match('/^([-]?[0-9\.]+)%/isU', $i_position[1], $match)) $i_position[1] = $b_y + $match[1]*($b_h-$i_height)/100;
-					else $i_position[1] = $b_y+$i_position[1];
-					
-					$i_x_min = $b_x;
-					$i_x_max = $b_x+$b_w;
-					$i_y_min = $b_y;
-					$i_y_max = $b_y+$b_h;
-					
-					if (!$i_repeat[0] && !$i_repeat[1])
-					{
-						$i_x_min = 	$i_position[0]; $i_x_max = 	$i_position[0]+$i_width;
-						$i_y_min = 	$i_position[1]; $i_y_max = 	$i_position[1]+$i_height;					
-					}
-					else if ($i_repeat[0] && !$i_repeat[1])
-					{
-						$i_y_min = 	$i_position[1]; $i_y_max = 	$i_position[1]+$i_height;					
-					}
-					elseif (!$i_repeat[0] && $i_repeat[1])
-					{
-						$i_x_min = 	$i_position[0]; $i_x_max = 	$i_position[0]+$i_width;
-					}
-					
-					$this->pdf->clippingPathOpen($b_x, $b_y, $b_w, $b_h, $in_TL, $in_TR, $in_BL, $in_BR);		
-					for ($i_y=$i_y_min; $i_y<$i_y_max; $i_y+=$i_height)
-					{
-						for ($i_x=$i_x_min; $i_x<$i_x_max; $i_x+=$i_width)
-						{
-							$c_x = null;
-							$c_y = null;
-							$c_w = $i_width;
-							$c_h = $i_height;
-							if ($i_y_max-$i_y<$i_height)
-							{
-								$c_x = $i_x;
-								$c_y = $i_y;
-								$c_h = $i_y_max-$i_y;
-							}
-							if ($i_x_max-$i_x<$i_width)
-							{
-								$c_x = $i_x;
-								$c_y = $i_y;
-								$c_w = $i_x_max-$i_x;
-							}
-	
-							$this->pdf->Image($i_name, $i_x, $i_y, $i_width, $i_height, '', '');						
-						}
-					}
-					$this->pdf->clippingPathClose();
-				}
-			}
-			
-			$x-= 0.01;
-			$y-= 0.01;
-			$w+= 0.02;
-			$h+= 0.02;
-			if ($border['l']['width']) $border['l']['width']+= 0.02;
-			if ($border['t']['width']) $border['t']['width']+= 0.02;
-			if ($border['r']['width']) $border['r']['width']+= 0.02;
-			if ($border['b']['width']) $border['b']['width']+= 0.02;
-			
-			$Bl = ($border['l']['width'] && $border['l']['color'][0]!==null);
-			$Bt = ($border['t']['width'] && $border['t']['color'][0]!==null);
-			$Br = ($border['r']['width'] && $border['r']['color'][0]!==null);
-			$Bb = ($border['b']['width'] && $border['b']['color'][0]!==null);
-			
-			if (is_array($out_BL) && ($Bb || $Bl))
-			{
-				if ($in_BL)
-				{
-					$courbe = array();
-					$courbe[] = $x+$out_BL[0]; 				$courbe[] = $y+$h;
-					$courbe[] = $x; 						$courbe[] = $y+$h-$out_BL[1];
-					$courbe[] = $x+$out_BL[0];				$courbe[] = $y+$h-$border['b']['width'];
-					$courbe[] = $x+$border['l']['width'];	$courbe[] = $y+$h-$out_BL[1];
-					$courbe[] = $x+$out_BL[0];				$courbe[] = $y+$h-$out_BL[1];
-				}
-				else
-				{
-					$courbe = array();
-					$courbe[] = $x+$out_BL[0]; 				$courbe[] = $y+$h;
-					$courbe[] = $x; 						$courbe[] = $y+$h-$out_BL[1];
-					$courbe[] = $x+$border['l']['width'];	$courbe[] = $y+$h-$border['b']['width'];
-					$courbe[] = $x+$out_BL[0];				$courbe[] = $y+$h-$out_BL[1];
-				}
-				$this->drawCourbe($courbe, $border['l']['color']);
-			}
-
-		
-			if (is_array($out_TL) && ($Bt || $Bl))
-			{
-				if ($in_TL)
-				{
-					$courbe = array();
-					$courbe[] = $x; 						$courbe[] = $y+$out_TL[1];
-					$courbe[] = $x+$out_TL[0]; 				$courbe[] = $y;
-					$courbe[] = $x+$border['l']['width'];	$courbe[] = $y+$out_TL[1];
-					$courbe[] = $x+$out_TL[0];				$courbe[] = $y+$border['t']['width'];
-					$courbe[] = $x+$out_TL[0];				$courbe[] = $y+$out_TL[1];
-				}
-				else
-				{
-					$courbe = array();
-					$courbe[] = $x; 						$courbe[] = $y+$out_TL[1];
-					$courbe[] = $x+$out_TL[0]; 				$courbe[] = $y;
-					$courbe[] = $x+$border['l']['width'];	$courbe[] = $y+$border['t']['width'];
-					$courbe[] = $x+$out_TL[0];				$courbe[] = $y+$out_TL[1];
-				}
-				$this->drawCourbe($courbe, $border['t']['color']);
-			}
-			
-			if (is_array($out_TR) && ($Bt || $Br))
-			{
-				if ($in_TR)
-				{
-					$courbe = array();
-					$courbe[] = $x+$w-$out_TR[0]; 				$courbe[] = $y;
-					$courbe[] = $x+$w; 							$courbe[] = $y+$out_TR[1];
-					$courbe[] = $x+$w-$out_TR[0];				$courbe[] = $y+$border['t']['width'];
-					$courbe[] = $x+$w-$border['r']['width'];	$courbe[] = $y+$out_TR[1];
-					$courbe[] = $x+$w-$out_TR[0];				$courbe[] = $y+$out_TR[1];
-				}
-				else
-				{
-					$courbe = array();
-					$courbe[] = $x+$w-$out_TR[0]; 				$courbe[] = $y;
-					$courbe[] = $x+$w; 							$courbe[] = $y+$out_TR[1];
-					$courbe[] = $x+$w-$border['r']['width'];	$courbe[] = $y+$border['t']['width'];
-					$courbe[] = $x+$w-$out_TR[0];				$courbe[] = $y+$out_TR[1];
-				}
-				$this->drawCourbe($courbe, $border['r']['color']);
-			}
-			
-			if (is_array($out_BR) && ($Bb || $Br))
-			{
-				if ($in_BR)
-				{
-					$courbe = array();
-					$courbe[] = $x+$w; 							$courbe[] = $y+$h-$out_BR[1];
-					$courbe[] = $x+$w-$out_BR[0]; 				$courbe[] = $y+$h;
-					$courbe[] = $x+$w-$border['r']['width'];	$courbe[] = $y+$h-$out_BR[1];
-					$courbe[] = $x+$w-$out_BR[0];				$courbe[] = $y+$h-$border['b']['width'];
-					$courbe[] = $x+$w-$out_BR[0];				$courbe[] = $y+$h-$out_BR[1];
-				}
-				else
-				{
-					$courbe = array();
-					$courbe[] = $x+$w; 							$courbe[] = $y+$h-$out_BR[1];
-					$courbe[] = $x+$w-$out_BR[0]; 				$courbe[] = $y+$h;
-					$courbe[] = $x+$w-$border['r']['width'];	$courbe[] = $y+$h-$border['b']['width'];
-					$courbe[] = $x+$w-$out_BR[0];				$courbe[] = $y+$h-$out_BR[1];
-				}
-				$this->drawCourbe($courbe, $border['b']['color']);
-			}
-			
-			if ($Bl)
-			{
-				$pt = array();
-				$pt[] = $x;								$pt[] = $y+$h;
-				$pt[] = $x;								$pt[] = $y+$h-$border['b']['width'];
-				$pt[] = $x;								$pt[] = $y+$border['t']['width'];
-				$pt[] = $x;								$pt[] = $y;
-				$pt[] = $x+$border['l']['width'];		$pt[] = $y+$border['t']['width'];
-				$pt[] = $x+$border['l']['width'];		$pt[] = $y+$h-$border['b']['width'];
-
-				$bord = 3;			
-				if (is_array($out_BL))
-				{
-					$bord-=1;
-					$pt[3] -= $out_BL[1] - $border['b']['width'];
-					if ($in_BL) $pt[11]-= $in_BL[1];
-					unset($pt[0]);unset($pt[1]);
-				}
-				if (is_array($out_TL))
-				{
-					$bord-=2;
-					$pt[5] += $out_TL[1]-$border['t']['width'];
-					if ($in_TL) $pt[9] += $in_TL[1];
-					unset($pt[6]);unset($pt[7]);
-				}
-				
-				$pt = array_values($pt);
-				$this->drawLine($pt, $border['l']['color'], $border['l']['type'], $border['l']['width'], $bord);
-			}
-
-			if ($Bt)
-			{
-				$pt = array();
-				$pt[] = $x;								$pt[] = $y;
-				$pt[] = $x+$border['l']['width'];		$pt[] = $y;
-				$pt[] = $x+$w-$border['r']['width'];	$pt[] = $y;
-				$pt[] = $x+$w;							$pt[] = $y;
-				$pt[] = $x+$w-$border['r']['width'];	$pt[] = $y+$border['t']['width'];
-				$pt[] = $x+$border['l']['width'];		$pt[] = $y+$border['t']['width'];
-
-				$bord = 3;			
-				if (is_array($out_TL))
-				{
-					$bord-=1;
-					$pt[2] += $out_TL[0] - $border['l']['width'];
-					if ($in_TL) $pt[10]+= $in_TL[0];
-					unset($pt[0]);unset($pt[1]);
-				}
-				if (is_array($out_TR))
-				{
-					$bord-=2;
-					$pt[4] -= $out_TR[0] - $border['r']['width'];
-					if ($in_TR) $pt[8] -= $in_TR[0];
-					unset($pt[6]);unset($pt[7]);
-				}
-				
-				$pt = array_values($pt);
-				$this->drawLine($pt, $border['t']['color'], $border['t']['type'], $border['t']['width'], $bord);
-			}
-
-			if ($Br)
-			{
-				$pt = array();
-				$pt[] = $x+$w;								$pt[] = $y;
-				$pt[] = $x+$w;								$pt[] = $y+$border['t']['width'];
-				$pt[] = $x+$w;								$pt[] = $y+$h-$border['b']['width'];
-				$pt[] = $x+$w;								$pt[] = $y+$h;
-				$pt[] = $x+$w-$border['r']['width'];		$pt[] = $y+$h-$border['b']['width'];
-				$pt[] = $x+$w-$border['r']['width'];		$pt[] = $y+$border['t']['width'];
-				
-				$bord = 3;			
-				if (is_array($out_TR))
-				{
-					$bord-=1;
-					$pt[3] += $out_TR[1] - $border['t']['width'];
-					if ($in_TR) $pt[11]+= $in_TR[1];
-					unset($pt[0]);unset($pt[1]);
-				}
-				if (is_array($out_BR))
-				{
-					$bord-=2;
-					$pt[5] -= $out_BR[1] - $border['b']['width'];
-					if ($in_BR) $pt[9] -= $in_BR[1];
-					unset($pt[6]);unset($pt[7]);
-				}
-				
-				$pt = array_values($pt);
-				$this->drawLine($pt, $border['r']['color'], $border['r']['type'], $border['r']['width'], $bord);
-			}
-			
-			if ($Bb)
-			{
-				$pt = array();
-				$pt[] = $x+$w;							$pt[] = $y+$h;
-				$pt[] = $x+$w-$border['r']['width'];	$pt[] = $y+$h;
-				$pt[] = $x+$border['l']['width'];		$pt[] = $y+$h;
-				$pt[] = $x;								$pt[] = $y+$h;
-				$pt[] = $x+$border['l']['width'];		$pt[] = $y+$h-$border['b']['width'];
-				$pt[] = $x+$w-$border['r']['width'];	$pt[] = $y+$h-$border['b']['width'];
-				
-				$bord = 3;			
-				if (is_array($out_BL))
-				{
-					$bord-=2;
-					$pt[4] += $out_BL[0] - $border['l']['width'];
-					if ($in_BL) $pt[8] += $in_BL[0];
-					unset($pt[6]);unset($pt[7]);
-				}
-				if (is_array($out_BR))
-				{
-					$bord-=1;
-					$pt[2] -= $out_BR[0] - $border['r']['width'];
-					if ($in_BR) $pt[10]-= $in_BR[0];
-					unset($pt[0]);unset($pt[1]);
-					
-				}
-
-				$pt = array_values($pt);
-				$this->drawLine($pt, $border['b']['color'], $border['b']['type'], $border['b']['width'], $bord);
-			}
-
-			if ($background['color'])
-			{
-				$this->pdf->setMyFillColor($background['color']);
-			}
-		}
-		
-		function drawCourbe($pt, $color)
-		{
-			$this->pdf->setMyFillColor($color);
-			
-			if (count($pt)==10)
-				$this->pdf->drawCourbe($pt[0], $pt[1], $pt[2], $pt[3], $pt[4], $pt[5], $pt[6], $pt[7], $pt[8], $pt[9]);
-			else
-				$this->pdf->drawCoin($pt[0], $pt[1], $pt[2], $pt[3], $pt[4], $pt[5], $pt[6], $pt[7]);
-		}
-		
-		/**
-		* Tracer une ligne epaisse défini par ses points avec des extreminites en biseau
-		* 
-		* @param	array	liste des points definissant le tour de la ligne
-		* @param	float	couleur RVB
-		* @param	string	type de ligne
-		* @param	float	largeur de la ligne
-		* @return	null
-		*/	
-		function drawLine($pt, $color, $type, $width, $bord=3)
-		{
-			$this->pdf->setMyFillColor($color);
-			if ($type=='dashed' || $type=='dotted')
-			{
-				if ($bord==1)
-				{
-					$tmp = array(); $tmp[]=$pt[0]; $tmp[]=$pt[1]; $tmp[]=$pt[2]; $tmp[]=$pt[3]; $tmp[]=$pt[8]; $tmp[]=$pt[9];
-					$this->pdf->Polygon($tmp, 'F');
-					
-					$tmp = array(); $tmp[]=$pt[2]; $tmp[]=$pt[3]; $tmp[]=$pt[4]; $tmp[]=$pt[5]; $tmp[]=$pt[6]; $tmp[]=$pt[7]; $tmp[]=$pt[8]; $tmp[]=$pt[9];
-					$pt = $tmp;
-				}
-				else if ($bord==2)
-				{
-					$tmp = array(); $tmp[]=$pt[2]; $tmp[]=$pt[3]; $tmp[]=$pt[4]; $tmp[]=$pt[5]; $tmp[]=$pt[6]; $tmp[]=$pt[7];
-					$this->pdf->Polygon($tmp, 'F');
-					
-					$tmp = array(); $tmp[]=$pt[0]; $tmp[]=$pt[1]; $tmp[]=$pt[2]; $tmp[]=$pt[3]; $tmp[]=$pt[6]; $tmp[]=$pt[7]; $tmp[]=$pt[8]; $tmp[]=$pt[9];
-					$pt = $tmp;					
-				}
-				else if ($bord==3)
-				{
-					$tmp = array(); $tmp[]=$pt[0]; $tmp[]=$pt[1]; $tmp[]=$pt[2]; $tmp[]=$pt[3]; $tmp[]=$pt[10]; $tmp[]=$pt[11];
-					$this->pdf->Polygon($tmp, 'F');
-	
-					$tmp = array(); $tmp[]=$pt[4]; $tmp[]=$pt[5]; $tmp[]=$pt[6]; $tmp[]=$pt[7]; $tmp[]=$pt[8]; $tmp[]=$pt[9];
-					$this->pdf->Polygon($tmp, 'F');
-					
-					$tmp = array(); $tmp[]=$pt[2]; $tmp[]=$pt[3]; $tmp[]=$pt[4]; $tmp[]=$pt[5]; $tmp[]=$pt[8]; $tmp[]=$pt[9]; $tmp[]=$pt[10]; $tmp[]=$pt[11];
-					$pt = $tmp;
-				}
-				
-				if ($pt[2]==$pt[0])
-				{
-					$l = abs(($pt[3]-$pt[1])*0.5);
-					$px = 0;
-					$py = $width;
-					$x1 = $pt[0]; $y1 = ($pt[3]+$pt[1])*0.5;
-					$x2 = $pt[6]; $y2 = ($pt[7]+$pt[5])*0.5;
-				}
-				else
-				{
-					$l = abs(($pt[2]-$pt[0])*0.5);
-					$px = $width;
-					$py = 0;					
-					$x1 = ($pt[2]+$pt[0])*0.5; $y1 = $pt[1];
-					$x2 = ($pt[6]+$pt[4])*0.5; $y2 = $pt[7];
-				}
-				if ($type=='dashed')
-				{
-					$px = $px*3.;
-					$py = $py*3.;
-				}
-				$mode = ($l/($px+$py)<.5);
-				
-				for($i=0; $l-($px+$py)*($i-0.5)>0; $i++)
-				{
-					if (($i%2)==$mode)
-					{
-						$j = $i-0.5;
-						$lx1 = $px*($j);	if ($lx1<-$l)	$lx1 =-$l;
-						$ly1 = $py*($j);	if ($ly1<-$l)	$ly1 =-$l;
-						$lx2 = $px*($j+1);	if ($lx2>$l)	$lx2 = $l;
-						$ly2 = $py*($j+1);	if ($ly2>$l)	$ly2 = $l;
-						
-						$tmp = array();
-						$tmp[] = $x1+$lx1;	$tmp[] = $y1+$ly1;	
-						$tmp[] = $x1+$lx2; 	$tmp[] = $y1+$ly2;	
-						$tmp[] = $x2+$lx2; 	$tmp[] = $y2+$ly2;	
-						$tmp[] = $x2+$lx1;	$tmp[] = $y2+$ly1;
-						$this->pdf->Polygon($tmp, 'F');	
-
-						if ($j>0)
-						{
-							$tmp = array();
-							$tmp[] = $x1-$lx1;	$tmp[] = $y1-$ly1;	
-							$tmp[] = $x1-$lx2; 	$tmp[] = $y1-$ly2;	
-							$tmp[] = $x2-$lx2; 	$tmp[] = $y2-$ly2;	
-							$tmp[] = $x2-$lx1;	$tmp[] = $y2-$ly1;
-							$this->pdf->Polygon($tmp, 'F');	
-						}
-					}
-				}
-			}
-			else if ($type=='double')
-			{
-				$pt1 = $pt;
-				$pt2 = $pt;
-				
-				if (count($pt)==12)
-				{
-					$pt1[0] = ($pt[0]-$pt[10])*0.33 + $pt[10];
-					$pt1[1] = ($pt[1]-$pt[11])*0.33 + $pt[11];
-					$pt1[2] = ($pt[2]-$pt[10])*0.33 + $pt[10];
-					$pt1[3] = ($pt[3]-$pt[11])*0.33 + $pt[11];
-					$pt1[4] = ($pt[4]-$pt[8])*0.33 + $pt[8];
-					$pt1[5] = ($pt[5]-$pt[9])*0.33 + $pt[9];
-					$pt1[6] = ($pt[6]-$pt[8])*0.33 + $pt[8];
-					$pt1[7] = ($pt[7]-$pt[9])*0.33 + $pt[9];
-					$pt2[10]= ($pt[10]-$pt[0])*0.33 + $pt[0];
-					$pt2[11]= ($pt[11]-$pt[1])*0.33 + $pt[1];
-					$pt2[2] = ($pt[2] -$pt[0])*0.33 + $pt[0];
-					$pt2[3] = ($pt[3] -$pt[1])*0.33 + $pt[1];
-					$pt2[4] = ($pt[4] -$pt[6])*0.33 + $pt[6];
-					$pt2[5] = ($pt[5] -$pt[7])*0.33 + $pt[7];
-					$pt2[8] = ($pt[8] -$pt[6])*0.33 + $pt[6];
-					$pt2[9] = ($pt[9] -$pt[7])*0.33 + $pt[7];
-				}
-				else
-				{
-					$pt1[0] = ($pt[0]-$pt[6])*0.33 + $pt[6];
-					$pt1[1] = ($pt[1]-$pt[7])*0.33 + $pt[7];
-					$pt1[2] = ($pt[2]-$pt[4])*0.33 + $pt[4];
-					$pt1[3] = ($pt[3]-$pt[5])*0.33 + $pt[5];
-					$pt2[6] = ($pt[6]-$pt[0])*0.33 + $pt[0];
-					$pt2[7] = ($pt[7]-$pt[1])*0.33 + $pt[1];
-					$pt2[4] = ($pt[4]-$pt[2])*0.33 + $pt[2];
-					$pt2[5] = ($pt[5]-$pt[3])*0.33 + $pt[3];
-				}
-				$this->pdf->Polygon($pt1, 'F');
-				$this->pdf->Polygon($pt2, 'F');
-			}
-			else if ($type=='solid')
-			{
-				$this->pdf->Polygon($pt, 'F');
-			}
-		}
-	
-		/**
-		* balise : BR
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @param	integer	position reelle courante si saut de ligne pendant l'ecriture d'un texte 
-		* @return	null
-		*/	
-		function o_BR($param, $curr = null)
-		{
-			if ($this->forOneLine) return false;
-			
-			$h = max($this->maxH, $this->style->getLineHeight());
-
-			// si la ligne est vide, la position maximale n'a pas été mise à jour => on la met à jour
-			if ($this->maxH==0) $this->maxY = max($this->maxY, $this->pdf->getY()+$h);
-			
-			$this->makeBR($h, $curr);
-			
-			$this->maxH = 0;
-			
-			return true;
-		}
-		
-		function makeBR($h, $curr = null)
-		{
-			// si le saut de ligne rentre => on le prend en compte, sinon nouvelle page
-			if ($h)
-			{
-				if (($this->pdf->getY()+$h<$this->pdf->getH() - $this->pdf->getbMargin()) || $this->isInOverflow || $this->isInFooter)
-					$this->setNewLine($h, $curr);
-				else
-					$this->setNewPage(null, '', null, $curr);
-			}
-			else
-			{
-				$this->setNewPositionForNewLine($curr);	
-			}
-			
-			$this->maxH = 0;
-		}
-		
-		/**
-		* balise : HR
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_HR($param)
-		{
-			if ($this->forOneLine) return false;
-			$old_align = $this->style->value['text-align'];
-			$this->style->value['text-align'] = 'left';
-
-			if ($this->maxH) $this->o_BR($param);
-			
-			$f_size = $this->style->value['font-size'];
-			$this->style->value['font-size']=$f_size*0.5; $this->o_BR($param);
-			$this->style->value['font-size']=0;
-			
-			$param['style']['width'] = '100%';
-			
-			$this->style->save();
-			$this->style->value['height']=$this->style->ConvertToMM('1mm');
-
-			$this->style->analyse('hr', $param);
-			$this->style->setPosition();
-			$this->style->FontSet();
-			
-			$h = $this->style->value['height'];
-			if ($h)		$h-= $this->style->value['border']['t']['width']+$this->style->value['border']['b']['width'];
-			if ($h<=0)	$h = $this->style->value['border']['t']['width']+$this->style->value['border']['b']['width'];
-
-			$this->drawRectangle($this->pdf->getX(), $this->pdf->getY(), $this->style->value['width'], $h, $this->style->value['border'], 0, 0, $this->style->value['background']);
-			$this->maxH = $h;
-
-			$this->style->load();
-			$this->style->FontSet();
-			
-			$this->o_BR($param);
-
-			$this->style->value['font-size']=$f_size*0.5; $this->o_BR($param);
-			$this->style->value['font-size']=$f_size;
-
-			$this->style->value['text-align'] = $old_align;
-			$this->setNewPositionForNewLine();
-						
-			return true;
-		}
-
-		/**
-		* balise : B
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_B($param, $other = 'b')
-		{
-			$this->style->save();
-			$this->style->value['font-bold'] = true;
-			$this->style->analyse($other, $param);
-			$this->style->setPosition();
-			$this->style->FontSet();
-			
-			return true;
-		}
-		function o_STRONG($param) { return $this->o_B($param, 'strong'); }
-				
-		/**
-		* balise : B
-		* mode : FERMETURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function c_B($param)
-		{
-			$this->style->load();
-			$this->style->FontSet();
-			
-			return true;
-		}
-		function c_STRONG($param) { return $this->c_B($param); }
-		
-		/**
-		* balise : I
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_I($param, $other = 'i')
-		{
-			$this->style->save();
-			$this->style->value['font-italic'] = true;
-			$this->style->analyse($other, $param);
-			$this->style->setPosition();
-			$this->style->FontSet();
-			
-			return true;
-		}	
-		function o_ADDRESS($param)	{ return $this->o_I($param, 'address');	}
-		function o_CITE($param)		{ return $this->o_I($param, 'cite');		}
-		function o_EM($param)		{ return $this->o_I($param, 'em');			}
-		function o_SAMP($param)		{ return $this->o_I($param, 'samp');		}
-
-		/**
-		* balise : I
-		* mode : FERMETURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function c_I($param)
-		{
-			$this->style->load();
-			$this->style->FontSet();
-			
-			return true;
-		}	
-		function c_ADDRESS($param)	{ return $this->c_I($param); }
-		function c_CITE($param)		{ return $this->c_I($param); }
-		function c_EM($param) 		{ return $this->c_I($param); }
-		function c_SAMP($param)		{ return $this->c_I($param); }
-
-		/**
-		* balise : S
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_S($param, $other = 's')
-		{
-			$this->style->save();
-			$this->style->value['font-linethrough'] = true;
-			$this->style->analyse($other, $param);
-			$this->style->setPosition();
-			$this->style->FontSet();
-			
-			return true;
-		}	
-		function o_DEL($param) { return $this->o_S($param, 'del'); }
-		
-		/**
-		* balise : S
-		* mode : FERMETURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function c_S($param)
-		{
-			$this->style->load();
-			$this->style->FontSet();
-			
-			return true;
-		}
-		function c_DEL($param) { return $this->c_S($param); }
-		
-		/**
-		* balise : U
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_U($param, $other='u')
-		{
-			$this->style->save();
-			$this->style->value['font-underline'] = true;
-			$this->style->analyse($other, $param);
-			$this->style->setPosition();
-			$this->style->FontSet();
-			
-			return true;
-		}	
-		function o_INS($param) { return $this->o_U($param, 'ins'); }
-		
-		/**
-		* balise : U
-		* mode : FERMETURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function c_U($param)
-		{
-			$this->style->load();
-			$this->style->FontSet();
-			
-			return true;
-		}
-		function c_INS($param) { return $this->c_U($param); }
-		
-		/**
-		* balise : A
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_A($param)
-		{
-			$this->inLink = str_replace('&amp;', '&', isset($param['href']) ? $param['href'] : '');
-			
-			if (isset($param['name']))
-			{
-				$nom = 	$param['name'];
-				if (!isset($this->lstAncre[$nom])) $this->lstAncre[$nom] = array($this->pdf->AddLink(), false);
-				
-				if (!$this->lstAncre[$nom][1])
-				{
-					$this->lstAncre[$nom][1] = true;
-					$this->pdf->SetLink($this->lstAncre[$nom][0], -1, -1);
-				}
-			}
-			
-			if (preg_match('/^#([^#]+)$/isU', $this->inLink, $match))
-			{
-				$nom = $match[1];
-				if (!isset($this->lstAncre[$nom])) $this->lstAncre[$nom] = array($this->pdf->AddLink(), false);
-				
-				$this->inLink = $this->lstAncre[$nom][0];
-			}
-			
-			$this->style->save();
-			$this->style->value['font-underline'] = true;
-			$this->style->value['color'] = array(0.08, 0.08, 0.98);
-			$this->style->analyse('a', $param);
-			$this->style->setPosition();
-			$this->style->FontSet();
-			
-			return true;		
-		}
-
-		/**
-		* balise : A
-		* mode : FERMETURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function c_A($param)
-		{
-			$this->inLink	= '';
-			$this->style->load();
-			$this->style->FontSet();			
-			
-			return true;
-		}
-
-		/**
-		* balise : H1
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_H1($param, $other = 'h1')
-		{
-			if ($this->forOneLine) return false;
-			
-			if ($this->maxH) $this->o_BR(array());
-			$this->style->save();
-			$this->style->value['font-bold'] = true;
-			
-			$size = array('h1' => '28px', 'h2' => '24px', 'h3' => '20px', 'h4' => '16px', 'h5' => '12px', 'h6' => '9px');
-			$this->style->value['margin']['l'] = 0;
-			$this->style->value['margin']['r'] = 0;
-			$this->style->value['margin']['t'] = $this->style->ConvertToMM('16px');
-			$this->style->value['margin']['b'] = $this->style->ConvertToMM('16px');
-			$this->style->value['font-size'] = $this->style->ConvertToMM($size[$other]);
-
-			$this->style->analyse($other, $param);
-			$this->style->setPosition();
-			$this->style->FontSet();
-			$this->setNewPositionForNewLine();
-			
-			return true;
-		}
-		function o_H2($param)	{ return $this->o_H1($param, 'h2'); }
-		function o_H3($param)	{ return $this->o_H1($param, 'h3'); }
-		function o_H4($param)	{ return $this->o_H1($param, 'h4'); }
-		function o_H5($param)	{ return $this->o_H1($param, 'h5'); }
-		function o_H6($param)	{ return $this->o_H1($param, 'h6'); }
-		
-		
-		/**
-		* balise : H1
-		* mode : FERMETURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function c_H1($param)
-		{
-			if ($this->forOneLine) return false;
-
-			// hauteur du H1
-			$this->maxH+= $this->style->value['margin']['b'];
-			$h = max($this->maxH, $this->style->getLineHeight());
-			
-			$this->style->load();
-			$this->style->FontSet();
-			
-			// saut de ligne et initialisation de la hauteur
-			$this->makeBR($h);
-			$this->maxH = 0;
-			
-			return true;
-		}
-		function c_H2($param)	{ return $this->c_H1($param); }
-		function c_H3($param)	{ return $this->c_H1($param); }
-		function c_H4($param)	{ return $this->c_H1($param); }
-		function c_H5($param)	{ return $this->c_H1($param); }
-		function c_H6($param)	{ return $this->c_H1($param); }
-		
-		/**
-		* balise : SPAN
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_SPAN($param, $other = 'span')
-		{
-			$this->style->save();
-			$this->style->analyse($other, $param);
-			$this->style->setPosition();
-			$this->style->FontSet();		
-			
-			return true;
-		}	
-		function o_FONT($param)		{ return $this->o_SPAN($param, 'font');	}
- 		function o_LABEL($param)	{ return $this->o_SPAN($param, 'label');}
-		
-		/**
-		* balise : SPAN
-		* mode : FERMETURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function c_SPAN($param)
-		{
-			$this->style->restorePosition();
-			$this->style->load();
-			$this->style->FontSet();
-			
-			return true;
-		}
-		function c_FONT($param)		{ return $this->c_SPAN($param); }
-		function c_LABEL($param)	{ return $this->c_SPAN($param); }
-		
-
-		/**
-		* balise : P
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_P($param)
-		{
-			if ($this->forOneLine) return false;
-
-			if (!in_array($this->previousCall, array('c_P', 'c_UL')))
-			{
-				if ($this->maxH) $this->o_BR(array());
-			}
-			
-			$this->style->save();
-			$this->style->analyse('p', $param);
-			$this->style->setPosition();
-			$this->style->FontSet();
-			 // annule les effets du setposition
-			$this->pdf->setXY($this->pdf->getX()-$this->style->value['margin']['l'], $this->pdf->getY()-$this->style->value['margin']['t']);
-			
-			list($mL, $mR) = $this->getMargins($this->pdf->getY());
-			$mR = $this->pdf->getW()-$mR;
-			$mL+= $this->style->value['margin']['l']+$this->style->value['padding']['l'];
-			$mR+= $this->style->value['margin']['r']+$this->style->value['padding']['r'];
-			$this->saveMargin($mL,0,$mR);
-			
-			if ($this->style->value['text-indent']>0)
-			{
-				$y = $this->pdf->getY()+$this->style->value['margin']['t']+$this->style->value['padding']['t'];
-				$this->pageMarges[floor($y*100)] = array($mL+$this->style->value['text-indent'], $this->pdf->getW()-$mR);
-				$y+= $this->style->getLineHeight()*0.1;
-				$this->pageMarges[floor($y*100)] = array($mL, $this->pdf->getW()-$mR);
-			}
-			$this->makeBR($this->style->value['margin']['t']+$this->style->value['padding']['t']);
-			return true;
-		}
-		
-		/**
-		* balise : P
-		* mode : FERMETURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function c_P($param)
-		{
-			if ($this->forOneLine) return false;
-
-			if ($this->maxH) $this->o_BR(array());
-			$this->loadMargin();
-			$h = $this->style->value['margin']['b']+$this->style->value['padding']['b'];
-			
-			$this->style->load();
-			$this->style->FontSet();
-			$this->makeBR($h); 
-			
-			return true;
-		}
-		
-		/**
-		* balise : PRE
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_PRE($param, $other = 'pre')
-		{
-			if ($other=='pre' && $this->maxH) $this->o_BR(array());
-			
-			$this->style->save();
-			$this->style->value['font-family']	= 'courier';
-			$this->style->analyse($other, $param);
-			$this->style->setPosition();
-			$this->style->FontSet();
-
-			if ($other=='pre') return $this->o_DIV($param, $other);
-			
-			return true;
-		}
-		function o_CODE($param) { return $this->o_PRE($param, 'code'); }
-		
-		/**
-		* balise : PRE
-		* mode : FERMETURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function c_PRE($param, $other = 'pre')
-		{
-			if ($other=='pre')
-			{
-				if ($this->forOneLine) return false;
-
-				$this->c_DIV($param);
-				$this->o_BR(array());
-			}
-			$this->style->load();
-			$this->style->FontSet();
-			
-			return true;
-		}
-		function c_CODE($param) { return $this->c_PRE($param, 'code'); }
-				
-		/**
-		* balise : BIG
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_BIG($param)
-		{
-			$this->style->save();
-			$this->style->value['mini-decal']-= $this->style->value['mini-size']*0.05;
-			$this->style->value['mini-size'] *= 1.2;
-			$this->style->analyse('big', $param);
-			$this->style->setPosition();
-			$this->style->FontSet();
-			return true;
-		}
-
-		/**
-		* balise : BIG
-		* mode : FERMETURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function c_BIG($param)
-		{
-			$this->style->load();
-			$this->style->FontSet();
-			
-			return true;
-		}
-
-		/**
-		* balise : SMALL
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_SMALL($param)
-		{
-			$this->style->save();
-			$this->style->value['mini-decal']+= $this->style->value['mini-size']*0.05;
-			$this->style->value['mini-size'] *= 0.82;
-			$this->style->analyse('small', $param);
-			$this->style->setPosition();
-			$this->style->FontSet();
-			return true;
-		}
-		 
-		/**
-		* balise : SMALL
-		* mode : FERMETURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function c_SMALL($param)
-		{
-			$this->style->load();
-			$this->style->FontSet();
-			
-			return true;
-		}
-
-
-		/**
-		* balise : SUP
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_SUP($param)
-		{
-			$this->style->save();
-			$this->style->value['mini-decal']-= $this->style->value['mini-size']*0.15;
-			$this->style->value['mini-size'] *= 0.75;
-			$this->style->analyse('sup', $param);
-			$this->style->setPosition();
-			$this->style->FontSet();
-			
-			return true;
-		}
-		 
-		/**
-		* balise : SUP
-		* mode : FERMETURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function c_SUP($param)
-		{
-			$this->style->load();
-			$this->style->FontSet();
-			
-			return true;
-		}
-
-		/**
-		* balise : SUB
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_SUB($param)
-		{
-			$this->style->save();
-			$this->style->value['mini-decal']+= $this->style->value['mini-size']*0.15;
-			$this->style->value['mini-size'] *= 0.75;
-			$this->style->analyse('sub', $param);
-			$this->style->setPosition();
-			$this->style->FontSet();
-			return true;
-		}
-		 
-		/**
-		* balise : SUB
-		* mode : FERMETURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function c_SUB($param)
-		{
-			$this->style->load();
-			$this->style->FontSet();
-			
-			return true;
-		}
-
-		/**
-		* balise : UL
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_UL($param, $other = 'ul')
-		{
-			if ($this->forOneLine) return false;
-
-			if (!in_array($this->previousCall, array('c_P', 'c_UL')))
-			{
-				if ($this->maxH) $this->o_BR(array());
-				if (!count($this->defLIST)) $this->o_BR(array());
-			}
-			
-			if (!isset($param['style']['width'])) $param['allwidth'] = true;
-			$param['cellspacing'] = 0;
-
-			// une liste est traitée comme un tableau
-			$this->o_TABLE($param, $other);
-
-			// ajouter un niveau de liste
-			$this->listeAddLevel($other, $this->style->value['list-style-type'], $this->style->value['list-style-image']);
-			
-			return true;
-		}
-		function o_OL($param) { return $this->o_UL($param, 'ol'); }	
-		
-		/**
-		* balise : UL
-		* mode : FERMETURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/
-		function c_UL($param)
-		{
-			if ($this->forOneLine) return false;
-
-			// fin du tableau
-			$this->c_TABLE($param);
-			
-			// enlever un niveau de liste
-			$this->listeDelLevel();
-
-			if (!$this->sub_part)
-			{
-				if (!count($this->defLIST)) $this->o_BR(array());
-			}
-			
-			return true;
-		}
-		function c_OL($param) { return $this->c_UL($param); }
-
-		/**
-		* balise : LI
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/
-		function o_LI($param)
-		{
-			if ($this->forOneLine) return false;
-
-			// ajouter une puce au niveau actuel
-			$this->listeAddLi();
-
-			if (!isset($param['style']['width'])) $param['style']['width'] = '100%';
-
-			// preparation du style de la puce
-			$paramPUCE = $param;
-			
-			$inf = $this->listeGetLi();
-			if ($inf[0])
-			{
-				$paramPUCE['style']['font-family']		= $inf[0];
-				$paramPUCE['style']['text-align']		= 'li_right';
-				$paramPUCE['style']['vertical-align']	= 'top';
-				$paramPUCE['style']['width']			= $this->listeGetWidth();
-				$paramPUCE['style']['padding-right']	= $this->listeGetPadding();
-				$paramPUCE['txt'] = $inf[2];
-			}
-			else
-			{
-				$paramPUCE['style']['text-align']		= 'li_right';
-				$paramPUCE['style']['vertical-align']	= 'top';
-				$paramPUCE['style']['width']			= $this->listeGetWidth();
-				$paramPUCE['style']['padding-right']	= $this->listeGetPadding();
-				$paramPUCE['src'] = $inf[2];
-				$paramPUCE['sub_li'] = true;
-			}
-			
-			// nouvelle ligne
-			$this->o_TR($param, 'li');
-
-			$this->style->save();
-			
-			if ($inf[1]) // small
-			{
-				$this->style->value['mini-decal']+= $this->style->value['mini-size']*0.045;
-				$this->style->value['mini-size'] *= 0.75;
-			}
-			
-			// si on est dans un sub_html => preparation, sinon affichage classique
-			if ($this->sub_part)
-			{
-				// TD pour la puce
-				$tmp_pos = $this->temp_pos;
-				$tmp_lst1 = $this->parsing->code[$tmp_pos+1];
-				$tmp_lst2 = $this->parsing->code[$tmp_pos+2];
-				$this->parsing->code[$tmp_pos+1] = array();
-				$this->parsing->code[$tmp_pos+1]['name']	= (isset($paramPUCE['src'])) ? 'img' : 'write';
-				$this->parsing->code[$tmp_pos+1]['param']	= $paramPUCE; unset($this->parsing->code[$tmp_pos+1]['param']['style']['width']);
-				$this->parsing->code[$tmp_pos+1]['close']	= 0;
-				$this->parsing->code[$tmp_pos+2] = array();
-				$this->parsing->code[$tmp_pos+2]['name']	= 'li';
-				$this->parsing->code[$tmp_pos+2]['param']	= $paramPUCE;
-				$this->parsing->code[$tmp_pos+2]['close']	= 1;
-				$this->o_TD($paramPUCE, 'li_sub');
-				$this->c_TD($param);
-				$this->temp_pos = $tmp_pos;
-				$this->parsing->code[$tmp_pos+1] = $tmp_lst1;
-				$this->parsing->code[$tmp_pos+2] = $tmp_lst2;
-			}
-			else
-			{
-				// TD pour la puce
-				$this->o_TD($paramPUCE, 'li_sub');
-				unset($paramPUCE['style']['width']);
-				if (isset($paramPUCE['src']))	$this->o_IMG($paramPUCE);
-				else							$this->o_WRITE($paramPUCE);
-				$this->c_TD($paramPUCE);
-			}
-			$this->style->load();
-
-				
-			// td pour le contenu
-			$this->o_TD($param, 'li');
-			
-			return true;
-		}
-
-		/**
-		* balise : LI
-		* mode : FERMETURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/
-		function c_LI($param)
-		{
-			if ($this->forOneLine) return false;
-
-			// fin du contenu
-			$this->c_TD($param);
-			
-			// fin de la ligne
-			$this->c_TR($param);
-			
-			return true;
-		}
-		
-		/**
-		* balise : TBODY
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_TBODY($param)
-		{
-			if ($this->forOneLine) return false;
-
-			$this->style->save();
-			$this->style->analyse('tbody', $param);
-			$this->style->setPosition();
-			$this->style->FontSet();
-			
-			return true;
-		}	
-
-		/**
-		* balise : TBODY
-		* mode : FERMETURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function c_TBODY($param)
-		{
-			if ($this->forOneLine) return false;
-
-			$this->style->load();
-			$this->style->FontSet();
-			
-			return true;
-		}
-
-		/**
-		* balise : THEAD
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_THEAD($param)
-		{
-			if ($this->forOneLine) return false;
-
-			global $HTML2PDF_TABLEAU;
-			
-			$this->style->save();
-			$this->style->analyse('thead', $param);
-			$this->style->setPosition();
-			$this->style->FontSet();
-			
-			// si on est en mode sub_html : sauvegarde du numéro du TR 
-			if ($this->sub_part)
-			{
-				$HTML2PDF_TABLEAU[$param['num']]['thead']['tr'][0] = $HTML2PDF_TABLEAU[$param['num']]['tr_curr'];
-				$HTML2PDF_TABLEAU[$param['num']]['thead']['code'] = array(); 
-				for($pos=$this->temp_pos; $pos<count($this->parsing->code); $pos++)
-				{
-					$todo = $this->parsing->code[$pos];
-					if (strtolower($todo['name'])=='thead') $todo['name'] = 'thead_sub';
-					$HTML2PDF_TABLEAU[$param['num']]['thead']['code'][] = $todo;
-					if (strtolower($todo['name'])=='thead_sub' && $todo['close']) break;
-				}
-			}
-			else
-			{
-				$level = $this->parsing->getLevel($this->parse_pos);
-				$this->parse_pos+= count($level);
-				$HTML2PDF_TABLEAU[$param['num']]['tr_curr']+= count($HTML2PDF_TABLEAU[$param['num']]['thead']['tr']);
-			}
-			
-			return true;
-		}	
-
-		/**
-		* balise : THEAD
-		* mode : FERMETURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function c_THEAD($param)
-		{
-			if ($this->forOneLine) return false;
-
-			$this->style->load();
-			$this->style->FontSet();
-
-			// si on est en mode sub_html : sauvegarde du numéro du TR 
-			if ($this->sub_part)
-			{
-				global $HTML2PDF_TABLEAU;
-				$min = $HTML2PDF_TABLEAU[$param['num']]['thead']['tr'][0];
-				$max = $HTML2PDF_TABLEAU[$param['num']]['tr_curr']-1;				
-				$HTML2PDF_TABLEAU[$param['num']]['thead']['tr'] = range($min, $max);
-			}
-			
-			return true;
-		}
-
-		/**
-		* balise : TFOOT
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_TFOOT($param)
-		{
-			if ($this->forOneLine) return false;
-
-			global $HTML2PDF_TABLEAU; 		
-
-			$this->style->save();
-			$this->style->analyse('tfoot', $param);
-			$this->style->setPosition();
-			$this->style->FontSet();
-			
-			// si on est en mode sub_html : sauvegarde du numéro du TR 
-			if ($this->sub_part)
-			{
-				$HTML2PDF_TABLEAU[$param['num']]['tfoot']['tr'][0] = $HTML2PDF_TABLEAU[$param['num']]['tr_curr'];
-				$HTML2PDF_TABLEAU[$param['num']]['tfoot']['code'] = array(); 
-				for($pos=$this->temp_pos; $pos<count($this->parsing->code); $pos++)
-				{
-					$todo = $this->parsing->code[$pos];
-					if (strtolower($todo['name'])=='tfoot') $todo['name'] = 'tfoot_sub';
-					$HTML2PDF_TABLEAU[$param['num']]['tfoot']['code'][] = $todo;
-					if (strtolower($todo['name'])=='tfoot_sub' && $todo['close']) break;
-				}
-			}
-			else
-			{
-				$level = $this->parsing->getLevel($this->parse_pos);
-				$this->parse_pos+= count($level);
-				$HTML2PDF_TABLEAU[$param['num']]['tr_curr']+= count($HTML2PDF_TABLEAU[$param['num']]['tfoot']['tr']);
-			}
-			
-			return true;
-		}	
-
-		/**
-		* balise : TFOOT
-		* mode : FERMETURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function c_TFOOT($param)
-		{
-			if ($this->forOneLine) return false;
-
-			$this->style->load();
-			$this->style->FontSet();
-			
-			// si on est en mode sub_html : sauvegarde du numéro du TR 
-			if ($this->sub_part)
-			{
-				global $HTML2PDF_TABLEAU;
-				
-				$min = $HTML2PDF_TABLEAU[$param['num']]['tfoot']['tr'][0];
-				$max = $HTML2PDF_TABLEAU[$param['num']]['tr_curr']-1;				
-				$HTML2PDF_TABLEAU[$param['num']]['tfoot']['tr'] = range($min, $max);
-			}
-			
-			return true;
-		}
-
-		/**
-		* balise : THEAD_SUB
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_THEAD_SUB($param)
-		{
-			if ($this->forOneLine) return false;
-
-			$this->style->save();
-			$this->style->analyse('thead', $param);
-			$this->style->setPosition();
-			$this->style->FontSet();
-			
-			return true;
-		}
-		
-		/**
-		* balise : THEAD_SUB
-		* mode : FERMETURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function c_THEAD_SUB($param)
-		{
-			if ($this->forOneLine) return false;
-
-			$this->style->load();
-			$this->style->FontSet();
-			
-			return true;
-		}
-
-		/**
-		* balise : TFOOT_SUB
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_TFOOT_SUB($param)
-		{
-			if ($this->forOneLine) return false;
-
-			$this->style->save();
-			$this->style->analyse('tfoot', $param);
-			$this->style->setPosition();
-			$this->style->FontSet();
-			
-			return true;
-		}
-		
-		/**
-		* balise : TFOOT_SUB
-		* mode : FERMETURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function c_TFOOT_SUB($param)
-		{
-			if ($this->forOneLine) return false;
-
-			$this->style->load();
-			$this->style->FontSet();
-			
-			return true;
-		}
-				
-		/**
-		* balise : FORM
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_FORM($param)
-		{
-			$this->style->save();
-			$this->style->analyse('form', $param);
-			$this->style->setPosition();
-			$this->style->FontSet();
-			
-			$this->isInForm = isset($param['action']) ? $param['action'] : '';
-			
-			return true;
-		}	
-
-		/**
-		* balise : FORM
-		* mode : FERMETURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function c_FORM($param)
-		{
-			$this->isInForm = false;
-			$this->style->load();
-			$this->style->FontSet();
-			
-			return true;
-		}
-		
-		/**
-		* balise : TABLE
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_TABLE($param, $other = 'table')
-		{
-			if ($this->maxH)
-			{
-				if ($this->forOneLine) return false;
-				$this->o_BR(array());
-			}
-			
-			if ($this->forOneLine)
-			{
-				$this->maxE++;
-				$this->maxX = $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
-				return false;		
-			}
-			
-			$this->maxH = 0;
-			// utilisation du tableau des paramétres des tables
-			global $HTML2PDF_TABLEAU; 
-
-			$align_object = isset($param['align']) ? strtolower($param['align']) : 'left';
-			if (isset($param['align'])) unset($param['align']);
-			if (!in_array($align_object, array('left', 'center', 'right'))) $align_object = 'left';
-			
-			// lecture et initialisation du style
-			$this->style->save();
-			$this->style->analyse($other, $param);
-			$this->style->setPosition();
-			$this->style->FontSet();
-
-			if ($this->style->value['margin-auto']) $align_object = 'center';
-
-			// est-on en collapse
-			$collapse = false;			
-			if ($other=='table')
-				$collapse = isset($this->style->value['border']['collapse']) ? $this->style->value['border']['collapse'] : false;
-
-			// si oui il faut adapté les borders
-			if ($collapse)
-			{
-				$param['style']['border'] = 'none';
-				$param['cellspacing'] = 0;
-				$none = $this->style->readBorder('none');
-				$this->style->value['border']['t'] = $none;
-				$this->style->value['border']['r'] = $none;
-				$this->style->value['border']['b'] = $none;
-				$this->style->value['border']['l'] = $none;
-			}				
-			
-			// si on est en mode sub_html : initialisation des dimensions et autres 
-			if ($this->sub_part)
-			{
-				if ($this->DEBUG_actif) $this->DEBUG_add('Table n°'.$param['num'], true);
-				$HTML2PDF_TABLEAU[$param['num']] = array();
-				$HTML2PDF_TABLEAU[$param['num']]['border']		= isset($param['border']) ? $this->style->readBorder($param['border']) : null; // border spécifique si border precisé en paramètre
-				$HTML2PDF_TABLEAU[$param['num']]['cellpadding']	= $this->style->ConvertToMM(isset($param['cellpadding']) ? $param['cellpadding'] : '1px'); // cellpadding du tableau
-				$HTML2PDF_TABLEAU[$param['num']]['cellspacing']	= $this->style->ConvertToMM(isset($param['cellspacing']) ? $param['cellspacing'] : '2px'); // cellspacing du tableau
-				$HTML2PDF_TABLEAU[$param['num']]['cases']		= array();				// liste des propriétés des cases
-				$HTML2PDF_TABLEAU[$param['num']]['corr']		= array();				// tableau de correlation pour les colspan et rowspan
-				$HTML2PDF_TABLEAU[$param['num']]['corr_x']		= 0;					// position dans le tableau de correlation
-				$HTML2PDF_TABLEAU[$param['num']]['corr_y']		= 0;					// position dans le tableau de correlation
-				$HTML2PDF_TABLEAU[$param['num']]['td_curr']		= 0;					// colonne courante
-				$HTML2PDF_TABLEAU[$param['num']]['tr_curr']		= 0;					// ligne courante
-				$HTML2PDF_TABLEAU[$param['num']]['curr_x']		= $this->pdf->getX();	// position courante X
-				$HTML2PDF_TABLEAU[$param['num']]['curr_y']		= $this->pdf->getY();	// position courante Y
-				$HTML2PDF_TABLEAU[$param['num']]['width']		= 0;					// largeur globale
-				$HTML2PDF_TABLEAU[$param['num']]['height']		= 0;					// hauteur globale
-				$HTML2PDF_TABLEAU[$param['num']]['align']		= $align_object;
-				$HTML2PDF_TABLEAU[$param['num']]['marge']		= array();
-				$HTML2PDF_TABLEAU[$param['num']]['marge']['t']	= $this->style->value['padding']['t']+$this->style->value['border']['t']['width']+$HTML2PDF_TABLEAU[$param['num']]['cellspacing']*0.5;
-				$HTML2PDF_TABLEAU[$param['num']]['marge']['r']	= $this->style->value['padding']['r']+$this->style->value['border']['r']['width']+$HTML2PDF_TABLEAU[$param['num']]['cellspacing']*0.5;
-				$HTML2PDF_TABLEAU[$param['num']]['marge']['b']	= $this->style->value['padding']['b']+$this->style->value['border']['b']['width']+$HTML2PDF_TABLEAU[$param['num']]['cellspacing']*0.5;
-				$HTML2PDF_TABLEAU[$param['num']]['marge']['l']	= $this->style->value['padding']['l']+$this->style->value['border']['l']['width']+$HTML2PDF_TABLEAU[$param['num']]['cellspacing']*0.5;
-				$HTML2PDF_TABLEAU[$param['num']]['page']		= 0;					// nombre de pages
-				$HTML2PDF_TABLEAU[$param['num']]['new_page']	= true;					// nouvelle page pour le TR courant
-				$HTML2PDF_TABLEAU[$param['num']]['style_value'] = null;					// style du tableau
-				$HTML2PDF_TABLEAU[$param['num']]['thead']		= array();				// infos sur le thead
-				$HTML2PDF_TABLEAU[$param['num']]['tfoot']		= array();				// infos sur le tfoot
-				$HTML2PDF_TABLEAU[$param['num']]['thead']['tr']	= array();				// tr du thead
-				$HTML2PDF_TABLEAU[$param['num']]['tfoot']['tr']	= array();				// tr du tfoot
-				$HTML2PDF_TABLEAU[$param['num']]['thead']['height']	= 0;				// hauteur du thead
-				$HTML2PDF_TABLEAU[$param['num']]['tfoot']['height']	= 0;				// hauteur du tfoot
-				$HTML2PDF_TABLEAU[$param['num']]['thead']['code'] = array();			// contenu HTML du thead
-				$HTML2PDF_TABLEAU[$param['num']]['tfoot']['code'] = array();			// contenu HTML du tfoot
-				$HTML2PDF_TABLEAU[$param['num']]['cols']		= array();				// definition via les balises col
-				$this->saveMargin($this->pdf->getlMargin(), $this->pdf->gettMargin(), $this->pdf->getrMargin());
-				
-				// adaptation de la largeur en fonction des marges du tableau
-				$this->style->value['width']-= $HTML2PDF_TABLEAU[$param['num']]['marge']['l'] + $HTML2PDF_TABLEAU[$param['num']]['marge']['r'];
-			}
-			else
-			{
-				// on repart à la premiere page du tableau et à la premiere case
-				$HTML2PDF_TABLEAU[$param['num']]['page'] = 0;
-				$HTML2PDF_TABLEAU[$param['num']]['td_curr']	= 0;
-				$HTML2PDF_TABLEAU[$param['num']]['tr_curr']	= 0;
-				$HTML2PDF_TABLEAU[$param['num']]['td_x']		= $HTML2PDF_TABLEAU[$param['num']]['marge']['l']+$HTML2PDF_TABLEAU[$param['num']]['curr_x'];
-				$HTML2PDF_TABLEAU[$param['num']]['td_y']		= $HTML2PDF_TABLEAU[$param['num']]['marge']['t']+$HTML2PDF_TABLEAU[$param['num']]['curr_y'];				
-
-				// initialisation du style des bordures de la premiere partie de tableau
-				$this->drawRectangle(
-						$HTML2PDF_TABLEAU[$param['num']]['curr_x'],
-						$HTML2PDF_TABLEAU[$param['num']]['curr_y'],
-						$HTML2PDF_TABLEAU[$param['num']]['width'],
-						isset($HTML2PDF_TABLEAU[$param['num']]['height'][0]) ? $HTML2PDF_TABLEAU[$param['num']]['height'][0] : null,
-						$this->style->value['border'],
-						$this->style->value['padding'],
-						0,
-						$this->style->value['background']
-					);
-
-				$HTML2PDF_TABLEAU[$param['num']]['style_value'] = $this->style->value;
-			}
-			
-			return true;
-		}
-
-		/**
-		* balise : TABLE
-		* mode : FERMETURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function c_TABLE($param)
-		{
-			if ($this->forOneLine) return false;
-
-			$this->maxH = 0;
-			global $HTML2PDF_TABLEAU; 
-
-			// restauration du style
-			$this->style->load();
-			$this->style->FontSet();
-
-			// si on est en mode sub_html : initialisation des dimensions et autres 
-			if ($this->sub_part)
-			{
-				// ajustement de la taille des cases
-				$this->calculTailleCases($HTML2PDF_TABLEAU[$param['num']]['cases'], $HTML2PDF_TABLEAU[$param['num']]['corr']);
-
-				// calcul de la hauteur du THEAD et du TFOOT
-				$lst = array('thead', 'tfoot');
-				foreach($lst as $mode)
-				{
-					$HTML2PDF_TABLEAU[$param['num']][$mode]['height'] = 0;
-					foreach($HTML2PDF_TABLEAU[$param['num']][$mode]['tr'] as $tr)
-					{
-						// hauteur de la ligne tr
-						$h = 0;
-						for($i=0; $i<count($HTML2PDF_TABLEAU[$param['num']]['cases'][$tr]); $i++)
-							if ($HTML2PDF_TABLEAU[$param['num']]['cases'][$tr][$i]['rowspan']==1)
-								$h = max($h, $HTML2PDF_TABLEAU[$param['num']]['cases'][$tr][$i]['h']);
-						$HTML2PDF_TABLEAU[$param['num']][$mode]['height']+= $h;	
-					}
-				}
-
-				// calcul des dimensions du tableau - Largeur
-				$HTML2PDF_TABLEAU[$param['num']]['width'] = $HTML2PDF_TABLEAU[$param['num']]['marge']['l'] + $HTML2PDF_TABLEAU[$param['num']]['marge']['r'];
-				if (isset($HTML2PDF_TABLEAU[$param['num']]['cases'][0]))
-					foreach($HTML2PDF_TABLEAU[$param['num']]['cases'][0] as $case)
-						$HTML2PDF_TABLEAU[$param['num']]['width']+= $case['w'];
-
-				// positionnement du tableau horizontalement;
-				$old = $this->style->getOldValues();
-				$parent_w = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
-				$x = $HTML2PDF_TABLEAU[$param['num']]['curr_x'];
-				$w = $HTML2PDF_TABLEAU[$param['num']]['width'];
-				if ($parent_w>$w)
-				{
-					if ($HTML2PDF_TABLEAU[$param['num']]['align']=='center')
-						$x = $x + ($parent_w-$w)*0.5;
-					else if ($HTML2PDF_TABLEAU[$param['num']]['align']=='right')
-						$x = $x + $parent_w-$w;
-
-					$HTML2PDF_TABLEAU[$param['num']]['curr_x'] = $x;
-				}					
-
-
-				// calcul des dimensions du tableau - hauteur du tableau sur chaque page
-				$HTML2PDF_TABLEAU[$param['num']]['height'] = array();
-
-				$h0 = $HTML2PDF_TABLEAU[$param['num']]['marge']['t'] + $HTML2PDF_TABLEAU[$param['num']]['marge']['b'];	// minimum de hauteur à cause des marges
-				$h0+= $HTML2PDF_TABLEAU[$param['num']]['thead']['height'] + $HTML2PDF_TABLEAU[$param['num']]['tfoot']['height']; // et du tfoot et thead
-				$max = $this->pdf->getH() - $this->pdf->getbMargin();			// max de hauteur par page
-				$y = $HTML2PDF_TABLEAU[$param['num']]['curr_y'];	// position Y actuelle
-				$height = $h0;
-				
-				// on va lire les hauteurs de chaque ligne, une à une, et voir si ca rentre sur la page.
-				for($k=0; $k<count($HTML2PDF_TABLEAU[$param['num']]['cases']); $k++)
-				{
-					// si c'est des lignes du thead ou du tfoot : on passe
-					if (in_array($k, $HTML2PDF_TABLEAU[$param['num']]['thead']['tr'])) continue;
-					if (in_array($k, $HTML2PDF_TABLEAU[$param['num']]['tfoot']['tr'])) continue;
-
-					// hauteur de la ligne $k
-					$th = 0;
-					$h = 0;
-					for($i=0; $i<count($HTML2PDF_TABLEAU[$param['num']]['cases'][$k]); $i++)
-					{
-						$h = max($h, $HTML2PDF_TABLEAU[$param['num']]['cases'][$k][$i]['h']);
-						
-						if ($HTML2PDF_TABLEAU[$param['num']]['cases'][$k][$i]['rowspan']==1)
-							$th = max($th, $HTML2PDF_TABLEAU[$param['num']]['cases'][$k][$i]['h']);
-					}
-			
-					// si la ligne ne rentre pas dans la page
-					// => la hauteur sur cette page est trouvée, et on passe à la page d'apres
-					if ($y+$h+$height>$max)
-					{
-						if ($height==$h0) $height = null;
-						$HTML2PDF_TABLEAU[$param['num']]['height'][] = $height;
-						$height = $h0;						
-						$y = $this->margeTop;
-					}
-					$height+= $th;
-				}
-				// rajout du reste de tableau (si il existe) à la derniere page
-				if ($height!=$h0 || $k==0) $HTML2PDF_TABLEAU[$param['num']]['height'][] = $height;
-			}
-			else
-			{
-				if (count($HTML2PDF_TABLEAU[$param['num']]['tfoot']['code']))
-				{
-					$tmp_tr = $HTML2PDF_TABLEAU[$param['num']]['tr_curr'];
-					$tmp_td = $HTML2PDF_TABLEAU[$param['num']]['td_curr'];
-					$OLD_parse_pos = $this->parse_pos;
-					$OLD_parse_code = $this->parsing->code;
-					
-					$HTML2PDF_TABLEAU[$param['num']]['tr_curr'] = $HTML2PDF_TABLEAU[$param['num']]['tfoot']['tr'][0];
-					$HTML2PDF_TABLEAU[$param['num']]['td_curr'] = 0;
-					$this->parse_pos = 0;
-					$this->parsing->code = $HTML2PDF_TABLEAU[$param['num']]['tfoot']['code'];
-					$this->makeHTMLcode();
-					
-					$this->parse_pos = 	$OLD_parse_pos;
-					$this->parsing->code = $OLD_parse_code;
-					$HTML2PDF_TABLEAU[$param['num']]['tr_curr'] = $tmp_tr;
-					$HTML2PDF_TABLEAU[$param['num']]['td_curr'] = $tmp_td;
-				}
-					
-				// determination des coordonnées de sortie du tableau
-				$x = $HTML2PDF_TABLEAU[$param['num']]['curr_x'] + $HTML2PDF_TABLEAU[$param['num']]['width'];
-				if (count($HTML2PDF_TABLEAU[$param['num']]['height'])>1)
-					$y = $this->margeTop+$HTML2PDF_TABLEAU[$param['num']]['height'][count($HTML2PDF_TABLEAU[$param['num']]['height'])-1];
-				else if (count($HTML2PDF_TABLEAU[$param['num']]['height'])==1)
-					$y = $HTML2PDF_TABLEAU[$param['num']]['curr_y']+$HTML2PDF_TABLEAU[$param['num']]['height'][count($HTML2PDF_TABLEAU[$param['num']]['height'])-1];
-				else
-					$y = $HTML2PDF_TABLEAU[$param['num']]['curr_y'];					
-
-				// taille du tableau
-				$this->maxX = max($this->maxX, $x);
-				$this->maxY = max($this->maxY, $y);
-				
-				
-				// nouvelle position apres le tableau
-				$this->pdf->setXY($this->pdf->getlMargin(), $y);
-				
-				// restauration des marges
-				$this->loadMargin();
-				
-				if ($this->DEBUG_actif) $this->DEBUG_add('Table n°'.$param['num'], false);
-			}
-			
-			return true;
-		}
-
-				
-		/**
-		* balise : COL
-		* mode : OUVERTURE (pas de fermeture)
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_COL($param)
-		{
-			global $HTML2PDF_TABLEAU;
-			$span = isset($param['span']) ? $param['span'] : 1;
-			for($k=0; $k<$span; $k++)
-				$HTML2PDF_TABLEAU[$param['num']]['cols'][] = $param;
-		}
-		
-		/**
-		* balise : TR
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_TR($param, $other = 'tr')
-		{
-			if ($this->forOneLine) return false;
-
-			$this->maxH = 0;
-			global $HTML2PDF_TABLEAU; 
-
-			// analyse du style
-			$this->style->save();
-			$this->style->analyse($other, $param);
-			$this->style->setPosition();
-			$this->style->FontSet();
-			
-			// positionnement dans le tableau
-			$HTML2PDF_TABLEAU[$param['num']]['tr_curr']++;
-			$HTML2PDF_TABLEAU[$param['num']]['td_curr']= 0;
-			
-			// si on est pas dans un sub_html
-			if (!$this->sub_part)
-			{
-				// Y courant apres la ligne
-				$ty=null;
-				for($ii=0; $ii<count($HTML2PDF_TABLEAU[$param['num']]['cases'][$HTML2PDF_TABLEAU[$param['num']]['tr_curr']-1]); $ii++)
-					$ty = max($ty, $HTML2PDF_TABLEAU[$param['num']]['cases'][$HTML2PDF_TABLEAU[$param['num']]['tr_curr']-1][$ii]['h']);	
-				
-				$hfoot = $HTML2PDF_TABLEAU[$param['num']]['tfoot']['height'];
-				
-				// si la ligne ne rentre pas dans la page => nouvelle page
-				if (!$this->isInTfoot && $HTML2PDF_TABLEAU[$param['num']]['td_y'] + $HTML2PDF_TABLEAU[$param['num']]['marge']['b'] + $ty +$hfoot> $this->pdf->getH() - $this->pdf->getbMargin())
-				{
-					if (count($HTML2PDF_TABLEAU[$param['num']]['tfoot']['code']))
-					{
-						$tmp_tr = $HTML2PDF_TABLEAU[$param['num']]['tr_curr'];
-						$tmp_td = $HTML2PDF_TABLEAU[$param['num']]['td_curr'];
-						$OLD_parse_pos = $this->parse_pos;
-						$OLD_parse_code = $this->parsing->code;
-						
-						$HTML2PDF_TABLEAU[$param['num']]['tr_curr'] = $HTML2PDF_TABLEAU[$param['num']]['tfoot']['tr'][0];
-						$HTML2PDF_TABLEAU[$param['num']]['td_curr'] = 0;
-						$this->parse_pos = 0;
-						$this->parsing->code = $HTML2PDF_TABLEAU[$param['num']]['tfoot']['code'];
-						$this->isInTfoot = true;
-						$this->makeHTMLcode();
-						$this->isInTfoot = false;
-						
-						$this->parse_pos = 	$OLD_parse_pos;
-						$this->parsing->code = $OLD_parse_code;
-						$HTML2PDF_TABLEAU[$param['num']]['tr_curr'] = $tmp_tr;
-						$HTML2PDF_TABLEAU[$param['num']]['td_curr'] = $tmp_td;
-					}
-					
-					$HTML2PDF_TABLEAU[$param['num']]['new_page'] = true;
-					$this->setNewPage();
-
-					$HTML2PDF_TABLEAU[$param['num']]['page']++;
-					$HTML2PDF_TABLEAU[$param['num']]['curr_y'] = $this->pdf->getY();
-					$HTML2PDF_TABLEAU[$param['num']]['td_y'] = $HTML2PDF_TABLEAU[$param['num']]['curr_y']+$HTML2PDF_TABLEAU[$param['num']]['marge']['t'];
-
-					// si la hauteur de cette partie a bien été calculée, on trace le cadre
-					if (isset($HTML2PDF_TABLEAU[$param['num']]['height'][$HTML2PDF_TABLEAU[$param['num']]['page']]))
-					{
-						$old = $this->style->value;
-						$this->style->value = $HTML2PDF_TABLEAU[$param['num']]['style_value'];
-
-						// initialisation du style des bordures de la premiere partie de tableau
-						$this->drawRectangle(
-								$HTML2PDF_TABLEAU[$param['num']]['curr_x'],
-								$HTML2PDF_TABLEAU[$param['num']]['curr_y'],
-								$HTML2PDF_TABLEAU[$param['num']]['width'],
-								$HTML2PDF_TABLEAU[$param['num']]['height'][$HTML2PDF_TABLEAU[$param['num']]['page']],
-								$this->style->value['border'],
-								$this->style->value['padding'],
-								$HTML2PDF_TABLEAU[$param['num']]['cellspacing']*0.5,
-								$this->style->value['background']
-							);
-											 
-						$this->style->value = $old;
-					}
-				}
-				
-				if ($HTML2PDF_TABLEAU[$param['num']]['new_page'] && count($HTML2PDF_TABLEAU[$param['num']]['thead']['code']))
-				{
-					$HTML2PDF_TABLEAU[$param['num']]['new_page'] = false;
-					$tmp_tr = $HTML2PDF_TABLEAU[$param['num']]['tr_curr'];
-					$tmp_td = $HTML2PDF_TABLEAU[$param['num']]['td_curr'];
-					$OLD_parse_pos = $this->parse_pos;
-					$OLD_parse_code = $this->parsing->code;
-					
-					$HTML2PDF_TABLEAU[$param['num']]['tr_curr'] = $HTML2PDF_TABLEAU[$param['num']]['thead']['tr'][0];
-					$HTML2PDF_TABLEAU[$param['num']]['td_curr'] = 0;
-					$this->parse_pos = 0;
-					$this->parsing->code = $HTML2PDF_TABLEAU[$param['num']]['thead']['code'];
-					$this->isInThead = true;
-					$this->makeHTMLcode();
-					$this->isInThead = false;
-					
-					$this->parse_pos = 	$OLD_parse_pos;
-					$this->parsing->code = $OLD_parse_code;
-					$HTML2PDF_TABLEAU[$param['num']]['tr_curr'] = $tmp_tr;
-					$HTML2PDF_TABLEAU[$param['num']]['td_curr'] = $tmp_td;
-					$HTML2PDF_TABLEAU[$param['num']]['new_page'] = true;
-				}
-			}
-			else
-			{
-				$HTML2PDF_TABLEAU[$param['num']]['cases'][$HTML2PDF_TABLEAU[$param['num']]['tr_curr']-1] = array();
-				if (!isset($HTML2PDF_TABLEAU[$param['num']]['corr'][$HTML2PDF_TABLEAU[$param['num']]['corr_y']]))
-					$HTML2PDF_TABLEAU[$param['num']]['corr'][$HTML2PDF_TABLEAU[$param['num']]['corr_y']] = array();
-					
-				$HTML2PDF_TABLEAU[$param['num']]['corr_x']=0;
-				while(isset($HTML2PDF_TABLEAU[$param['num']]['corr'][$HTML2PDF_TABLEAU[$param['num']]['corr_y']][$HTML2PDF_TABLEAU[$param['num']]['corr_x']]))
-					$HTML2PDF_TABLEAU[$param['num']]['corr_x']++;
-			}							
-			
-			return true;
-		}
-
-		/**
-		* balise : TR
-		* mode : FERMETURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function c_TR($param)
-		{
-			if ($this->forOneLine) return false;
-
-			$this->maxH = 0;
-			global $HTML2PDF_TABLEAU; 
-
-			// restauration du style
-			$this->style->load();
-			$this->style->FontSet();			
-
-			// si on est pas dans un sub_html
-			if (!$this->sub_part)
-			{
-				// Y courant apres la ligne
-				$ty=null;
-				for($ii=0; $ii<count($HTML2PDF_TABLEAU[$param['num']]['cases'][$HTML2PDF_TABLEAU[$param['num']]['tr_curr']-1]); $ii++)
-					if ($HTML2PDF_TABLEAU[$param['num']]['cases'][$HTML2PDF_TABLEAU[$param['num']]['tr_curr']-1][$ii]['rowspan']==1)
-						$ty = $HTML2PDF_TABLEAU[$param['num']]['cases'][$HTML2PDF_TABLEAU[$param['num']]['tr_curr']-1][$ii]['h'];	
-
-				// mise à jour des coordonnées courantes
-				$HTML2PDF_TABLEAU[$param['num']]['td_x'] = $HTML2PDF_TABLEAU[$param['num']]['curr_x']+$HTML2PDF_TABLEAU[$param['num']]['marge']['l'];
-				$HTML2PDF_TABLEAU[$param['num']]['td_y']+= $ty;
-				$HTML2PDF_TABLEAU[$param['num']]['new_page'] = false;
-			}
-			else
-			{
-				$HTML2PDF_TABLEAU[$param['num']]['corr_y']++;	
-			}
-			
-			return true;
-		}
-
-		/**
-		* balise : TD
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_TD($param, $other = 'td')
-		{
-			if ($this->forOneLine) return false;
-
-			$this->maxH = 0;
-			global $HTML2PDF_TABLEAU; 
-
-			$param['cellpadding'] = $HTML2PDF_TABLEAU[$param['num']]['cellpadding'].'mm';
-			$param['cellspacing'] = $HTML2PDF_TABLEAU[$param['num']]['cellspacing'].'mm';
-			
-			if ($other=='li')
-			{
-				$special_li = true;
-			}
-			else
-			{
-				$special_li = false;
-				if ($other=='li_sub')
-				{
-					$param['style']['border'] = 'none';
-					$param['style']['background-color']		= 'transparent';
-					$param['style']['background-image']		= 'none';
-					$param['style']['background-position']	= '';
-					$param['style']['background-repeat']	= '';
-					$other = 'li';
-				}
-			}
-
-			// est-on en collapse, et egalement y-a-t'il des definitions de colonne
-			$x = $HTML2PDF_TABLEAU[$param['num']]['td_curr'];
-			$y = $HTML2PDF_TABLEAU[$param['num']]['tr_curr']-1;
-			$colspan = isset($param['colspan']) ? $param['colspan'] : 1;
-			$rowspan = isset($param['rowspan']) ? $param['rowspan'] : 1;
-			$collapse = false;
-			if (in_array($other, array('td', 'th')))
-			{
-				$num_col = isset($HTML2PDF_TABLEAU[$param['num']]['cases'][$y][$x]['Xr']) ? $HTML2PDF_TABLEAU[$param['num']]['cases'][$y][$x]['Xr'] : $HTML2PDF_TABLEAU[$param['num']]['corr_x'];
-				
-				// si une definition de colonne est presente
-				if (isset($HTML2PDF_TABLEAU[$param['num']]['cols'][$num_col]))
-				{
-					// on la recupere
-					$col_param = $HTML2PDF_TABLEAU[$param['num']]['cols'][$num_col];
-					
-					// pour les colspan, on recupere toutes les largeurs
-					$col_param['style']['width'] = array();
-					for($k=0; $k<$colspan; $k++)
-					{
-						if (isset($HTML2PDF_TABLEAU[$param['num']]['cols'][$num_col+$k]['style']['width']))
-							$col_param['style']['width'][] = $HTML2PDF_TABLEAU[$param['num']]['cols'][$num_col+$k]['style']['width'];
-					}
-					
-					// on les somme
-					$total = '';
-					$last = $this->style->getLastWidth();
-					if (count($col_param['style']['width']))
-					{
-						$total = $col_param['style']['width'][0]; unset($col_param['style']['width'][0]);
-						foreach($col_param['style']['width'] as $width)
-						{
-							if (substr($total, -1)=='%' && substr($width, -1)=='%')
-								$total = (str_replace('%', '', $total)+str_replace('%', '', $width)).'%';
-							else
-								$total = ($this->style->ConvertToMM($total, $last) + $this->style->ConvertToMM($width, $last)).'mm';
-						}
-					}
-					
-					// et on recupere la largeur finale
-					if ($total)
-						$col_param['style']['width'] = $total;
-					else
-						unset($col_param['style']['width']);
-					
-					
-					// on merge les 2 styles (col + td)
-					$param['style'] = array_merge($col_param['style'], $param['style']);
-					
-					// si une classe est définie, on la merge egalement
-					if (isset($col_param['class']))
-						$param['class'] = $col_param['class'].(isset($param['class']) ? ' '.$param['class'] : '');
-				}
-				
-				$collapse = isset($this->style->value['border']['collapse']) ? $this->style->value['border']['collapse'] : false;
-			}
-
-
-			// analyse du style
-			$this->style->save();
-			$heritage = null;
-			if (in_array($other, array('td', 'th')))
-			{
-				$heritage = array();
-				
-				$old = $this->style->getLastValue('background');
-				if ($old && ($old['color'] || $old['image']))
-					$heritage['background'] = $old;
-					
-				if ($HTML2PDF_TABLEAU[$param['num']]['border'])
-				{
-					$heritage['border'] = array();
-					$heritage['border']['l'] = $HTML2PDF_TABLEAU[$param['num']]['border'];
-					$heritage['border']['t'] = $HTML2PDF_TABLEAU[$param['num']]['border'];
-					$heritage['border']['r'] = $HTML2PDF_TABLEAU[$param['num']]['border'];
-					$heritage['border']['b'] = $HTML2PDF_TABLEAU[$param['num']]['border'];
-				} 
-			} 
-			$return = $this->style->analyse($other, $param, $heritage);
-
-			if ($special_li)
-			{
-				$this->style->value['width']-= $this->style->ConvertToMM($this->listeGetWidth());
-				$this->style->value['width']-= $this->style->ConvertToMM($this->listeGetPadding());
-			}
-			$this->style->setPosition();
-			$this->style->FontSet();
-			
-			// si on est en collapse : modification du style
-			if ($collapse)
-			{
-				if (!$this->sub_part)
-				{
-					if (
-							($HTML2PDF_TABLEAU[$param['num']]['tr_curr']>1  && !$HTML2PDF_TABLEAU[$param['num']]['new_page']) ||
-							(!$this->isInThead && count($HTML2PDF_TABLEAU[$param['num']]['thead']['code']))
-						)
-					{
-						$this->style->value['border']['t'] = $this->style->readBorder('none');				
-					}
-				}
-			
-				if ($HTML2PDF_TABLEAU[$param['num']]['td_curr']>0)
-				{
-					if (!$return) $this->style->value['width']+= $this->style->value['border']['l']['width'];
-					$this->style->value['border']['l'] = $this->style->readBorder('none');	
-				}
-			}	
-			
-			$marge = array();
-			$marge['t'] = $this->style->value['padding']['t']+0.5*$HTML2PDF_TABLEAU[$param['num']]['cellspacing']+$this->style->value['border']['t']['width'];
-			$marge['r'] = $this->style->value['padding']['r']+0.5*$HTML2PDF_TABLEAU[$param['num']]['cellspacing']+$this->style->value['border']['r']['width'];
-			$marge['b'] = $this->style->value['padding']['b']+0.5*$HTML2PDF_TABLEAU[$param['num']]['cellspacing']+$this->style->value['border']['b']['width'];
-			$marge['l'] = $this->style->value['padding']['l']+0.5*$HTML2PDF_TABLEAU[$param['num']]['cellspacing']+$this->style->value['border']['l']['width'];
-
-			// si on est dans un sub_html
-			if ($this->sub_part)
-			{
-				// on se positionne dans le tableau
-				$HTML2PDF_TABLEAU[$param['num']]['td_curr']++;
-				$HTML2PDF_TABLEAU[$param['num']]['cases'][$y][$x] = array();
-				$HTML2PDF_TABLEAU[$param['num']]['cases'][$y][$x]['w'] = 0;
-				$HTML2PDF_TABLEAU[$param['num']]['cases'][$y][$x]['h'] = 0;
-				$HTML2PDF_TABLEAU[$param['num']]['cases'][$y][$x]['dw'] = 0;
-				$HTML2PDF_TABLEAU[$param['num']]['cases'][$y][$x]['colspan'] = $colspan;
-				$HTML2PDF_TABLEAU[$param['num']]['cases'][$y][$x]['rowspan'] = $rowspan;
-				$HTML2PDF_TABLEAU[$param['num']]['cases'][$y][$x]['Xr'] = $HTML2PDF_TABLEAU[$param['num']]['corr_x'];
-				$HTML2PDF_TABLEAU[$param['num']]['cases'][$y][$x]['Yr'] = $HTML2PDF_TABLEAU[$param['num']]['corr_y'];
-				
-				for($j=0; $j<$rowspan; $j++)
-				{
-					for($i=0; $i<$colspan; $i++)
-					{
-						$HTML2PDF_TABLEAU[$param['num']]['corr']
-							[$HTML2PDF_TABLEAU[$param['num']]['corr_y']+$j]
-							[$HTML2PDF_TABLEAU[$param['num']]['corr_x']+$i] = ($i+$j>0) ? '' : array($x,$y,$colspan,$rowspan);
-
-					}
-				}
-				$HTML2PDF_TABLEAU[$param['num']]['corr_x']+= $colspan;
-				while(isset($HTML2PDF_TABLEAU[$param['num']]['corr'][$HTML2PDF_TABLEAU[$param['num']]['corr_y']][$HTML2PDF_TABLEAU[$param['num']]['corr_x']]))
-					$HTML2PDF_TABLEAU[$param['num']]['corr_x']++;
-
-				// on extrait tout ce qui est contenu dans le TD
-				// on en créé un sous HTML que l'on transforme en PDF
-				// pour analyse les dimensions
-				// et les récupérer dans le tableau global.
-				$level = $this->parsing->getLevel($this->temp_pos);
-				$this->CreateSubHTML($this->sub_html);
-				$this->sub_html->parsing->code = $level;
-				$this->sub_html->MakeHTMLcode();
-				$this->temp_pos+= count($level);
-			}
-			else
-			{
-				// on se positionne dans le tableau
-				$HTML2PDF_TABLEAU[$param['num']]['td_curr']++;
-				$HTML2PDF_TABLEAU[$param['num']]['td_x']+= $HTML2PDF_TABLEAU[$param['num']]['cases'][$y][$x]['dw'];
-				
-				// initialisation du style des bordures de la premiere partie de tableau
-				$this->drawRectangle(
-						$HTML2PDF_TABLEAU[$param['num']]['td_x'],
-						$HTML2PDF_TABLEAU[$param['num']]['td_y'],
-						$HTML2PDF_TABLEAU[$param['num']]['cases'][$y][$x]['w'],
-						$HTML2PDF_TABLEAU[$param['num']]['cases'][$y][$x]['h'],
-						$this->style->value['border'],
-						$this->style->value['padding'],
-						$HTML2PDF_TABLEAU[$param['num']]['cellspacing']*0.5,
-						$this->style->value['background']
-					);
-				
-
-				$this->style->value['width'] = $HTML2PDF_TABLEAU[$param['num']]['cases'][$y][$x]['w'] - $marge['l'] - $marge['r'];
-
-				// limitation des marges aux dimensions de la case
-				$mL = $HTML2PDF_TABLEAU[$param['num']]['td_x']+$marge['l'];
-				$mR = $this->pdf->getW() - $mL - $this->style->value['width'];
-				$this->saveMargin($mL, 0, $mR);
-				
-				// positionnement en fonction
-				$h_corr = $HTML2PDF_TABLEAU[$param['num']]['cases'][$y][$x]['h'];
-				$h_reel = $HTML2PDF_TABLEAU[$param['num']]['cases'][$y][$x]['real_h'];
-				switch($this->style->value['vertical-align'])
-				{
-					case 'bottom':
-						$y_corr = $h_corr-$h_reel;
-						break;
-						
-					case 'middle':
-						$y_corr = ($h_corr-$h_reel)*0.5;
-						break;
-						
-					case 'top':
-					default:
-						$y_corr = 0;
-						break;	
-				}
-
-				$x = $HTML2PDF_TABLEAU[$param['num']]['td_x']+$marge['l'];
-				$y = $HTML2PDF_TABLEAU[$param['num']]['td_y']+$marge['t']+$y_corr;
-				$this->pdf->setXY($x, $y);
-				$this->setNewPositionForNewLine();
-			}
-			
-			return true;
-		}
-
-		/**
-		* balise : TD
-		* mode : FERMETURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function c_TD($param)
-		{
-			if ($this->forOneLine) return false;
-
-			$this->maxH = 0;
-			global $HTML2PDF_TABLEAU; 
-
-			// récupération de la marge
-			$marge = array();
-			$marge['t'] = $this->style->value['padding']['t']+0.5*$HTML2PDF_TABLEAU[$param['num']]['cellspacing']+$this->style->value['border']['t']['width'];
-			$marge['r'] = $this->style->value['padding']['r']+0.5*$HTML2PDF_TABLEAU[$param['num']]['cellspacing']+$this->style->value['border']['r']['width'];
-			$marge['b'] = $this->style->value['padding']['b']+0.5*$HTML2PDF_TABLEAU[$param['num']]['cellspacing']+$this->style->value['border']['b']['width'];
-			$marge['l'] = $this->style->value['padding']['l']+0.5*$HTML2PDF_TABLEAU[$param['num']]['cellspacing']+$this->style->value['border']['l']['width'];
-			$marge['t']+= 0.001;
-			$marge['r']+= 0.001;
-			$marge['b']+= 0.001;
-			$marge['l']+= 0.001;
-
-			// si on est dans un sub_html
-			if ($this->sub_part)
-			{
-				if ($this->testTDin1page && $this->sub_html->pdf->getPage()>1) HTML2PDF::makeError(7, __FILE__, __LINE__); 
-				
-				// dimentions de cette case
-				$w0 = $this->sub_html->maxX + $marge['l'] + $marge['r'];
-				$h0 = $this->sub_html->maxY + $marge['t'] + $marge['b'];
-	
-				// dimensions imposées par le style
-				$w2 = $this->style->value['width'] + $marge['l'] + $marge['r'];
-				$h2 = $this->style->value['height'] + $marge['t'] + $marge['b'];
-	
-				// dimension finale de la case = max des 2 ci-dessus
-				$HTML2PDF_TABLEAU[$param['num']]['cases'][$HTML2PDF_TABLEAU[$param['num']]['tr_curr']-1][$HTML2PDF_TABLEAU[$param['num']]['td_curr']-1]['w'] = max(array($w0, $w2));
-				$HTML2PDF_TABLEAU[$param['num']]['cases'][$HTML2PDF_TABLEAU[$param['num']]['tr_curr']-1][$HTML2PDF_TABLEAU[$param['num']]['td_curr']-1]['h'] = max(array($h0, $h2));
-
-				$HTML2PDF_TABLEAU[$param['num']]['cases'][$HTML2PDF_TABLEAU[$param['num']]['tr_curr']-1][$HTML2PDF_TABLEAU[$param['num']]['td_curr']-1]['real_w'] = $w0;
-				$HTML2PDF_TABLEAU[$param['num']]['cases'][$HTML2PDF_TABLEAU[$param['num']]['tr_curr']-1][$HTML2PDF_TABLEAU[$param['num']]['td_curr']-1]['real_h'] = $h0;
-
-				// suppresion du sous_html
-				$this->destroySubHTML($this->sub_html);
-			}
-			else
-			{
-				$this->loadMargin();
-				//positionnement
-				$HTML2PDF_TABLEAU[$param['num']]['td_x']+= $HTML2PDF_TABLEAU[$param['num']]['cases'][$HTML2PDF_TABLEAU[$param['num']]['tr_curr']-1][$HTML2PDF_TABLEAU[$param['num']]['td_curr']-1]['w'];
-			}
-
-			// restauration du style
-			$this->style->load();
-			$this->style->FontSet();	
-			
-			return true;
-		}
-		
-		function calculTailleCases(&$cases, &$corr)
-		{
-/*			// construction d'un tableau de correlation
-			$corr = array();
-
-			// on fait correspondre chaque case d'un tableau normé aux cases réelles, en prennant en compte les colspan et rowspan
-			$Yr=0;
-			for($y=0; $y<count($cases); $y++)
-			{
-				$Xr=0; 	while(isset($corr[$Yr][$Xr])) $Xr++;
-				
-				for($x=0; $x<count($cases[$y]); $x++)
-				{
-					for($j=0; $j<$cases[$y][$x]['rowspan']; $j++)
-					{
-						for($i=0; $i<$cases[$y][$x]['colspan']; $i++)
-						{
-							$corr[$Yr+$j][$Xr+$i] = ($i+$j>0) ? '' : array($x, $y, $cases[$y][$x]['colspan'], $cases[$y][$x]['rowspan']);
-						}
-					}
-					$Xr+= $cases[$y][$x]['colspan'];
-					while(isset($corr[$Yr][$Xr])) $Xr++;
-				}
-				$Yr++;
-			}
-*/			
-			if (!isset($corr[0])) return true;
-			
-			// on détermine, pour les cases sans colspan, la largeur maximale de chaque colone
-			$sw = array();
-			for($x=0; $x<count($corr[0]); $x++)
-			{
-				$m=0;
-				for($y=0; $y<count($corr); $y++)
-					if (isset($corr[$y][$x]) && is_array($corr[$y][$x]) && $corr[$y][$x][2]==1)
-						$m = max($m, $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w']);				
-				$sw[$x] = $m;	
-			}
-
-			// on vérifie que cette taille est valide avec les colones en colspan
-			for($x=0; $x<count($corr[0]); $x++)
-			{
-				for($y=0; $y<count($corr); $y++)
-				{
-					if (isset($corr[$y][$x]) && is_array($corr[$y][$x]) && $corr[$y][$x][2]>1)
-					{
-						// somme des colonnes correspondant au colspan
-						$s = 0; for($i=0; $i<$corr[$y][$x][2]; $i++) $s+= $sw[$x+$i];
-						
-						// si la somme est inférieure à la taille necessaire => règle de 3 pour adapter
-						if ($s>0 && $s<$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w'])
-							for($i=0; $i<$corr[$y][$x][2]; $i++)
-								$sw[$x+$i] = $sw[$x+$i]/$s*$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w'];
-					}
-				}
-			}
-
-			// on applique les nouvelles largeurs
-			for($x=0; $x<count($corr[0]); $x++)
-			{
-				for($y=0; $y<count($corr); $y++)
-				{
-					if (isset($corr[$y][$x]) && is_array($corr[$y][$x]))
-					{
-						if ($corr[$y][$x][2]==1)
-						{
-							$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w'] = $sw[$x];
-						}
-						else
-						{
-							// somme des colonnes correspondant au colspan
-							$s = 0; for($i=0; $i<$corr[$y][$x][2]; $i++) $s+= $sw[$x+$i];
-							$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w'] = $s;
-						}
-					}
-				}
-			}
-
-			// on détermine, pour les cases sans rowspan, la hauteur maximale de chaque colone
-			$sh = array();
-			for($y=0; $y<count($corr); $y++)
-			{
-				$m=0;
-				for($x=0; $x<count($corr[0]); $x++)
-					if (isset($corr[$y][$x]) && is_array($corr[$y][$x]) && $corr[$y][$x][3]==1)
-						$m = max($m, $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h']);
-				$sh[$y] = $m;	
-			}
-
-
-			// on vérifie que cette taille est valide avec les lignes en rowspan
-			for($y=0; $y<count($corr); $y++)
-			{
-				for($x=0; $x<count($corr[0]); $x++)
-				{
-					if (isset($corr[$y][$x]) && is_array($corr[$y][$x]) && $corr[$y][$x][3]>1)
-					{
-						// somme des colonnes correspondant au colspan
-						$s = 0; for($i=0; $i<$corr[$y][$x][3]; $i++) $s+= $sh[$y+$i];
-						
-						// si la somme est inférieure à la taille necessaire => règle de 3 pour adapter
-						if ($s>0 && $s<$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h'])
-							for($i=0; $i<$corr[$y][$x][3]; $i++)
-								$sh[$y+$i] = $sh[$y+$i]/$s*$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h'];
-					}
-				}
-			}
-			
-
-			// on applique les nouvelles hauteurs
-			for($y=0; $y<count($corr); $y++)
-			{
-				for($x=0; $x<count($corr[0]); $x++)
-				{
-					if (isset($corr[$y][$x]) && is_array($corr[$y][$x]))
-					{
-						if ($corr[$y][$x][3]==1)
-						{
-							$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h'] = $sh[$y];
-						}
-						else
-						{
-							// somme des lignes correspondant au rowspan
-							$s = 0; for($i=0; $i<$corr[$y][$x][3]; $i++) $s+= $sh[$y+$i];
-							$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h'] = $s;
-							
-							for($j=1; $j<$corr[$y][$x][3]; $j++)
-							{
-								$tx = $x+1;
-								$ty = $y+$j;
-								for(true; isset($corr[$ty][$tx]) && !is_array($corr[$ty][$tx]); $tx++);
-								if (isset($corr[$ty][$tx])) $cases[$corr[$ty][$tx][1]][$corr[$ty][$tx][0]]['dw']+= $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w'];
-																	
-							}
-						}
-					}
-				}
-			}		
-		}
-
-		/**
-		* balise : TH
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_TH($param)
-		{
-			if ($this->forOneLine) return false;
-
-			$this->maxH = 0;
-			// identique à TD mais en gras
-			if (!isset($param['style']['font-weight'])) $param['style']['font-weight'] = 'bold';
-			$this->o_TD($param, 'th');
-			
-			return true;
-		}	
-
-		/**
-		* balise : TH
-		* mode : FERMETURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function c_TH($param)
-		{
-			if ($this->forOneLine) return false;
-
-			$this->maxH = 0;
-			// identique à TD
-			$this->c_TD($param);			
-			
-			return true;
-		}
-
-		/**
-		* balise : IMG
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_IMG($param)
-		{
-			// analyse du style
-			$src	= str_replace('&amp;', '&', $param['src']);	
-
-			$this->style->save();
-			$this->style->value['width']	= 0;
-			$this->style->value['height']	= 0;
-			$this->style->value['border']	= array(
-													'type'	=> 'none',
-													'width'	=> 0,
-													'color'	=> array(0, 0, 0),
-												);
-			$this->style->value['background'] = array(
-													'color'		=> null,
-													'image'		=> null,
-													'position'	=> null,
-													'repeat'	=> null
-												);
-			$this->style->analyse('img', $param);
-			$this->style->setPosition();
-			$this->style->FontSet();
-
-			// affichage de l'image
-			$res = $this->Image($src, isset($param['sub_li']));
-			if (!$res) return $res;
-
-			// restauration du style
-			$this->style->load();
-			$this->style->FontSet();
-			$this->maxE++; 
-			
-			return true;
-		}
-		
-		/**
-		* balise : SELECT
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_SELECT($param)
-		{
-			// preparation du champs
-			if (!isset($param['name']))		$param['name']	= 'champs_pdf_'.(count($this->lstChamps)+1);
-			
-			$param['name'] = strtolower($param['name']);
-			
-			if (isset($this->lstChamps[$param['name']]))
-				$this->lstChamps[$param['name']]++;
-			else
-				$this->lstChamps[$param['name']] = 1;
-				
-			$this->style->save();
-			$this->style->analyse('select', $param);
-			$this->style->setPosition();
-			$this->style->FontSet();
-			
-			$this->lstSelect = array();
-			$this->lstSelect['name']	= $param['name'];
-			$this->lstSelect['multi']	= isset($param['multiple']) ? true : false;
-			$this->lstSelect['size']	= isset($param['size']) ? $param['size'] : 1;
-			$this->lstSelect['options']	= array();
-
-			if ($this->lstSelect['multi'] && $this->lstSelect['size']<3) $this->lstSelect['size'] = 3;
-			
-			return true;
-		}
-		
-		/**
-		* balise : OPTION
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_OPTION($param)
-		{
-			// on extrait tout ce qui est contenu dans l'option
-			$level = $this->parsing->getLevel($this->parse_pos);
-			$this->parse_pos+= count($level); 
-			$value = isset($param['value']) ? $param['value'] : 'auto_opt_'.(count($this->lstSelect)+1);
-			
-			$this->lstSelect['options'][$value] = isset($level[0]['param']['txt']) ? $level[0]['param']['txt'] : '';
-			
-			return true;
-		}
-		
-		/**
-		* balise : OPTION
-		* mode : FERMETURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function c_OPTION($param) { return true; }
-				
-		/**
-		* balise : SELECT
-		* mode : FERMETURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function c_SELECT()
-		{
-			// position d'affichage
-			$x = $this->pdf->getX();
-			$y = $this->pdf->getY();
-			$f = 1.08*$this->style->value['font-size'];
-
-			$w = $this->style->value['width']; if (!$w) $w = 50; 
-			$h = ($f*1.07*$this->lstSelect['size'] + 1);
-			$prop = array();
-			if ($this->lstSelect['multi']) $prop['multipleSelection'] = true;
-			$this->pdf->form_Select($this->lstSelect['name'], $x, $y, $w, $h, $this->lstSelect['options'], $this->lstSelect['size']>1, $prop);
-							
-			$this->maxX = max($this->maxX, $x+$w);
-			$this->maxY = max($this->maxY, $y+$h);
- 			$this->maxH = max($this->maxH, $h);
-			$this->pdf->setX($x+$w);
-			
-			$this->style->load();
-			$this->style->FontSet();
-			
-			$this->lstSelect = array();
-			
-			return true;
-		}
-
-		/**
-		* balise : TEXTAREA
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_TEXTAREA($param)
-		{
-			// preparation du champs
-			if (!isset($param['name']))		$param['name']	= 'champs_pdf_'.(count($this->lstChamps)+1);
-			
-			$param['name'] = strtolower($param['name']);
-			
-			if (isset($this->lstChamps[$param['name']]))
-				$this->lstChamps[$param['name']]++;
-			else
-				$this->lstChamps[$param['name']] = 1;
-				
-			$this->style->save();
-			$this->style->analyse('textarea', $param);
-			$this->style->setPosition();
-			$this->style->FontSet();
-
-			// position d'affichage
-			$x = $this->pdf->getX();
-			$y = $this->pdf->getY();
-			$fx = 0.65*$this->style->value['font-size'];
-			$fy = 1.08*$this->style->value['font-size'];
-
-			// on extrait tout ce qui est contenu dans le textarea
-			$level = $this->parsing->getLevel($this->parse_pos);
-			$this->parse_pos+= count($level);
-
-			$w = $fx*(isset($param['cols']) ? $param['cols'] : 22)+1; 
-			$h = $fy*1.07*(isset($param['rows']) ? $param['rows'] : 3)+3;
-			
-//			if ($this->style->value['width']) $w = $this->style->value['width'];
-//			if ($this->style->value['height']) $h = $this->style->value['height'];
-			
-			$prop = array();
-			$prop['multiline'] = true;
-			$prop['value'] = isset($level[0]['param']['txt']) ? $level[0]['param']['txt'] : '';
-			
-			$this->pdf->form_InputText($param['name'], $x, $y, $w, $h, $prop);
-					
-			$this->maxX = max($this->maxX, $x+$w);
-			$this->maxY = max($this->maxY, $y+$h);
- 			$this->maxH = max($this->maxH, $h);
-			$this->pdf->setX($x+$w);
-					
-			return true;
-		}
-		
-		/**
-		* balise : TEXTAREA
-		* mode : FERMETURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function c_TEXTAREA()
-		{
-			$this->style->load();
-			$this->style->FontSet();
-			
-			return true;
-		}
-						
-		/**
-		* balise : INPUT
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_INPUT($param)
-		{
-			// preparation du champs
-			if (!isset($param['name']))		$param['name']	= 'champs_pdf_'.(count($this->lstChamps)+1);
-			if (!isset($param['value']))	$param['value']	= '';
-			if (!isset($param['type']))		$param['type']	= 'text';
-			
-			$param['name'] = strtolower($param['name']);
-			$param['type'] = strtolower($param['type']);
-
-			if (!in_array($param['type'], array('text', 'checkbox', 'radio', 'hidden', 'submit', 'reset', 'button'))) $param['type'] = 'text';
-
-			if (isset($this->lstChamps[$param['name']]))
-				$this->lstChamps[$param['name']]++;
-			else
-				$this->lstChamps[$param['name']] = 1;
-
-			$this->style->save();
-			$this->style->analyse('input', $param);
-			$this->style->setPosition();
-			$this->style->FontSet();
-			
-			$name = $param['name'];
-		
-			// position d'affichage
-			$x = $this->pdf->getX();
-			$y = $this->pdf->getY();
-			$f = 1.08*$this->style->value['font-size'];
-			
-			switch($param['type'])
-			{
-				case 'checkbox':
-					$w = 3;
-					$h = $w;
-					if ($h<$f) $y+= ($f-$h)*0.5;
-					$this->pdf->form_InputCheckBox($name, $x, $y, $w, isset($param['checked']));
-					break;
-				
-				case 'radio':
-					$w = 3;
-					$h = $w;
-					if ($h<$f) $y+= ($f-$h)*0.5;
-					$this->pdf->form_InputRadio($name, $x, $y, $w);
-					break;
-					
-				case 'hidden':
-					$w = 0;
-					$h = 0;
-					$this->pdf->form_InputHidden($name, $param['value']);
-					break;
-					
-				case 'text':
-					$w = $this->style->value['width']; if (!$w) $w = 40; 
-					$h = $f*1.3;
-					$prop = array();
-					$prop['value'] = $param['value'];
-					$this->pdf->form_InputText($name, $x, $y, $w, $h, $prop);
-					break;
-
-				case 'submit':
-					$w = $this->style->value['width'];	if (!$w) $w = 40; 
-					$h = $this->style->value['height'];	if (!$h) $h = $f*1.3;
-					$action =  'this.submitForm("'.$this->isInForm.'", false);';
-					$this->pdf->form_InputButton($name, $x, $y, $w, $h, $param['value'], $action, array());
-					break;
-					
-				case 'reset':
-					$w = $this->style->value['width'];	if (!$w) $w = 40; 
-					$h = $this->style->value['height'];	if (!$h) $h = $f*1.3;
-					$action =  'this.resetForm();';
-					$this->pdf->form_InputButton($name, $x, $y, $w, $h, $param['value'], $action, array());
-					break;
-					
-				case 'button':
-					$w = $this->style->value['width'];	if (!$w) $w = 40; 
-					$h = $this->style->value['height'];	if (!$h) $h = $f*1.3;
-					$action = isset($param['onclick']) ? $param['onclick'] : '';
-					$this->pdf->form_InputButton($name, $x, $y, $w, $h, $param['value'], $action, array());
-					break;
-					
-				default:
-					$w = 0;
-					$h = 0;
-					break;
-			}
-			
-			$this->maxX = max($this->maxX, $x+$w);
-			$this->maxY = max($this->maxY, $y+$h);
- 			$this->maxH = max($this->maxH, $h);
-			$this->pdf->setX($x+$w);
-			
-			$this->style->load();
-			$this->style->FontSet();
-			
-			return true;
-		}
-		
-		/**
-		* balise : DRAW
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_DRAW($param)
-		{
-			if ($this->forOneLine) return false;
-			if ($this->DEBUG_actif) $this->DEBUG_add('DRAW', true);
-			
-			$this->style->save();
-			$this->style->analyse('draw', $param);
-			$this->style->FontSet();
-			
-			$align_object = null;
-			if ($this->style->value['margin-auto']) $align_object = 'center';
-			
-			$over_w = $this->style->value['width'];
-			$over_h = $this->style->value['height'];
-			$this->style->value['old_maxX'] = $this->maxX;
-			$this->style->value['old_maxY'] = $this->maxY;
-			$this->style->value['old_maxH'] = $this->maxH;
-
-			$w = $this->style->value['width'];
-			$h = $this->style->value['height'];
-			
-			if (!$this->style->value['position'])
-			{
-				if (
-					$w < ($this->pdf->getW() - $this->pdf->getlMargin()-$this->pdf->getrMargin()) &&
-					$this->pdf->getX() + $w>=($this->pdf->getW() - $this->pdf->getrMargin())
-					)
-					$this->o_BR(array());
-	
-				if (
-						($h < ($this->pdf->getH() - $this->pdf->gettMargin()-$this->pdf->getbMargin())) &&
-						($this->pdf->getY() + $h>=($this->pdf->getH() - $this->pdf->getbMargin())) && 
-						!$this->isInOverflow
-					)
-					$this->setNewPage();
-				
-				// en cas d'alignement => correction
-				$old = $this->style->getOldValues();
-				$parent_w = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
-				
-				if ($parent_w>$w)
-				{				
-					if ($align_object=='center')		$this->pdf->setX($this->pdf->getX() + ($parent_w-$w)*0.5);
-					else if ($align_object=='right')	$this->pdf->setX($this->pdf->getX() + $parent_w-$w);
-				}
-				
-				$this->style->setPosition();
-			}
-			else
-			{
-				// en cas d'alignement => correction
-				$old = $this->style->getOldValues();
-				$parent_w = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
-				
-				if ($parent_w>$w)
-				{				
-					if ($align_object=='center')		$this->pdf->setX($this->pdf->getX() + ($parent_w-$w)*0.5);
-					else if ($align_object=='right')	$this->pdf->setX($this->pdf->getX() + $parent_w-$w);
-				}
-				
-				$this->style->setPosition();
-				$this->saveMax();
-				$this->maxX = 0;
-				$this->maxY = 0;
-				$this->maxH = 0;
-				$this->maxE = 0;
-			}		
-			
-			// initialisation du style des bordures de la div
-			$this->drawRectangle(
-					$this->style->value['x'],
-					$this->style->value['y'],
-					$this->style->value['width'],
-					$this->style->value['height'],
-					$this->style->value['border'],
-					$this->style->value['padding'],
-					0,
-					$this->style->value['background']
-				);
-			
-			$marge = array();
-			$marge['l'] = $this->style->value['border']['l']['width'];
-			$marge['r'] = $this->style->value['border']['r']['width'];
-			$marge['t'] = $this->style->value['border']['t']['width'];
-			$marge['b'] = $this->style->value['border']['b']['width'];
-
-			$this->style->value['width'] -= $marge['l']+$marge['r'];
-			$this->style->value['height']-= $marge['t']+$marge['b'];
-		
-			$over_w-= $marge['l']+$marge['r'];
-			$over_h-= $marge['t']+$marge['b'];
-			$this->pdf->clippingPathOpen(
-				$this->style->value['x']+$marge['l'],
-				$this->style->value['y']+$marge['t'],
-				$this->style->value['width'],
-				$this->style->value['height']
-			);		
-
-			// limitation des marges aux dimensions du contenu
-			$mL = $this->style->value['x']+$marge['l'];
-			$mR = $this->pdf->getW() - $mL - $over_w;
-			
-			$x = $this->style->value['x']+$marge['l'];
-			$y = $this->style->value['y']+$marge['t'];
-			$this->saveMargin($mL, 0, $mR);
-			$this->pdf->setXY($x, $y);
-			
-			$this->isInDraw = array(
-				'x' => $x,
-				'y' => $y,
-				'w' => $over_w,
-				'h' => $over_h,
-			);
-			$this->pdf->doTransform(array(1,0,0,1,$x,$y));
-			return true;
-		}
-			
-		/**
-		* balise : DRAW
-		* mode : FERMETURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function c_DRAW($param)
-		{
-			if ($this->forOneLine) return false;
-
-			$this->pdf->undoTransform();
-			$this->pdf->clippingPathClose();
-			
-			$this->maxX = $this->style->value['old_maxX'];
-			$this->maxY = $this->style->value['old_maxY'];
-			$this->maxH = $this->style->value['old_maxH'];
-			
-			$marge = array();
-			$marge['l'] = $this->style->value['border']['l']['width'];
-			$marge['r'] = $this->style->value['border']['r']['width'];
-			$marge['t'] = $this->style->value['border']['t']['width'];
-			$marge['b'] = $this->style->value['border']['b']['width'];
-			
-			$x = $this->style->value['x'];
-			$y = $this->style->value['y'];
-			$w = $this->style->value['width']+$marge['l']+$marge['r'];
-			$h = $this->style->value['height']+$marge['t']+$marge['b'];
-			
-			if ($this->style->value['position']!='absolute')
-			{
-				// position
-				$this->pdf->setXY($x+$w, $y);
-				 	
-				// position MAX
-				$this->maxX = max($this->maxX, $x+$w);
-				$this->maxY = max($this->maxY, $y+$h);
-		 		$this->maxH = max($this->maxH, $h);
-			}
-			else
-			{
-				// position
-				$this->pdf->setXY($this->style->value['xc'], $this->style->value['yc']);
-				 	
-				$this->loadMax();
-			}
-	 	
-	 		$block = ($this->style->value['display']!='inline' && $this->style->value['position']!='absolute');
-	 		
-	 		$this->style->load();
-			$this->style->FontSet();
-			$this->loadMargin();
-			
-			if ($block) $this->o_BR(array());
-			if ($this->DEBUG_actif) $this->DEBUG_add('DRAW', false);
-			
-			$this->isInDraw = null;
-			
-			return true;
-		}
-		
-		/**
-		* balise : LINE
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_LINE($param)
-		{
-			if (!$this->isInDraw) HTML2PDF::makeError(8, __FILE__, __LINE__, 'LINE');
-			$this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
-			$this->style->save();
-	 		$styles = $this->style->getSvgStyle('path', $param);
-	 		$styles['fill'] = null;
-			$style = $this->pdf->svgSetStyle($styles);
-	 					
-			$x1 = isset($param['x1']) ? $this->style->ConvertToMM($param['x1'], $this->isInDraw['w']) : 0.;
-			$y1 = isset($param['y1']) ? $this->style->ConvertToMM($param['y1'], $this->isInDraw['h']) : 0.;
-			$x2 = isset($param['x2']) ? $this->style->ConvertToMM($param['x2'], $this->isInDraw['w']) : 0.;
-			$y2 = isset($param['y2']) ? $this->style->ConvertToMM($param['y2'], $this->isInDraw['h']) : 0.;
-			$this->pdf->svgLine($x1, $y1, $x2, $y2);
-
-			$this->pdf->undoTransform();
-			$this->style->load();
-		}
-		
-		/**
-		* balise : RECT
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_RECT($param)
-		{
-			if (!$this->isInDraw) HTML2PDF::makeError(8, __FILE__, __LINE__, 'RECT');
-			$this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
-			$this->style->save();
-	 		$styles = $this->style->getSvgStyle('path', $param);
-			$style = $this->pdf->svgSetStyle($styles);
-	 					
-			$x = isset($param['x']) ? $this->style->ConvertToMM($param['x'], $this->isInDraw['w']) : 0.;
-			$y = isset($param['y']) ? $this->style->ConvertToMM($param['y'], $this->isInDraw['h']) : 0.;
-			$w = isset($param['w']) ? $this->style->ConvertToMM($param['w'], $this->isInDraw['w']) : 0.;
-			$h = isset($param['h']) ? $this->style->ConvertToMM($param['h'], $this->isInDraw['h']) : 0.;
-				
-			$this->pdf->svgRect($x, $y, $w, $h, $style);
-
-			$this->pdf->undoTransform();
-			$this->style->load();
-		}
-		
-		/**
-		* balise : CIRCLE
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_CIRCLE($param)
-		{
-			if (!$this->isInDraw) HTML2PDF::makeError(8, __FILE__, __LINE__, 'CIRCLE');
-			$this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
-			$this->style->save();
-	 		$styles = $this->style->getSvgStyle('path', $param);
-			$style = $this->pdf->svgSetStyle($styles);
-	 					
-			$cx = isset($param['cx']) ? $this->style->ConvertToMM($param['cx'], $this->isInDraw['w']) : 0.;
-			$cy = isset($param['cy']) ? $this->style->ConvertToMM($param['cy'], $this->isInDraw['h']) : 0.;
-			$r = isset($param['r']) ? $this->style->ConvertToMM($param['r'], $this->isInDraw['w']) : 0.;
-			$this->pdf->svgEllipse($cx, $cy, $r, $r, $style);
-			
-			$this->pdf->undoTransform();
-			$this->style->load();
-		}
-		
-		/**
-		* balise : ELLIPSE
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_ELLIPSE($param)
-		{
-			if (!$this->isInDraw) HTML2PDF::makeError(8, __FILE__, __LINE__, 'ELLIPSE');
-			$this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
-			$this->style->save();
-	 		$styles = $this->style->getSvgStyle('path', $param);
-			$style = $this->pdf->svgSetStyle($styles);
-	 					
-			$cx = isset($param['cx']) ? $this->style->ConvertToMM($param['cx'], $this->isInDraw['w']) : 0.;
-			$cy = isset($param['cy']) ? $this->style->ConvertToMM($param['cy'], $this->isInDraw['h']) : 0.;
-			$rx = isset($param['ry']) ? $this->style->ConvertToMM($param['rx'], $this->isInDraw['w']) : 0.;
-			$ry = isset($param['rx']) ? $this->style->ConvertToMM($param['ry'], $this->isInDraw['h']) : 0.;
-			$this->pdf->svgEllipse($cx, $cy, $rx, $ry, $style);
-						
-			$this->pdf->undoTransform();
-			$this->style->load();
-		}
-		
-		
-			/**
-		* balise : POLYLINE
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_POLYLINE($param)
-		{
-			if (!$this->isInDraw) HTML2PDF::makeError(8, __FILE__, __LINE__, 'POLYGON');
-			$this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
-			$this->style->save();
-	 		$styles = $this->style->getSvgStyle('path', $param);
-			$style = $this->pdf->svgSetStyle($styles);
-	 		
-			$path = isset($param['points']) ? $param['points'] : null;
-			if ($path)
-			{
-				$path = str_replace(',', ' ', $path);
-				$path = preg_replace('/[\s]+/', ' ', trim($path));
-				
-				// decoupage et nettoyage
-				$path = explode(' ', $path);
-				foreach($path as $k => $v)
-				{
-					$path[$k] = trim($v);
-					if ($path[$k]==='') unset($path[$k]);
-				}
-				$path = array_values($path);
-
-				$actions = array();
-				for($k=0; $k<count($path); $k+=2)
-				{
-					$actions[] = array(($k ? 'L' : 'M') ,
-										$this->style->ConvertToMM($path[$k+0], $this->isInDraw['w']),
-										$this->style->ConvertToMM($path[$k+1], $this->isInDraw['h'])); 	
-				}
-
-				// on trace
-				$this->pdf->svgPolygone($actions, $style);
-			}
-			
-			$this->pdf->undoTransform();
-			$this->style->load();
-		}
-		
-		/**
-		* balise : POLYGON
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_POLYGON($param)
-		{
-			if (!$this->isInDraw) HTML2PDF::makeError(8, __FILE__, __LINE__, 'POLYGON');
-			$this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
-			$this->style->save();
-	 		$styles = $this->style->getSvgStyle('path', $param);
-			$style = $this->pdf->svgSetStyle($styles);
-			
-			$path = isset($param['points']) ? $param['points'] : null;
-			if ($path)
-			{
-				$path = str_replace(',', ' ', $path);
-				$path = preg_replace('/[\s]+/', ' ', trim($path));
-				
-				// decoupage et nettoyage
-				$path = explode(' ', $path);
-				foreach($path as $k => $v)
-				{
-					$path[$k] = trim($v);
-					if ($path[$k]==='') unset($path[$k]);
-				}
-				$path = array_values($path);
-
-				$actions = array();
-				for($k=0; $k<count($path); $k+=2)
-				{
-					$actions[] = array(($k ? 'L' : 'M') ,
-										$this->style->ConvertToMM($path[$k+0], $this->isInDraw['w']),
-										$this->style->ConvertToMM($path[$k+1], $this->isInDraw['h'])); 	
-				}
-				$actions[] = array('z');
-				// on trace
-				$this->pdf->svgPolygone($actions, $style);
-			}
-			
-			$this->pdf->undoTransform();
-			$this->style->load();
-		}
-
-		/**
-		* balise : PATH
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_PATH($param)
-		{
-			if (!$this->isInDraw) HTML2PDF::makeError(8, __FILE__, __LINE__, 'PATH');
-			$this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
-			$this->style->save();
-	 		$styles = $this->style->getSvgStyle('path', $param);
-			$style = $this->pdf->svgSetStyle($styles);
-	 					
-			$path = isset($param['d']) ? $param['d'] : null;
-			if ($path)
-			{
-				// preparation
-				$path = str_replace(',', ' ', $path);
-				$path = preg_replace('/([a-zA-Z])([0-9\.\-])/', '$1 $2', $path); 
-				$path = preg_replace('/([0-9\.])([a-zA-Z])/', '$1 $2', $path);
-				$path = preg_replace('/[\s]+/', ' ', trim($path));
-				$path = preg_replace('/ ([a-z]{2})/', '$1', $path); 
-				
-				// decoupage et nettoyage
-				$path = explode(' ', $path);
-				foreach($path as $k => $v)
-				{
-					$path[$k] = trim($v);
-					if ($path[$k]==='') unset($path[$k]);
-				}
-				$path = array_values($path);
-
-				// conversion des unites
-				$actions = array();
-				$action = array();
-				for($k=0; $k<count($path); $k+=count($action))
-				{
-					$action = array();
-					$action[] = $path[$k];
-					switch($path[$k])
-					{
-						case 'C':
-						case 'c':
-							$action[] = $this->style->ConvertToMM($path[$k+1], $this->isInDraw['w']);	// x1
-							$action[] = $this->style->ConvertToMM($path[$k+2], $this->isInDraw['h']);	// y1
-							$action[] = $this->style->ConvertToMM($path[$k+3], $this->isInDraw['w']);	// x2
-							$action[] = $this->style->ConvertToMM($path[$k+4], $this->isInDraw['h']);	// y2
-							$action[] = $this->style->ConvertToMM($path[$k+5], $this->isInDraw['w']);	// x
-							$action[] = $this->style->ConvertToMM($path[$k+6], $this->isInDraw['h']);	// y
-							break;
-							
-						case 'Q':
-						case 'S':
-						case 'q':
-						case 's':
-							$action[] = $this->style->ConvertToMM($path[$k+1], $this->isInDraw['w']);	// x2
-							$action[] = $this->style->ConvertToMM($path[$k+2], $this->isInDraw['h']);	// y2
-							$action[] = $this->style->ConvertToMM($path[$k+3], $this->isInDraw['w']);	// x
-							$action[] = $this->style->ConvertToMM($path[$k+4], $this->isInDraw['h']);	// y
-							break;
-							
-						case 'A':
-						case 'a':
-							$action[] = $this->style->ConvertToMM($path[$k+1], $this->isInDraw['w']);	// rx
-							$action[] = $this->style->ConvertToMM($path[$k+2], $this->isInDraw['h']);	// ry
-							$action[] = 1.*$path[$k+3];													// angle de deviation de l'axe X
-							$action[] = ($path[$k+4]=='1') ? 1 : 0;										// large-arc-flag 
-							$action[] = ($path[$k+5]=='1') ? 1 : 0; 									// sweep-flag
-							$action[] = $this->style->ConvertToMM($path[$k+6], $this->isInDraw['w']);	// x
-							$action[] = $this->style->ConvertToMM($path[$k+7], $this->isInDraw['h']);	// y
-							break;
-							
-						case 'M':
-						case 'L':
-						case 'T':
-						case 'm':
-						case 'l':
-						case 't':
-							$action[] = $this->style->ConvertToMM($path[$k+1], $this->isInDraw['w']);	// x
-							$action[] = $this->style->ConvertToMM($path[$k+2], $this->isInDraw['h']);	// y
-							break;
-							
-						case 'H':
-						case 'h':
-							$action[] = $this->style->ConvertToMM($path[$k+1], $this->isInDraw['w']);	// x
-							break;
-							
-						case 'V':
-						case 'v':
-							$action[] = $this->style->ConvertToMM($path[$k+1], $this->isInDraw['h']);	// y
-							break;
-							
-						case 'z':
-						case 'Z':
-						default:
-							break;
-					}
-					$actions[] = $action;
-				}
-				
-				// on trace
-				$this->pdf->svgPolygone($actions, $style);
-			}
-			
-			$this->pdf->undoTransform();
-			$this->style->load();
-		}
-		
-		/**
-		* balise : G
-		* mode : OUVERTURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function o_G($param)
-		{
-			if (!$this->isInDraw) HTML2PDF::makeError(8, __FILE__, __LINE__, 'LINE');
-			$this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
-			$this->style->save();
-	 		$styles = $this->style->getSvgStyle('path', $param);
-			$style = $this->pdf->svgSetStyle($styles);
-		}
-		
-		/**
-		* balise : G
-		* mode : FERMETURE
-		* 
-		* @param	array	paramètres de l'élément de parsing
-		* @return	null
-		*/	
-		function c_G($param)
-		{
-			$this->pdf->undoTransform();
-			$this->style->load();
-		}
-		
-		function _prepareTransform($transform)
-		{
-			if (!$transform) return null;
-			$actions = array();
-			if (!preg_match_all('/([a-z]+)\(([^\)]*)\)/isU', $transform, $match)) return null;
-
-			for($k=0; $k<count($match[0]); $k++)
-			{
-				$nom = strtolower($match[1][$k]);
-				$val = explode(',', trim($match[2][$k]));
-				foreach($val as $i => $j)
-					$val[$i] = trim($j);	
-
-				switch($nom)
-				{
-					case 'scale':
-						if (!isset($val[0])) $val[0] = 1.;		else $val[0] = 1.*$val[0];
-						if (!isset($val[1])) $val[1] = $val[0];	else $val[1] = 1.*$val[1];
-						$actions[] = array($val[0],0,0,$val[1],0,0);
-						break;	
-					
-					case 'translate':
-						if (!isset($val[0])) $val[0] = 0.; else $val[0] = $this->style->ConvertToMM($val[0], $this->isInDraw['w']);
-						if (!isset($val[1])) $val[1] = 0.; else $val[1] = $this->style->ConvertToMM($val[1], $this->isInDraw['h']);
-						$actions[] = array(1,0,0,1,$val[0],$val[1]);
-						break;
-
-					case 'rotate':
-						if (!isset($val[0])) $val[0] = 0.; else $val[0] = $val[0]*M_PI/180.;
-						if (!isset($val[1])) $val[1] = 0.; else $val[1] = $this->style->ConvertToMM($val[1], $this->isInDraw['w']);
-						if (!isset($val[2])) $val[2] = 0.; else $val[2] = $this->style->ConvertToMM($val[2], $this->isInDraw['h']);
-						if ($val[1] || $val[2]) $actions[] = array(1,0,0,1,-$val[1],-$val[2]);
-						$actions[] = array(cos($val[0]),sin($val[0]),-sin($val[0]),cos($val[0]),0,0);
-						if ($val[1] || $val[2]) $actions[] = array(1,0,0,1,$val[1],$val[2]);
-						break;
-						
-					case 'skewx':
-						if (!isset($val[0])) $val[0] = 0.; else $val[0] = $val[0]*M_PI/180.;
-						$actions[] = array(1,0,tan($val[0]),1,0,0);
-						break;
-						
-					case 'skewy':
-						if (!isset($val[0])) $val[0] = 0.; else $val[0] = $val[0]*M_PI/180.;
-						$actions[] = array(1,tan($val[0]),0,1,0,0);
-						break;
-					case 'matrix':
-						if (!isset($val[0])) $val[0] = 0.; else $val[0] = $val[0]*1.;
-						if (!isset($val[1])) $val[1] = 0.; else $val[1] = $val[1]*1.;
-						if (!isset($val[2])) $val[2] = 0.; else $val[2] = $val[2]*1.;
-						if (!isset($val[3])) $val[3] = 0.; else $val[3] = $val[3]*1.;
-						if (!isset($val[4])) $val[4] = 0.; else $val[4] = $this->style->ConvertToMM($val[4], $this->isInDraw['w']);
-						if (!isset($val[5])) $val[5] = 0.; else $val[5] = $this->style->ConvertToMM($val[5], $this->isInDraw['h']);
-						$actions[] =$val;
-						break;
-				}
-			}
-
-			if (!$actions) return null;
-			$m = $actions[0]; unset($actions[0]);
-			foreach($actions as $n)
-			{
-				$m = array(
-					$m[0]*$n[0]+$m[2]*$n[1],
-					$m[1]*$n[0]+$m[3]*$n[1],
-					$m[0]*$n[2]+$m[2]*$n[3],
-					$m[1]*$n[2]+$m[3]*$n[3],
-					$m[0]*$n[4]+$m[2]*$n[5]+$m[4],
-					$m[1]*$n[4]+$m[3]*$n[5]+$m[5]
-				);	
-			}
-		
-			return $m;
-		}
-		
-		function _getDrawNumber(&$lst, $key, $n=1, $correct=false)
-		{
-			$res = array_fill(0, $n, 0);
-			$tmp = isset($lst[$key]) ? $lst[$key] : null;
-			if (!$tmp) return $res;
-			$tmp = explode(' ', trim(preg_replace('/[\s]+/', ' ', $tmp)));
-			foreach($tmp as $k => $v)
-			{
-				$v = trim($v);
-				if (!$correct)
-				{
-					$res[$k] = $this->style->ConvertToMM($v);
-				}
-				else
-				{
-					$res[$k] = $this->style->ConvertToMM($v, ($k%2) ? $this->isInDraw['h'] : $this->isInDraw['w']);
-				}
-			}
-			return $res;
-		}
-		
-		/**
-		* permet d'afficher un index automatique utilisant les bookmark
-		* 
-		* @param	string	titre du sommaire
-		* @param	int		taille en mm de la fonte du titre du sommaire
-		* @param	int		taille en mm de la fonte du texte du sommaire
-		* @param	boolean	ajouter un bookmark spécifique pour l'index, juste avant le début de celui-ci
-		* @param	boolean	afficher les numéros de page associés à chaque bookmark
-		* @param	int		si présent : page où afficher le sommaire. sinon : nouvelle page
-		* @param	string	nom de la fonte à utiliser
-		* @return	null
-		*/	
-		function createIndex($titre = 'Index', $size_title = 20, $size_bookmark = 15, $bookmark_title = true, $display_page = true, $on_page = null, $font_name = 'helvetica')
-		{
-			$old_page = $this->INDEX_NewPage($on_page);
-			$this->pdf->createIndex($this, $titre, $size_title, $size_bookmark, $bookmark_title, $display_page, $on_page, $font_name);				
-			if ($old_page) $this->pdf->setPage($old_page);	
-		}
-			
-		/**
-		* nouvelle page pour l'index. ne pas utiliser directement. seul MyPDF doit l'utiliser !!!!
-		* 
-		* @param	int		page courante
-		* @return	null
-		*/	
-		function INDEX_NewPage(&$page)
-		{
-			if ($page)
-			{
-				$old_page = $this->pdf->getPage();
-				$this->pdf->setPage($page);
-				$this->pdf->setXY($this->margeLeft, $this->margeTop);
-				$this->maxH = 0;
-				$page++;
-				return $old_page;
-			}
-			else
-			{
-				$this->setNewPage();
-
-				return null;
-			}
-		}
-		
-		/**
-		* chargement du fichier de langue
-		* 
-		* @param	string langue
-		* @return	null
-		*/
-		function textLOAD($langue)
-		{
-			global $HTML2PDF_TEXTES;
-			if (count($HTML2PDF_TEXTES)) return true;
-			
-			if (!preg_match('/^([a-z0-9]+)$/isU', $langue))
-			{
-				echo 'ERROR : language code <b>'.$langue.'</b> incorrect.';
-				exit;
-			}
-			
-			$file = dirname(__FILE__).'/langues/'.strtolower($langue).'.txt';
-			if (!is_file($file))
-			{
-				echo 'ERROR : language code <b>'.$langue.'</b> unknown.<br>';
-				echo 'You can create the translation file <b>'.$file.'</b> and send it to me in order to integrate it into a future version.';
-				exit;				
-			}
-			
-			$texte = array();
-			$infos = file($file);
-			foreach($infos as $val)
-			{
-				$val = trim($val);
-				$val = explode("\t", $val);
-				if (count($val)<2) continue;
-				
-				$t_k = trim($val[0]); unset($val[0]);
-				$t_v = trim(implode(' ', $val));
-				if ($t_k && $t_v) $texte[$t_k] = $t_v;
-			}
-			$HTML2PDF_TEXTES = $texte;
-			
-			return true;
-		}
-		
-		/**
-		* recuperer un texte precis
-		* 
-		* @param	string code du texte
-		* @return	null
-		*/
-		function textGET($key)
-		{
-			global $HTML2PDF_TEXTES;
-			if (!isset($HTML2PDF_TEXTES[$key])) return '######';
-			
-			return $HTML2PDF_TEXTES[$key];
-		}
-		
-		/**
-		* generer une erreur HTML2PDF
-		* 
-		* @param	int		numero de l'erreur
-		* @param	string	nom du fichier ou c'est produit l'erreur
-		* @param	int		numero de la ligne ou c'est produit l'erreur
-		* @param	mixed	indications suplementaires sur l'erreur
-		* @return	string	code HTML eventuel associé à l'erreur
-		*/
-		function makeError($err, $file, $line, $other = null, $html = '')
-		{
-			$msg = '';
-			switch($err)
-			{
-				case 1:
-					$msg = (HTML2PDF::textGET('err01'));
-					$msg = str_replace('[[OTHER]]', $other, $msg); 
-					break;
-					
-				case 2:
-					$msg = (HTML2PDF::textGET('err02'));
-					$msg = str_replace('[[OTHER_0]]', $other[0], $msg); 
-					$msg = str_replace('[[OTHER_1]]', $other[1], $msg); 
-					$msg = str_replace('[[OTHER_2]]', $other[2], $msg); 
-					break;
-					
-				case 3:
-					$msg = (HTML2PDF::textGET('err03'));
-					$msg = str_replace('[[OTHER]]', $other, $msg); 
-					break;
-					
-				case 4:
-					$msg = (HTML2PDF::textGET('err04'));
-					$msg = str_replace('[[OTHER]]', print_r($other, true), $msg); 
-					break;
-					
-				case 5:
-					$msg = (HTML2PDF::textGET('err05'));
-					$msg = str_replace('[[OTHER]]', print_r($other, true), $msg); 
-					break;
-					
-				case 6:
-					$msg = (HTML2PDF::textGET('err06'));
-					$msg = str_replace('[[OTHER]]', $other, $msg); 
-					break;	
-					
-				case 7:
-					$msg = (HTML2PDF::textGET('err07'));
-					break;	
-					
-				case 8:
-					$msg = (HTML2PDF::textGET('err08'));
-					$msg = str_replace('[[OTHER]]', $other, $msg); 
-					break;
-					
-				case 9:
-					$msg = (HTML2PDF::textGET('err09'));
-					$msg = str_replace('[[OTHER_0]]', $other[0], $msg); 
-					$msg = str_replace('[[OTHER_1]]', $other[1], $msg); 
-					break;
-			}
-			echo '<span style="color: #AA0000; font-weight: bold;">'.(HTML2PDF::textGET('txt01')).$err.'</span><br>';
-			echo (HTML2PDF::textGET('txt02')).' '.$file.'<br>';
-			echo (HTML2PDF::textGET('txt03')).' '.$line.'<br>';
-			echo '<br>';
-			echo $msg;
-			echo '<br>';
-			if ($html) echo '<br>HTML : ...'.htmlentities($html).'...';
-			exit;	
-		}
-	}
-}
+<?php
+/**
+ * Logiciel : HTML2PDF
+ * 
+ * Convertisseur HTML => PDF, utilise FPDF
+ * Distribué sous la licence LGPL. 
+ *
+ * @author		Laurent MINGUET <webmaster@html2pdf.fr>
+ * @version		3.31
+ */
+
+if (!defined('__CLASS_HTML2PDF__'))
+{
+	define('__CLASS_HTML2PDF__', '3.31');
+
+	require_once(dirname(__FILE__).'/_mypdf/mypdf.class.php');	// classe mypdf
+	require_once(dirname(__FILE__).'/fpdi/fpdi.php');         // Added by Rod
+	require_once(dirname(__FILE__).'/parsingHTML.class.php');	// classe de parsing HTML
+	require_once(dirname(__FILE__).'/styleHTML.class.php');		// classe de gestion des styles
+
+	global $HTML2PDF_TABLEAU;	$HTML2PDF_TABLEAU = array();	// tableau global necessaire à la gestion des tables imbriquées 
+	global $HTML2PDF_TEXTES;	$HTML2PDF_TEXTES = array(); 	// tableau comprennant le fichier de langue
+	
+	class HTML2PDF
+	{
+		var	$pdf				= null;		// objet PDF
+		var	$style				= null;		// objet de style
+		var	$parsing			= null;		// objet de parsing
+		
+		var	$langue				= 'fr';		// langue des messages
+		var	$sens				= 'P';		// sens d'affichage Portrait ou Landscape
+		var	$format				= 'A4';		// format de la page : A4, A3, ...
+		var	$encoding			= '';		// charset encoding
+		
+		var	$background			= array();	// informations sur le background
+		var	$testTDin1page		= true;		// activer le test de TD ne devant pas depasser une page
+		var	$testIsImage		= true;		// test si les images existes ou non
+		var $testIsDeprecated	= false;	// test si certaines fonctions sont deprecated
+		var	$isSubPart			= false;	// indique que le convertisseur courant est un sous html
+		
+		var	$parse_pos			= 0;		// position du parsing
+		var	$temp_pos			= 0;		// position temporaire pour multi tableau
+		var	$page				= 0;		// numero de la page courante
+		
+		var	$sub_html			= null;		// sous html
+		var	$sub_part			= false;	// indicateur de sous html
+		
+		var	$maxX				= 0;		// zone maxi X
+		var	$maxY				= 0;		// zone maxi Y
+		var	$maxE				= 0;		// nomre d'elements dans la zone
+		var	$maxH				= 0;		// plus grande hauteur dans la ligne, pour saut de ligne à corriger
+		var	$maxSave			= array();	// tableau de sauvegarde des maximaux
+		var	$currentH			= 0;		// hauteur de la ligne courante
+		
+		var	$firstPage			= true;		// premier page
+		
+		var	$defaultLeft		= 0;		// marges par default de la page
+		var	$defaultTop			= 0;
+		var	$defaultRight		= 0;
+		var	$defaultBottom		= 0;
+		
+		var	$margeLeft			= 0;		//marges réelles de la page
+		var	$margeTop			= 0;
+		var	$margeRight			= 0;
+		var	$margeBottom		= 0;
+		var	$marges				= array();	// tableau de sauvegarde des differents etats des marges de la page courante
+		
+		var	$inLink				= '';		// indique si on est à l'interieur d'un lien
+		var	$lstAncre			= array();	// liste des ancres détectées ou créées
+		var	$subHEADER			= array();	// tableau des sous commandes pour faire l'HEADER
+		var	$subFOOTER			= array();	// tableau des sous commandes pour faire le FOOTER
+		var	$subSTATES			= array();	// tableau de sauvegarde de certains paramètres
+		var	$defLIST			= array();	// tableau de sauvegarde de l'etat des UL et OL
+		
+		var	$lstChamps			= array();	// liste des champs
+		var	$lstSelect			= array();	// options du select en cours
+		var	$previousCall		= null;		// dernier appel
+		var	$pageMarges			= array();	// marges spécifiques dues aux floats
+		var	$isInThead			= false;	// indique si on est dans un thead
+		var	$isInTfoot			= false;	// indique si on est dans un tfoot
+		var	$isInOverflow		= false;	// indique si on est dans une div overflow
+		var	$isInFooter			= false;	// indique si on est dans un footer ou non
+		var	$isInDraw			= null;		// indique si on est en mode dessin
+		var	$isAfterFloat		= false;	// indique si on est apres un float
+		var	$forOneLine			= false;	// indique si on est dans un sous HTML ne servant qu'a calculer la taille de la prochaine ligne
+		var	$isInForm			= false;	// indique si on est dans un formulaire. Contient dans ce cas là l'action de celui-ci
+		
+		var	$DEBUG_actif		= false;	// indique si on est en mode debug
+		var	$DEBUG_ok_usage		= false;	// indique l'existance de la fonction memory_get_usage
+		var	$DEBUG_ok_peak		= false;	// indique l'existance de la fonction memory_get_peak_usage
+		var	$DEBUG_level		= 0;		// niveau du debug
+		var	$DEBUG_start_time	= 0;		// 
+		var	$DEBUG_last_time	= 0;		// 
+		var	$defaultFont		= null;		// fonte par défaut si la fonte demandée n'existe pas
+
+		/**
+		 * Constructeur
+		 *
+		 * @param	string		sens portrait ou landscape
+		 * @param	string		format A4, A5, ...
+		 * @param	string		langue : fr, en, it...
+		 * @param	array		marges par defaut, dans l'ordre (left, top, right, bottom)
+		 * @return	null
+		 */
+		function HTML2PDF($sens = 'P', $format = 'A4', $langue='fr', $marges = array(5, 5, 5, 8))
+		{
+			// sauvegarde des paramètres
+			$this->page 		= 0;
+			$this->sens			= $sens;
+			$this->format		= $format;
+			$this->encoding		= 'ISO-8859-15';
+			
+			$this->firstPage	= true;
+			$this->langue		= strtolower($langue);
+			
+			// chargement du fichier de langue
+			HTML2PDF::textLOAD($this->langue);
+			
+			// création de l' objet PDF
+			$this->pdf = new FPDI($sens, 'mm', $format);
+
+			// initialisation des styles
+			$this->style = new styleHTML($this->pdf);
+			$this->style->FontSet();
+			$this->defLIST = array();
+			
+			// initialisations diverses
+			$this->setTestTdInOnePage(true);
+			$this->setTestIsImage(true);
+			$this->setTestIsDeprecated(true);
+			$this->setDefaultFont(null);
+			
+			// initialisation du parsing
+			$this->parsing = new parsingHTML($this->encoding);
+			$this->sub_html = null; 
+			$this->sub_part	= false;
+			
+			// initialisation des marges
+			if (!is_array($marges)) $marges = array($marges, $marges, $marges, $marges);	
+			$this->setDefaultMargins($marges[0], $marges[1], $marges[2], $marges[3]);
+			$this->setMargins();
+			$this->marges = array();
+
+			// initialisation des champs de formulaire
+			$this->lstChamps = array();
+		}
+		
+		/**
+		* activer le debug mode
+		*
+		* @return	null
+		*/
+		function setModeDebug()
+		{
+			list($usec, $sec) = explode(' ', microtime());
+			
+			$this->DEBUG_actif = true;
+			$this->DEBUG_ok_usage = function_exists('memory_get_usage');
+			$this->DEBUG_ok_peak = function_exists('memory_get_peak_usage');
+			$this->DEBUG_start_time		= (float)$sec + (float)$usec;
+			$this->DEBUG_last_time		= (float)$sec + (float)$usec;
+			
+			$this->DEBUG_stepline('step', 'time', 'delta', 'memory', 'peak');
+			$this->DEBUG_add('Init debug');
+		}
+		
+		/**
+		* rajouter une ligne de debug
+		*
+		* @param	string	nom de l'etape
+		* @param	boolean true=monter d'un niveau, false=descendre d'un niveau, null : ne rien faire
+		* @return	null
+		*/
+		function DEBUG_add($nom, $level=null)
+		{
+			list($usec, $sec) = explode(' ', microtime());
+			if ($level===true) $this->DEBUG_level++;
+
+			$nom	= str_repeat('  ',$this->DEBUG_level). $nom.($level===true ? ' Begin' : ($level===false ? ' End' : ''));
+			$time	= (float)$sec + (float)$usec;
+			$usage	= ($this->DEBUG_ok_usage ? memory_get_usage() : 0);
+			$peak	= ($this->DEBUG_ok_peak ? memory_get_peak_usage() : 0);
+
+			$this->DEBUG_stepline(
+						$nom,
+						number_format(($time - $this->DEBUG_start_time)*1000, 1, '.', ' ').' ms',
+						number_format(($time - $this->DEBUG_last_time)*1000, 1, '.', ' ').' ms',
+						number_format($usage/1024, 1, '.', ' ').' Ko',
+						number_format($peak/1024, 1, '.', ' ').' Ko');
+						
+			$this->DEBUG_last_time = $time;
+			if ($level===false) $this->DEBUG_level--;
+			return true;
+		}
+		
+		/**
+		* affiche une ligne de debug
+		*
+		* @param	string	nom de l'etape
+		* @param	string	valeur 1
+		* @param	string	valeur 2
+		* @param	string	valeur 3
+		* @param	string	valeur 4
+		* @return	null
+		*/
+		function DEBUG_stepline($nom, $val1, $val2, $val3, $val4)
+		{
+			$txt = str_pad($nom, 30, ' ', STR_PAD_RIGHT).
+					str_pad($val1, 12, ' ', STR_PAD_LEFT).
+					str_pad($val2, 12, ' ', STR_PAD_LEFT).
+					str_pad($val3, 15, ' ', STR_PAD_LEFT).
+					str_pad($val4, 15, ' ', STR_PAD_LEFT);
+			
+			echo '<pre style="padding:0; margin:0">'.$txt.'</pre>';
+		}
+		
+		/**
+		* renseigner l'encoding à utiliser
+
+		*
+		* @param	string	nouvel encoding
+		* @return	string	ancien encoding
+		*/
+		function setEncoding($encoding = 'ISO-8859-15')
+		{
+			$old = $this->encoding;
+			$this->encoding = $encoding;
+			$this->parsing->setEncoding($this->encoding);
+			return $old;
+		}
+		
+		/**
+		* activer ou desactiver le test de TD ne devant pas depasser une page
+		*
+		* @param	boolean	nouvel etat
+		* @return	boolean ancien etat
+		*/
+		function setTestTdInOnePage($mode = true)
+		{
+			$old = $this->testTDin1page;
+			$this->testTDin1page = $mode ? true : false;
+			return $old;
+		}
+		
+		/**
+		* activer ou desactiver le test sur la présence des images
+		*
+		* @param	boolean	nouvel etat
+		* @return	boolean ancien etat
+		*/
+		function setTestIsImage($mode = true)
+		{
+			$old = $this->testIsImage;
+			$this->testIsImage = $mode ? true : false;
+			return $old;
+		}
+		
+		/**
+		* activer ou desactiver le test sur les fonctions deprecated
+		*
+		* @param	boolean	nouvel etat
+		* @return	boolean ancien etat
+		*/
+		function setTestIsDeprecated($mode = true)
+		{
+			$old = $this->testIsDeprecated;
+			$this->testIsDeprecated = $mode ? true : false;
+			return $old;
+		}
+
+		/**
+		* définit la fonte par défaut si aucun fonte n'est spécifiée, ou si la fonte demandée n'existe pas
+		*
+		* @param	string	nom de la fonte par defaut. si null : Arial pour fonte non spécifiée, et erreur pour fonte non existante 
+		* @return	string	nom de l'ancienne fonte par defaut
+		*/
+		function setDefaultFont($default = null)
+		{
+			$old = $this->defaultFont;
+			$this->defaultFont = $default;
+			$this->style->setDefaultFont($default);
+			return $old;
+		}
+			
+		/**
+		* définir les marges par défault
+		*
+		* @param	int		en mm, marge left
+		* @param	int		en mm, marge top
+		* @param	int		en mm, marge right. si null, left=right
+		* @param	int		en mm, marge bottom. si null, bottom=8
+		* @return	null
+		*/
+		function setDefaultMargins($left, $top, $right = null, $bottom = null)
+		{
+			if ($right===null)	$right = $left;
+			if ($bottom===null)	$bottom = 8;
+			
+			$this->defaultLeft		= $this->style->ConvertToMM($left.'mm');
+			$this->defaultTop		= $this->style->ConvertToMM($top.'mm');
+			$this->defaultRight		= $this->style->ConvertToMM($right.'mm');
+			$this->defaultBottom	= $this->style->ConvertToMM($bottom.'mm');
+		}
+
+		/**
+		* définir les marges réelles, fonctions de la balise page
+		*
+		* @return	null
+		*/
+		function setMargins()
+		{
+			$this->margeLeft	= $this->defaultLeft	+ (isset($this->background['left'])		? $this->background['left']		: 0);
+			$this->margeRight	= $this->defaultRight	+ (isset($this->background['right'])	? $this->background['right']	: 0);
+			$this->margeTop		= $this->defaultTop 	+ (isset($this->background['top'])		? $this->background['top']		: 0);
+			$this->margeBottom	= $this->defaultBottom	+ (isset($this->background['bottom'])	? $this->background['bottom']	: 0);
+			
+			$this->pdf->SetMargins($this->margeLeft, $this->margeTop, $this->margeRight);
+			$this->pdf->setcMargin(0);
+			$this->pdf->SetAutoPageBreak(false, $this->margeBottom);
+			
+			$this->pageMarges = array();
+			$this->pageMarges[floor($this->margeTop*100)] = array($this->margeLeft, $this->pdf->getW()-$this->margeRight);
+		}
+		
+		/**
+		* recuperer les positions x minimales et maximales en fonction d'une hauteur
+		*
+		* @param	float	y
+		* @return	array(float, float)
+		*/
+		function getMargins($y)
+		{
+			$y = floor($y*100);
+			$x = array($this->pdf->getlMargin(), $this->pdf->getW()-$this->pdf->getrMargin());
+			
+			foreach($this->pageMarges as $m_y => $m_x)
+				if ($m_y<=$y) $x = $m_x;
+			
+			return $x;
+		}
+		
+		/**
+		* ajouter une marge suite a un float
+		*
+		* @param	string	left ou right
+		* @param	float	x1
+		* @param	float	y1
+		* @param	float	x2
+		* @param	float	y2
+		* @return	null
+		*/
+		function addMargins($float, $x1, $y1, $x2, $y2)
+		{
+			$old1 = $this->getMargins($y1);
+			$old2 = $this->getMargins($y2);
+			if ($float=='left') $old1[0] = $x2;
+			if ($float=='right') $old1[1] = $x1;
+			
+			$y1 = floor($y1*100);
+			$y2 = floor($y2*100);
+
+			foreach($this->pageMarges as $m_y => $m_x)
+			{
+				if ($m_y<$y1) continue;				
+				if ($m_y>$y2) break;	
+				if ($float=='left' && $this->pageMarges[$m_y][0]<$x2) unset($this->pageMarges[$m_y]);
+				if ($float=='right' && $this->pageMarges[$m_y][1]>$x1) unset($this->pageMarges[$m_y]);
+			}
+
+			$this->pageMarges[$y1] = $old1;
+			$this->pageMarges[$y2] = $old2;
+			
+			ksort($this->pageMarges);
+			
+			$this->isAfterFloat = true;
+		}
+	
+		/**
+		* définir des nouvelles marges et sauvegarder les anciennes
+		*
+		* @param	float	marge left
+		* @param	float	marge top
+		* @param	float	marge right
+		* @return	null
+		*/
+		function saveMargin($ml, $mt, $mr)
+		{
+			$this->marges[] = array('l' => $this->pdf->getlMargin(), 't' => $this->pdf->gettMargin(), 'r' => $this->pdf->getrMargin(), 'page' => $this->pageMarges);
+			$this->pdf->SetMargins($ml, $mt, $mr);
+
+			$this->pageMarges = array();
+			$this->pageMarges[floor($mt*100)] = array($ml, $this->pdf->getW()-$mr);
+		}
+		
+		/**
+		* récuperer les dernières marches sauvées
+		*
+		* @return	null
+		*/
+		function loadMargin()
+		{
+			$old = array_pop($this->marges);
+			if ($old)
+			{
+				$ml = $old['l'];
+				$mt = $old['t'];
+				$mr = $old['r'];
+				$mP = $old['page'];
+			}
+			else
+			{
+				$ml = $this->margeLeft;
+				$mt = 0;
+				$mr = $this->margeRight;
+				$mP = array($mt => array($ml, $this->pdf->getW()-$mr));
+			}
+			
+			$this->pdf->SetMargins($ml, $mt, $mr);
+			$this->pageMarges = $mP;
+		}
+		
+		/**
+		* permet d'ajouter une fonte.
+		*
+		* @param	string nom de la fonte
+		* @param	string style de la fonte
+		* @param	string fichier de la fonte
+		* @return	null
+		*/
+		function addFont($family, $style='', $file='')
+		{
+			$this->pdf->AddFont($family, $style, $file);
+		}
+		
+		/**
+		* sauvegarder l'état actuelle des maximums
+		*
+		* @return	null
+		*/
+		function saveMax()
+		{
+			$this->maxSave[] = array($this->maxX, $this->maxY, $this->maxH, $this->maxE);
+		}
+				
+		/**
+		* charger le dernier état sauvé des maximums
+		*
+		* @return	null
+		*/
+		function loadMax()
+		{
+			$old = array_pop($this->maxSave);
+
+			if ($old)
+			{
+				$this->maxX = $old[0];
+				$this->maxY = $old[1];
+				$this->maxH = $old[2];
+				$this->maxE = $old[3];
+			}
+			else
+			{
+				$this->maxX = 0;
+				$this->maxY = 0;
+				$this->maxH = 0;
+				$this->maxE = 0;
+			}
+		}
+		
+		/**
+		* afficher l'header contenu dans page_header
+		*
+		* @return	null
+		*/
+		function setPageHeader()
+		{
+			if (!count($this->subHEADER)) return false;
+
+			$OLD_parse_pos = $this->parse_pos;
+			$OLD_parse_code = $this->parsing->code;
+			
+			$this->parse_pos = 0;
+			$this->parsing->code = $this->subHEADER;
+			$this->makeHTMLcode();
+			
+			$this->parse_pos = 	$OLD_parse_pos;
+			$this->parsing->code = $OLD_parse_code;
+		}
+
+		/**
+		* afficher le footer contenu dans page_footer
+		*
+		* @return	null
+		*/
+		function setPageFooter()
+		{
+			if (!count($this->subFOOTER)) return false;
+
+			$OLD_parse_pos = $this->parse_pos;
+			$OLD_parse_code = $this->parsing->code;
+			
+			$this->parse_pos = 0;
+			$this->parsing->code = $this->subFOOTER;
+			$this->isInFooter = true;
+			$this->makeHTMLcode();
+			$this->isInFooter = false;
+			
+			$this->parse_pos = 	$OLD_parse_pos;
+			$this->parsing->code = $OLD_parse_code;
+		}
+		
+		/**
+		* saut de ligne avec une hauteur spécifique
+		*
+		* @param	float	hauteur de la ligne
+		* @param	integer	position reelle courante si saut de ligne pendant l'ecriture d'un texte 
+		* @return	null
+		*/
+		function setNewLine($h, $curr = null)
+		{
+			$this->pdf->Ln($h);
+			
+			$this->setNewPositionForNewLine($curr);
+		}
+			
+		/**
+		* création d'une nouvelle page avec le format et l'orientation spécifies
+		*
+		* @param	mixed	format de la page : A5, A4, array(width, height)
+		* @param	string	sens P=portrait ou L=landscape
+		* @param	array	tableau des propriétés du fond de la page
+		* @param	integer	position reelle courante si saut de ligne pendant l'ecriture d'un texte 
+		* @return	null
+		*/
+		function setNewPage($format = null, $orientation = '', $background = null, $curr = null)
+		{
+			$this->firstPage = false;
+
+			$this->format = $format ? $format : $this->format;
+			$this->sens = $orientation ? $orientation : $this->sens;
+			$this->background = $background!==null ? $background : $this->background;
+			$this->maxY = 0;	
+			$this->maxX = 0;
+			$this->maxH = 0;
+			
+			$this->pdf->SetMargins($this->defaultLeft, $this->defaultTop, $this->defaultRight);
+			$this->pdf->AddPage($this->sens, $this->format);
+			$this->page++;
+			
+			if (!$this->sub_part && !$this->isSubPart)
+			{
+				if (is_array($this->background))
+				{
+					if (isset($this->background['color']) && $this->background['color'])
+					{
+						$this->pdf->setMyFillColor($this->background['color']);
+						$this->pdf->Rect(0, 0, $this->pdf->getW(), $this->pdf->getH(), 'F');
+					}
+
+					if (isset($this->background['img']) && $this->background['img'])
+						$this->pdf->Image($this->background['img'], $this->background['posX'], $this->background['posY'], $this->background['width']);
+				}	
+				
+				$this->setPageHeader();
+				$this->setPageFooter();
+			}
+			
+			$this->setMargins();
+			$this->pdf->setY($this->margeTop);
+			
+			$this->setNewPositionForNewLine($curr);
+			$this->maxH = 0;
+		}
+		
+		/**
+		* calcul de la position de debut de la prochaine ligne en fonction de l'alignement voulu
+		*
+		* @param	integer	position reelle courante si saut de ligne pendant l'ecriture d'un texte 
+		* @return	null
+		*/
+		function setNewPositionForNewLine($curr = null)
+		{
+			list($lx, $rx) = $this->getMargins($this->pdf->getY());
+			$this->pdf->setX($lx);
+			$wMax = $rx-$lx;
+			$this->currentH = 0;
+			
+			if ($this->sub_part || $this->isSubPart || $this->forOneLine)
+			{
+//				$this->pdf->setWordSpacing(0);
+				return null;
+			}
+/*
+			if (
+				$this->style->value['text-align']!='right' && 
+				$this->style->value['text-align']!='center' && 
+				$this->style->value['text-align']!='justify'
+				)
+			{
+//				$this->pdf->setWordSpacing(0);
+				return null;
+			}
+*/			
+			$sub = null;
+			$this->createSubHTML($sub);
+			$sub->saveMargin(0, 0, $sub->pdf->getW()-$wMax);
+			$sub->forOneLine = true;
+			$sub->parse_pos = $this->parse_pos;
+			$sub->parsing->code = $this->parsing->code;
+			
+			if ($curr!==null && $sub->parsing->code[$this->parse_pos]['name']=='write')
+			{
+				$txt = $sub->parsing->code[$this->parse_pos]['param']['txt'];
+				$txt = str_replace('[[page_cu]]',	$sub->page,	$txt);
+				$sub->parsing->code[$this->parse_pos]['param']['txt'] = substr($txt, $curr);
+			}
+			else
+				$sub->parse_pos++;
+				
+			// pour chaque element identifié par le parsing
+			$res = null;
+			for($sub->parse_pos; $sub->parse_pos<count($sub->parsing->code); $sub->parse_pos++)
+			{
+				$todo = $sub->parsing->code[$sub->parse_pos];
+				$res = $sub->loadAction($todo);
+				if (!$res) break;
+			}
+
+			$w = $sub->maxX; // largeur maximale
+			$h = $sub->maxH; // hauteur maximale
+			$e = ($res===null ? $sub->maxE : 0); // nombre d'éléments maximal
+			$this->destroySubHTML($sub);
+			
+			if ($this->style->value['text-align']=='center')
+				$this->pdf->setX(($rx+$this->pdf->getX()-$w)*0.5-0.01);
+			elseif ($this->style->value['text-align']=='right')
+				$this->pdf->setX($rx-$w-0.01);
+			else
+				$this->pdf->setX($lx);
+			
+			$this->currentH = $h;
+/*				
+			if ($this->style->value['text-align']=='justify' && $e>1)
+				$this->pdf->setWordSpacing(($wMax-$w)/($e-1));
+			else
+				$this->pdf->setWordSpacing(0);
+*/
+		}
+		
+		/** 
+		* récupération du PDF 
+		* 
+		* @param	string	nom du fichier PDF 
+		* @param	boolean	destination 
+		* @return	string	contenu éventuel du pdf
+		* 
+		*
+		* Destination où envoyer le document. Le paramètre peut prendre les valeurs suivantes :
+		* true	: equivalent à I
+		* false	: equivalent à S
+		* I : envoyer en inline au navigateur. Le plug-in est utilisé s'il est installé. Le nom indiqué dans name est utilisé lorsque l'on sélectionne "Enregistrer sous" sur le lien générant le PDF.
+		* D : envoyer au navigateur en forçant le téléchargement, avec le nom indiqué dans name.
+		* F : sauver dans un fichier local, avec le nom indiqué dans name (peut inclure un répertoire).
+		* S : renvoyer le document sous forme de chaîne. name est ignoré.
+		*/
+		function Output($name = '', $dest = false)
+		{
+			// nettoyage
+			global $HTML2PDF_TABLEAU; $HTML2PDF_TABLEAU = array();
+
+			if ($this->DEBUG_actif)
+			{
+				$this->DEBUG_add('Before output');
+				$this->pdf->Close();
+				exit;
+			}
+			
+			// interpretation des paramètres
+			if ($dest===false)	$dest = 'I';
+			if ($dest===true)	$dest = 'S';
+			if ($dest==='')		$dest = 'I';
+			if ($name=='')		$name='document.pdf';
+			
+			// verification de la destination
+			$dest = strtoupper($dest);
+			if (!in_array($dest, array('I', 'D', 'F', 'S'))) $dest = 'I';
+	
+			// verification du nom
+			if (strtolower(substr($name, -4))!='.pdf')
+			{
+				echo 'ERROR : The output document name "'.$name.'" is not a PDF name';
+				exit;
+			}
+			
+			return $this->pdf->Output($name, $dest);
+		}
+		
+		/**
+		* création d'un sous HTML2PDF pour la gestion des tableaux imbriqués
+		*
+		* @param	HTML2PDF	futur sous HTML2PDF passé en référence pour création
+		* @param	integer		marge eventuelle de l'objet si simulation d'un TD
+		* @return	null
+		*/		
+		function createSubHTML(&$sub_html, $cellmargin=0)
+		{
+			// calcul de la largueur
+			if ($this->style->value['width'])
+			{
+				$marge = $cellmargin*2;
+				$marge+= $this->style->value['padding']['l'] + $this->style->value['padding']['r'];
+				$marge+= $this->style->value['border']['l']['width'] + $this->style->value['border']['r']['width'];
+				$marge = $this->pdf->getW() - $this->style->value['width'] + $marge;
+			}
+			else
+				$marge = $this->margeLeft+$this->margeRight;
+			
+			//clonage
+			$sub_html = new HTML2PDF(
+										$this->sens,
+										$this->format,
+										$this->langue,
+										array($this->defaultLeft,$this->defaultTop,$this->defaultRight,$this->defaultBottom)
+									);
+			$sub_html->setIsSubPart();
+			$sub_html->setEncoding($this->encoding);
+			$sub_html->setTestTdInOnePage($this->testTDin1page);
+			$sub_html->setTestIsImage($this->testIsImage);
+			$sub_html->setTestIsDeprecated($this->testIsDeprecated);
+			$sub_html->setDefaultFont($this->defaultFont);
+			$sub_html->style->css		= $this->style->css;
+			$sub_html->style->css_keys	= $this->style->css_keys;
+			$sub_html->pdf->cloneFontFrom($this->pdf);
+			
+			$sub_html->style->table			= $this->style->table;
+			$sub_html->style->value			= $this->style->value;
+			$sub_html->style->setOnlyLeft();
+			$sub_html->setNewPage($this->format, $this->sens);
+			$sub_html->initSubHtml($marge, $this->page, $this->defLIST);
+			
+			// initialisation des positions et autre
+			$sub_html->maxX = 0;
+			$sub_html->maxY = 0;
+			$sub_html->maxH = 0;
+			$sub_html->pdf->setXY(0, 0);
+		}
+		
+		/**
+		* initialise le sous HTML2PDF. Ne pas utiliser directement. seul la fonction createSubHTML doit l'utiliser
+		*
+		* @return	null
+		*/	
+		function initSubHtml($marge, $page, $defLIST)
+		{
+			$this->saveMargin(0, 0, $marge);
+			$this->defLIST = $defLIST;
+			
+			$this->page = $page;
+			$this->pdf->setXY(0, 0);
+			$this->style->FontSet();
+		}
+		
+		function setIsSubPart()
+		{
+			$this->isSubPart = true;
+		}
+		
+		/**
+		* destruction d'un sous HTML2PDF pour la gestion des tableaux imbriqués
+		*
+		* @return	null
+		*/	
+		function destroySubHTML(&$sub_html)
+		{
+			unset($sub_html);
+			$sub_html = null;	
+		}
+		
+		/**
+		* Convertir un nombre arabe en nombre romain
+		*
+		* @param	integer	nombre à convertir
+		* @return	string	nombre converti
+		*/
+		function listeArab2Rom($nb_ar)
+		{
+			$nb_b10	= array('I','X','C','M');
+			$nb_b5	= array('V','L','D');
+			$nb_ro	= '';
+
+			if ($nb_ar<1)		return $nb_ar;
+			if ($nb_ar>3999)	return $nb_ar;
+
+			for($i=3; $i>=0 ; $i--)
+			{
+				$chiffre=floor($nb_ar/pow(10,$i));
+				if($chiffre>=1)
+				{
+					$nb_ar=$nb_ar-$chiffre*pow(10,$i);
+					if($chiffre<=3)
+					{
+						for($j=$chiffre; $j>=1; $j--)
+						{
+							$nb_ro=$nb_ro.$nb_b10[$i];
+						}
+					}
+					else if($chiffre==9)
+					{
+						$nb_ro=$nb_ro.$nb_b10[$i].$nb_b10[$i+1];
+					}
+					elseif($chiffre==4)
+					{
+					$nb_ro=$nb_ro.$nb_b10[$i].$nb_b5[$i];
+					}
+					else
+					{
+						$nb_ro=$nb_ro.$nb_b5[$i];
+						for($j=$chiffre-5; $j>=1; $j--)
+						{
+							$nb_ro=$nb_ro.$nb_b10[$i];
+						}
+					}
+				}
+			}
+			return $nb_ro;
+		}
+		
+		/**
+		* Ajouter un LI au niveau actuel
+		*
+		* @return	null
+		*/
+		function listeAddLi()
+		{
+			$this->defLIST[count($this->defLIST)-1]['nb']++;
+		}
+
+		function listeGetWidth() { return '7mm'; }
+		function listeGetPadding() { return '1mm'; }
+
+		/**
+		* Recuperer le LI du niveau actuel
+		*
+		* @return	string	chaine à afficher
+		*/
+		function listeGetLi()
+		{
+			$im = $this->defLIST[count($this->defLIST)-1]['img'];
+			$st = $this->defLIST[count($this->defLIST)-1]['style'];
+			$nb = $this->defLIST[count($this->defLIST)-1]['nb'];
+			$up = (substr($st, 0, 6)=='upper-');
+			
+			if ($im) return array(false, false, $im);
+			
+			switch($st)
+			{
+				case 'none':
+					return array('helvetica', true, ' ');
+					
+				case 'upper-alpha':
+				case 'lower-alpha':
+					$str = '';
+					while($nb>26)
+					{
+						$str = chr(96+$nb%26).$str; 
+						$nb = floor($nb/26);	
+					}
+					$str = chr(96+$nb).$str; 
+					
+					return array('helvetica', false, ($up ? strtoupper($str) : $str).'.');
+
+				case 'upper-roman':
+				case 'lower-roman':
+					$str = $this->listeArab2Rom($nb);
+					
+					return array('helvetica', false, ($up ? strtoupper($str) : $str).'.');
+					
+				case 'decimal':
+					return array('helvetica', false, $nb.'.');
+
+				case 'square':
+					return array('zapfdingbats', true, chr(110));
+
+				case 'circle':
+					return array('zapfdingbats', true, chr(109));
+
+				case 'disc':
+				default:
+					return array('zapfdingbats', true, chr(108));
+			}
+		}
+				
+		/**
+		* Ajouter un niveau de liste
+		*
+		* @param	string	type de liste : ul, ol
+		* @param	string	style de la liste
+		* @return	null
+		*/
+		function listeAddLevel($type = 'ul', $style = '', $img = null)
+		{
+			if ($img)
+			{
+				if (preg_match('/^url\(([^)]+)\)$/isU', trim($img), $match))
+					$img = $match[1];
+				else
+					$img = null;
+			}
+			else
+				$img = null;
+			
+			if (!in_array($type, array('ul', 'ol'))) $type = 'ul';
+			if (!in_array($style, array('lower-alpha', 'upper-alpha', 'upper-roman', 'lower-roman', 'decimal', 'square', 'circle', 'disc', 'none'))) $style = '';
+			
+			if (!$style)
+			{
+				if ($type=='ul')	$style = 'disc';
+				else				$style = 'decimal';
+			}
+			$this->defLIST[count($this->defLIST)] = array('style' => $style, 'nb' => 0, 'img' => $img);
+		}
+		
+		/**
+		* Supprimer un niveau de liste
+		*
+		* @return	null
+		*/
+		function listeDelLevel()
+		{
+			if (count($this->defLIST))
+			{
+				unset($this->defLIST[count($this->defLIST)-1]);
+				$this->defLIST = array_values($this->defLIST);
+			}
+		}
+		
+		/**
+		* traitement d'un code HTML fait pour HTML2PDF
+		*
+		* @param	string	code HTML à convertir
+		* @param	boolean	afficher en pdf (false) ou en html adapté (true)
+		* @return	null
+		*/
+		function writeHTML($html, $vue = false)
+		{
+			// si c'est une vrai page HTML, une conversion s'impose
+			if (preg_match('/<body/isU', $html))
+				$html = $this->getHtmlFromPage($html);
+				
+			$html = str_replace('[[page_nb]]',	'{nb}',	 $html);
+			
+			$html = str_replace('[[date_y]]',	date('Y'),	 $html);
+			$html = str_replace('[[date_m]]',	date('m'),	 $html);
+			$html = str_replace('[[date_d]]',	date('d'),	 $html);
+
+			$html = str_replace('[[date_h]]',	date('H'),	 $html);
+			$html = str_replace('[[date_i]]',	date('i'),	 $html);
+			$html = str_replace('[[date_s]]',	date('s'),	 $html);
+			
+			// si on veut voir le résultat en HTML => on appelle la fonction
+			if ($vue)	$this->vueHTML($html);	
+
+			// sinon, traitement pour conversion en PDF :
+			// parsing
+			$this->sub_pdf = false;
+			$this->style->readStyle($html);
+			$this->parsing->setHTML($html);
+			$this->parsing->parse();
+			$this->makeHTMLcode();
+		}
+			
+		/**
+		* traitement du code d'une vrai page HTML pour l'adapter à HTML2PDF
+		*
+		* @param	string	code HTML à adapter
+		* @return	string	code HTML adapté
+		*/
+		function getHtmlFromPage($html)
+		{
+			$html = str_replace('<BODY', '<body', $html);
+			$html = str_replace('</BODY', '</body', $html);
+			
+			// extraction du contenu
+			$res = explode('<body', $html);
+			if (count($res)<2) return $html;
+			$content = '<page'.$res[1];
+			$content = explode('</body', $content);
+			$content = $content[0].'</page>';
+
+			// extraction des balises link
+			preg_match_all('/<link([^>]*)>/isU', $html, $match);
+			foreach($match[0] as $src)
+				$content = $src.'</link>'.$content;	
+			
+			// extraction des balises style
+			preg_match_all('/<style[^>]*>(.*)<\/style[^>]*>/isU', $html, $match);
+			foreach($match[0] as $src)
+				$content = $src.$content;	
+						
+			return $content;	
+		}
+		
+		/**
+		* execute les différentes actions du code HTML
+		*
+		* @return	null
+		*/
+		function makeHTMLcode()
+		{
+			// pour chaque element identifié par le parsing
+			for($this->parse_pos=0; $this->parse_pos<count($this->parsing->code); $this->parse_pos++)
+			{
+				// récupération de l'élément
+				$todo = $this->parsing->code[$this->parse_pos];
+				
+				// si c'est une ouverture de tableau
+				if (in_array($todo['name'], array('table', 'ul', 'ol')) && !$todo['close'])
+				{
+					// on va créer un sous HTML, et on va travailler sur une position temporaire
+					$tag_open = $todo['name'];
+
+					$this->sub_part = true;
+					$this->temp_pos = $this->parse_pos;
+					
+					// pour tous les éléments jusqu'à la fermeture de la table afin de préparer les dimensions
+					while(isset($this->parsing->code[$this->temp_pos]) && !($this->parsing->code[$this->temp_pos]['name']==$tag_open && $this->parsing->code[$this->temp_pos]['close']))
+					{
+						$this->loadAction($this->parsing->code[$this->temp_pos]);
+						$this->temp_pos++;
+					}
+					if (isset($this->parsing->code[$this->temp_pos])) 	$this->loadAction($this->parsing->code[$this->temp_pos]);
+					$this->sub_part = false;
+				}
+				
+				// chargement de l'action correspondant à l'élément
+				$this->loadAction($todo);
+			}
+		} 
+
+
+	
+		/**
+		* affichage en mode HTML du contenu
+		*
+		* @param	string	contenu
+		* @return	null
+		*/	
+		function vueHTML($content)
+		{
+			$content = preg_replace('/<page_header([^>]*)>/isU',	'<hr>'.HTML2PDF::textGET('vue01').' : $1<hr><div$1>', $content);
+			$content = preg_replace('/<page_footer([^>]*)>/isU',	'<hr>'.HTML2PDF::textGET('vue02').' : $1<hr><div$1>', $content);
+			$content = preg_replace('/<page([^>]*)>/isU',			'<hr>'.HTML2PDF::textGET('vue03').' : $1<hr><div$1>', $content);
+			$content = preg_replace('/<\/page([^>]*)>/isU',			'</div><hr>', $content);
+			$content = preg_replace('/<bookmark([^>]*)>/isU',		'<hr>bookmark : $1<hr>', $content);
+			$content = preg_replace('/<\/bookmark([^>]*)>/isU',		'', $content);
+			$content = preg_replace('/<barcode([^>]*)>/isU',		'<hr>barcode : $1<hr>', $content);
+			$content = preg_replace('/<\/barcode([^>]*)>/isU',		'', $content);
+			$content = preg_replace('/<qrcode([^>]*)>/isU',		'<hr>qrcode : $1<hr>', $content);
+			$content = preg_replace('/<\/qrcode([^>]*)>/isU',		'', $content);
+			
+			echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+	<head>
+		<title>'.HTML2PDF::textGET('vue04').' HTML</title>
+		<meta http-equiv="Content-Type" content="text/html; charset='.$this->encoding.'" >
+	</head>
+	<body style="padding: 10px; font-size: 10pt;font-family:	Verdana;">
+'.$content.'
+	</body>
+</html>';
+			exit;	
+		}
+
+		/**
+		* chargement de l'action correspondante à un element de parsing
+		*
+		* @param	array	élément de parsing
+		* @return	null
+		*/		
+		function loadAction($row)
+		{
+			// nom de l'action
+			$fnc	= ($row['close'] ? 'c_' : 'o_').strtoupper($row['name']);
+			
+			// parametres de l'action
+			$param	= $row['param'];
+			
+			// si aucune page n'est créé, on la créé
+			if ($fnc!='o_PAGE' && $this->firstPage)
+			{
+				$this->setNewPage();
+			}
+			
+			// lancement de l'action
+			if (is_callable(array(&$this, $fnc)))
+			{
+				$res = $this->{$fnc}($param);
+				$this->previousCall = $fnc;
+				return $res;
+			}
+			else
+			{
+				HTML2PDF::makeError(1, __FILE__, __LINE__, strtoupper($row['name']), $this->parsing->getHtmlErrorCode($row['html_pos']));
+				return false;
+			}
+		}
+		
+		/**
+		* balise	: PAGE
+		* mode		: OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_PAGE($param)
+		{
+			if ($this->forOneLine) return false;
+			if ($this->DEBUG_actif) $this->DEBUG_add('PAGE n°'.($this->page+1), true);
+
+			$newPageSet= (!isset($param['pageset']) || $param['pageset']!='old');
+			
+			$this->maxH = 0;
+			if ($newPageSet)
+			{
+				$this->subHEADER = array();
+				$this->subFOOTER = array();
+						
+				// identification de l'orientation demandée
+				$orientation = '';
+				if (isset($param['orientation']))
+				{
+					$param['orientation'] = strtolower($param['orientation']);
+					if ($param['orientation']=='p')			$orientation = 'P';
+					if ($param['orientation']=='portrait')	$orientation = 'P';
+	
+					if ($param['orientation']=='l')			$orientation = 'L';
+					if ($param['orientation']=='paysage')	$orientation = 'L';
+					if ($param['orientation']=='landscape')	$orientation = 'L';
+				}
+				
+				// identification de l'orientation demandée
+				$format = null;
+				if (isset($param['format']))
+				{
+					$format = strtolower($param['format']);
+					if (preg_match('/^([0-9]+)x([0-9]+)$/isU', $format, $match))
+					{
+						$format = array(intval($match[1]), intval($match[2]));
+					}
+				}
+					
+				// identification des propriétés du background
+				$background = array();
+				if (isset($param['backimg']))
+				{
+					$background['img']		= isset($param['backimg'])	? $param['backimg']		: '';		// nom de l'image
+					$background['posX']		= isset($param['backimgx'])	? $param['backimgx']	: 'center'; // position horizontale de l'image
+					$background['posY']		= isset($param['backimgy'])	? $param['backimgy']	: 'middle'; // position verticale de l'image
+					$background['width']	= isset($param['backimgw'])	? $param['backimgw']	: '100%';	// taille de l'image (100% = largueur de la feuille)
+					
+					// conversion du nom de l'image, en cas de paramètres en _GET
+					$background['img'] = str_replace('&amp;', '&', $background['img']);
+					// conversion des positions
+					if ($background['posX']=='left')	$background['posX'] = '0%';
+					if ($background['posX']=='center')	$background['posX'] = '50%';
+					if ($background['posX']=='right')	$background['posX'] = '100%';
+					if ($background['posY']=='top')		$background['posY'] = '0%';
+					if ($background['posY']=='middle')	$background['posY'] = '50%';
+					if ($background['posY']=='bottom')	$background['posY'] = '100%';
+	
+	
+					// si il y a une image de précisé
+					if ($background['img'])	
+					{
+						// est-ce que c'est une image ?
+						$infos=@GetImageSize($background['img']);
+						if (count($infos)>1)
+						{
+							// taille de l'image, en fonction de la taille spécifiée. 
+							$Wi = $this->style->ConvertToMM($background['width'], $this->pdf->getW());
+							$Hi = $Wi*$infos[1]/$infos[0];
+							
+							// récupération des dimensions et positions de l'image
+							$background['width']	= $Wi;	
+							$background['posX']		= $this->style->ConvertToMM($background['posX'], $this->pdf->getW() - $Wi);
+							$background['posY']		= $this->style->ConvertToMM($background['posY'], $this->pdf->getH() - $Hi);
+						}
+						else
+							$background = array();	
+					}
+					else
+						$background = array();
+				}
+				
+				// marges TOP et BOTTOM pour le texte.
+				$background['top']		= isset($param['backtop'])			? $param['backtop'] 		: '0';
+				$background['bottom']	= isset($param['backbottom'])		? $param['backbottom']		: '0';
+				$background['left']		= isset($param['backleft'])			? $param['backleft'] 		: '0';
+				$background['right']	= isset($param['backright'])		? $param['backright']		: '0';
+
+				if (preg_match('/^([0-9]*)$/isU', $background['top']))		$background['top']		.= 'mm';
+				if (preg_match('/^([0-9]*)$/isU', $background['bottom']))	$background['bottom']	.= 'mm';
+				if (preg_match('/^([0-9]*)$/isU', $background['left']))		$background['left']		.= 'mm';
+				if (preg_match('/^([0-9]*)$/isU', $background['right']))	$background['right']	.= 'mm';
+
+				$background['top']		= $this->style->ConvertToMM($background['top'],		$this->pdf->getH());
+				$background['bottom']	= $this->style->ConvertToMM($background['bottom'],	$this->pdf->getH());
+				$background['left']		= $this->style->ConvertToMM($background['left'],	$this->pdf->getW());
+				$background['right']	= $this->style->ConvertToMM($background['right'],	$this->pdf->getW());
+
+				$res = false;
+				$background['color']	= isset($param['backcolor'])	? $this->style->ConvertToColor($param['backcolor'], $res) : null;
+				if (!$res) $background['color'] = null;
+
+				$this->style->save();
+				$this->style->analyse('PAGE', $param);
+				$this->style->setPosition();
+				$this->style->FontSet();
+				
+				// nouvelle page
+				$this->setNewPage($format, $orientation, $background);
+	
+				// footer automatique
+				if (isset($param['footer']))
+				{
+					$lst = explode(';', $param['footer']);
+					foreach($lst as $key => $val) $lst[$key] = trim(strtolower($val));
+					$page	= in_array('page', $lst);
+					$date	= in_array('date', $lst);
+					$heure	= in_array('heure', $lst);
+					$form	= in_array('form', $lst);
+				}
+				else
+				{
+					$page	= null;
+					$date	= null;
+					$heure	= null;
+					$form	= null;
+				}
+				$this->pdf->SetMyFooter($page, $date, $heure, $form);
+			}
+			else
+			{
+				$this->style->save();
+				$this->style->analyse('PAGE', $param);
+				$this->style->setPosition();
+				$this->style->FontSet();
+				
+				$this->setNewPage();
+			}			
+			
+			return true;
+		}
+
+		/**
+		* balise : PAGE
+		* mode : FERMETURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function c_PAGE($param)
+		{
+			if ($this->forOneLine) return false;
+
+			$this->maxH = 0;
+
+			$this->style->load();
+			$this->style->FontSet();
+			
+			if ($this->DEBUG_actif) $this->DEBUG_add('PAGE n°'.$this->page, false);
+			
+			return true;
+		}
+		
+		
+		function o_PAGE_HEADER($param)
+		{
+			if ($this->forOneLine) return false;
+
+			$this->subHEADER = array();
+			for($this->parse_pos; $this->parse_pos<count($this->parsing->code); $this->parse_pos++)
+			{
+				$todo = $this->parsing->code[$this->parse_pos];
+				if ($todo['name']=='page_header') $todo['name']='page_header_sub';
+				$this->subHEADER[] = $todo;
+				if (strtolower($todo['name'])=='page_header_sub' && $todo['close']) break;
+			}
+
+			$this->setPageHeader();
+			
+			return true;
+		}
+		
+		function o_PAGE_FOOTER($param)
+		{
+			if ($this->forOneLine) return false;
+
+			$this->subFOOTER = array();
+			for($this->parse_pos; $this->parse_pos<count($this->parsing->code); $this->parse_pos++)
+			{
+				$todo = $this->parsing->code[$this->parse_pos];
+				if ($todo['name']=='page_footer') $todo['name']='page_footer_sub';
+				$this->subFOOTER[] = $todo;
+				if (strtolower($todo['name'])=='page_footer_sub' && $todo['close']) break;
+			}
+			
+			$this->setPageFooter();
+			
+			return true;
+		}
+
+		function o_PAGE_HEADER_SUB($param)
+		{
+			if ($this->forOneLine) return false;
+
+			// sauvegarde de l'état
+			$this->subSTATES = array();
+			$this->subSTATES['x']	= $this->pdf->getX();
+			$this->subSTATES['y']	= $this->pdf->getY();
+			$this->subSTATES['s']	= $this->style->value;
+			$this->subSTATES['t']	= $this->style->table;
+			$this->subSTATES['ml']	= $this->margeLeft;
+			$this->subSTATES['mr']	= $this->margeRight;
+			$this->subSTATES['mt']	= $this->margeTop;
+			$this->subSTATES['mb']	= $this->margeBottom;
+			$this->subSTATES['mp']	= $this->pageMarges;
+	
+			// nouvel etat pour le footer
+			$this->pageMarges = array();
+			$this->margeLeft	= $this->defaultLeft;
+			$this->margeRight	= $this->defaultRight;
+			$this->margeTop		= $this->defaultTop;
+			$this->margeBottom	= $this->defaultBottom;
+			$this->pdf->SetMargins($this->margeLeft, $this->margeTop, $this->margeRight);
+			$this->pdf->SetAutoPageBreak(false, $this->margeBottom);
+			$this->pdf->setXY($this->defaultLeft, $this->defaultTop);
+			
+			$this->style->initStyle();
+			$this->style->resetStyle();
+			$this->style->value['width']	= $this->pdf->getW() - $this->defaultLeft - $this->defaultRight;
+			$this->style->table				= array();
+
+			$this->style->save();
+			$this->style->analyse('page_header_sub', $param);
+			$this->style->setPosition();
+			$this->style->FontSet();
+			$this->setNewPositionForNewLine();				
+			return true;
+		}
+
+		function c_PAGE_HEADER_SUB($param)
+		{
+			if ($this->forOneLine) return false;
+
+			$this->style->load();
+
+			// retablissement de l'etat
+			$this->style->value				= $this->subSTATES['s'];
+			$this->style->table				= $this->subSTATES['t'];
+			$this->pageMarges				= $this->subSTATES['mp'];
+			$this->margeLeft				= $this->subSTATES['ml'];
+			$this->margeRight				= $this->subSTATES['mr'];
+			$this->margeTop					= $this->subSTATES['mt'];
+			$this->margeBottom				= $this->subSTATES['mb'];
+			$this->pdf->SetMargins($this->margeLeft, $this->margeTop, $this->margeRight);
+			$this->pdf->setbMargin($this->margeBottom);
+			$this->pdf->SetAutoPageBreak(false, $this->margeBottom);
+			$this->pdf->setXY($this->subSTATES['x'], $this->subSTATES['y']);
+			
+			$this->style->FontSet();			
+			$this->maxH = 0;		
+			
+			return true;
+		}
+				
+		function o_PAGE_FOOTER_SUB($param)
+		{
+			if ($this->forOneLine) return false;
+
+			$this->subSTATES = array();
+			$this->subSTATES['x']	= $this->pdf->getX();
+			$this->subSTATES['y']	= $this->pdf->getY();
+			$this->subSTATES['s']	= $this->style->value;
+			$this->subSTATES['t']	= $this->style->table;
+			$this->subSTATES['ml']	= $this->margeLeft;
+			$this->subSTATES['mr']	= $this->margeRight;
+			$this->subSTATES['mt']	= $this->margeTop;
+			$this->subSTATES['mb']	= $this->margeBottom;
+			$this->subSTATES['mp']	= $this->pageMarges;
+	
+			// nouvel etat pour le footer
+			$this->pageMarges = array();
+			$this->margeLeft	= $this->defaultLeft;
+			$this->margeRight	= $this->defaultRight;
+			$this->margeTop		= $this->defaultTop;
+			$this->margeBottom	= $this->defaultBottom;
+			$this->pdf->SetMargins($this->margeLeft, $this->margeTop, $this->margeRight);
+			$this->pdf->SetAutoPageBreak(false, $this->margeBottom);
+			$this->pdf->setXY($this->defaultLeft, $this->defaultTop);
+			
+	
+			$this->style->initStyle();
+			$this->style->resetStyle();
+			$this->style->value['width']	= $this->pdf->getW() - $this->defaultLeft - $this->defaultRight;
+			$this->style->table				= array();			
+
+			// on en créé un sous HTML que l'on transforme en PDF
+			// pour récupérer la hauteur
+			// on extrait tout ce qui est contenu dans le FOOTER
+			$sub = null;
+			$this->CreateSubHTML($sub);
+			$sub->parsing->code = $this->parsing->getLevel($this->parse_pos);
+			$sub->MakeHTMLcode();
+			$this->pdf->setY($this->pdf->getH() - $sub->maxY - $this->defaultBottom - 0.01);
+			$this->destroySubHTML($sub);
+			
+			$this->style->save();			
+			$this->style->analyse('page_footer_sub', $param);
+			$this->style->setPosition();
+			$this->style->FontSet();
+			$this->setNewPositionForNewLine();		
+			
+			return true;
+		}
+
+		function c_PAGE_FOOTER_SUB($param)
+		{
+			if ($this->forOneLine) return false;
+
+			$this->style->load();
+
+			$this->style->value				= $this->subSTATES['s'];
+			$this->style->table				= $this->subSTATES['t'];
+			$this->pageMarges 				= $this->subSTATES['mp'];
+			$this->margeLeft				= $this->subSTATES['ml'];
+			$this->margeRight				= $this->subSTATES['mr'];
+			$this->margeTop					= $this->subSTATES['mt'];
+			$this->margeBottom				= $this->subSTATES['mb'];
+			$this->pdf->SetMargins($this->margeLeft, $this->margeTop, $this->margeRight);
+			$this->pdf->SetAutoPageBreak(false, $this->margeBottom);
+			$this->pdf->setXY($this->subSTATES['x'], $this->subSTATES['y']);
+
+			$this->style->FontSet();	
+			$this->maxH = 0;		
+			
+			return true;
+		}
+		
+		/**
+		* balise : NOBREAK
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/
+		function o_NOBREAK($param)
+		{
+			if ($this->forOneLine) return false;
+
+			$this->maxH = 0;
+
+			// on en créé un sous HTML que l'on transforme en PDF
+			// pour analyse les dimensions
+			// et voir si ca rentre
+			$sub = null;
+			$this->CreateSubHTML($sub);
+			$sub->parsing->code = $this->parsing->getLevel($this->parse_pos);
+			$sub->MakeHTMLcode();
+			
+			$y = $this->pdf->getY();
+			if (
+					$sub->maxY < ($this->pdf->getH() - $this->pdf->gettMargin()-$this->pdf->getbMargin()) &&
+					$y + $sub->maxY>=($this->pdf->getH() - $this->pdf->getbMargin())
+				)
+				$this->setNewPage();
+			$this->destroySubHTML($sub);
+			
+			return true;
+		}
+		
+
+		/**
+		* balise : NOBREAK
+		* mode : FERMETURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function c_NOBREAK($param)
+		{
+			if ($this->forOneLine) return false;
+
+			$this->maxH = 0;
+					
+			return true;
+		}
+		
+		/**
+		* balise : DIV
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_DIV($param, $other = 'div')
+		{
+			if ($this->forOneLine) return false;
+			if ($this->DEBUG_actif) $this->DEBUG_add(strtoupper($other), true);
+			
+			$this->style->save();
+			$this->style->analyse($other, $param);
+			$this->style->FontSet();
+			
+			// gestion specifique a la balise legend pour l'afficher au bon endroit
+			if (in_array($other, array('fieldset', 'legend')))
+			{
+				if (isset($param['moveTop']))	$this->style->value['margin']['t']	+= $param['moveTop'];
+				if (isset($param['moveLeft']))	$this->style->value['margin']['l']	+= $param['moveLeft'];
+				if (isset($param['moveDown']))	$this->style->value['margin']['b']	+= $param['moveDown'];
+			}
+			
+			$align_object = null;
+			if ($this->style->value['margin-auto']) $align_object = 'center';
+
+			$marge = array();
+			$marge['l'] = $this->style->value['border']['l']['width'] + $this->style->value['padding']['l']+0.03;
+			$marge['r'] = $this->style->value['border']['r']['width'] + $this->style->value['padding']['r']+0.03;
+			$marge['t'] = $this->style->value['border']['t']['width'] + $this->style->value['padding']['t']+0.03;
+			$marge['b'] = $this->style->value['border']['b']['width'] + $this->style->value['padding']['b']+0.03;
+			
+			// on extrait tout ce qui est contenu dans la DIV
+			$level = $this->parsing->getLevel($this->parse_pos);
+
+			// on en créé un sous HTML que l'on transforme en PDF
+			// pour analyse les dimensions
+			$w = 0; $h = 0;
+			if (count($level))
+			{
+				$sub = null;
+				$this->CreateSubHTML($sub);
+				$sub->parsing->code = $level;
+				$sub->MakeHTMLcode();
+				$w = $sub->maxX;
+				$h = $sub->maxY;
+				$this->destroySubHTML($sub);
+			}
+			$w_reel = $w;
+			$h_reel = $h;
+			
+//			if (($w==0 && $this->style->value['width']==0) || ($w>$this->style->value['width']) || $this->style->value['position']=='absolute')
+				$w+= $marge['l']+$marge['r']+0.001;
+
+			$h+= $marge['t']+$marge['b']+0.001;
+			
+			if ($this->style->value['overflow']=='hidden')
+			{
+				$over_w = max($w, $this->style->value['width']);
+				$over_h = max($h, $this->style->value['height']);
+				$overflow = true;
+				$this->style->value['old_maxX'] = $this->maxX;
+				$this->style->value['old_maxY'] = $this->maxY;
+				$this->style->value['old_maxH'] = $this->maxH;
+				$this->style->value['old_overflow'] = $this->isInOverflow;
+				$this->isInOverflow = true;
+			}
+			else
+			{
+				$over_w = null;
+				$over_h = null;
+				$overflow = false;
+				$this->style->value['width']	= max($w, $this->style->value['width']);
+				$this->style->value['height']	= max($h, $this->style->value['height']);
+			}
+			
+			switch($this->style->value['rotate'])
+			{
+				case 90:
+					$tmp = $over_h; $over_h = $over_w; $over_w = $tmp;
+					$tmp = $h_reel; $h_reel = $w_reel; $w_reel = $tmp;
+					unset($tmp);
+					$w = $this->style->value['height'];
+					$h = $this->style->value['width'];
+					$t_x =-$h;
+					$t_y = 0;
+					break;
+					
+				case 180:
+					$w = $this->style->value['width'];
+					$h = $this->style->value['height'];
+					$t_x = -$w;
+					$t_y = -$h;
+					break;
+					
+				case 270:
+					$tmp = $over_h; $over_h = $over_w; $over_w = $tmp;
+					$tmp = $h_reel; $h_reel = $w_reel; $w_reel = $tmp;
+					unset($tmp);
+					$w = $this->style->value['height'];
+					$h = $this->style->value['width'];
+					$t_x = 0;
+					$t_y =-$w;
+					break;
+					
+				default:
+					$w = $this->style->value['width'];
+					$h = $this->style->value['height'];
+					$t_x = 0;
+					$t_y = 0;
+					break;
+			}
+
+			if (!$this->style->value['position'])
+			{
+				if (
+					$w < ($this->pdf->getW() - $this->pdf->getlMargin()-$this->pdf->getrMargin()) &&
+					$this->pdf->getX() + $w>=($this->pdf->getW() - $this->pdf->getrMargin())
+					)
+					$this->o_BR(array());
+	
+				if (
+						($h < ($this->pdf->getH() - $this->pdf->gettMargin()-$this->pdf->getbMargin())) &&
+						($this->pdf->getY() + $h>=($this->pdf->getH() - $this->pdf->getbMargin())) && 
+						!$this->isInOverflow
+					)
+					$this->setNewPage();
+				
+				// en cas d'alignement => correction
+				$old = $this->style->getOldValues();
+				$parent_w = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
+				
+				if ($parent_w>$w)
+				{				
+					if ($align_object=='center')		$this->pdf->setX($this->pdf->getX() + ($parent_w-$w)*0.5);
+					else if ($align_object=='right')	$this->pdf->setX($this->pdf->getX() + $parent_w-$w);
+				}
+				
+				$this->style->setPosition();
+			}
+			else
+			{
+				// en cas d'alignement => correction
+				$old = $this->style->getOldValues();
+				$parent_w = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
+				
+				if ($parent_w>$w)
+				{
+					if ($align_object=='center')		$this->pdf->setX($this->pdf->getX() + ($parent_w-$w)*0.5);
+					else if ($align_object=='right')	$this->pdf->setX($this->pdf->getX() + $parent_w-$w);
+				}
+				
+				$this->style->setPosition();
+				$this->saveMax();
+				$this->maxX = 0;
+				$this->maxY = 0;
+				$this->maxH = 0;
+				$this->maxE = 0;
+			}		
+			
+			if ($this->style->value['rotate'])
+			{
+				$this->pdf->startTransform();
+				$this->pdf->setRotation($this->style->value['rotate']);
+				$this->pdf->setTranslate($t_x, $t_y);
+			}
+			
+			// initialisation du style des bordures de la div
+			$this->drawRectangle(
+					$this->style->value['x'],
+					$this->style->value['y'],
+					$this->style->value['width'],
+					$this->style->value['height'],
+					$this->style->value['border'],
+					$this->style->value['padding'],
+					0,
+					$this->style->value['background']
+				);
+
+			$marge = array();
+			$marge['l'] = $this->style->value['border']['l']['width'] + $this->style->value['padding']['l']+0.03;
+			$marge['r'] = $this->style->value['border']['r']['width'] + $this->style->value['padding']['r']+0.03;
+			$marge['t'] = $this->style->value['border']['t']['width'] + $this->style->value['padding']['t']+0.03;
+			$marge['b'] = $this->style->value['border']['b']['width'] + $this->style->value['padding']['b']+0.03;
+
+			$this->style->value['width'] -= $marge['l']+$marge['r'];
+			$this->style->value['height']-= $marge['t']+$marge['b'];
+		
+			// positionnement en fonction des alignements
+			$x_corr = 0;
+			$y_corr = 0;
+			if (!$this->sub_part && !$this->isSubPart)
+			{
+				switch($this->style->value['text-align'])
+				{
+					case 'right':	$x_corr = ($this->style->value['width']-$w_reel); break;
+					case 'center':	$x_corr = ($this->style->value['width']-$w_reel)*0.5; break;
+				}
+				if ($x_corr>0) $x_corr=0;
+				switch($this->style->value['vertical-align'])
+				{
+					case 'bottom':	$y_corr = ($this->style->value['height']-$h_reel); break;
+					case 'middle':	$y_corr = ($this->style->value['height']-$h_reel)*0.5; break;
+				}
+			}
+			
+			if ($overflow)
+			{
+				$over_w-= $marge['l']+$marge['r'];
+				$over_h-= $marge['t']+$marge['b'];
+				$this->pdf->clippingPathOpen(
+					$this->style->value['x']+$marge['l'],
+					$this->style->value['y']+$marge['t'],
+					$this->style->value['width'],
+					$this->style->value['height']
+				);
+
+				$this->style->value['x']+= $x_corr;
+				// limitation des marges aux dimensions du contenu
+				$mL = $this->style->value['x']+$marge['l'];
+				$mR = $this->pdf->getW() - $mL - $over_w;
+			}
+			else
+			{
+				// limitation des marges aux dimensions de la div
+				$mL = $this->style->value['x']+$marge['l'];
+				$mR = $this->pdf->getW() - $mL - $this->style->value['width'];
+			}
+			
+			$x = $this->style->value['x']+$marge['l'];
+			$y = $this->style->value['y']+$marge['t']+$y_corr;
+			$this->saveMargin($mL, 0, $mR);
+			$this->pdf->setXY($x, $y);
+			
+			$this->setNewPositionForNewLine();
+			
+			return true;
+		}
+		function o_BLOCKQUOTE($param) { return $this->o_DIV($param, 'blockquote'); }
+		function o_LEGEND($param) { return $this->o_DIV($param, 'legend'); }
+		
+		/**
+		* balise : FIELDSET
+		* mode : OUVERTURE
+		* ecrite par Pavel Kochman
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_FIELDSET($param)
+		{
+
+			$this->style->save();
+			$this->style->analyse('fieldset', $param);
+
+			// get height of LEGEND element and make fieldset corrections
+			for($temp_pos = $this->parse_pos + 1; $temp_pos<count($this->parsing->code); $temp_pos++)
+			{
+				$todo = $this->parsing->code[$temp_pos];
+				if($todo['name'] == 'fieldset') break;
+				if($todo['name'] == 'legend' && !$todo['close'])
+				{
+					$legend_open_pos = $temp_pos;
+
+					$sub = null;
+					$this->CreateSubHTML($sub);
+					$sub->parsing->code = $this->parsing->getLevel($temp_pos - 1);
+
+					// pour chaque element identifié par le parsing
+					$res = null;
+					for($sub->parse_pos = 0; $sub->parse_pos<count($sub->parsing->code); $sub->parse_pos++)
+					{
+						$todo = $sub->parsing->code[$sub->parse_pos];
+						$sub->loadAction($todo);
+						
+						if ($todo['name'] == 'legend' && $todo['close'])
+							break;
+					}
+
+					$legendH = $sub->maxY;
+					$this->destroySubHTML($sub);
+
+					$move = $this->style->value['padding']['t'] + $this->style->value['border']['t']['width'] + 0.03;
+					
+					$param['moveTop'] = $legendH / 2;
+					
+					$this->parsing->code[$legend_open_pos]['param']['moveTop'] = - ($legendH / 2 + $move);
+					$this->parsing->code[$legend_open_pos]['param']['moveLeft'] = 2 - $this->style->value['border']['l']['width'] - $this->style->value['padding']['l'];
+					$this->parsing->code[$legend_open_pos]['param']['moveDown'] = $move;
+					break;
+				}
+			}
+			$this->style->load();
+			
+			return $this->o_DIV($param, 'fieldset');
+		}
+				
+		/**
+		* balise : DIV
+		* mode : FERMETURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function c_DIV($param, $other='div')
+		{
+			if ($this->forOneLine) return false;
+			
+			if ($this->style->value['overflow']=='hidden')
+			{
+				$this->maxX = $this->style->value['old_maxX'];
+				$this->maxY = $this->style->value['old_maxY'];
+				$this->maxH = $this->style->value['old_maxH'];
+				$this->isInOverflow = $this->style->value['old_overflow'];
+				$this->pdf->clippingPathClose();
+			}
+				
+			if ($this->style->value['rotate'])
+				$this->pdf->stopTransform();
+			
+			$marge = array();
+			$marge['l'] = $this->style->value['border']['l']['width'] + $this->style->value['padding']['l']+0.03;
+			$marge['r'] = $this->style->value['border']['r']['width'] + $this->style->value['padding']['r']+0.03;
+			$marge['t'] = $this->style->value['border']['t']['width'] + $this->style->value['padding']['t']+0.03;
+			$marge['b'] = $this->style->value['border']['b']['width'] + $this->style->value['padding']['b']+0.03;
+			
+			$x = $this->style->value['x'];
+			$y = $this->style->value['y'];
+			$w = $this->style->value['width']+$marge['l']+$marge['r']+$this->style->value['margin']['r'];
+			$h = $this->style->value['height']+$marge['t']+$marge['b']+$this->style->value['margin']['b'];
+			
+			switch($this->style->value['rotate'])
+			{
+				case 90:
+					$t = $w; $w = $h; $h = $t;
+					break;
+					
+				case 270:
+					$t = $w; $w = $h; $h = $t;
+					break;
+				
+				default:
+					break;
+			}
+
+
+			if ($this->style->value['position']!='absolute')
+			{
+				// position
+				$this->pdf->setXY($x+$w, $y); 	
+				
+				// position MAX
+				$this->maxX = max($this->maxX, $x+$w);
+				$this->maxY = max($this->maxY, $y+$h);
+		 		$this->maxH = max($this->maxH, $h);
+			}
+			else
+			{
+				// position
+				$this->pdf->setXY($this->style->value['xc'], $this->style->value['yc']); 	
+				 	
+				$this->loadMax();
+			}
+	 	
+	 		$block = ($this->style->value['display']!='inline' && $this->style->value['position']!='absolute');
+	 		
+	 		$this->style->load();
+			$this->style->FontSet();
+			$this->loadMargin();
+			
+			if ($block) $this->o_BR(array());
+			if ($this->DEBUG_actif) $this->DEBUG_add(strtoupper($other), false);
+			
+			return true;
+		}
+		function c_BLOCKQUOTE($param) { return $this->c_DIV($param, 'blockquote'); }
+		function c_FIELDSET($param) { return $this->c_DIV($param, 'fieldset'); }
+		function c_LEGEND($param) { return $this->c_DIV($param, 'legend'); }
+
+		/**
+		* balise : BARCODE
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_BARCODE($param)
+		{
+			if (!isset($param['type'])) 	$param['type'] = '';
+			if (!isset($param['value']))	$param['value']	= 0;
+			if (!isset($param['label']))	$param['label']	= 'label';
+			
+			if ($this->testIsDeprecated && (isset($param['bar_h']) || isset($param['bar_w'])))
+				HTML2PDF::makeError(9, __FILE__, __LINE__, array('BARCODE', 'bar_h, bar_w'));
+
+			// les différents types de barcode
+			$lst_barcode = array();
+			$lst_barcode['EAN13']	= 'EAN13';
+			$lst_barcode['UPCA']	= 'UPC_A';
+			$lst_barcode['C39']		= 'CODE39';
+			
+			// pour compatibilité < 3.29
+			$lst_barcode['UPC_A']	= 'UPC_A';
+			$lst_barcode['CODE39']	= 'CODE39';
+
+			$param['type'] = strtoupper($param['type']);
+			if (!isset($lst_barcode[$param['type']])) $param['type']=='C39';
+			$param['type'] = $lst_barcode[$param['type']];
+		
+			if (!isset($param['style']['color'])) $param['style']['color'] = '#000000';
+			$param['style']['background-color'] = $param['style']['color'];
+			
+			$this->style->save();
+			$this->style->analyse('barcode', $param);
+			$this->style->setPosition();
+			$this->style->FontSet();
+			
+			$x = $this->pdf->getX();
+			$y = $this->pdf->getY();
+			$w = $this->style->value['width'];	if (!$w) $w = $this->style->ConvertToMM('50mm');
+			$h = $this->style->value['height'];	if (!$h) $h = $this->style->ConvertToMM('10mm');
+			$txt = ($param['label']!=='none');
+			$infos = $this->pdf->{'BARCODE_'.$param['type']}($x, $y, $w, $h, $param['value'], $txt);
+			
+			// position maximale globale
+			$this->maxX = max($this->maxX, $x+$infos[0]);
+			$this->maxY = max($this->maxY, $y+$infos[1]);
+ 			$this->maxH = max($this->maxH, $infos[1]);
+ 			$this->maxE++;
+ 			
+			$this->pdf->setXY($x+$infos[0], $y);
+ 			
+			$this->style->load();
+			$this->style->FontSet();
+			
+			return true;
+		}
+
+		/**
+		* balise : BARCODE
+		* mode : FERMETURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function c_BARCODE($param)
+		{
+			// completement inutile
+			
+			return true;
+		}
+		
+			
+		/**
+		* balise : QRCODE
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_QRCODE($param)
+		{
+			if ($this->testIsDeprecated && (isset($param['size']) || isset($param['noborder'])))
+				HTML2PDF::makeError(9, __FILE__, __LINE__, array('QRCODE', 'size, noborder'));
+			
+			$msg = '
+<h1>QRCODE Tag</h1>
+<pre>
+	<b>ATTENTION :</b> 
+		Vous devez télécharger la librairie "QR-code generator >=0.99" (sous licence LGPL)
+ 		a cette adresse : <a href="http://prgm.spipu.net/php_qrcode" target="_blank">http://prgm.spipu.net/php_qrcode</a>
+ 		et mettre tout son contenu dans ce repertoire : '.str_replace('\\', '/', dirname(__FILE__)).'/qrcode
+ 		
+ 	<b>WARNING:</b> 
+ 		You have to download the librairy "QR-code generator >=0.99" (under LGPL licence)
+ 		at this url : <a href="http://prgm.spipu.net/php_qrcode" target="_blank">http://prgm.spipu.net/php_qrcode</a>
+ 		and to put all his contents in this folder '.str_replace('\\', '/', dirname(__FILE__)).'/qrcode
+ </pre>';
+			
+			$file_class = dirname(__FILE__).'/qrcode/qrcode.class.php';
+			if (!is_file($file_class))	{ echo $msg; exit; }
+			require_once($file_class);
+			if (__CLASS_QRCODE__<'0.99') { echo $msg; exit; }
+			
+			if ($this->DEBUG_actif) $this->DEBUG_add('QRCODE', true);
+			if (!isset($param['value']))						$param['value']	= '';
+			if (!isset($param['ec']))							$param['ec']	= 'H';
+			if (!isset($param['style']['color']))				$param['style']['color'] = '#000000';
+			if (!isset($param['style']['background-color']))	$param['style']['background-color'] = '#FFFFFF';
+			if (isset($param['style']['border']))
+			{
+				$borders = $param['style']['border']!='none';
+				unset($param['style']['border']);
+			}
+			else
+				$borders = true;
+			
+			if ($param['value']==='') return true;
+			if (!in_array($param['ec'], array('L', 'M', 'Q', 'H'))) $param['ec'] = 'H';
+			
+			$this->style->save();
+			$this->style->analyse('qrcode', $param);
+			$this->style->setPosition();
+			$this->style->FontSet();
+			
+			$x = $this->pdf->getX();
+			$y = $this->pdf->getY();
+			$w = $this->style->value['width'];
+			$h = $this->style->value['height'];
+			$size = max($w, $h); if (!$size) $size = $this->style->ConvertToMM('50mm');
+
+			$color = $this->style->value['color'];
+			if (count($color)==4) $color = array(0, 0, 0);
+			$color[0] = floor($color[0]*255.);
+			$color[1] = floor($color[1]*255.);
+			$color[2] = floor($color[2]*255.);
+			
+			$background = $this->style->value['background']['color'];
+			if (count($background)==4) $background = array(0, 0, 0);
+			$background[0] = floor($background[0]*255.);
+			$background[1] = floor($background[1]*255.);
+			$background[2] = floor($background[2]*255.);
+			
+			if (!$this->sub_part && !$this->isSubPart)
+			{
+				$qrcode = new QRcode($param['value'], $param['ec']);
+				if (!$borders) $qrcode->disableBorder();
+				$qrcode->displayFPDF($this->pdf, $x, $y, $size, $background, $color);
+				unset($qrcode);
+			}
+			
+			// position maximale globale
+			$this->maxX = max($this->maxX, $x+$size);
+			$this->maxY = max($this->maxY, $y+$size);
+ 			$this->maxH = max($this->maxH, $size);
+ 			
+ 			$this->pdf->setX($x+$size);
+ 			
+			$this->style->load();
+			$this->style->FontSet();
+			
+			return true;
+		}
+		
+		/**
+		* balise : QRCODE
+		* mode : FERMETURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function c_QRCODE($param)
+		{
+			if ($this->DEBUG_actif) $this->DEBUG_add('QRCODE', false);
+			// completement inutile
+			return true;
+		}
+				
+		/**
+		* balise : BOOKMARK
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_BOOKMARK($param)
+		{
+			$titre = isset($param['title']) ? trim($param['title']) : '';
+			$level = isset($param['level']) ? floor($param['level']) : 0;
+			
+			if ($level<0) $level = 0;
+			if ($titre) $this->pdf->Bookmark($titre, $level, -1);
+			
+			return true;
+		}
+			
+		/**
+		* balise : BOOKMARK
+		* mode : FERMETURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function c_BOOKMARK($param)
+		{
+			// completement inutile
+			
+			return true;
+		}
+		
+		function getElementY($h)
+		{
+			if ($this->sub_part || $this->isSubPart || !$this->currentH || $this->currentH<$h)
+				return 0;
+				
+			return ($this->currentH-$h)*0.8;
+		}
+		
+		/**
+		* balise : WRITE
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_WRITE($param)
+		{
+			$fill = ($this->style->value['background']['color']!==null && $this->style->value['background']['image']===null);
+			if (in_array($this->style->value['id_balise'], array('fieldset', 'legend', 'div', 'table', 'tr', 'td', 'th')))
+				$fill = false;
+			
+			// récupération du texte à écrire, et conversion
+			$txt = $param['txt'];
+			
+			if ($this->isAfterFloat)
+			{
+				$txt = ltrim($txt);
+				$this->isAfterFloat = false;
+			}
+
+			$txt = str_replace('[[page_cu]]',	$this->page,	$txt);
+			
+			if ($this->style->value['text-transform']!='none')
+			{
+				if ($this->style->value['text-transform']=='capitalize')
+					$txt = ucwords($txt);
+				else if ($this->style->value['text-transform']=='uppercase')
+					$txt = strtoupper($txt);
+				else if ($this->style->value['text-transform']=='lowercase')
+					$txt = strtolower($txt);
+			}
+			
+			// tailles du texte
+			$h	= 1.08*$this->style->value['font-size'];
+			$dh	= $h*$this->style->value['mini-decal'];
+			$lh = $this->style->getLineHeight();
+			
+			// identification de l'alignement
+			$align = 'L';
+			if ($this->style->value['text-align']=='li_right')
+			{
+				$w = $this->style->value['width'];
+				$align = 'R';
+			}
+
+			// pré calcul de la taille de chaque mot et de la phrase complete
+			$w = 0;
+			$words = explode(' ', $txt);
+			foreach($words as $k => $word)
+			{
+				$words[$k] = array($word, $this->pdf->GetStringWidth($word));
+				$w+= $words[$k][1];
+			}
+			$space = $this->pdf->GetStringWidth(' ');
+			$w+= $space*(count($words)-1);
+
+			$curr_pos = 0;									// position dans le texte
+			$curr_max = strlen($txt);						// taille maxi du texte
+			$maxX = 0;										// plus grande largeur du texte apres retour à la ligne
+			$x = $this->pdf->getX();						// position du texte
+			$y = $this->pdf->getY();
+			$dy = $this->getElementY($lh);
+						
+			list($left, $right) = $this->getMargins($y);	// marges autorisees
+			$nb = 0;										// nbr de lignes découpées
+			
+			// tant que ca ne rentre pas sur la ligne et qu'on a du texte => on découpe
+			while($x+$w>$right && $x<$right && count($words))
+			{
+				// trouver une phrase qui rentre dans la largeur, en ajoutant les mots 1 à 1
+				$i=0;
+				$old = array('', 0);
+				$str = $words[0];
+				$add = false;
+				while(($x+$str[1])<$right)
+				{
+					$i++;
+					$add = true;
+					
+					array_shift($words);
+					$old = $str;
+
+					if (!count($words)) break;
+					$str[0].= ' '.$words[0][0];
+					$str[1]+= $space+$words[0][1];
+				}
+				$str = $old;
+				
+				// si rien de rentre, et que le premier mot ne rentre de toute facon pas dans une ligne, on le force...
+				if ($i==0 && (($left+$words[0][1])>=$right))
+				{
+					$str = $words[0];
+					array_shift($words);
+					$i++;
+					$add = true;
+				}
+				$curr_pos+= ($curr_pos ? 1 : 0)+strlen($str[0]);
+				
+				// ecriture du bout de phrase extrait et qui rentre
+				$wc = ($align=='L' ? $str[1] : $this->style->value['width']);
+				if ($right - $left<$wc) $wc = $right - $left;
+/*
+				if ($this->pdf->ws)
+				{
+					$oldSpace = $this->pdf->CurrentFont['cw'][' '];
+					$this->pdf->CurrentFont['cw'][' ']*=(1.+$this->pdf->ws);
+					$wc = $str[1];
+					$this->pdf->CurrentFont['cw'][' '] = $oldSpace;
+				}
+*/
+				if (strlen($str[0]))
+				{
+					$this->pdf->setXY($this->pdf->getX(), $y+$dh+$dy);
+					$this->pdf->Cell($wc, $h, $str[0], 0, 0, $align, $fill, $this->inLink);
+					$this->pdf->setXY($this->pdf->getX(), $y);
+				}
+				$this->maxH = max($this->maxH, $lh);
+				
+				// détermination de la largeur max
+				$maxX = max($maxX, $this->pdf->getX());
+
+				// nouvelle position et nouvelle largeur pour la boucle
+				$w-= $str[1];
+				$y = $this->pdf->getY();
+				$x = $this->pdf->getX();
+				$dy = $this->getElementY($lh);
+				
+				// si il reste du text à afficher
+				if (count($words))
+				{
+					if ($add) $w-= $space;
+					if ($this->forOneLine)
+					{
+						$this->maxE+= $i+1;
+						$this->maxX = max($this->maxX, $maxX);
+						return null;
+					}
+					
+					// retour à la ligne
+					$this->o_BR(array('style' => ''), $curr_pos);
+					
+					$y = $this->pdf->getY();
+					$x = $this->pdf->getX();
+					$dy = $this->getElementY($lh);
+					
+					// si la prochaine ligne ne rentre pas dans la page => nouvelle page 
+					if ($y + $h>=$this->pdf->getH() - $this->pdf->getbMargin())
+					{
+						if (!$this->isInOverflow && !$this->isInFooter)
+						{
+							$this->setNewPage(null, '', null, $curr_pos);
+							$y = $this->pdf->getY();
+							$x = $this->pdf->getX();
+							$dy = $this->getElementY($lh);
+						}
+					}
+				
+					// ligne suplémentaire. au bout de 1000 : trop long => erreur
+					$nb++;
+					if ($nb>1000)
+					{
+						$txt = ''; foreach($words as $k => $word) $txt.= ($k ? ' ' : '').$word[0];
+						HTML2PDF::makeError(2, __FILE__, __LINE__, array($txt, $right-$left, $w));
+					}
+
+					list($left, $right) = $this->getMargins($y);	// marges autorisees
+				}
+			}
+				
+			// si il reste du text apres découpe, c'est qu'il rentre direct => on l'affiche
+			if (count($words))
+			{
+				$txt = ''; foreach($words as $k => $word) $txt.= ($k ? ' ' : '').$word[0];
+/*
+				if ($this->pdf->ws)
+				{
+					$oldSpace = $this->pdf->CurrentFont['cw'][' '];
+					$this->pdf->CurrentFont['cw'][' ']*=(1.+$this->pdf->ws);
+					$w = $this->pdf->GetStringWidth($txt);
+					$this->pdf->CurrentFont['cw'][' '] = $oldSpace;
+				}
+*/
+				$this->pdf->setXY($this->pdf->getX(), $y+$dh+$dy);
+				$this->pdf->Cell(($align=='L' ? $w : $this->style->value['width']), $h, $txt, 0, 0, $align, $fill, $this->inLink);
+				$this->pdf->setXY($this->pdf->getX(), $y);	
+				$this->maxH = max($this->maxH, $lh);
+				$this->maxE+= count($words);
+			}
+			
+			// détermination des positions MAX
+			$maxX = max($maxX, $this->pdf->getX());
+			$maxY = $this->pdf->getY()+$h;
+			
+			// position maximale globale
+			$this->maxX = max($this->maxX, $maxX);
+			$this->maxY = max($this->maxY, $maxY);
+			
+			return true;
+		}
+
+		/**
+		* tracer une image
+		* 
+		* @param	string	nom du fichier source
+		* @return	null
+		*/	
+		function Image($src, $sub_li=false)
+		{
+			// est-ce que c'est une image ?
+			$infos=@GetImageSize($src);
+
+			if (count($infos)<2)
+			{
+				if ($this->testIsImage)
+				{
+					HTML2PDF::makeError(6, __FILE__, __LINE__, $src);
+					return false;
+				}
+				$src = null;
+				$infos = array(16, 16);
+			}
+			
+			// récupération des dimensions dans l'unité du PDF
+			$wi = $infos[0]/$this->pdf->getK();
+			$hi = $infos[1]/$this->pdf->getK();
+			
+			// détermination des dimensions d'affichage en fonction du style
+			if ($this->style->value['width'] && $this->style->value['height'])
+			{
+				$w = $this->style->value['width'];
+				$h = $this->style->value['height'];
+			}
+			else if ($this->style->value['width'])
+			{
+				$w = $this->style->value['width'];
+				$h = $hi*$w/$wi;
+				
+			}
+			else if ($this->style->value['height'])
+			{
+				$h = $this->style->value['height'];
+				$w = $wi*$h/$hi;
+			}
+			else
+			{
+				$w = 72./96.*$wi;
+				$h = 72./96.*$hi;					
+			}
+			
+			// detection du float
+			$float = $this->style->getFloat();
+			if ($float && $this->maxH)
+				if (!$this->o_BR(array()))
+					return false;
+
+			// position d'affichage
+			$x = $this->pdf->getX();
+			$y = $this->pdf->getY();
+			
+			// si l'image ne rentre pas dans la ligne => nouvelle ligne 
+			if (!$float && ($x + $w>$this->pdf->getW() - $this->pdf->getrMargin()) && $this->maxH)
+			{
+				if ($this->forOneLine) return null;
+
+				$hnl = max($this->maxH, $this->style->getLineHeight());
+				$this->setNewLine($hnl);
+				$x = $this->pdf->getX();
+				$y = $this->pdf->getY();
+			}
+			
+			// si l'image ne rentre pas dans la page => nouvelle page 
+			if (
+					($y + $h>$this->pdf->getH() - $this->pdf->getbMargin()) && 
+					!$this->isInOverflow
+				)
+			{
+				$this->setNewPage();
+				$x = $this->pdf->getX();
+				$y = $this->pdf->getY();
+			}
+
+			// correction pour l'affichage d'une puce image
+			$hT = 0.80*$this->style->value['font-size'];
+			if ($sub_li && $h<$hT)
+			{
+				$y+=($hT-$h);
+			}
+
+			$yc = $y-$this->style->value['margin']['t'];
+
+			// détermination de la position réelle d'affichage en fonction du text-align du parent
+			$old = $this->style->getOldValues();
+
+			if ( $old['width'])
+			{
+				$parent_w = $old['width'];
+				$parent_x = $x;
+			}
+			else
+			{
+ 				$parent_w = $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
+				$parent_x = $this->pdf->getlMargin();
+			}
+			
+			if ($float)
+			{
+				list($lx, $rx) = $this->getMargins($yc);
+				$parent_x = $lx;
+				$parent_w = $rx-$lx;
+			}
+
+			if ($parent_w>$w && $float!='left')
+			{
+				if ($float=='right' || $this->style->value['text-align']=='li_right')	$x = $parent_x + $parent_w - $w-$this->style->value['margin']['r']-$this->style->value['margin']['l'];
+			}
+			
+			// affichage de l'image, et positionnement à la suite
+			if (!$this->sub_part && !$this->isSubPart)
+			{
+				if ($src) $this->pdf->Image($src, $x, $y, $w, $h, '', $this->inLink);
+				else
+				{
+					$this->pdf->setMyFillColor(array(0.94, 0.86, 0.86));
+					$this->pdf->Rect($x, $y, $w, $h, 'F');
+				}
+			}
+
+			$x-= $this->style->value['margin']['l'];
+			$y-= $this->style->value['margin']['t'];
+			$w+= $this->style->value['margin']['l'] + $this->style->value['margin']['r'];
+			$h+= $this->style->value['margin']['t'] + $this->style->value['margin']['b'];
+
+			if ($float=='left')
+			{
+				$this->maxX = max($this->maxX, $x+$w);
+				$this->maxY = max($this->maxY, $y+$h);
+
+				$this->addMargins($float, $x, $y, $x+$w, $y+$h);
+
+				list($lx, $rx) = $this->getMargins($yc);
+				$this->pdf->setXY($lx, $yc);
+	 		}
+			else if ($float=='right')
+			{
+//				$this->maxX = max($this->maxX, $x+$w);
+				$this->maxY = max($this->maxY, $y+$h);
+
+				$this->addMargins($float, $x, $y, $x+$w, $y+$h);
+
+				list($lx, $rx) = $this->getMargins($yc);
+				$this->pdf->setXY($lx, $yc);
+			}
+			else
+			{
+				$this->pdf->setX($x+$w);
+				$this->maxX = max($this->maxX, $x+$w);
+				$this->maxY = max($this->maxY, $y+$h);
+	 			$this->maxH = max($this->maxH, $h);
+			}
+			return true;
+		}
+		
+		/**
+		* Tracer un rectanble
+		* 
+		* @param	float	position X
+		* @param	float	position Y
+		* @param	float	Largeur
+		* @param	float	Hauteur
+		* @param	array	Tableau de style de définition des borders
+		* @param	float	padding - marge intérieur au rectangle => non utile mais on le passe en paramètre
+		* @param	float	margin - marge exterieur au rectangle
+		* @param	array	Tableau de style de définition du background
+		* @return	null
+		*/	
+		function drawRectangle($x, $y, $w, $h, $border, $padding, $margin, $background)
+		{
+			if ($this->sub_part || $this->isSubPart) return false;
+			if ($h===null) return false;
+			
+			$x+= $margin;
+			$y+= $margin;
+			$w-= $margin*2;
+			$h-= $margin*2;
+			
+			// récupération des radius
+			$out_TL = $border['radius']['tl'];
+			$out_TR = $border['radius']['tr'];
+			$out_BR = $border['radius']['br'];
+			$out_BL = $border['radius']['bl'];
+			
+			// verification des coins en radius
+			$out_TL = ($out_TL[0] && $out_TL[1]) ? $out_TL : null;
+			$out_TR = ($out_TR[0] && $out_TR[1]) ? $out_TR : null;
+			$out_BR = ($out_BR[0] && $out_BR[1]) ? $out_BR : null;
+			$out_BL = ($out_BL[0] && $out_BL[1]) ? $out_BL : null;
+
+			
+			$in_TL = $out_TL;
+			$in_TR = $out_TR;
+			$in_BR = $out_BR;
+			$in_BL = $out_BL;
+			
+			if (is_array($in_TL)) { $in_TL[0]-= $border['l']['width']; $in_TL[1]-= $border['t']['width']; }
+			if (is_array($in_TR)) { $in_TR[0]-= $border['r']['width']; $in_TR[1]-= $border['t']['width']; }
+			if (is_array($in_BR)) { $in_BR[0]-= $border['r']['width']; $in_BR[1]-= $border['b']['width']; }
+			if (is_array($in_BL)) { $in_BL[0]-= $border['l']['width']; $in_BL[1]-= $border['b']['width']; }
+			
+			if ($in_TL[0]<=0 || $in_TL[1]<=0) $in_TL = null;
+			if ($in_TR[0]<=0 || $in_TR[1]<=0) $in_TR = null;
+			if ($in_BR[0]<=0 || $in_BR[1]<=0) $in_BR = null;
+			if ($in_BL[0]<=0 || $in_BL[1]<=0) $in_BL = null;
+					
+			// traitement de la couleur de fond
+			$STYLE = '';
+			if ($background['color'])
+			{
+				$this->pdf->setMyFillColor($background['color']);
+				$STYLE.= 'F';		
+			}
+			
+			if ($STYLE)
+			{
+				$this->pdf->clippingPathOpen($x, $y, $w, $h, $out_TL,$out_TR, $out_BL, $out_BR);		
+				$this->pdf->Rect($x, $y, $w, $h, $STYLE);
+				$this->pdf->clippingPathClose();		
+			}
+			
+			// traitement de l'image de fond
+			if ($background['image'])
+			{
+				$i_name		= $background['image'];
+				$i_position	= $background['position']!==null	? $background['position']	: array(0, 0);
+				$i_repeat	= $background['repeat']!==null		? $background['repeat']		: array(true, true);
+				
+				// taile du fond (il faut retirer les borders
+				$b_x = $x;
+				$b_y = $y;
+				$b_w = $w;
+				$b_h = $h;
+				
+				if ($border['b']['width']) { $b_h-= $border['b']['width']; }
+				if ($border['l']['width']) { $b_w-= $border['l']['width']; $b_x+= $border['l']['width']; }
+				if ($border['t']['width']) { $b_h-= $border['t']['width']; $b_y+= $border['t']['width']; }
+				if ($border['r']['width']) { $b_w-= $border['r']['width']; }
+
+				// est-ce que c'est une image ?
+				$i_infos=@GetImageSize($i_name);
+	
+				if (count($i_infos)<2)
+				{
+					if ($this->testIsImage)
+					{
+						HTML2PDF::makeError(6, __FILE__, __LINE__, $i_name);
+						return false;
+					}
+				}
+				else
+				{
+					// récupération des dimensions dans l'unité du PDF
+					$i_width	= 72./96.*$i_infos[0]/$this->pdf->getK();
+					$i_height	= 72./96.*$i_infos[1]/$this->pdf->getK();
+					
+					if ($i_repeat[0]) $i_position[0] = $b_x;
+					else if(preg_match('/^([-]?[0-9\.]+)%/isU', $i_position[0], $match)) $i_position[0] = $b_x + $match[1]*($b_w-$i_width)/100;
+					else $i_position[0] = $b_x+$i_position[0];
+				
+					if ($i_repeat[1]) $i_position[1] = $b_y;
+					else if(preg_match('/^([-]?[0-9\.]+)%/isU', $i_position[1], $match)) $i_position[1] = $b_y + $match[1]*($b_h-$i_height)/100;
+					else $i_position[1] = $b_y+$i_position[1];
+					
+					$i_x_min = $b_x;
+					$i_x_max = $b_x+$b_w;
+					$i_y_min = $b_y;
+					$i_y_max = $b_y+$b_h;
+					
+					if (!$i_repeat[0] && !$i_repeat[1])
+					{
+						$i_x_min = 	$i_position[0]; $i_x_max = 	$i_position[0]+$i_width;
+						$i_y_min = 	$i_position[1]; $i_y_max = 	$i_position[1]+$i_height;					
+					}
+					else if ($i_repeat[0] && !$i_repeat[1])
+					{
+						$i_y_min = 	$i_position[1]; $i_y_max = 	$i_position[1]+$i_height;					
+					}
+					elseif (!$i_repeat[0] && $i_repeat[1])
+					{
+						$i_x_min = 	$i_position[0]; $i_x_max = 	$i_position[0]+$i_width;
+					}
+					
+					$this->pdf->clippingPathOpen($b_x, $b_y, $b_w, $b_h, $in_TL, $in_TR, $in_BL, $in_BR);		
+					for ($i_y=$i_y_min; $i_y<$i_y_max; $i_y+=$i_height)
+					{
+						for ($i_x=$i_x_min; $i_x<$i_x_max; $i_x+=$i_width)
+						{
+							$c_x = null;
+							$c_y = null;
+							$c_w = $i_width;
+							$c_h = $i_height;
+							if ($i_y_max-$i_y<$i_height)
+							{
+								$c_x = $i_x;
+								$c_y = $i_y;
+								$c_h = $i_y_max-$i_y;
+							}
+							if ($i_x_max-$i_x<$i_width)
+							{
+								$c_x = $i_x;
+								$c_y = $i_y;
+								$c_w = $i_x_max-$i_x;
+							}
+	
+							$this->pdf->Image($i_name, $i_x, $i_y, $i_width, $i_height, '', '');						
+						}
+					}
+					$this->pdf->clippingPathClose();
+				}
+			}
+			
+			$x-= 0.01;
+			$y-= 0.01;
+			$w+= 0.02;
+			$h+= 0.02;
+			if ($border['l']['width']) $border['l']['width']+= 0.02;
+			if ($border['t']['width']) $border['t']['width']+= 0.02;
+			if ($border['r']['width']) $border['r']['width']+= 0.02;
+			if ($border['b']['width']) $border['b']['width']+= 0.02;
+			
+			$Bl = ($border['l']['width'] && $border['l']['color'][0]!==null);
+			$Bt = ($border['t']['width'] && $border['t']['color'][0]!==null);
+			$Br = ($border['r']['width'] && $border['r']['color'][0]!==null);
+			$Bb = ($border['b']['width'] && $border['b']['color'][0]!==null);
+			
+			if (is_array($out_BL) && ($Bb || $Bl))
+			{
+				if ($in_BL)
+				{
+					$courbe = array();
+					$courbe[] = $x+$out_BL[0]; 				$courbe[] = $y+$h;
+					$courbe[] = $x; 						$courbe[] = $y+$h-$out_BL[1];
+					$courbe[] = $x+$out_BL[0];				$courbe[] = $y+$h-$border['b']['width'];
+					$courbe[] = $x+$border['l']['width'];	$courbe[] = $y+$h-$out_BL[1];
+					$courbe[] = $x+$out_BL[0];				$courbe[] = $y+$h-$out_BL[1];
+				}
+				else
+				{
+					$courbe = array();
+					$courbe[] = $x+$out_BL[0]; 				$courbe[] = $y+$h;
+					$courbe[] = $x; 						$courbe[] = $y+$h-$out_BL[1];
+					$courbe[] = $x+$border['l']['width'];	$courbe[] = $y+$h-$border['b']['width'];
+					$courbe[] = $x+$out_BL[0];				$courbe[] = $y+$h-$out_BL[1];
+				}
+				$this->drawCourbe($courbe, $border['l']['color']);
+			}
+
+		
+			if (is_array($out_TL) && ($Bt || $Bl))
+			{
+				if ($in_TL)
+				{
+					$courbe = array();
+					$courbe[] = $x; 						$courbe[] = $y+$out_TL[1];
+					$courbe[] = $x+$out_TL[0]; 				$courbe[] = $y;
+					$courbe[] = $x+$border['l']['width'];	$courbe[] = $y+$out_TL[1];
+					$courbe[] = $x+$out_TL[0];				$courbe[] = $y+$border['t']['width'];
+					$courbe[] = $x+$out_TL[0];				$courbe[] = $y+$out_TL[1];
+				}
+				else
+				{
+					$courbe = array();
+					$courbe[] = $x; 						$courbe[] = $y+$out_TL[1];
+					$courbe[] = $x+$out_TL[0]; 				$courbe[] = $y;
+					$courbe[] = $x+$border['l']['width'];	$courbe[] = $y+$border['t']['width'];
+					$courbe[] = $x+$out_TL[0];				$courbe[] = $y+$out_TL[1];
+				}
+				$this->drawCourbe($courbe, $border['t']['color']);
+			}
+			
+			if (is_array($out_TR) && ($Bt || $Br))
+			{
+				if ($in_TR)
+				{
+					$courbe = array();
+					$courbe[] = $x+$w-$out_TR[0]; 				$courbe[] = $y;
+					$courbe[] = $x+$w; 							$courbe[] = $y+$out_TR[1];
+					$courbe[] = $x+$w-$out_TR[0];				$courbe[] = $y+$border['t']['width'];
+					$courbe[] = $x+$w-$border['r']['width'];	$courbe[] = $y+$out_TR[1];
+					$courbe[] = $x+$w-$out_TR[0];				$courbe[] = $y+$out_TR[1];
+				}
+				else
+				{
+					$courbe = array();
+					$courbe[] = $x+$w-$out_TR[0]; 				$courbe[] = $y;
+					$courbe[] = $x+$w; 							$courbe[] = $y+$out_TR[1];
+					$courbe[] = $x+$w-$border['r']['width'];	$courbe[] = $y+$border['t']['width'];
+					$courbe[] = $x+$w-$out_TR[0];				$courbe[] = $y+$out_TR[1];
+				}
+				$this->drawCourbe($courbe, $border['r']['color']);
+			}
+			
+			if (is_array($out_BR) && ($Bb || $Br))
+			{
+				if ($in_BR)
+				{
+					$courbe = array();
+					$courbe[] = $x+$w; 							$courbe[] = $y+$h-$out_BR[1];
+					$courbe[] = $x+$w-$out_BR[0]; 				$courbe[] = $y+$h;
+					$courbe[] = $x+$w-$border['r']['width'];	$courbe[] = $y+$h-$out_BR[1];
+					$courbe[] = $x+$w-$out_BR[0];				$courbe[] = $y+$h-$border['b']['width'];
+					$courbe[] = $x+$w-$out_BR[0];				$courbe[] = $y+$h-$out_BR[1];
+				}
+				else
+				{
+					$courbe = array();
+					$courbe[] = $x+$w; 							$courbe[] = $y+$h-$out_BR[1];
+					$courbe[] = $x+$w-$out_BR[0]; 				$courbe[] = $y+$h;
+					$courbe[] = $x+$w-$border['r']['width'];	$courbe[] = $y+$h-$border['b']['width'];
+					$courbe[] = $x+$w-$out_BR[0];				$courbe[] = $y+$h-$out_BR[1];
+				}
+				$this->drawCourbe($courbe, $border['b']['color']);
+			}
+			
+			if ($Bl)
+			{
+				$pt = array();
+				$pt[] = $x;								$pt[] = $y+$h;
+				$pt[] = $x;								$pt[] = $y+$h-$border['b']['width'];
+				$pt[] = $x;								$pt[] = $y+$border['t']['width'];
+				$pt[] = $x;								$pt[] = $y;
+				$pt[] = $x+$border['l']['width'];		$pt[] = $y+$border['t']['width'];
+				$pt[] = $x+$border['l']['width'];		$pt[] = $y+$h-$border['b']['width'];
+
+				$bord = 3;			
+				if (is_array($out_BL))
+				{
+					$bord-=1;
+					$pt[3] -= $out_BL[1] - $border['b']['width'];
+					if ($in_BL) $pt[11]-= $in_BL[1];
+					unset($pt[0]);unset($pt[1]);
+				}
+				if (is_array($out_TL))
+				{
+					$bord-=2;
+					$pt[5] += $out_TL[1]-$border['t']['width'];
+					if ($in_TL) $pt[9] += $in_TL[1];
+					unset($pt[6]);unset($pt[7]);
+				}
+				
+				$pt = array_values($pt);
+				$this->drawLine($pt, $border['l']['color'], $border['l']['type'], $border['l']['width'], $bord);
+			}
+
+			if ($Bt)
+			{
+				$pt = array();
+				$pt[] = $x;								$pt[] = $y;
+				$pt[] = $x+$border['l']['width'];		$pt[] = $y;
+				$pt[] = $x+$w-$border['r']['width'];	$pt[] = $y;
+				$pt[] = $x+$w;							$pt[] = $y;
+				$pt[] = $x+$w-$border['r']['width'];	$pt[] = $y+$border['t']['width'];
+				$pt[] = $x+$border['l']['width'];		$pt[] = $y+$border['t']['width'];
+
+				$bord = 3;			
+				if (is_array($out_TL))
+				{
+					$bord-=1;
+					$pt[2] += $out_TL[0] - $border['l']['width'];
+					if ($in_TL) $pt[10]+= $in_TL[0];
+					unset($pt[0]);unset($pt[1]);
+				}
+				if (is_array($out_TR))
+				{
+					$bord-=2;
+					$pt[4] -= $out_TR[0] - $border['r']['width'];
+					if ($in_TR) $pt[8] -= $in_TR[0];
+					unset($pt[6]);unset($pt[7]);
+				}
+				
+				$pt = array_values($pt);
+				$this->drawLine($pt, $border['t']['color'], $border['t']['type'], $border['t']['width'], $bord);
+			}
+
+			if ($Br)
+			{
+				$pt = array();
+				$pt[] = $x+$w;								$pt[] = $y;
+				$pt[] = $x+$w;								$pt[] = $y+$border['t']['width'];
+				$pt[] = $x+$w;								$pt[] = $y+$h-$border['b']['width'];
+				$pt[] = $x+$w;								$pt[] = $y+$h;
+				$pt[] = $x+$w-$border['r']['width'];		$pt[] = $y+$h-$border['b']['width'];
+				$pt[] = $x+$w-$border['r']['width'];		$pt[] = $y+$border['t']['width'];
+				
+				$bord = 3;			
+				if (is_array($out_TR))
+				{
+					$bord-=1;
+					$pt[3] += $out_TR[1] - $border['t']['width'];
+					if ($in_TR) $pt[11]+= $in_TR[1];
+					unset($pt[0]);unset($pt[1]);
+				}
+				if (is_array($out_BR))
+				{
+					$bord-=2;
+					$pt[5] -= $out_BR[1] - $border['b']['width'];
+					if ($in_BR) $pt[9] -= $in_BR[1];
+					unset($pt[6]);unset($pt[7]);
+				}
+				
+				$pt = array_values($pt);
+				$this->drawLine($pt, $border['r']['color'], $border['r']['type'], $border['r']['width'], $bord);
+			}
+			
+			if ($Bb)
+			{
+				$pt = array();
+				$pt[] = $x+$w;							$pt[] = $y+$h;
+				$pt[] = $x+$w-$border['r']['width'];	$pt[] = $y+$h;
+				$pt[] = $x+$border['l']['width'];		$pt[] = $y+$h;
+				$pt[] = $x;								$pt[] = $y+$h;
+				$pt[] = $x+$border['l']['width'];		$pt[] = $y+$h-$border['b']['width'];
+				$pt[] = $x+$w-$border['r']['width'];	$pt[] = $y+$h-$border['b']['width'];
+				
+				$bord = 3;			
+				if (is_array($out_BL))
+				{
+					$bord-=2;
+					$pt[4] += $out_BL[0] - $border['l']['width'];
+					if ($in_BL) $pt[8] += $in_BL[0];
+					unset($pt[6]);unset($pt[7]);
+				}
+				if (is_array($out_BR))
+				{
+					$bord-=1;
+					$pt[2] -= $out_BR[0] - $border['r']['width'];
+					if ($in_BR) $pt[10]-= $in_BR[0];
+					unset($pt[0]);unset($pt[1]);
+					
+				}
+
+				$pt = array_values($pt);
+				$this->drawLine($pt, $border['b']['color'], $border['b']['type'], $border['b']['width'], $bord);
+			}
+
+			if ($background['color'])
+			{
+				$this->pdf->setMyFillColor($background['color']);
+			}
+		}
+		
+		function drawCourbe($pt, $color)
+		{
+			$this->pdf->setMyFillColor($color);
+			
+			if (count($pt)==10)
+				$this->pdf->drawCourbe($pt[0], $pt[1], $pt[2], $pt[3], $pt[4], $pt[5], $pt[6], $pt[7], $pt[8], $pt[9]);
+			else
+				$this->pdf->drawCoin($pt[0], $pt[1], $pt[2], $pt[3], $pt[4], $pt[5], $pt[6], $pt[7]);
+		}
+		
+		/**
+		* Tracer une ligne epaisse défini par ses points avec des extreminites en biseau
+		* 
+		* @param	array	liste des points definissant le tour de la ligne
+		* @param	float	couleur RVB
+		* @param	string	type de ligne
+		* @param	float	largeur de la ligne
+		* @return	null
+		*/	
+		function drawLine($pt, $color, $type, $width, $bord=3)
+		{
+			$this->pdf->setMyFillColor($color);
+			if ($type=='dashed' || $type=='dotted')
+			{
+				if ($bord==1)
+				{
+					$tmp = array(); $tmp[]=$pt[0]; $tmp[]=$pt[1]; $tmp[]=$pt[2]; $tmp[]=$pt[3]; $tmp[]=$pt[8]; $tmp[]=$pt[9];
+					$this->pdf->Polygon($tmp, 'F');
+					
+					$tmp = array(); $tmp[]=$pt[2]; $tmp[]=$pt[3]; $tmp[]=$pt[4]; $tmp[]=$pt[5]; $tmp[]=$pt[6]; $tmp[]=$pt[7]; $tmp[]=$pt[8]; $tmp[]=$pt[9];
+					$pt = $tmp;
+				}
+				else if ($bord==2)
+				{
+					$tmp = array(); $tmp[]=$pt[2]; $tmp[]=$pt[3]; $tmp[]=$pt[4]; $tmp[]=$pt[5]; $tmp[]=$pt[6]; $tmp[]=$pt[7];
+					$this->pdf->Polygon($tmp, 'F');
+					
+					$tmp = array(); $tmp[]=$pt[0]; $tmp[]=$pt[1]; $tmp[]=$pt[2]; $tmp[]=$pt[3]; $tmp[]=$pt[6]; $tmp[]=$pt[7]; $tmp[]=$pt[8]; $tmp[]=$pt[9];
+					$pt = $tmp;					
+				}
+				else if ($bord==3)
+				{
+					$tmp = array(); $tmp[]=$pt[0]; $tmp[]=$pt[1]; $tmp[]=$pt[2]; $tmp[]=$pt[3]; $tmp[]=$pt[10]; $tmp[]=$pt[11];
+					$this->pdf->Polygon($tmp, 'F');
+	
+					$tmp = array(); $tmp[]=$pt[4]; $tmp[]=$pt[5]; $tmp[]=$pt[6]; $tmp[]=$pt[7]; $tmp[]=$pt[8]; $tmp[]=$pt[9];
+					$this->pdf->Polygon($tmp, 'F');
+					
+					$tmp = array(); $tmp[]=$pt[2]; $tmp[]=$pt[3]; $tmp[]=$pt[4]; $tmp[]=$pt[5]; $tmp[]=$pt[8]; $tmp[]=$pt[9]; $tmp[]=$pt[10]; $tmp[]=$pt[11];
+					$pt = $tmp;
+				}
+				
+				if ($pt[2]==$pt[0])
+				{
+					$l = abs(($pt[3]-$pt[1])*0.5);
+					$px = 0;
+					$py = $width;
+					$x1 = $pt[0]; $y1 = ($pt[3]+$pt[1])*0.5;
+					$x2 = $pt[6]; $y2 = ($pt[7]+$pt[5])*0.5;
+				}
+				else
+				{
+					$l = abs(($pt[2]-$pt[0])*0.5);
+					$px = $width;
+					$py = 0;					
+					$x1 = ($pt[2]+$pt[0])*0.5; $y1 = $pt[1];
+					$x2 = ($pt[6]+$pt[4])*0.5; $y2 = $pt[7];
+				}
+				if ($type=='dashed')
+				{
+					$px = $px*3.;
+					$py = $py*3.;
+				}
+				$mode = ($l/($px+$py)<.5);
+				
+				for($i=0; $l-($px+$py)*($i-0.5)>0; $i++)
+				{
+					if (($i%2)==$mode)
+					{
+						$j = $i-0.5;
+						$lx1 = $px*($j);	if ($lx1<-$l)	$lx1 =-$l;
+						$ly1 = $py*($j);	if ($ly1<-$l)	$ly1 =-$l;
+						$lx2 = $px*($j+1);	if ($lx2>$l)	$lx2 = $l;
+						$ly2 = $py*($j+1);	if ($ly2>$l)	$ly2 = $l;
+						
+						$tmp = array();
+						$tmp[] = $x1+$lx1;	$tmp[] = $y1+$ly1;	
+						$tmp[] = $x1+$lx2; 	$tmp[] = $y1+$ly2;	
+						$tmp[] = $x2+$lx2; 	$tmp[] = $y2+$ly2;	
+						$tmp[] = $x2+$lx1;	$tmp[] = $y2+$ly1;
+						$this->pdf->Polygon($tmp, 'F');	
+
+						if ($j>0)
+						{
+							$tmp = array();
+							$tmp[] = $x1-$lx1;	$tmp[] = $y1-$ly1;	
+							$tmp[] = $x1-$lx2; 	$tmp[] = $y1-$ly2;	
+							$tmp[] = $x2-$lx2; 	$tmp[] = $y2-$ly2;	
+							$tmp[] = $x2-$lx1;	$tmp[] = $y2-$ly1;
+							$this->pdf->Polygon($tmp, 'F');	
+						}
+					}
+				}
+			}
+			else if ($type=='double')
+			{
+				$pt1 = $pt;
+				$pt2 = $pt;
+				
+				if (count($pt)==12)
+				{
+					$pt1[0] = ($pt[0]-$pt[10])*0.33 + $pt[10];
+					$pt1[1] = ($pt[1]-$pt[11])*0.33 + $pt[11];
+					$pt1[2] = ($pt[2]-$pt[10])*0.33 + $pt[10];
+					$pt1[3] = ($pt[3]-$pt[11])*0.33 + $pt[11];
+					$pt1[4] = ($pt[4]-$pt[8])*0.33 + $pt[8];
+					$pt1[5] = ($pt[5]-$pt[9])*0.33 + $pt[9];
+					$pt1[6] = ($pt[6]-$pt[8])*0.33 + $pt[8];
+					$pt1[7] = ($pt[7]-$pt[9])*0.33 + $pt[9];
+					$pt2[10]= ($pt[10]-$pt[0])*0.33 + $pt[0];
+					$pt2[11]= ($pt[11]-$pt[1])*0.33 + $pt[1];
+					$pt2[2] = ($pt[2] -$pt[0])*0.33 + $pt[0];
+					$pt2[3] = ($pt[3] -$pt[1])*0.33 + $pt[1];
+					$pt2[4] = ($pt[4] -$pt[6])*0.33 + $pt[6];
+					$pt2[5] = ($pt[5] -$pt[7])*0.33 + $pt[7];
+					$pt2[8] = ($pt[8] -$pt[6])*0.33 + $pt[6];
+					$pt2[9] = ($pt[9] -$pt[7])*0.33 + $pt[7];
+				}
+				else
+				{
+					$pt1[0] = ($pt[0]-$pt[6])*0.33 + $pt[6];
+					$pt1[1] = ($pt[1]-$pt[7])*0.33 + $pt[7];
+					$pt1[2] = ($pt[2]-$pt[4])*0.33 + $pt[4];
+					$pt1[3] = ($pt[3]-$pt[5])*0.33 + $pt[5];
+					$pt2[6] = ($pt[6]-$pt[0])*0.33 + $pt[0];
+					$pt2[7] = ($pt[7]-$pt[1])*0.33 + $pt[1];
+					$pt2[4] = ($pt[4]-$pt[2])*0.33 + $pt[2];
+					$pt2[5] = ($pt[5]-$pt[3])*0.33 + $pt[3];
+				}
+				$this->pdf->Polygon($pt1, 'F');
+				$this->pdf->Polygon($pt2, 'F');
+			}
+			else if ($type=='solid')
+			{
+				$this->pdf->Polygon($pt, 'F');
+			}
+		}
+	
+		/**
+		* balise : BR
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @param	integer	position reelle courante si saut de ligne pendant l'ecriture d'un texte 
+		* @return	null
+		*/	
+		function o_BR($param, $curr = null)
+		{
+			if ($this->forOneLine) return false;
+			
+			$h = max($this->maxH, $this->style->getLineHeight());
+
+			// si la ligne est vide, la position maximale n'a pas été mise à jour => on la met à jour
+			if ($this->maxH==0) $this->maxY = max($this->maxY, $this->pdf->getY()+$h);
+			
+			$this->makeBR($h, $curr);
+			
+			$this->maxH = 0;
+			
+			return true;
+		}
+		
+		function makeBR($h, $curr = null)
+		{
+			// si le saut de ligne rentre => on le prend en compte, sinon nouvelle page
+			if ($h)
+			{
+				if (($this->pdf->getY()+$h<$this->pdf->getH() - $this->pdf->getbMargin()) || $this->isInOverflow || $this->isInFooter)
+					$this->setNewLine($h, $curr);
+				else
+					$this->setNewPage(null, '', null, $curr);
+			}
+			else
+			{
+				$this->setNewPositionForNewLine($curr);	
+			}
+			
+			$this->maxH = 0;
+		}
+		
+		/**
+		* balise : HR
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_HR($param)
+		{
+			if ($this->forOneLine) return false;
+			$old_align = $this->style->value['text-align'];
+			$this->style->value['text-align'] = 'left';
+
+			if ($this->maxH) $this->o_BR($param);
+			
+			$f_size = $this->style->value['font-size'];
+			$this->style->value['font-size']=$f_size*0.5; $this->o_BR($param);
+			$this->style->value['font-size']=0;
+			
+			$param['style']['width'] = '100%';
+			
+			$this->style->save();
+			$this->style->value['height']=$this->style->ConvertToMM('1mm');
+
+			$this->style->analyse('hr', $param);
+			$this->style->setPosition();
+			$this->style->FontSet();
+			
+			$h = $this->style->value['height'];
+			if ($h)		$h-= $this->style->value['border']['t']['width']+$this->style->value['border']['b']['width'];
+			if ($h<=0)	$h = $this->style->value['border']['t']['width']+$this->style->value['border']['b']['width'];
+
+			$this->drawRectangle($this->pdf->getX(), $this->pdf->getY(), $this->style->value['width'], $h, $this->style->value['border'], 0, 0, $this->style->value['background']);
+			$this->maxH = $h;
+
+			$this->style->load();
+			$this->style->FontSet();
+			
+			$this->o_BR($param);
+
+			$this->style->value['font-size']=$f_size*0.5; $this->o_BR($param);
+			$this->style->value['font-size']=$f_size;
+
+			$this->style->value['text-align'] = $old_align;
+			$this->setNewPositionForNewLine();
+						
+			return true;
+		}
+
+		/**
+		* balise : B
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_B($param, $other = 'b')
+		{
+			$this->style->save();
+			$this->style->value['font-bold'] = true;
+			$this->style->analyse($other, $param);
+			$this->style->setPosition();
+			$this->style->FontSet();
+			
+			return true;
+		}
+		function o_STRONG($param) { return $this->o_B($param, 'strong'); }
+				
+		/**
+		* balise : B
+		* mode : FERMETURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function c_B($param)
+		{
+			$this->style->load();
+			$this->style->FontSet();
+			
+			return true;
+		}
+		function c_STRONG($param) { return $this->c_B($param); }
+		
+		/**
+		* balise : I
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_I($param, $other = 'i')
+		{
+			$this->style->save();
+			$this->style->value['font-italic'] = true;
+			$this->style->analyse($other, $param);
+			$this->style->setPosition();
+			$this->style->FontSet();
+			
+			return true;
+		}	
+		function o_ADDRESS($param)	{ return $this->o_I($param, 'address');	}
+		function o_CITE($param)		{ return $this->o_I($param, 'cite');		}
+		function o_EM($param)		{ return $this->o_I($param, 'em');			}
+		function o_SAMP($param)		{ return $this->o_I($param, 'samp');		}
+
+		/**
+		* balise : I
+		* mode : FERMETURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function c_I($param)
+		{
+			$this->style->load();
+			$this->style->FontSet();
+			
+			return true;
+		}	
+		function c_ADDRESS($param)	{ return $this->c_I($param); }
+		function c_CITE($param)		{ return $this->c_I($param); }
+		function c_EM($param) 		{ return $this->c_I($param); }
+		function c_SAMP($param)		{ return $this->c_I($param); }
+
+		/**
+		* balise : S
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_S($param, $other = 's')
+		{
+			$this->style->save();
+			$this->style->value['font-linethrough'] = true;
+			$this->style->analyse($other, $param);
+			$this->style->setPosition();
+			$this->style->FontSet();
+			
+			return true;
+		}	
+		function o_DEL($param) { return $this->o_S($param, 'del'); }
+		
+		/**
+		* balise : S
+		* mode : FERMETURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function c_S($param)
+		{
+			$this->style->load();
+			$this->style->FontSet();
+			
+			return true;
+		}
+		function c_DEL($param) { return $this->c_S($param); }
+		
+		/**
+		* balise : U
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_U($param, $other='u')
+		{
+			$this->style->save();
+			$this->style->value['font-underline'] = true;
+			$this->style->analyse($other, $param);
+			$this->style->setPosition();
+			$this->style->FontSet();
+			
+			return true;
+		}	
+		function o_INS($param) { return $this->o_U($param, 'ins'); }
+		
+		/**
+		* balise : U
+		* mode : FERMETURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function c_U($param)
+		{
+			$this->style->load();
+			$this->style->FontSet();
+			
+			return true;
+		}
+		function c_INS($param) { return $this->c_U($param); }
+		
+		/**
+		* balise : A
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_A($param)
+		{
+			$this->inLink = str_replace('&amp;', '&', isset($param['href']) ? $param['href'] : '');
+			
+			if (isset($param['name']))
+			{
+				$nom = 	$param['name'];
+				if (!isset($this->lstAncre[$nom])) $this->lstAncre[$nom] = array($this->pdf->AddLink(), false);
+				
+				if (!$this->lstAncre[$nom][1])
+				{
+					$this->lstAncre[$nom][1] = true;
+					$this->pdf->SetLink($this->lstAncre[$nom][0], -1, -1);
+				}
+			}
+			
+			if (preg_match('/^#([^#]+)$/isU', $this->inLink, $match))
+			{
+				$nom = $match[1];
+				if (!isset($this->lstAncre[$nom])) $this->lstAncre[$nom] = array($this->pdf->AddLink(), false);
+				
+				$this->inLink = $this->lstAncre[$nom][0];
+			}
+			
+			$this->style->save();
+			$this->style->value['font-underline'] = true;
+			$this->style->value['color'] = array(0.08, 0.08, 0.98);
+			$this->style->analyse('a', $param);
+			$this->style->setPosition();
+			$this->style->FontSet();
+			
+			return true;		
+		}
+
+		/**
+		* balise : A
+		* mode : FERMETURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function c_A($param)
+		{
+			$this->inLink	= '';
+			$this->style->load();
+			$this->style->FontSet();			
+			
+			return true;
+		}
+
+		/**
+		* balise : H1
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_H1($param, $other = 'h1')
+		{
+			if ($this->forOneLine) return false;
+			
+			if ($this->maxH) $this->o_BR(array());
+			$this->style->save();
+			$this->style->value['font-bold'] = true;
+			
+			$size = array('h1' => '28px', 'h2' => '24px', 'h3' => '20px', 'h4' => '16px', 'h5' => '12px', 'h6' => '9px');
+			$this->style->value['margin']['l'] = 0;
+			$this->style->value['margin']['r'] = 0;
+			$this->style->value['margin']['t'] = $this->style->ConvertToMM('16px');
+			$this->style->value['margin']['b'] = $this->style->ConvertToMM('16px');
+			$this->style->value['font-size'] = $this->style->ConvertToMM($size[$other]);
+
+			$this->style->analyse($other, $param);
+			$this->style->setPosition();
+			$this->style->FontSet();
+			$this->setNewPositionForNewLine();
+			
+			return true;
+		}
+		function o_H2($param)	{ return $this->o_H1($param, 'h2'); }
+		function o_H3($param)	{ return $this->o_H1($param, 'h3'); }
+		function o_H4($param)	{ return $this->o_H1($param, 'h4'); }
+		function o_H5($param)	{ return $this->o_H1($param, 'h5'); }
+		function o_H6($param)	{ return $this->o_H1($param, 'h6'); }
+		
+		
+		/**
+		* balise : H1
+		* mode : FERMETURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function c_H1($param)
+		{
+			if ($this->forOneLine) return false;
+
+			// hauteur du H1
+			$this->maxH+= $this->style->value['margin']['b'];
+			$h = max($this->maxH, $this->style->getLineHeight());
+			
+			$this->style->load();
+			$this->style->FontSet();
+			
+			// saut de ligne et initialisation de la hauteur
+			$this->makeBR($h);
+			$this->maxH = 0;
+			
+			return true;
+		}
+		function c_H2($param)	{ return $this->c_H1($param); }
+		function c_H3($param)	{ return $this->c_H1($param); }
+		function c_H4($param)	{ return $this->c_H1($param); }
+		function c_H5($param)	{ return $this->c_H1($param); }
+		function c_H6($param)	{ return $this->c_H1($param); }
+		
+		/**
+		* balise : SPAN
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_SPAN($param, $other = 'span')
+		{
+			$this->style->save();
+			$this->style->analyse($other, $param);
+			$this->style->setPosition();
+			$this->style->FontSet();		
+			
+			return true;
+		}	
+		function o_FONT($param)		{ return $this->o_SPAN($param, 'font');	}
+ 		function o_LABEL($param)	{ return $this->o_SPAN($param, 'label');}
+		
+		/**
+		* balise : SPAN
+		* mode : FERMETURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function c_SPAN($param)
+		{
+			$this->style->restorePosition();
+			$this->style->load();
+			$this->style->FontSet();
+			
+			return true;
+		}
+		function c_FONT($param)		{ return $this->c_SPAN($param); }
+		function c_LABEL($param)	{ return $this->c_SPAN($param); }
+		
+
+		/**
+		* balise : P
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_P($param)
+		{
+			if ($this->forOneLine) return false;
+
+			if (!in_array($this->previousCall, array('c_P', 'c_UL')))
+			{
+				if ($this->maxH) $this->o_BR(array());
+			}
+			
+			$this->style->save();
+			$this->style->analyse('p', $param);
+			$this->style->setPosition();
+			$this->style->FontSet();
+			 // annule les effets du setposition
+			$this->pdf->setXY($this->pdf->getX()-$this->style->value['margin']['l'], $this->pdf->getY()-$this->style->value['margin']['t']);
+			
+			list($mL, $mR) = $this->getMargins($this->pdf->getY());
+			$mR = $this->pdf->getW()-$mR;
+			$mL+= $this->style->value['margin']['l']+$this->style->value['padding']['l'];
+			$mR+= $this->style->value['margin']['r']+$this->style->value['padding']['r'];
+			$this->saveMargin($mL,0,$mR);
+			
+			if ($this->style->value['text-indent']>0)
+			{
+				$y = $this->pdf->getY()+$this->style->value['margin']['t']+$this->style->value['padding']['t'];
+				$this->pageMarges[floor($y*100)] = array($mL+$this->style->value['text-indent'], $this->pdf->getW()-$mR);
+				$y+= $this->style->getLineHeight()*0.1;
+				$this->pageMarges[floor($y*100)] = array($mL, $this->pdf->getW()-$mR);
+			}
+			$this->makeBR($this->style->value['margin']['t']+$this->style->value['padding']['t']);
+			return true;
+		}
+		
+		/**
+		* balise : P
+		* mode : FERMETURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function c_P($param)
+		{
+			if ($this->forOneLine) return false;
+
+			if ($this->maxH) $this->o_BR(array());
+			$this->loadMargin();
+			$h = $this->style->value['margin']['b']+$this->style->value['padding']['b'];
+			
+			$this->style->load();
+			$this->style->FontSet();
+			$this->makeBR($h); 
+			
+			return true;
+		}
+		
+		/**
+		* balise : PRE
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_PRE($param, $other = 'pre')
+		{
+			if ($other=='pre' && $this->maxH) $this->o_BR(array());
+			
+			$this->style->save();
+			$this->style->value['font-family']	= 'courier';
+			$this->style->analyse($other, $param);
+			$this->style->setPosition();
+			$this->style->FontSet();
+
+			if ($other=='pre') return $this->o_DIV($param, $other);
+			
+			return true;
+		}
+		function o_CODE($param) { return $this->o_PRE($param, 'code'); }
+		
+		/**
+		* balise : PRE
+		* mode : FERMETURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function c_PRE($param, $other = 'pre')
+		{
+			if ($other=='pre')
+			{
+				if ($this->forOneLine) return false;
+
+				$this->c_DIV($param);
+				$this->o_BR(array());
+			}
+			$this->style->load();
+			$this->style->FontSet();
+			
+			return true;
+		}
+		function c_CODE($param) { return $this->c_PRE($param, 'code'); }
+				
+		/**
+		* balise : BIG
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_BIG($param)
+		{
+			$this->style->save();
+			$this->style->value['mini-decal']-= $this->style->value['mini-size']*0.05;
+			$this->style->value['mini-size'] *= 1.2;
+			$this->style->analyse('big', $param);
+			$this->style->setPosition();
+			$this->style->FontSet();
+			return true;
+		}
+
+		/**
+		* balise : BIG
+		* mode : FERMETURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function c_BIG($param)
+		{
+			$this->style->load();
+			$this->style->FontSet();
+			
+			return true;
+		}
+
+		/**
+		* balise : SMALL
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_SMALL($param)
+		{
+			$this->style->save();
+			$this->style->value['mini-decal']+= $this->style->value['mini-size']*0.05;
+			$this->style->value['mini-size'] *= 0.82;
+			$this->style->analyse('small', $param);
+			$this->style->setPosition();
+			$this->style->FontSet();
+			return true;
+		}
+		 
+		/**
+		* balise : SMALL
+		* mode : FERMETURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function c_SMALL($param)
+		{
+			$this->style->load();
+			$this->style->FontSet();
+			
+			return true;
+		}
+
+
+		/**
+		* balise : SUP
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_SUP($param)
+		{
+			$this->style->save();
+			$this->style->value['mini-decal']-= $this->style->value['mini-size']*0.15;
+			$this->style->value['mini-size'] *= 0.75;
+			$this->style->analyse('sup', $param);
+			$this->style->setPosition();
+			$this->style->FontSet();
+			
+			return true;
+		}
+		 
+		/**
+		* balise : SUP
+		* mode : FERMETURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function c_SUP($param)
+		{
+			$this->style->load();
+			$this->style->FontSet();
+			
+			return true;
+		}
+
+		/**
+		* balise : SUB
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_SUB($param)
+		{
+			$this->style->save();
+			$this->style->value['mini-decal']+= $this->style->value['mini-size']*0.15;
+			$this->style->value['mini-size'] *= 0.75;
+			$this->style->analyse('sub', $param);
+			$this->style->setPosition();
+			$this->style->FontSet();
+			return true;
+		}
+		 
+		/**
+		* balise : SUB
+		* mode : FERMETURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function c_SUB($param)
+		{
+			$this->style->load();
+			$this->style->FontSet();
+			
+			return true;
+		}
+
+		/**
+		* balise : UL
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_UL($param, $other = 'ul')
+		{
+			if ($this->forOneLine) return false;
+
+			if (!in_array($this->previousCall, array('c_P', 'c_UL')))
+			{
+				if ($this->maxH) $this->o_BR(array());
+				if (!count($this->defLIST)) $this->o_BR(array());
+			}
+			
+			if (!isset($param['style']['width'])) $param['allwidth'] = true;
+			$param['cellspacing'] = 0;
+
+			// une liste est traitée comme un tableau
+			$this->o_TABLE($param, $other);
+
+			// ajouter un niveau de liste
+			$this->listeAddLevel($other, $this->style->value['list-style-type'], $this->style->value['list-style-image']);
+			
+			return true;
+		}
+		function o_OL($param) { return $this->o_UL($param, 'ol'); }	
+		
+		/**
+		* balise : UL
+		* mode : FERMETURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/
+		function c_UL($param)
+		{
+			if ($this->forOneLine) return false;
+
+			// fin du tableau
+			$this->c_TABLE($param);
+			
+			// enlever un niveau de liste
+			$this->listeDelLevel();
+
+			if (!$this->sub_part)
+			{
+				if (!count($this->defLIST)) $this->o_BR(array());
+			}
+			
+			return true;
+		}
+		function c_OL($param) { return $this->c_UL($param); }
+
+		/**
+		* balise : LI
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/
+		function o_LI($param)
+		{
+			if ($this->forOneLine) return false;
+
+			// ajouter une puce au niveau actuel
+			$this->listeAddLi();
+
+			if (!isset($param['style']['width'])) $param['style']['width'] = '100%';
+
+			// preparation du style de la puce
+			$paramPUCE = $param;
+			
+			$inf = $this->listeGetLi();
+			if ($inf[0])
+			{
+				$paramPUCE['style']['font-family']		= $inf[0];
+				$paramPUCE['style']['text-align']		= 'li_right';
+				$paramPUCE['style']['vertical-align']	= 'top';
+				$paramPUCE['style']['width']			= $this->listeGetWidth();
+				$paramPUCE['style']['padding-right']	= $this->listeGetPadding();
+				$paramPUCE['txt'] = $inf[2];
+			}
+			else
+			{
+				$paramPUCE['style']['text-align']		= 'li_right';
+				$paramPUCE['style']['vertical-align']	= 'top';
+				$paramPUCE['style']['width']			= $this->listeGetWidth();
+				$paramPUCE['style']['padding-right']	= $this->listeGetPadding();
+				$paramPUCE['src'] = $inf[2];
+				$paramPUCE['sub_li'] = true;
+			}
+			
+			// nouvelle ligne
+			$this->o_TR($param, 'li');
+
+			$this->style->save();
+			
+			if ($inf[1]) // small
+			{
+				$this->style->value['mini-decal']+= $this->style->value['mini-size']*0.045;
+				$this->style->value['mini-size'] *= 0.75;
+			}
+			
+			// si on est dans un sub_html => preparation, sinon affichage classique
+			if ($this->sub_part)
+			{
+				// TD pour la puce
+				$tmp_pos = $this->temp_pos;
+				$tmp_lst1 = $this->parsing->code[$tmp_pos+1];
+				$tmp_lst2 = $this->parsing->code[$tmp_pos+2];
+				$this->parsing->code[$tmp_pos+1] = array();
+				$this->parsing->code[$tmp_pos+1]['name']	= (isset($paramPUCE['src'])) ? 'img' : 'write';
+				$this->parsing->code[$tmp_pos+1]['param']	= $paramPUCE; unset($this->parsing->code[$tmp_pos+1]['param']['style']['width']);
+				$this->parsing->code[$tmp_pos+1]['close']	= 0;
+				$this->parsing->code[$tmp_pos+2] = array();
+				$this->parsing->code[$tmp_pos+2]['name']	= 'li';
+				$this->parsing->code[$tmp_pos+2]['param']	= $paramPUCE;
+				$this->parsing->code[$tmp_pos+2]['close']	= 1;
+				$this->o_TD($paramPUCE, 'li_sub');
+				$this->c_TD($param);
+				$this->temp_pos = $tmp_pos;
+				$this->parsing->code[$tmp_pos+1] = $tmp_lst1;
+				$this->parsing->code[$tmp_pos+2] = $tmp_lst2;
+			}
+			else
+			{
+				// TD pour la puce
+				$this->o_TD($paramPUCE, 'li_sub');
+				unset($paramPUCE['style']['width']);
+				if (isset($paramPUCE['src']))	$this->o_IMG($paramPUCE);
+				else							$this->o_WRITE($paramPUCE);
+				$this->c_TD($paramPUCE);
+			}
+			$this->style->load();
+
+				
+			// td pour le contenu
+			$this->o_TD($param, 'li');
+			
+			return true;
+		}
+
+		/**
+		* balise : LI
+		* mode : FERMETURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/
+		function c_LI($param)
+		{
+			if ($this->forOneLine) return false;
+
+			// fin du contenu
+			$this->c_TD($param);
+			
+			// fin de la ligne
+			$this->c_TR($param);
+			
+			return true;
+		}
+		
+		/**
+		* balise : TBODY
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_TBODY($param)
+		{
+			if ($this->forOneLine) return false;
+
+			$this->style->save();
+			$this->style->analyse('tbody', $param);
+			$this->style->setPosition();
+			$this->style->FontSet();
+			
+			return true;
+		}	
+
+		/**
+		* balise : TBODY
+		* mode : FERMETURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function c_TBODY($param)
+		{
+			if ($this->forOneLine) return false;
+
+			$this->style->load();
+			$this->style->FontSet();
+			
+			return true;
+		}
+
+		/**
+		* balise : THEAD
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_THEAD($param)
+		{
+			if ($this->forOneLine) return false;
+
+			global $HTML2PDF_TABLEAU;
+			
+			$this->style->save();
+			$this->style->analyse('thead', $param);
+			$this->style->setPosition();
+			$this->style->FontSet();
+			
+			// si on est en mode sub_html : sauvegarde du numéro du TR 
+			if ($this->sub_part)
+			{
+				$HTML2PDF_TABLEAU[$param['num']]['thead']['tr'][0] = $HTML2PDF_TABLEAU[$param['num']]['tr_curr'];
+				$HTML2PDF_TABLEAU[$param['num']]['thead']['code'] = array(); 
+				for($pos=$this->temp_pos; $pos<count($this->parsing->code); $pos++)
+				{
+					$todo = $this->parsing->code[$pos];
+					if (strtolower($todo['name'])=='thead') $todo['name'] = 'thead_sub';
+					$HTML2PDF_TABLEAU[$param['num']]['thead']['code'][] = $todo;
+					if (strtolower($todo['name'])=='thead_sub' && $todo['close']) break;
+				}
+			}
+			else
+			{
+				$level = $this->parsing->getLevel($this->parse_pos);
+				$this->parse_pos+= count($level);
+				$HTML2PDF_TABLEAU[$param['num']]['tr_curr']+= count($HTML2PDF_TABLEAU[$param['num']]['thead']['tr']);
+			}
+			
+			return true;
+		}	
+
+		/**
+		* balise : THEAD
+		* mode : FERMETURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function c_THEAD($param)
+		{
+			if ($this->forOneLine) return false;
+
+			$this->style->load();
+			$this->style->FontSet();
+
+			// si on est en mode sub_html : sauvegarde du numéro du TR 
+			if ($this->sub_part)
+			{
+				global $HTML2PDF_TABLEAU;
+				$min = $HTML2PDF_TABLEAU[$param['num']]['thead']['tr'][0];
+				$max = $HTML2PDF_TABLEAU[$param['num']]['tr_curr']-1;				
+				$HTML2PDF_TABLEAU[$param['num']]['thead']['tr'] = range($min, $max);
+			}
+			
+			return true;
+		}
+
+		/**
+		* balise : TFOOT
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_TFOOT($param)
+		{
+			if ($this->forOneLine) return false;
+
+			global $HTML2PDF_TABLEAU; 		
+
+			$this->style->save();
+			$this->style->analyse('tfoot', $param);
+			$this->style->setPosition();
+			$this->style->FontSet();
+			
+			// si on est en mode sub_html : sauvegarde du numéro du TR 
+			if ($this->sub_part)
+			{
+				$HTML2PDF_TABLEAU[$param['num']]['tfoot']['tr'][0] = $HTML2PDF_TABLEAU[$param['num']]['tr_curr'];
+				$HTML2PDF_TABLEAU[$param['num']]['tfoot']['code'] = array(); 
+				for($pos=$this->temp_pos; $pos<count($this->parsing->code); $pos++)
+				{
+					$todo = $this->parsing->code[$pos];
+					if (strtolower($todo['name'])=='tfoot') $todo['name'] = 'tfoot_sub';
+					$HTML2PDF_TABLEAU[$param['num']]['tfoot']['code'][] = $todo;
+					if (strtolower($todo['name'])=='tfoot_sub' && $todo['close']) break;
+				}
+			}
+			else
+			{
+				$level = $this->parsing->getLevel($this->parse_pos);
+				$this->parse_pos+= count($level);
+				$HTML2PDF_TABLEAU[$param['num']]['tr_curr']+= count($HTML2PDF_TABLEAU[$param['num']]['tfoot']['tr']);
+			}
+			
+			return true;
+		}	
+
+		/**
+		* balise : TFOOT
+		* mode : FERMETURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function c_TFOOT($param)
+		{
+			if ($this->forOneLine) return false;
+
+			$this->style->load();
+			$this->style->FontSet();
+			
+			// si on est en mode sub_html : sauvegarde du numéro du TR 
+			if ($this->sub_part)
+			{
+				global $HTML2PDF_TABLEAU;
+				
+				$min = $HTML2PDF_TABLEAU[$param['num']]['tfoot']['tr'][0];
+				$max = $HTML2PDF_TABLEAU[$param['num']]['tr_curr']-1;				
+				$HTML2PDF_TABLEAU[$param['num']]['tfoot']['tr'] = range($min, $max);
+			}
+			
+			return true;
+		}
+
+		/**
+		* balise : THEAD_SUB
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_THEAD_SUB($param)
+		{
+			if ($this->forOneLine) return false;
+
+			$this->style->save();
+			$this->style->analyse('thead', $param);
+			$this->style->setPosition();
+			$this->style->FontSet();
+			
+			return true;
+		}
+		
+		/**
+		* balise : THEAD_SUB
+		* mode : FERMETURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function c_THEAD_SUB($param)
+		{
+			if ($this->forOneLine) return false;
+
+			$this->style->load();
+			$this->style->FontSet();
+			
+			return true;
+		}
+
+		/**
+		* balise : TFOOT_SUB
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_TFOOT_SUB($param)
+		{
+			if ($this->forOneLine) return false;
+
+			$this->style->save();
+			$this->style->analyse('tfoot', $param);
+			$this->style->setPosition();
+			$this->style->FontSet();
+			
+			return true;
+		}
+		
+		/**
+		* balise : TFOOT_SUB
+		* mode : FERMETURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function c_TFOOT_SUB($param)
+		{
+			if ($this->forOneLine) return false;
+
+			$this->style->load();
+			$this->style->FontSet();
+			
+			return true;
+		}
+				
+		/**
+		* balise : FORM
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_FORM($param)
+		{
+			$this->style->save();
+			$this->style->analyse('form', $param);
+			$this->style->setPosition();
+			$this->style->FontSet();
+			
+			$this->isInForm = isset($param['action']) ? $param['action'] : '';
+			
+			return true;
+		}	
+
+		/**
+		* balise : FORM
+		* mode : FERMETURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function c_FORM($param)
+		{
+			$this->isInForm = false;
+			$this->style->load();
+			$this->style->FontSet();
+			
+			return true;
+		}
+		
+		/**
+		* balise : TABLE
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_TABLE($param, $other = 'table')
+		{
+			if ($this->maxH)
+			{
+				if ($this->forOneLine) return false;
+				$this->o_BR(array());
+			}
+			
+			if ($this->forOneLine)
+			{
+				$this->maxE++;
+				$this->maxX = $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
+				return false;		
+			}
+			
+			$this->maxH = 0;
+			// utilisation du tableau des paramétres des tables
+			global $HTML2PDF_TABLEAU; 
+
+			$align_object = isset($param['align']) ? strtolower($param['align']) : 'left';
+			if (isset($param['align'])) unset($param['align']);
+			if (!in_array($align_object, array('left', 'center', 'right'))) $align_object = 'left';
+			
+			// lecture et initialisation du style
+			$this->style->save();
+			$this->style->analyse($other, $param);
+			$this->style->setPosition();
+			$this->style->FontSet();
+
+			if ($this->style->value['margin-auto']) $align_object = 'center';
+
+			// est-on en collapse
+			$collapse = false;			
+			if ($other=='table')
+				$collapse = isset($this->style->value['border']['collapse']) ? $this->style->value['border']['collapse'] : false;
+
+			// si oui il faut adapté les borders
+			if ($collapse)
+			{
+				$param['style']['border'] = 'none';
+				$param['cellspacing'] = 0;
+				$none = $this->style->readBorder('none');
+				$this->style->value['border']['t'] = $none;
+				$this->style->value['border']['r'] = $none;
+				$this->style->value['border']['b'] = $none;
+				$this->style->value['border']['l'] = $none;
+			}				
+			
+			// si on est en mode sub_html : initialisation des dimensions et autres 
+			if ($this->sub_part)
+			{
+				if ($this->DEBUG_actif) $this->DEBUG_add('Table n°'.$param['num'], true);
+				$HTML2PDF_TABLEAU[$param['num']] = array();
+				$HTML2PDF_TABLEAU[$param['num']]['border']		= isset($param['border']) ? $this->style->readBorder($param['border']) : null; // border spécifique si border precisé en paramètre
+				$HTML2PDF_TABLEAU[$param['num']]['cellpadding']	= $this->style->ConvertToMM(isset($param['cellpadding']) ? $param['cellpadding'] : '1px'); // cellpadding du tableau
+				$HTML2PDF_TABLEAU[$param['num']]['cellspacing']	= $this->style->ConvertToMM(isset($param['cellspacing']) ? $param['cellspacing'] : '2px'); // cellspacing du tableau
+				$HTML2PDF_TABLEAU[$param['num']]['cases']		= array();				// liste des propriétés des cases
+				$HTML2PDF_TABLEAU[$param['num']]['corr']		= array();				// tableau de correlation pour les colspan et rowspan
+				$HTML2PDF_TABLEAU[$param['num']]['corr_x']		= 0;					// position dans le tableau de correlation
+				$HTML2PDF_TABLEAU[$param['num']]['corr_y']		= 0;					// position dans le tableau de correlation
+				$HTML2PDF_TABLEAU[$param['num']]['td_curr']		= 0;					// colonne courante
+				$HTML2PDF_TABLEAU[$param['num']]['tr_curr']		= 0;					// ligne courante
+				$HTML2PDF_TABLEAU[$param['num']]['curr_x']		= $this->pdf->getX();	// position courante X
+				$HTML2PDF_TABLEAU[$param['num']]['curr_y']		= $this->pdf->getY();	// position courante Y
+				$HTML2PDF_TABLEAU[$param['num']]['width']		= 0;					// largeur globale
+				$HTML2PDF_TABLEAU[$param['num']]['height']		= 0;					// hauteur globale
+				$HTML2PDF_TABLEAU[$param['num']]['align']		= $align_object;
+				$HTML2PDF_TABLEAU[$param['num']]['marge']		= array();
+				$HTML2PDF_TABLEAU[$param['num']]['marge']['t']	= $this->style->value['padding']['t']+$this->style->value['border']['t']['width']+$HTML2PDF_TABLEAU[$param['num']]['cellspacing']*0.5;
+				$HTML2PDF_TABLEAU[$param['num']]['marge']['r']	= $this->style->value['padding']['r']+$this->style->value['border']['r']['width']+$HTML2PDF_TABLEAU[$param['num']]['cellspacing']*0.5;
+				$HTML2PDF_TABLEAU[$param['num']]['marge']['b']	= $this->style->value['padding']['b']+$this->style->value['border']['b']['width']+$HTML2PDF_TABLEAU[$param['num']]['cellspacing']*0.5;
+				$HTML2PDF_TABLEAU[$param['num']]['marge']['l']	= $this->style->value['padding']['l']+$this->style->value['border']['l']['width']+$HTML2PDF_TABLEAU[$param['num']]['cellspacing']*0.5;
+				$HTML2PDF_TABLEAU[$param['num']]['page']		= 0;					// nombre de pages
+				$HTML2PDF_TABLEAU[$param['num']]['new_page']	= true;					// nouvelle page pour le TR courant
+				$HTML2PDF_TABLEAU[$param['num']]['style_value'] = null;					// style du tableau
+				$HTML2PDF_TABLEAU[$param['num']]['thead']		= array();				// infos sur le thead
+				$HTML2PDF_TABLEAU[$param['num']]['tfoot']		= array();				// infos sur le tfoot
+				$HTML2PDF_TABLEAU[$param['num']]['thead']['tr']	= array();				// tr du thead
+				$HTML2PDF_TABLEAU[$param['num']]['tfoot']['tr']	= array();				// tr du tfoot
+				$HTML2PDF_TABLEAU[$param['num']]['thead']['height']	= 0;				// hauteur du thead
+				$HTML2PDF_TABLEAU[$param['num']]['tfoot']['height']	= 0;				// hauteur du tfoot
+				$HTML2PDF_TABLEAU[$param['num']]['thead']['code'] = array();			// contenu HTML du thead
+				$HTML2PDF_TABLEAU[$param['num']]['tfoot']['code'] = array();			// contenu HTML du tfoot
+				$HTML2PDF_TABLEAU[$param['num']]['cols']		= array();				// definition via les balises col
+				$this->saveMargin($this->pdf->getlMargin(), $this->pdf->gettMargin(), $this->pdf->getrMargin());
+				
+				// adaptation de la largeur en fonction des marges du tableau
+				$this->style->value['width']-= $HTML2PDF_TABLEAU[$param['num']]['marge']['l'] + $HTML2PDF_TABLEAU[$param['num']]['marge']['r'];
+			}
+			else
+			{
+				// on repart à la premiere page du tableau et à la premiere case
+				$HTML2PDF_TABLEAU[$param['num']]['page'] = 0;
+				$HTML2PDF_TABLEAU[$param['num']]['td_curr']	= 0;
+				$HTML2PDF_TABLEAU[$param['num']]['tr_curr']	= 0;
+				$HTML2PDF_TABLEAU[$param['num']]['td_x']		= $HTML2PDF_TABLEAU[$param['num']]['marge']['l']+$HTML2PDF_TABLEAU[$param['num']]['curr_x'];
+				$HTML2PDF_TABLEAU[$param['num']]['td_y']		= $HTML2PDF_TABLEAU[$param['num']]['marge']['t']+$HTML2PDF_TABLEAU[$param['num']]['curr_y'];				
+
+				// initialisation du style des bordures de la premiere partie de tableau
+				$this->drawRectangle(
+						$HTML2PDF_TABLEAU[$param['num']]['curr_x'],
+						$HTML2PDF_TABLEAU[$param['num']]['curr_y'],
+						$HTML2PDF_TABLEAU[$param['num']]['width'],
+						isset($HTML2PDF_TABLEAU[$param['num']]['height'][0]) ? $HTML2PDF_TABLEAU[$param['num']]['height'][0] : null,
+						$this->style->value['border'],
+						$this->style->value['padding'],
+						0,
+						$this->style->value['background']
+					);
+
+				$HTML2PDF_TABLEAU[$param['num']]['style_value'] = $this->style->value;
+			}
+			
+			return true;
+		}
+
+		/**
+		* balise : TABLE
+		* mode : FERMETURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function c_TABLE($param)
+		{
+			if ($this->forOneLine) return false;
+
+			$this->maxH = 0;
+			global $HTML2PDF_TABLEAU; 
+
+			// restauration du style
+			$this->style->load();
+			$this->style->FontSet();
+
+			// si on est en mode sub_html : initialisation des dimensions et autres 
+			if ($this->sub_part)
+			{
+				// ajustement de la taille des cases
+				$this->calculTailleCases($HTML2PDF_TABLEAU[$param['num']]['cases'], $HTML2PDF_TABLEAU[$param['num']]['corr']);
+
+				// calcul de la hauteur du THEAD et du TFOOT
+				$lst = array('thead', 'tfoot');
+				foreach($lst as $mode)
+				{
+					$HTML2PDF_TABLEAU[$param['num']][$mode]['height'] = 0;
+					foreach($HTML2PDF_TABLEAU[$param['num']][$mode]['tr'] as $tr)
+					{
+						// hauteur de la ligne tr
+						$h = 0;
+						for($i=0; $i<count($HTML2PDF_TABLEAU[$param['num']]['cases'][$tr]); $i++)
+							if ($HTML2PDF_TABLEAU[$param['num']]['cases'][$tr][$i]['rowspan']==1)
+								$h = max($h, $HTML2PDF_TABLEAU[$param['num']]['cases'][$tr][$i]['h']);
+						$HTML2PDF_TABLEAU[$param['num']][$mode]['height']+= $h;	
+					}
+				}
+
+				// calcul des dimensions du tableau - Largeur
+				$HTML2PDF_TABLEAU[$param['num']]['width'] = $HTML2PDF_TABLEAU[$param['num']]['marge']['l'] + $HTML2PDF_TABLEAU[$param['num']]['marge']['r'];
+				if (isset($HTML2PDF_TABLEAU[$param['num']]['cases'][0]))
+					foreach($HTML2PDF_TABLEAU[$param['num']]['cases'][0] as $case)
+						$HTML2PDF_TABLEAU[$param['num']]['width']+= $case['w'];
+
+				// positionnement du tableau horizontalement;
+				$old = $this->style->getOldValues();
+				$parent_w = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
+				$x = $HTML2PDF_TABLEAU[$param['num']]['curr_x'];
+				$w = $HTML2PDF_TABLEAU[$param['num']]['width'];
+				if ($parent_w>$w)
+				{
+					if ($HTML2PDF_TABLEAU[$param['num']]['align']=='center')
+						$x = $x + ($parent_w-$w)*0.5;
+					else if ($HTML2PDF_TABLEAU[$param['num']]['align']=='right')
+						$x = $x + $parent_w-$w;
+
+					$HTML2PDF_TABLEAU[$param['num']]['curr_x'] = $x;
+				}					
+
+
+				// calcul des dimensions du tableau - hauteur du tableau sur chaque page
+				$HTML2PDF_TABLEAU[$param['num']]['height'] = array();
+
+				$h0 = $HTML2PDF_TABLEAU[$param['num']]['marge']['t'] + $HTML2PDF_TABLEAU[$param['num']]['marge']['b'];	// minimum de hauteur à cause des marges
+				$h0+= $HTML2PDF_TABLEAU[$param['num']]['thead']['height'] + $HTML2PDF_TABLEAU[$param['num']]['tfoot']['height']; // et du tfoot et thead
+				$max = $this->pdf->getH() - $this->pdf->getbMargin();			// max de hauteur par page
+				$y = $HTML2PDF_TABLEAU[$param['num']]['curr_y'];	// position Y actuelle
+				$height = $h0;
+				
+				// on va lire les hauteurs de chaque ligne, une à une, et voir si ca rentre sur la page.
+				for($k=0; $k<count($HTML2PDF_TABLEAU[$param['num']]['cases']); $k++)
+				{
+					// si c'est des lignes du thead ou du tfoot : on passe
+					if (in_array($k, $HTML2PDF_TABLEAU[$param['num']]['thead']['tr'])) continue;
+					if (in_array($k, $HTML2PDF_TABLEAU[$param['num']]['tfoot']['tr'])) continue;
+
+					// hauteur de la ligne $k
+					$th = 0;
+					$h = 0;
+					for($i=0; $i<count($HTML2PDF_TABLEAU[$param['num']]['cases'][$k]); $i++)
+					{
+						$h = max($h, $HTML2PDF_TABLEAU[$param['num']]['cases'][$k][$i]['h']);
+						
+						if ($HTML2PDF_TABLEAU[$param['num']]['cases'][$k][$i]['rowspan']==1)
+							$th = max($th, $HTML2PDF_TABLEAU[$param['num']]['cases'][$k][$i]['h']);
+					}
+			
+					// si la ligne ne rentre pas dans la page
+					// => la hauteur sur cette page est trouvée, et on passe à la page d'apres
+					if ($y+$h+$height>$max)
+					{
+						if ($height==$h0) $height = null;
+						$HTML2PDF_TABLEAU[$param['num']]['height'][] = $height;
+						$height = $h0;						
+						$y = $this->margeTop;
+					}
+					$height+= $th;
+				}
+				// rajout du reste de tableau (si il existe) à la derniere page
+				if ($height!=$h0 || $k==0) $HTML2PDF_TABLEAU[$param['num']]['height'][] = $height;
+			}
+			else
+			{
+				if (count($HTML2PDF_TABLEAU[$param['num']]['tfoot']['code']))
+				{
+					$tmp_tr = $HTML2PDF_TABLEAU[$param['num']]['tr_curr'];
+					$tmp_td = $HTML2PDF_TABLEAU[$param['num']]['td_curr'];
+					$OLD_parse_pos = $this->parse_pos;
+					$OLD_parse_code = $this->parsing->code;
+					
+					$HTML2PDF_TABLEAU[$param['num']]['tr_curr'] = $HTML2PDF_TABLEAU[$param['num']]['tfoot']['tr'][0];
+					$HTML2PDF_TABLEAU[$param['num']]['td_curr'] = 0;
+					$this->parse_pos = 0;
+					$this->parsing->code = $HTML2PDF_TABLEAU[$param['num']]['tfoot']['code'];
+					$this->makeHTMLcode();
+					
+					$this->parse_pos = 	$OLD_parse_pos;
+					$this->parsing->code = $OLD_parse_code;
+					$HTML2PDF_TABLEAU[$param['num']]['tr_curr'] = $tmp_tr;
+					$HTML2PDF_TABLEAU[$param['num']]['td_curr'] = $tmp_td;
+				}
+					
+				// determination des coordonnées de sortie du tableau
+				$x = $HTML2PDF_TABLEAU[$param['num']]['curr_x'] + $HTML2PDF_TABLEAU[$param['num']]['width'];
+				if (count($HTML2PDF_TABLEAU[$param['num']]['height'])>1)
+					$y = $this->margeTop+$HTML2PDF_TABLEAU[$param['num']]['height'][count($HTML2PDF_TABLEAU[$param['num']]['height'])-1];
+				else if (count($HTML2PDF_TABLEAU[$param['num']]['height'])==1)
+					$y = $HTML2PDF_TABLEAU[$param['num']]['curr_y']+$HTML2PDF_TABLEAU[$param['num']]['height'][count($HTML2PDF_TABLEAU[$param['num']]['height'])-1];
+				else
+					$y = $HTML2PDF_TABLEAU[$param['num']]['curr_y'];					
+
+				// taille du tableau
+				$this->maxX = max($this->maxX, $x);
+				$this->maxY = max($this->maxY, $y);
+				
+				
+				// nouvelle position apres le tableau
+				$this->pdf->setXY($this->pdf->getlMargin(), $y);
+				
+				// restauration des marges
+				$this->loadMargin();
+				
+				if ($this->DEBUG_actif) $this->DEBUG_add('Table n°'.$param['num'], false);
+			}
+			
+			return true;
+		}
+
+				
+		/**
+		* balise : COL
+		* mode : OUVERTURE (pas de fermeture)
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_COL($param)
+		{
+			global $HTML2PDF_TABLEAU;
+			$span = isset($param['span']) ? $param['span'] : 1;
+			for($k=0; $k<$span; $k++)
+				$HTML2PDF_TABLEAU[$param['num']]['cols'][] = $param;
+		}
+		
+		/**
+		* balise : TR
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_TR($param, $other = 'tr')
+		{
+			if ($this->forOneLine) return false;
+
+			$this->maxH = 0;
+			global $HTML2PDF_TABLEAU; 
+
+			// analyse du style
+			$this->style->save();
+			$this->style->analyse($other, $param);
+			$this->style->setPosition();
+			$this->style->FontSet();
+			
+			// positionnement dans le tableau
+			$HTML2PDF_TABLEAU[$param['num']]['tr_curr']++;
+			$HTML2PDF_TABLEAU[$param['num']]['td_curr']= 0;
+			
+			// si on est pas dans un sub_html
+			if (!$this->sub_part)
+			{
+				// Y courant apres la ligne
+				$ty=null;
+				for($ii=0; $ii<count($HTML2PDF_TABLEAU[$param['num']]['cases'][$HTML2PDF_TABLEAU[$param['num']]['tr_curr']-1]); $ii++)
+					$ty = max($ty, $HTML2PDF_TABLEAU[$param['num']]['cases'][$HTML2PDF_TABLEAU[$param['num']]['tr_curr']-1][$ii]['h']);	
+				
+				$hfoot = $HTML2PDF_TABLEAU[$param['num']]['tfoot']['height'];
+				
+				// si la ligne ne rentre pas dans la page => nouvelle page
+				if (!$this->isInTfoot && $HTML2PDF_TABLEAU[$param['num']]['td_y'] + $HTML2PDF_TABLEAU[$param['num']]['marge']['b'] + $ty +$hfoot> $this->pdf->getH() - $this->pdf->getbMargin())
+				{
+					if (count($HTML2PDF_TABLEAU[$param['num']]['tfoot']['code']))
+					{
+						$tmp_tr = $HTML2PDF_TABLEAU[$param['num']]['tr_curr'];
+						$tmp_td = $HTML2PDF_TABLEAU[$param['num']]['td_curr'];
+						$OLD_parse_pos = $this->parse_pos;
+						$OLD_parse_code = $this->parsing->code;
+						
+						$HTML2PDF_TABLEAU[$param['num']]['tr_curr'] = $HTML2PDF_TABLEAU[$param['num']]['tfoot']['tr'][0];
+						$HTML2PDF_TABLEAU[$param['num']]['td_curr'] = 0;
+						$this->parse_pos = 0;
+						$this->parsing->code = $HTML2PDF_TABLEAU[$param['num']]['tfoot']['code'];
+						$this->isInTfoot = true;
+						$this->makeHTMLcode();
+						$this->isInTfoot = false;
+						
+						$this->parse_pos = 	$OLD_parse_pos;
+						$this->parsing->code = $OLD_parse_code;
+						$HTML2PDF_TABLEAU[$param['num']]['tr_curr'] = $tmp_tr;
+						$HTML2PDF_TABLEAU[$param['num']]['td_curr'] = $tmp_td;
+					}
+					
+					$HTML2PDF_TABLEAU[$param['num']]['new_page'] = true;
+					$this->setNewPage();
+
+					$HTML2PDF_TABLEAU[$param['num']]['page']++;
+					$HTML2PDF_TABLEAU[$param['num']]['curr_y'] = $this->pdf->getY();
+					$HTML2PDF_TABLEAU[$param['num']]['td_y'] = $HTML2PDF_TABLEAU[$param['num']]['curr_y']+$HTML2PDF_TABLEAU[$param['num']]['marge']['t'];
+
+					// si la hauteur de cette partie a bien été calculée, on trace le cadre
+					if (isset($HTML2PDF_TABLEAU[$param['num']]['height'][$HTML2PDF_TABLEAU[$param['num']]['page']]))
+					{
+						$old = $this->style->value;
+						$this->style->value = $HTML2PDF_TABLEAU[$param['num']]['style_value'];
+
+						// initialisation du style des bordures de la premiere partie de tableau
+						$this->drawRectangle(
+								$HTML2PDF_TABLEAU[$param['num']]['curr_x'],
+								$HTML2PDF_TABLEAU[$param['num']]['curr_y'],
+								$HTML2PDF_TABLEAU[$param['num']]['width'],
+								$HTML2PDF_TABLEAU[$param['num']]['height'][$HTML2PDF_TABLEAU[$param['num']]['page']],
+								$this->style->value['border'],
+								$this->style->value['padding'],
+								$HTML2PDF_TABLEAU[$param['num']]['cellspacing']*0.5,
+								$this->style->value['background']
+							);
+											 
+						$this->style->value = $old;
+					}
+				}
+				
+				if ($HTML2PDF_TABLEAU[$param['num']]['new_page'] && count($HTML2PDF_TABLEAU[$param['num']]['thead']['code']))
+				{
+					$HTML2PDF_TABLEAU[$param['num']]['new_page'] = false;
+					$tmp_tr = $HTML2PDF_TABLEAU[$param['num']]['tr_curr'];
+					$tmp_td = $HTML2PDF_TABLEAU[$param['num']]['td_curr'];
+					$OLD_parse_pos = $this->parse_pos;
+					$OLD_parse_code = $this->parsing->code;
+					
+					$HTML2PDF_TABLEAU[$param['num']]['tr_curr'] = $HTML2PDF_TABLEAU[$param['num']]['thead']['tr'][0];
+					$HTML2PDF_TABLEAU[$param['num']]['td_curr'] = 0;
+					$this->parse_pos = 0;
+					$this->parsing->code = $HTML2PDF_TABLEAU[$param['num']]['thead']['code'];
+					$this->isInThead = true;
+					$this->makeHTMLcode();
+					$this->isInThead = false;
+					
+					$this->parse_pos = 	$OLD_parse_pos;
+					$this->parsing->code = $OLD_parse_code;
+					$HTML2PDF_TABLEAU[$param['num']]['tr_curr'] = $tmp_tr;
+					$HTML2PDF_TABLEAU[$param['num']]['td_curr'] = $tmp_td;
+					$HTML2PDF_TABLEAU[$param['num']]['new_page'] = true;
+				}
+			}
+			else
+			{
+				$HTML2PDF_TABLEAU[$param['num']]['cases'][$HTML2PDF_TABLEAU[$param['num']]['tr_curr']-1] = array();
+				if (!isset($HTML2PDF_TABLEAU[$param['num']]['corr'][$HTML2PDF_TABLEAU[$param['num']]['corr_y']]))
+					$HTML2PDF_TABLEAU[$param['num']]['corr'][$HTML2PDF_TABLEAU[$param['num']]['corr_y']] = array();
+					
+				$HTML2PDF_TABLEAU[$param['num']]['corr_x']=0;
+				while(isset($HTML2PDF_TABLEAU[$param['num']]['corr'][$HTML2PDF_TABLEAU[$param['num']]['corr_y']][$HTML2PDF_TABLEAU[$param['num']]['corr_x']]))
+					$HTML2PDF_TABLEAU[$param['num']]['corr_x']++;
+			}							
+			
+			return true;
+		}
+
+		/**
+		* balise : TR
+		* mode : FERMETURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function c_TR($param)
+		{
+			if ($this->forOneLine) return false;
+
+			$this->maxH = 0;
+			global $HTML2PDF_TABLEAU; 
+
+			// restauration du style
+			$this->style->load();
+			$this->style->FontSet();			
+
+			// si on est pas dans un sub_html
+			if (!$this->sub_part)
+			{
+				// Y courant apres la ligne
+				$ty=null;
+				for($ii=0; $ii<count($HTML2PDF_TABLEAU[$param['num']]['cases'][$HTML2PDF_TABLEAU[$param['num']]['tr_curr']-1]); $ii++)
+					if ($HTML2PDF_TABLEAU[$param['num']]['cases'][$HTML2PDF_TABLEAU[$param['num']]['tr_curr']-1][$ii]['rowspan']==1)
+						$ty = $HTML2PDF_TABLEAU[$param['num']]['cases'][$HTML2PDF_TABLEAU[$param['num']]['tr_curr']-1][$ii]['h'];	
+
+				// mise à jour des coordonnées courantes
+				$HTML2PDF_TABLEAU[$param['num']]['td_x'] = $HTML2PDF_TABLEAU[$param['num']]['curr_x']+$HTML2PDF_TABLEAU[$param['num']]['marge']['l'];
+				$HTML2PDF_TABLEAU[$param['num']]['td_y']+= $ty;
+				$HTML2PDF_TABLEAU[$param['num']]['new_page'] = false;
+			}
+			else
+			{
+				$HTML2PDF_TABLEAU[$param['num']]['corr_y']++;	
+			}
+			
+			return true;
+		}
+
+		/**
+		* balise : TD
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_TD($param, $other = 'td')
+		{
+			if ($this->forOneLine) return false;
+
+			$this->maxH = 0;
+			global $HTML2PDF_TABLEAU; 
+
+			$param['cellpadding'] = $HTML2PDF_TABLEAU[$param['num']]['cellpadding'].'mm';
+			$param['cellspacing'] = $HTML2PDF_TABLEAU[$param['num']]['cellspacing'].'mm';
+			
+			if ($other=='li')
+			{
+				$special_li = true;
+			}
+			else
+			{
+				$special_li = false;
+				if ($other=='li_sub')
+				{
+					$param['style']['border'] = 'none';
+					$param['style']['background-color']		= 'transparent';
+					$param['style']['background-image']		= 'none';
+					$param['style']['background-position']	= '';
+					$param['style']['background-repeat']	= '';
+					$other = 'li';
+				}
+			}
+
+			// est-on en collapse, et egalement y-a-t'il des definitions de colonne
+			$x = $HTML2PDF_TABLEAU[$param['num']]['td_curr'];
+			$y = $HTML2PDF_TABLEAU[$param['num']]['tr_curr']-1;
+			$colspan = isset($param['colspan']) ? $param['colspan'] : 1;
+			$rowspan = isset($param['rowspan']) ? $param['rowspan'] : 1;
+			$collapse = false;
+			if (in_array($other, array('td', 'th')))
+			{
+				$num_col = isset($HTML2PDF_TABLEAU[$param['num']]['cases'][$y][$x]['Xr']) ? $HTML2PDF_TABLEAU[$param['num']]['cases'][$y][$x]['Xr'] : $HTML2PDF_TABLEAU[$param['num']]['corr_x'];
+				
+				// si une definition de colonne est presente
+				if (isset($HTML2PDF_TABLEAU[$param['num']]['cols'][$num_col]))
+				{
+					// on la recupere
+					$col_param = $HTML2PDF_TABLEAU[$param['num']]['cols'][$num_col];
+					
+					// pour les colspan, on recupere toutes les largeurs
+					$col_param['style']['width'] = array();
+					for($k=0; $k<$colspan; $k++)
+					{
+						if (isset($HTML2PDF_TABLEAU[$param['num']]['cols'][$num_col+$k]['style']['width']))
+							$col_param['style']['width'][] = $HTML2PDF_TABLEAU[$param['num']]['cols'][$num_col+$k]['style']['width'];
+					}
+					
+					// on les somme
+					$total = '';
+					$last = $this->style->getLastWidth();
+					if (count($col_param['style']['width']))
+					{
+						$total = $col_param['style']['width'][0]; unset($col_param['style']['width'][0]);
+						foreach($col_param['style']['width'] as $width)
+						{
+							if (substr($total, -1)=='%' && substr($width, -1)=='%')
+								$total = (str_replace('%', '', $total)+str_replace('%', '', $width)).'%';
+							else
+								$total = ($this->style->ConvertToMM($total, $last) + $this->style->ConvertToMM($width, $last)).'mm';
+						}
+					}
+					
+					// et on recupere la largeur finale
+					if ($total)
+						$col_param['style']['width'] = $total;
+					else
+						unset($col_param['style']['width']);
+					
+					
+					// on merge les 2 styles (col + td)
+					$param['style'] = array_merge($col_param['style'], $param['style']);
+					
+					// si une classe est définie, on la merge egalement
+					if (isset($col_param['class']))
+						$param['class'] = $col_param['class'].(isset($param['class']) ? ' '.$param['class'] : '');
+				}
+				
+				$collapse = isset($this->style->value['border']['collapse']) ? $this->style->value['border']['collapse'] : false;
+			}
+
+
+			// analyse du style
+			$this->style->save();
+			$heritage = null;
+			if (in_array($other, array('td', 'th')))
+			{
+				$heritage = array();
+				
+				$old = $this->style->getLastValue('background');
+				if ($old && ($old['color'] || $old['image']))
+					$heritage['background'] = $old;
+					
+				if ($HTML2PDF_TABLEAU[$param['num']]['border'])
+				{
+					$heritage['border'] = array();
+					$heritage['border']['l'] = $HTML2PDF_TABLEAU[$param['num']]['border'];
+					$heritage['border']['t'] = $HTML2PDF_TABLEAU[$param['num']]['border'];
+					$heritage['border']['r'] = $HTML2PDF_TABLEAU[$param['num']]['border'];
+					$heritage['border']['b'] = $HTML2PDF_TABLEAU[$param['num']]['border'];
+				} 
+			} 
+			$return = $this->style->analyse($other, $param, $heritage);
+
+			if ($special_li)
+			{
+				$this->style->value['width']-= $this->style->ConvertToMM($this->listeGetWidth());
+				$this->style->value['width']-= $this->style->ConvertToMM($this->listeGetPadding());
+			}
+			$this->style->setPosition();
+			$this->style->FontSet();
+			
+			// si on est en collapse : modification du style
+			if ($collapse)
+			{
+				if (!$this->sub_part)
+				{
+					if (
+							($HTML2PDF_TABLEAU[$param['num']]['tr_curr']>1  && !$HTML2PDF_TABLEAU[$param['num']]['new_page']) ||
+							(!$this->isInThead && count($HTML2PDF_TABLEAU[$param['num']]['thead']['code']))
+						)
+					{
+						$this->style->value['border']['t'] = $this->style->readBorder('none');				
+					}
+				}
+			
+				if ($HTML2PDF_TABLEAU[$param['num']]['td_curr']>0)
+				{
+					if (!$return) $this->style->value['width']+= $this->style->value['border']['l']['width'];
+					$this->style->value['border']['l'] = $this->style->readBorder('none');	
+				}
+			}	
+			
+			$marge = array();
+			$marge['t'] = $this->style->value['padding']['t']+0.5*$HTML2PDF_TABLEAU[$param['num']]['cellspacing']+$this->style->value['border']['t']['width'];
+			$marge['r'] = $this->style->value['padding']['r']+0.5*$HTML2PDF_TABLEAU[$param['num']]['cellspacing']+$this->style->value['border']['r']['width'];
+			$marge['b'] = $this->style->value['padding']['b']+0.5*$HTML2PDF_TABLEAU[$param['num']]['cellspacing']+$this->style->value['border']['b']['width'];
+			$marge['l'] = $this->style->value['padding']['l']+0.5*$HTML2PDF_TABLEAU[$param['num']]['cellspacing']+$this->style->value['border']['l']['width'];
+
+			// si on est dans un sub_html
+			if ($this->sub_part)
+			{
+				// on se positionne dans le tableau
+				$HTML2PDF_TABLEAU[$param['num']]['td_curr']++;
+				$HTML2PDF_TABLEAU[$param['num']]['cases'][$y][$x] = array();
+				$HTML2PDF_TABLEAU[$param['num']]['cases'][$y][$x]['w'] = 0;
+				$HTML2PDF_TABLEAU[$param['num']]['cases'][$y][$x]['h'] = 0;
+				$HTML2PDF_TABLEAU[$param['num']]['cases'][$y][$x]['dw'] = 0;
+				$HTML2PDF_TABLEAU[$param['num']]['cases'][$y][$x]['colspan'] = $colspan;
+				$HTML2PDF_TABLEAU[$param['num']]['cases'][$y][$x]['rowspan'] = $rowspan;
+				$HTML2PDF_TABLEAU[$param['num']]['cases'][$y][$x]['Xr'] = $HTML2PDF_TABLEAU[$param['num']]['corr_x'];
+				$HTML2PDF_TABLEAU[$param['num']]['cases'][$y][$x]['Yr'] = $HTML2PDF_TABLEAU[$param['num']]['corr_y'];
+				
+				for($j=0; $j<$rowspan; $j++)
+				{
+					for($i=0; $i<$colspan; $i++)
+					{
+						$HTML2PDF_TABLEAU[$param['num']]['corr']
+							[$HTML2PDF_TABLEAU[$param['num']]['corr_y']+$j]
+							[$HTML2PDF_TABLEAU[$param['num']]['corr_x']+$i] = ($i+$j>0) ? '' : array($x,$y,$colspan,$rowspan);
+
+					}
+				}
+				$HTML2PDF_TABLEAU[$param['num']]['corr_x']+= $colspan;
+				while(isset($HTML2PDF_TABLEAU[$param['num']]['corr'][$HTML2PDF_TABLEAU[$param['num']]['corr_y']][$HTML2PDF_TABLEAU[$param['num']]['corr_x']]))
+					$HTML2PDF_TABLEAU[$param['num']]['corr_x']++;
+
+				// on extrait tout ce qui est contenu dans le TD
+				// on en créé un sous HTML que l'on transforme en PDF
+				// pour analyse les dimensions
+				// et les récupérer dans le tableau global.
+				$level = $this->parsing->getLevel($this->temp_pos);
+				$this->CreateSubHTML($this->sub_html);
+				$this->sub_html->parsing->code = $level;
+				$this->sub_html->MakeHTMLcode();
+				$this->temp_pos+= count($level);
+			}
+			else
+			{
+				// on se positionne dans le tableau
+				$HTML2PDF_TABLEAU[$param['num']]['td_curr']++;
+				$HTML2PDF_TABLEAU[$param['num']]['td_x']+= $HTML2PDF_TABLEAU[$param['num']]['cases'][$y][$x]['dw'];
+				
+				// initialisation du style des bordures de la premiere partie de tableau
+				$this->drawRectangle(
+						$HTML2PDF_TABLEAU[$param['num']]['td_x'],
+						$HTML2PDF_TABLEAU[$param['num']]['td_y'],
+						$HTML2PDF_TABLEAU[$param['num']]['cases'][$y][$x]['w'],
+						$HTML2PDF_TABLEAU[$param['num']]['cases'][$y][$x]['h'],
+						$this->style->value['border'],
+						$this->style->value['padding'],
+						$HTML2PDF_TABLEAU[$param['num']]['cellspacing']*0.5,
+						$this->style->value['background']
+					);
+				
+
+				$this->style->value['width'] = $HTML2PDF_TABLEAU[$param['num']]['cases'][$y][$x]['w'] - $marge['l'] - $marge['r'];
+
+				// limitation des marges aux dimensions de la case
+				$mL = $HTML2PDF_TABLEAU[$param['num']]['td_x']+$marge['l'];
+				$mR = $this->pdf->getW() - $mL - $this->style->value['width'];
+				$this->saveMargin($mL, 0, $mR);
+				
+				// positionnement en fonction
+				$h_corr = $HTML2PDF_TABLEAU[$param['num']]['cases'][$y][$x]['h'];
+				$h_reel = $HTML2PDF_TABLEAU[$param['num']]['cases'][$y][$x]['real_h'];
+				switch($this->style->value['vertical-align'])
+				{
+					case 'bottom':
+						$y_corr = $h_corr-$h_reel;
+						break;
+						
+					case 'middle':
+						$y_corr = ($h_corr-$h_reel)*0.5;
+						break;
+						
+					case 'top':
+					default:
+						$y_corr = 0;
+						break;	
+				}
+
+				$x = $HTML2PDF_TABLEAU[$param['num']]['td_x']+$marge['l'];
+				$y = $HTML2PDF_TABLEAU[$param['num']]['td_y']+$marge['t']+$y_corr;
+				$this->pdf->setXY($x, $y);
+				$this->setNewPositionForNewLine();
+			}
+			
+			return true;
+		}
+
+		/**
+		* balise : TD
+		* mode : FERMETURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function c_TD($param)
+		{
+			if ($this->forOneLine) return false;
+
+			$this->maxH = 0;
+			global $HTML2PDF_TABLEAU; 
+
+			// récupération de la marge
+			$marge = array();
+			$marge['t'] = $this->style->value['padding']['t']+0.5*$HTML2PDF_TABLEAU[$param['num']]['cellspacing']+$this->style->value['border']['t']['width'];
+			$marge['r'] = $this->style->value['padding']['r']+0.5*$HTML2PDF_TABLEAU[$param['num']]['cellspacing']+$this->style->value['border']['r']['width'];
+			$marge['b'] = $this->style->value['padding']['b']+0.5*$HTML2PDF_TABLEAU[$param['num']]['cellspacing']+$this->style->value['border']['b']['width'];
+			$marge['l'] = $this->style->value['padding']['l']+0.5*$HTML2PDF_TABLEAU[$param['num']]['cellspacing']+$this->style->value['border']['l']['width'];
+			$marge['t']+= 0.001;
+			$marge['r']+= 0.001;
+			$marge['b']+= 0.001;
+			$marge['l']+= 0.001;
+
+			// si on est dans un sub_html
+			if ($this->sub_part)
+			{
+				if ($this->testTDin1page && $this->sub_html->pdf->getPage()>1) HTML2PDF::makeError(7, __FILE__, __LINE__); 
+				
+				// dimentions de cette case
+				$w0 = $this->sub_html->maxX + $marge['l'] + $marge['r'];
+				$h0 = $this->sub_html->maxY + $marge['t'] + $marge['b'];
+	
+				// dimensions imposées par le style
+				$w2 = $this->style->value['width'] + $marge['l'] + $marge['r'];
+				$h2 = $this->style->value['height'] + $marge['t'] + $marge['b'];
+	
+				// dimension finale de la case = max des 2 ci-dessus
+				$HTML2PDF_TABLEAU[$param['num']]['cases'][$HTML2PDF_TABLEAU[$param['num']]['tr_curr']-1][$HTML2PDF_TABLEAU[$param['num']]['td_curr']-1]['w'] = max(array($w0, $w2));
+				$HTML2PDF_TABLEAU[$param['num']]['cases'][$HTML2PDF_TABLEAU[$param['num']]['tr_curr']-1][$HTML2PDF_TABLEAU[$param['num']]['td_curr']-1]['h'] = max(array($h0, $h2));
+
+				$HTML2PDF_TABLEAU[$param['num']]['cases'][$HTML2PDF_TABLEAU[$param['num']]['tr_curr']-1][$HTML2PDF_TABLEAU[$param['num']]['td_curr']-1]['real_w'] = $w0;
+				$HTML2PDF_TABLEAU[$param['num']]['cases'][$HTML2PDF_TABLEAU[$param['num']]['tr_curr']-1][$HTML2PDF_TABLEAU[$param['num']]['td_curr']-1]['real_h'] = $h0;
+
+				// suppresion du sous_html
+				$this->destroySubHTML($this->sub_html);
+			}
+			else
+			{
+				$this->loadMargin();
+				//positionnement
+				$HTML2PDF_TABLEAU[$param['num']]['td_x']+= $HTML2PDF_TABLEAU[$param['num']]['cases'][$HTML2PDF_TABLEAU[$param['num']]['tr_curr']-1][$HTML2PDF_TABLEAU[$param['num']]['td_curr']-1]['w'];
+			}
+
+			// restauration du style
+			$this->style->load();
+			$this->style->FontSet();	
+			
+			return true;
+		}
+		
+		function calculTailleCases(&$cases, &$corr)
+		{
+/*			// construction d'un tableau de correlation
+			$corr = array();
+
+			// on fait correspondre chaque case d'un tableau normé aux cases réelles, en prennant en compte les colspan et rowspan
+			$Yr=0;
+			for($y=0; $y<count($cases); $y++)
+			{
+				$Xr=0; 	while(isset($corr[$Yr][$Xr])) $Xr++;
+				
+				for($x=0; $x<count($cases[$y]); $x++)
+				{
+					for($j=0; $j<$cases[$y][$x]['rowspan']; $j++)
+					{
+						for($i=0; $i<$cases[$y][$x]['colspan']; $i++)
+						{
+							$corr[$Yr+$j][$Xr+$i] = ($i+$j>0) ? '' : array($x, $y, $cases[$y][$x]['colspan'], $cases[$y][$x]['rowspan']);
+						}
+					}
+					$Xr+= $cases[$y][$x]['colspan'];
+					while(isset($corr[$Yr][$Xr])) $Xr++;
+				}
+				$Yr++;
+			}
+*/			
+			if (!isset($corr[0])) return true;
+			
+			// on détermine, pour les cases sans colspan, la largeur maximale de chaque colone
+			$sw = array();
+			for($x=0; $x<count($corr[0]); $x++)
+			{
+				$m=0;
+				for($y=0; $y<count($corr); $y++)
+					if (isset($corr[$y][$x]) && is_array($corr[$y][$x]) && $corr[$y][$x][2]==1)
+						$m = max($m, $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w']);				
+				$sw[$x] = $m;	
+			}
+
+			// on vérifie que cette taille est valide avec les colones en colspan
+			for($x=0; $x<count($corr[0]); $x++)
+			{
+				for($y=0; $y<count($corr); $y++)
+				{
+					if (isset($corr[$y][$x]) && is_array($corr[$y][$x]) && $corr[$y][$x][2]>1)
+					{
+						// somme des colonnes correspondant au colspan
+						$s = 0; for($i=0; $i<$corr[$y][$x][2]; $i++) $s+= $sw[$x+$i];
+						
+						// si la somme est inférieure à la taille necessaire => règle de 3 pour adapter
+						if ($s>0 && $s<$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w'])
+							for($i=0; $i<$corr[$y][$x][2]; $i++)
+								$sw[$x+$i] = $sw[$x+$i]/$s*$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w'];
+					}
+				}
+			}
+
+			// on applique les nouvelles largeurs
+			for($x=0; $x<count($corr[0]); $x++)
+			{
+				for($y=0; $y<count($corr); $y++)
+				{
+					if (isset($corr[$y][$x]) && is_array($corr[$y][$x]))
+					{
+						if ($corr[$y][$x][2]==1)
+						{
+							$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w'] = $sw[$x];
+						}
+						else
+						{
+							// somme des colonnes correspondant au colspan
+							$s = 0; for($i=0; $i<$corr[$y][$x][2]; $i++) $s+= $sw[$x+$i];
+							$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w'] = $s;
+						}
+					}
+				}
+			}
+
+			// on détermine, pour les cases sans rowspan, la hauteur maximale de chaque colone
+			$sh = array();
+			for($y=0; $y<count($corr); $y++)
+			{
+				$m=0;
+				for($x=0; $x<count($corr[0]); $x++)
+					if (isset($corr[$y][$x]) && is_array($corr[$y][$x]) && $corr[$y][$x][3]==1)
+						$m = max($m, $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h']);
+				$sh[$y] = $m;	
+			}
+
+
+			// on vérifie que cette taille est valide avec les lignes en rowspan
+			for($y=0; $y<count($corr); $y++)
+			{
+				for($x=0; $x<count($corr[0]); $x++)
+				{
+					if (isset($corr[$y][$x]) && is_array($corr[$y][$x]) && $corr[$y][$x][3]>1)
+					{
+						// somme des colonnes correspondant au colspan
+						$s = 0; for($i=0; $i<$corr[$y][$x][3]; $i++) $s+= $sh[$y+$i];
+						
+						// si la somme est inférieure à la taille necessaire => règle de 3 pour adapter
+						if ($s>0 && $s<$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h'])
+							for($i=0; $i<$corr[$y][$x][3]; $i++)
+								$sh[$y+$i] = $sh[$y+$i]/$s*$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h'];
+					}
+				}
+			}
+			
+
+			// on applique les nouvelles hauteurs
+			for($y=0; $y<count($corr); $y++)
+			{
+				for($x=0; $x<count($corr[0]); $x++)
+				{
+					if (isset($corr[$y][$x]) && is_array($corr[$y][$x]))
+					{
+						if ($corr[$y][$x][3]==1)
+						{
+							$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h'] = $sh[$y];
+						}
+						else
+						{
+							// somme des lignes correspondant au rowspan
+							$s = 0; for($i=0; $i<$corr[$y][$x][3]; $i++) $s+= $sh[$y+$i];
+							$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h'] = $s;
+							
+							for($j=1; $j<$corr[$y][$x][3]; $j++)
+							{
+								$tx = $x+1;
+								$ty = $y+$j;
+								for(true; isset($corr[$ty][$tx]) && !is_array($corr[$ty][$tx]); $tx++);
+								if (isset($corr[$ty][$tx])) $cases[$corr[$ty][$tx][1]][$corr[$ty][$tx][0]]['dw']+= $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w'];
+																	
+							}
+						}
+					}
+				}
+			}		
+		}
+
+		/**
+		* balise : TH
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_TH($param)
+		{
+			if ($this->forOneLine) return false;
+
+			$this->maxH = 0;
+			// identique à TD mais en gras
+			if (!isset($param['style']['font-weight'])) $param['style']['font-weight'] = 'bold';
+			$this->o_TD($param, 'th');
+			
+			return true;
+		}	
+
+		/**
+		* balise : TH
+		* mode : FERMETURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function c_TH($param)
+		{
+			if ($this->forOneLine) return false;
+
+			$this->maxH = 0;
+			// identique à TD
+			$this->c_TD($param);			
+			
+			return true;
+		}
+
+		/**
+		* balise : IMG
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_IMG($param)
+		{
+			// analyse du style
+			$src	= str_replace('&amp;', '&', $param['src']);	
+
+			$this->style->save();
+			$this->style->value['width']	= 0;
+			$this->style->value['height']	= 0;
+			$this->style->value['border']	= array(
+													'type'	=> 'none',
+													'width'	=> 0,
+													'color'	=> array(0, 0, 0),
+												);
+			$this->style->value['background'] = array(
+													'color'		=> null,
+													'image'		=> null,
+													'position'	=> null,
+													'repeat'	=> null
+												);
+			$this->style->analyse('img', $param);
+			$this->style->setPosition();
+			$this->style->FontSet();
+
+			// affichage de l'image
+			$res = $this->Image($src, isset($param['sub_li']));
+			if (!$res) return $res;
+
+			// restauration du style
+			$this->style->load();
+			$this->style->FontSet();
+			$this->maxE++; 
+			
+			return true;
+		}
+		
+		/**
+		* balise : SELECT
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_SELECT($param)
+		{
+			// preparation du champs
+			if (!isset($param['name']))		$param['name']	= 'champs_pdf_'.(count($this->lstChamps)+1);
+			
+			$param['name'] = strtolower($param['name']);
+			
+			if (isset($this->lstChamps[$param['name']]))
+				$this->lstChamps[$param['name']]++;
+			else
+				$this->lstChamps[$param['name']] = 1;
+				
+			$this->style->save();
+			$this->style->analyse('select', $param);
+			$this->style->setPosition();
+			$this->style->FontSet();
+			
+			$this->lstSelect = array();
+			$this->lstSelect['name']	= $param['name'];
+			$this->lstSelect['multi']	= isset($param['multiple']) ? true : false;
+			$this->lstSelect['size']	= isset($param['size']) ? $param['size'] : 1;
+			$this->lstSelect['options']	= array();
+
+			if ($this->lstSelect['multi'] && $this->lstSelect['size']<3) $this->lstSelect['size'] = 3;
+			
+			return true;
+		}
+		
+		/**
+		* balise : OPTION
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_OPTION($param)
+		{
+			// on extrait tout ce qui est contenu dans l'option
+			$level = $this->parsing->getLevel($this->parse_pos);
+			$this->parse_pos+= count($level); 
+			$value = isset($param['value']) ? $param['value'] : 'auto_opt_'.(count($this->lstSelect)+1);
+			
+			$this->lstSelect['options'][$value] = isset($level[0]['param']['txt']) ? $level[0]['param']['txt'] : '';
+			
+			return true;
+		}
+		
+		/**
+		* balise : OPTION
+		* mode : FERMETURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function c_OPTION($param) { return true; }
+				
+		/**
+		* balise : SELECT
+		* mode : FERMETURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function c_SELECT()
+		{
+			// position d'affichage
+			$x = $this->pdf->getX();
+			$y = $this->pdf->getY();
+			$f = 1.08*$this->style->value['font-size'];
+
+			$w = $this->style->value['width']; if (!$w) $w = 50; 
+			$h = ($f*1.07*$this->lstSelect['size'] + 1);
+			$prop = array();
+			if ($this->lstSelect['multi']) $prop['multipleSelection'] = true;
+			$this->pdf->form_Select($this->lstSelect['name'], $x, $y, $w, $h, $this->lstSelect['options'], $this->lstSelect['size']>1, $prop);
+							
+			$this->maxX = max($this->maxX, $x+$w);
+			$this->maxY = max($this->maxY, $y+$h);
+ 			$this->maxH = max($this->maxH, $h);
+			$this->pdf->setX($x+$w);
+			
+			$this->style->load();
+			$this->style->FontSet();
+			
+			$this->lstSelect = array();
+			
+			return true;
+		}
+
+		/**
+		* balise : TEXTAREA
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_TEXTAREA($param)
+		{
+			// preparation du champs
+			if (!isset($param['name']))		$param['name']	= 'champs_pdf_'.(count($this->lstChamps)+1);
+			
+			$param['name'] = strtolower($param['name']);
+			
+			if (isset($this->lstChamps[$param['name']]))
+				$this->lstChamps[$param['name']]++;
+			else
+				$this->lstChamps[$param['name']] = 1;
+				
+			$this->style->save();
+			$this->style->analyse('textarea', $param);
+			$this->style->setPosition();
+			$this->style->FontSet();
+
+			// position d'affichage
+			$x = $this->pdf->getX();
+			$y = $this->pdf->getY();
+			$fx = 0.65*$this->style->value['font-size'];
+			$fy = 1.08*$this->style->value['font-size'];
+
+			// on extrait tout ce qui est contenu dans le textarea
+			$level = $this->parsing->getLevel($this->parse_pos);
+			$this->parse_pos+= count($level);
+
+			$w = $fx*(isset($param['cols']) ? $param['cols'] : 22)+1; 
+			$h = $fy*1.07*(isset($param['rows']) ? $param['rows'] : 3)+3;
+			
+//			if ($this->style->value['width']) $w = $this->style->value['width'];
+//			if ($this->style->value['height']) $h = $this->style->value['height'];
+			
+			$prop = array();
+			$prop['multiline'] = true;
+			$prop['value'] = isset($level[0]['param']['txt']) ? $level[0]['param']['txt'] : '';
+			
+			$this->pdf->form_InputText($param['name'], $x, $y, $w, $h, $prop);
+					
+			$this->maxX = max($this->maxX, $x+$w);
+			$this->maxY = max($this->maxY, $y+$h);
+ 			$this->maxH = max($this->maxH, $h);
+			$this->pdf->setX($x+$w);
+					
+			return true;
+		}
+		
+		/**
+		* balise : TEXTAREA
+		* mode : FERMETURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function c_TEXTAREA()
+		{
+			$this->style->load();
+			$this->style->FontSet();
+			
+			return true;
+		}
+						
+		/**
+		* balise : INPUT
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_INPUT($param)
+		{
+			// preparation du champs
+			if (!isset($param['name']))		$param['name']	= 'champs_pdf_'.(count($this->lstChamps)+1);
+			if (!isset($param['value']))	$param['value']	= '';
+			if (!isset($param['type']))		$param['type']	= 'text';
+			
+			$param['name'] = strtolower($param['name']);
+			$param['type'] = strtolower($param['type']);
+
+			if (!in_array($param['type'], array('text', 'checkbox', 'radio', 'hidden', 'submit', 'reset', 'button'))) $param['type'] = 'text';
+
+			if (isset($this->lstChamps[$param['name']]))
+				$this->lstChamps[$param['name']]++;
+			else
+				$this->lstChamps[$param['name']] = 1;
+
+			$this->style->save();
+			$this->style->analyse('input', $param);
+			$this->style->setPosition();
+			$this->style->FontSet();
+			
+			$name = $param['name'];
+		
+			// position d'affichage
+			$x = $this->pdf->getX();
+			$y = $this->pdf->getY();
+			$f = 1.08*$this->style->value['font-size'];
+			
+			switch($param['type'])
+			{
+				case 'checkbox':
+					$w = 3;
+					$h = $w;
+					if ($h<$f) $y+= ($f-$h)*0.5;
+					$this->pdf->form_InputCheckBox($name, $x, $y, $w, isset($param['checked']));
+					break;
+				
+				case 'radio':
+					$w = 3;
+					$h = $w;
+					if ($h<$f) $y+= ($f-$h)*0.5;
+					$this->pdf->form_InputRadio($name, $x, $y, $w);
+					break;
+					
+				case 'hidden':
+					$w = 0;
+					$h = 0;
+					$this->pdf->form_InputHidden($name, $param['value']);
+					break;
+					
+				case 'text':
+					$w = $this->style->value['width']; if (!$w) $w = 40; 
+					$h = $f*1.3;
+					$prop = array();
+					$prop['value'] = $param['value'];
+					$this->pdf->form_InputText($name, $x, $y, $w, $h, $prop);
+					break;
+
+				case 'submit':
+					$w = $this->style->value['width'];	if (!$w) $w = 40; 
+					$h = $this->style->value['height'];	if (!$h) $h = $f*1.3;
+					$action =  'this.submitForm("'.$this->isInForm.'", false);';
+					$this->pdf->form_InputButton($name, $x, $y, $w, $h, $param['value'], $action, array());
+					break;
+					
+				case 'reset':
+					$w = $this->style->value['width'];	if (!$w) $w = 40; 
+					$h = $this->style->value['height'];	if (!$h) $h = $f*1.3;
+					$action =  'this.resetForm();';
+					$this->pdf->form_InputButton($name, $x, $y, $w, $h, $param['value'], $action, array());
+					break;
+					
+				case 'button':
+					$w = $this->style->value['width'];	if (!$w) $w = 40; 
+					$h = $this->style->value['height'];	if (!$h) $h = $f*1.3;
+					$action = isset($param['onclick']) ? $param['onclick'] : '';
+					$this->pdf->form_InputButton($name, $x, $y, $w, $h, $param['value'], $action, array());
+					break;
+					
+				default:
+					$w = 0;
+					$h = 0;
+					break;
+			}
+			
+			$this->maxX = max($this->maxX, $x+$w);
+			$this->maxY = max($this->maxY, $y+$h);
+ 			$this->maxH = max($this->maxH, $h);
+			$this->pdf->setX($x+$w);
+			
+			$this->style->load();
+			$this->style->FontSet();
+			
+			return true;
+		}
+		
+		/**
+		* balise : DRAW
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_DRAW($param)
+		{
+			if ($this->forOneLine) return false;
+			if ($this->DEBUG_actif) $this->DEBUG_add('DRAW', true);
+			
+			$this->style->save();
+			$this->style->analyse('draw', $param);
+			$this->style->FontSet();
+			
+			$align_object = null;
+			if ($this->style->value['margin-auto']) $align_object = 'center';
+			
+			$over_w = $this->style->value['width'];
+			$over_h = $this->style->value['height'];
+			$this->style->value['old_maxX'] = $this->maxX;
+			$this->style->value['old_maxY'] = $this->maxY;
+			$this->style->value['old_maxH'] = $this->maxH;
+
+			$w = $this->style->value['width'];
+			$h = $this->style->value['height'];
+			
+			if (!$this->style->value['position'])
+			{
+				if (
+					$w < ($this->pdf->getW() - $this->pdf->getlMargin()-$this->pdf->getrMargin()) &&
+					$this->pdf->getX() + $w>=($this->pdf->getW() - $this->pdf->getrMargin())
+					)
+					$this->o_BR(array());
+	
+				if (
+						($h < ($this->pdf->getH() - $this->pdf->gettMargin()-$this->pdf->getbMargin())) &&
+						($this->pdf->getY() + $h>=($this->pdf->getH() - $this->pdf->getbMargin())) && 
+						!$this->isInOverflow
+					)
+					$this->setNewPage();
+				
+				// en cas d'alignement => correction
+				$old = $this->style->getOldValues();
+				$parent_w = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
+				
+				if ($parent_w>$w)
+				{				
+					if ($align_object=='center')		$this->pdf->setX($this->pdf->getX() + ($parent_w-$w)*0.5);
+					else if ($align_object=='right')	$this->pdf->setX($this->pdf->getX() + $parent_w-$w);
+				}
+				
+				$this->style->setPosition();
+			}
+			else
+			{
+				// en cas d'alignement => correction
+				$old = $this->style->getOldValues();
+				$parent_w = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
+				
+				if ($parent_w>$w)
+				{				
+					if ($align_object=='center')		$this->pdf->setX($this->pdf->getX() + ($parent_w-$w)*0.5);
+					else if ($align_object=='right')	$this->pdf->setX($this->pdf->getX() + $parent_w-$w);
+				}
+				
+				$this->style->setPosition();
+				$this->saveMax();
+				$this->maxX = 0;
+				$this->maxY = 0;
+				$this->maxH = 0;
+				$this->maxE = 0;
+			}		
+			
+			// initialisation du style des bordures de la div
+			$this->drawRectangle(
+					$this->style->value['x'],
+					$this->style->value['y'],
+					$this->style->value['width'],
+					$this->style->value['height'],
+					$this->style->value['border'],
+					$this->style->value['padding'],
+					0,
+					$this->style->value['background']
+				);
+			
+			$marge = array();
+			$marge['l'] = $this->style->value['border']['l']['width'];
+			$marge['r'] = $this->style->value['border']['r']['width'];
+			$marge['t'] = $this->style->value['border']['t']['width'];
+			$marge['b'] = $this->style->value['border']['b']['width'];
+
+			$this->style->value['width'] -= $marge['l']+$marge['r'];
+			$this->style->value['height']-= $marge['t']+$marge['b'];
+		
+			$over_w-= $marge['l']+$marge['r'];
+			$over_h-= $marge['t']+$marge['b'];
+			$this->pdf->clippingPathOpen(
+				$this->style->value['x']+$marge['l'],
+				$this->style->value['y']+$marge['t'],
+				$this->style->value['width'],
+				$this->style->value['height']
+			);		
+
+			// limitation des marges aux dimensions du contenu
+			$mL = $this->style->value['x']+$marge['l'];
+			$mR = $this->pdf->getW() - $mL - $over_w;
+			
+			$x = $this->style->value['x']+$marge['l'];
+			$y = $this->style->value['y']+$marge['t'];
+			$this->saveMargin($mL, 0, $mR);
+			$this->pdf->setXY($x, $y);
+			
+			$this->isInDraw = array(
+				'x' => $x,
+				'y' => $y,
+				'w' => $over_w,
+				'h' => $over_h,
+			);
+			$this->pdf->doTransform(array(1,0,0,1,$x,$y));
+			return true;
+		}
+			
+		/**
+		* balise : DRAW
+		* mode : FERMETURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function c_DRAW($param)
+		{
+			if ($this->forOneLine) return false;
+
+			$this->pdf->undoTransform();
+			$this->pdf->clippingPathClose();
+			
+			$this->maxX = $this->style->value['old_maxX'];
+			$this->maxY = $this->style->value['old_maxY'];
+			$this->maxH = $this->style->value['old_maxH'];
+			
+			$marge = array();
+			$marge['l'] = $this->style->value['border']['l']['width'];
+			$marge['r'] = $this->style->value['border']['r']['width'];
+			$marge['t'] = $this->style->value['border']['t']['width'];
+			$marge['b'] = $this->style->value['border']['b']['width'];
+			
+			$x = $this->style->value['x'];
+			$y = $this->style->value['y'];
+			$w = $this->style->value['width']+$marge['l']+$marge['r'];
+			$h = $this->style->value['height']+$marge['t']+$marge['b'];
+			
+			if ($this->style->value['position']!='absolute')
+			{
+				// position
+				$this->pdf->setXY($x+$w, $y);
+				 	
+				// position MAX
+				$this->maxX = max($this->maxX, $x+$w);
+				$this->maxY = max($this->maxY, $y+$h);
+		 		$this->maxH = max($this->maxH, $h);
+			}
+			else
+			{
+				// position
+				$this->pdf->setXY($this->style->value['xc'], $this->style->value['yc']);
+				 	
+				$this->loadMax();
+			}
+	 	
+	 		$block = ($this->style->value['display']!='inline' && $this->style->value['position']!='absolute');
+	 		
+	 		$this->style->load();
+			$this->style->FontSet();
+			$this->loadMargin();
+			
+			if ($block) $this->o_BR(array());
+			if ($this->DEBUG_actif) $this->DEBUG_add('DRAW', false);
+			
+			$this->isInDraw = null;
+			
+			return true;
+		}
+		
+		/**
+		* balise : LINE
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_LINE($param)
+		{
+			if (!$this->isInDraw) HTML2PDF::makeError(8, __FILE__, __LINE__, 'LINE');
+			$this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
+			$this->style->save();
+	 		$styles = $this->style->getSvgStyle('path', $param);
+	 		$styles['fill'] = null;
+			$style = $this->pdf->svgSetStyle($styles);
+	 					
+			$x1 = isset($param['x1']) ? $this->style->ConvertToMM($param['x1'], $this->isInDraw['w']) : 0.;
+			$y1 = isset($param['y1']) ? $this->style->ConvertToMM($param['y1'], $this->isInDraw['h']) : 0.;
+			$x2 = isset($param['x2']) ? $this->style->ConvertToMM($param['x2'], $this->isInDraw['w']) : 0.;
+			$y2 = isset($param['y2']) ? $this->style->ConvertToMM($param['y2'], $this->isInDraw['h']) : 0.;
+			$this->pdf->svgLine($x1, $y1, $x2, $y2);
+
+			$this->pdf->undoTransform();
+			$this->style->load();
+		}
+		
+		/**
+		* balise : RECT
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_RECT($param)
+		{
+			if (!$this->isInDraw) HTML2PDF::makeError(8, __FILE__, __LINE__, 'RECT');
+			$this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
+			$this->style->save();
+	 		$styles = $this->style->getSvgStyle('path', $param);
+			$style = $this->pdf->svgSetStyle($styles);
+	 					
+			$x = isset($param['x']) ? $this->style->ConvertToMM($param['x'], $this->isInDraw['w']) : 0.;
+			$y = isset($param['y']) ? $this->style->ConvertToMM($param['y'], $this->isInDraw['h']) : 0.;
+			$w = isset($param['w']) ? $this->style->ConvertToMM($param['w'], $this->isInDraw['w']) : 0.;
+			$h = isset($param['h']) ? $this->style->ConvertToMM($param['h'], $this->isInDraw['h']) : 0.;
+				
+			$this->pdf->svgRect($x, $y, $w, $h, $style);
+
+			$this->pdf->undoTransform();
+			$this->style->load();
+		}
+		
+		/**
+		* balise : CIRCLE
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_CIRCLE($param)
+		{
+			if (!$this->isInDraw) HTML2PDF::makeError(8, __FILE__, __LINE__, 'CIRCLE');
+			$this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
+			$this->style->save();
+	 		$styles = $this->style->getSvgStyle('path', $param);
+			$style = $this->pdf->svgSetStyle($styles);
+	 					
+			$cx = isset($param['cx']) ? $this->style->ConvertToMM($param['cx'], $this->isInDraw['w']) : 0.;
+			$cy = isset($param['cy']) ? $this->style->ConvertToMM($param['cy'], $this->isInDraw['h']) : 0.;
+			$r = isset($param['r']) ? $this->style->ConvertToMM($param['r'], $this->isInDraw['w']) : 0.;
+			$this->pdf->svgEllipse($cx, $cy, $r, $r, $style);
+			
+			$this->pdf->undoTransform();
+			$this->style->load();
+		}
+		
+		/**
+		* balise : ELLIPSE
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_ELLIPSE($param)
+		{
+			if (!$this->isInDraw) HTML2PDF::makeError(8, __FILE__, __LINE__, 'ELLIPSE');
+			$this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
+			$this->style->save();
+	 		$styles = $this->style->getSvgStyle('path', $param);
+			$style = $this->pdf->svgSetStyle($styles);
+	 					
+			$cx = isset($param['cx']) ? $this->style->ConvertToMM($param['cx'], $this->isInDraw['w']) : 0.;
+			$cy = isset($param['cy']) ? $this->style->ConvertToMM($param['cy'], $this->isInDraw['h']) : 0.;
+			$rx = isset($param['ry']) ? $this->style->ConvertToMM($param['rx'], $this->isInDraw['w']) : 0.;
+			$ry = isset($param['rx']) ? $this->style->ConvertToMM($param['ry'], $this->isInDraw['h']) : 0.;
+			$this->pdf->svgEllipse($cx, $cy, $rx, $ry, $style);
+						
+			$this->pdf->undoTransform();
+			$this->style->load();
+		}
+		
+		
+			/**
+		* balise : POLYLINE
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_POLYLINE($param)
+		{
+			if (!$this->isInDraw) HTML2PDF::makeError(8, __FILE__, __LINE__, 'POLYGON');
+			$this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
+			$this->style->save();
+	 		$styles = $this->style->getSvgStyle('path', $param);
+			$style = $this->pdf->svgSetStyle($styles);
+	 		
+			$path = isset($param['points']) ? $param['points'] : null;
+			if ($path)
+			{
+				$path = str_replace(',', ' ', $path);
+				$path = preg_replace('/[\s]+/', ' ', trim($path));
+				
+				// decoupage et nettoyage
+				$path = explode(' ', $path);
+				foreach($path as $k => $v)
+				{
+					$path[$k] = trim($v);
+					if ($path[$k]==='') unset($path[$k]);
+				}
+				$path = array_values($path);
+
+				$actions = array();
+				for($k=0; $k<count($path); $k+=2)
+				{
+					$actions[] = array(($k ? 'L' : 'M') ,
+										$this->style->ConvertToMM($path[$k+0], $this->isInDraw['w']),
+										$this->style->ConvertToMM($path[$k+1], $this->isInDraw['h'])); 	
+				}
+
+				// on trace
+				$this->pdf->svgPolygone($actions, $style);
+			}
+			
+			$this->pdf->undoTransform();
+			$this->style->load();
+		}
+		
+		/**
+		* balise : POLYGON
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_POLYGON($param)
+		{
+			if (!$this->isInDraw) HTML2PDF::makeError(8, __FILE__, __LINE__, 'POLYGON');
+			$this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
+			$this->style->save();
+	 		$styles = $this->style->getSvgStyle('path', $param);
+			$style = $this->pdf->svgSetStyle($styles);
+			
+			$path = isset($param['points']) ? $param['points'] : null;
+			if ($path)
+			{
+				$path = str_replace(',', ' ', $path);
+				$path = preg_replace('/[\s]+/', ' ', trim($path));
+				
+				// decoupage et nettoyage
+				$path = explode(' ', $path);
+				foreach($path as $k => $v)
+				{
+					$path[$k] = trim($v);
+					if ($path[$k]==='') unset($path[$k]);
+				}
+				$path = array_values($path);
+
+				$actions = array();
+				for($k=0; $k<count($path); $k+=2)
+				{
+					$actions[] = array(($k ? 'L' : 'M') ,
+										$this->style->ConvertToMM($path[$k+0], $this->isInDraw['w']),
+										$this->style->ConvertToMM($path[$k+1], $this->isInDraw['h'])); 	
+				}
+				$actions[] = array('z');
+				// on trace
+				$this->pdf->svgPolygone($actions, $style);
+			}
+			
+			$this->pdf->undoTransform();
+			$this->style->load();
+		}
+
+		/**
+		* balise : PATH
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_PATH($param)
+		{
+			if (!$this->isInDraw) HTML2PDF::makeError(8, __FILE__, __LINE__, 'PATH');
+			$this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
+			$this->style->save();
+	 		$styles = $this->style->getSvgStyle('path', $param);
+			$style = $this->pdf->svgSetStyle($styles);
+	 					
+			$path = isset($param['d']) ? $param['d'] : null;
+			if ($path)
+			{
+				// preparation
+				$path = str_replace(',', ' ', $path);
+				$path = preg_replace('/([a-zA-Z])([0-9\.\-])/', '$1 $2', $path); 
+				$path = preg_replace('/([0-9\.])([a-zA-Z])/', '$1 $2', $path);
+				$path = preg_replace('/[\s]+/', ' ', trim($path));
+				$path = preg_replace('/ ([a-z]{2})/', '$1', $path); 
+				
+				// decoupage et nettoyage
+				$path = explode(' ', $path);
+				foreach($path as $k => $v)
+				{
+					$path[$k] = trim($v);
+					if ($path[$k]==='') unset($path[$k]);
+				}
+				$path = array_values($path);
+
+				// conversion des unites
+				$actions = array();
+				$action = array();
+				for($k=0; $k<count($path); $k+=count($action))
+				{
+					$action = array();
+					$action[] = $path[$k];
+					switch($path[$k])
+					{
+						case 'C':
+						case 'c':
+							$action[] = $this->style->ConvertToMM($path[$k+1], $this->isInDraw['w']);	// x1
+							$action[] = $this->style->ConvertToMM($path[$k+2], $this->isInDraw['h']);	// y1
+							$action[] = $this->style->ConvertToMM($path[$k+3], $this->isInDraw['w']);	// x2
+							$action[] = $this->style->ConvertToMM($path[$k+4], $this->isInDraw['h']);	// y2
+							$action[] = $this->style->ConvertToMM($path[$k+5], $this->isInDraw['w']);	// x
+							$action[] = $this->style->ConvertToMM($path[$k+6], $this->isInDraw['h']);	// y
+							break;
+							
+						case 'Q':
+						case 'S':
+						case 'q':
+						case 's':
+							$action[] = $this->style->ConvertToMM($path[$k+1], $this->isInDraw['w']);	// x2
+							$action[] = $this->style->ConvertToMM($path[$k+2], $this->isInDraw['h']);	// y2
+							$action[] = $this->style->ConvertToMM($path[$k+3], $this->isInDraw['w']);	// x
+							$action[] = $this->style->ConvertToMM($path[$k+4], $this->isInDraw['h']);	// y
+							break;
+							
+						case 'A':
+						case 'a':
+							$action[] = $this->style->ConvertToMM($path[$k+1], $this->isInDraw['w']);	// rx
+							$action[] = $this->style->ConvertToMM($path[$k+2], $this->isInDraw['h']);	// ry
+							$action[] = 1.*$path[$k+3];													// angle de deviation de l'axe X
+							$action[] = ($path[$k+4]=='1') ? 1 : 0;										// large-arc-flag 
+							$action[] = ($path[$k+5]=='1') ? 1 : 0; 									// sweep-flag
+							$action[] = $this->style->ConvertToMM($path[$k+6], $this->isInDraw['w']);	// x
+							$action[] = $this->style->ConvertToMM($path[$k+7], $this->isInDraw['h']);	// y
+							break;
+							
+						case 'M':
+						case 'L':
+						case 'T':
+						case 'm':
+						case 'l':
+						case 't':
+							$action[] = $this->style->ConvertToMM($path[$k+1], $this->isInDraw['w']);	// x
+							$action[] = $this->style->ConvertToMM($path[$k+2], $this->isInDraw['h']);	// y
+							break;
+							
+						case 'H':
+						case 'h':
+							$action[] = $this->style->ConvertToMM($path[$k+1], $this->isInDraw['w']);	// x
+							break;
+							
+						case 'V':
+						case 'v':
+							$action[] = $this->style->ConvertToMM($path[$k+1], $this->isInDraw['h']);	// y
+							break;
+							
+						case 'z':
+						case 'Z':
+						default:
+							break;
+					}
+					$actions[] = $action;
+				}
+				
+				// on trace
+				$this->pdf->svgPolygone($actions, $style);
+			}
+			
+			$this->pdf->undoTransform();
+			$this->style->load();
+		}
+		
+		/**
+		* balise : G
+		* mode : OUVERTURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function o_G($param)
+		{
+			if (!$this->isInDraw) HTML2PDF::makeError(8, __FILE__, __LINE__, 'LINE');
+			$this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
+			$this->style->save();
+	 		$styles = $this->style->getSvgStyle('path', $param);
+			$style = $this->pdf->svgSetStyle($styles);
+		}
+		
+		/**
+		* balise : G
+		* mode : FERMETURE
+		* 
+		* @param	array	paramètres de l'élément de parsing
+		* @return	null
+		*/	
+		function c_G($param)
+		{
+			$this->pdf->undoTransform();
+			$this->style->load();
+		}
+		
+		function _prepareTransform($transform)
+		{
+			if (!$transform) return null;
+			$actions = array();
+			if (!preg_match_all('/([a-z]+)\(([^\)]*)\)/isU', $transform, $match)) return null;
+
+			for($k=0; $k<count($match[0]); $k++)
+			{
+				$nom = strtolower($match[1][$k]);
+				$val = explode(',', trim($match[2][$k]));
+				foreach($val as $i => $j)
+					$val[$i] = trim($j);	
+
+				switch($nom)
+				{
+					case 'scale':
+						if (!isset($val[0])) $val[0] = 1.;		else $val[0] = 1.*$val[0];
+						if (!isset($val[1])) $val[1] = $val[0];	else $val[1] = 1.*$val[1];
+						$actions[] = array($val[0],0,0,$val[1],0,0);
+						break;	
+					
+					case 'translate':
+						if (!isset($val[0])) $val[0] = 0.; else $val[0] = $this->style->ConvertToMM($val[0], $this->isInDraw['w']);
+						if (!isset($val[1])) $val[1] = 0.; else $val[1] = $this->style->ConvertToMM($val[1], $this->isInDraw['h']);
+						$actions[] = array(1,0,0,1,$val[0],$val[1]);
+						break;
+
+					case 'rotate':
+						if (!isset($val[0])) $val[0] = 0.; else $val[0] = $val[0]*M_PI/180.;
+						if (!isset($val[1])) $val[1] = 0.; else $val[1] = $this->style->ConvertToMM($val[1], $this->isInDraw['w']);
+						if (!isset($val[2])) $val[2] = 0.; else $val[2] = $this->style->ConvertToMM($val[2], $this->isInDraw['h']);
+						if ($val[1] || $val[2]) $actions[] = array(1,0,0,1,-$val[1],-$val[2]);
+						$actions[] = array(cos($val[0]),sin($val[0]),-sin($val[0]),cos($val[0]),0,0);
+						if ($val[1] || $val[2]) $actions[] = array(1,0,0,1,$val[1],$val[2]);
+						break;
+						
+					case 'skewx':
+						if (!isset($val[0])) $val[0] = 0.; else $val[0] = $val[0]*M_PI/180.;
+						$actions[] = array(1,0,tan($val[0]),1,0,0);
+						break;
+						
+					case 'skewy':
+						if (!isset($val[0])) $val[0] = 0.; else $val[0] = $val[0]*M_PI/180.;
+						$actions[] = array(1,tan($val[0]),0,1,0,0);
+						break;
+					case 'matrix':
+						if (!isset($val[0])) $val[0] = 0.; else $val[0] = $val[0]*1.;
+						if (!isset($val[1])) $val[1] = 0.; else $val[1] = $val[1]*1.;
+						if (!isset($val[2])) $val[2] = 0.; else $val[2] = $val[2]*1.;
+						if (!isset($val[3])) $val[3] = 0.; else $val[3] = $val[3]*1.;
+						if (!isset($val[4])) $val[4] = 0.; else $val[4] = $this->style->ConvertToMM($val[4], $this->isInDraw['w']);
+						if (!isset($val[5])) $val[5] = 0.; else $val[5] = $this->style->ConvertToMM($val[5], $this->isInDraw['h']);
+						$actions[] =$val;
+						break;
+				}
+			}
+
+			if (!$actions) return null;
+			$m = $actions[0]; unset($actions[0]);
+			foreach($actions as $n)
+			{
+				$m = array(
+					$m[0]*$n[0]+$m[2]*$n[1],
+					$m[1]*$n[0]+$m[3]*$n[1],
+					$m[0]*$n[2]+$m[2]*$n[3],
+					$m[1]*$n[2]+$m[3]*$n[3],
+					$m[0]*$n[4]+$m[2]*$n[5]+$m[4],
+					$m[1]*$n[4]+$m[3]*$n[5]+$m[5]
+				);	
+			}
+		
+			return $m;
+		}
+		
+		function _getDrawNumber(&$lst, $key, $n=1, $correct=false)
+		{
+			$res = array_fill(0, $n, 0);
+			$tmp = isset($lst[$key]) ? $lst[$key] : null;
+			if (!$tmp) return $res;
+			$tmp = explode(' ', trim(preg_replace('/[\s]+/', ' ', $tmp)));
+			foreach($tmp as $k => $v)
+			{
+				$v = trim($v);
+				if (!$correct)
+				{
+					$res[$k] = $this->style->ConvertToMM($v);
+				}
+				else
+				{
+					$res[$k] = $this->style->ConvertToMM($v, ($k%2) ? $this->isInDraw['h'] : $this->isInDraw['w']);
+				}
+			}
+			return $res;
+		}
+		
+		/**
+		* permet d'afficher un index automatique utilisant les bookmark
+		* 
+		* @param	string	titre du sommaire
+		* @param	int		taille en mm de la fonte du titre du sommaire
+		* @param	int		taille en mm de la fonte du texte du sommaire
+		* @param	boolean	ajouter un bookmark spécifique pour l'index, juste avant le début de celui-ci
+		* @param	boolean	afficher les numéros de page associés à chaque bookmark
+		* @param	int		si présent : page où afficher le sommaire. sinon : nouvelle page
+		* @param	string	nom de la fonte à utiliser
+		* @return	null
+		*/	
+		function createIndex($titre = 'Index', $size_title = 20, $size_bookmark = 15, $bookmark_title = true, $display_page = true, $on_page = null, $font_name = 'helvetica')
+		{
+			$old_page = $this->INDEX_NewPage($on_page);
+			$this->pdf->createIndex($this, $titre, $size_title, $size_bookmark, $bookmark_title, $display_page, $on_page, $font_name);				
+			if ($old_page) $this->pdf->setPage($old_page);	
+		}
+			
+		/**
+		* nouvelle page pour l'index. ne pas utiliser directement. seul MyPDF doit l'utiliser !!!!
+		* 
+		* @param	int		page courante
+		* @return	null
+		*/	
+		function INDEX_NewPage(&$page)
+		{
+			if ($page)
+			{
+				$old_page = $this->pdf->getPage();
+				$this->pdf->setPage($page);
+				$this->pdf->setXY($this->margeLeft, $this->margeTop);
+				$this->maxH = 0;
+				$page++;
+				return $old_page;
+			}
+			else
+			{
+				$this->setNewPage();
+
+				return null;
+			}
+		}
+		
+		/**
+		* chargement du fichier de langue
+		* 
+		* @param	string langue
+		* @return	null
+		*/
+		function textLOAD($langue)
+		{
+			global $HTML2PDF_TEXTES;
+			if (count($HTML2PDF_TEXTES)) return true;
+			
+			if (!preg_match('/^([a-z0-9]+)$/isU', $langue))
+			{
+				echo 'ERROR : language code <b>'.$langue.'</b> incorrect.';
+				exit;
+			}
+			
+			$file = dirname(__FILE__).'/langues/'.strtolower($langue).'.txt';
+			if (!is_file($file))
+			{
+				echo 'ERROR : language code <b>'.$langue.'</b> unknown.<br>';
+				echo 'You can create the translation file <b>'.$file.'</b> and send it to me in order to integrate it into a future version.';
+				exit;				
+			}
+			
+			$texte = array();
+			$infos = file($file);
+			foreach($infos as $val)
+			{
+				$val = trim($val);
+				$val = explode("\t", $val);
+				if (count($val)<2) continue;
+				
+				$t_k = trim($val[0]); unset($val[0]);
+				$t_v = trim(implode(' ', $val));
+				if ($t_k && $t_v) $texte[$t_k] = $t_v;
+			}
+			$HTML2PDF_TEXTES = $texte;
+			
+			return true;
+		}
+		
+		/**
+		* recuperer un texte precis
+		* 
+		* @param	string code du texte
+		* @return	null
+		*/
+		function textGET($key)
+		{
+			global $HTML2PDF_TEXTES;
+			if (!isset($HTML2PDF_TEXTES[$key])) return '######';
+			
+			return $HTML2PDF_TEXTES[$key];
+		}
+		
+		/**
+		* generer une erreur HTML2PDF
+		* 
+		* @param	int		numero de l'erreur
+		* @param	string	nom du fichier ou c'est produit l'erreur
+		* @param	int		numero de la ligne ou c'est produit l'erreur
+		* @param	mixed	indications suplementaires sur l'erreur
+		* @return	string	code HTML eventuel associé à l'erreur
+		*/
+		function makeError($err, $file, $line, $other = null, $html = '')
+		{
+			$msg = '';
+			switch($err)
+			{
+				case 1:
+					$msg = (HTML2PDF::textGET('err01'));
+					$msg = str_replace('[[OTHER]]', $other, $msg); 
+					break;
+					
+				case 2:
+					$msg = (HTML2PDF::textGET('err02'));
+					$msg = str_replace('[[OTHER_0]]', $other[0], $msg); 
+					$msg = str_replace('[[OTHER_1]]', $other[1], $msg); 
+					$msg = str_replace('[[OTHER_2]]', $other[2], $msg); 
+					break;
+					
+				case 3:
+					$msg = (HTML2PDF::textGET('err03'));
+					$msg = str_replace('[[OTHER]]', $other, $msg); 
+					break;
+					
+				case 4:
+					$msg = (HTML2PDF::textGET('err04'));
+					$msg = str_replace('[[OTHER]]', print_r($other, true), $msg); 
+					break;
+					
+				case 5:
+					$msg = (HTML2PDF::textGET('err05'));
+					$msg = str_replace('[[OTHER]]', print_r($other, true), $msg); 
+					break;
+					
+				case 6:
+					$msg = (HTML2PDF::textGET('err06'));
+					$msg = str_replace('[[OTHER]]', $other, $msg); 
+					break;	
+					
+				case 7:
+					$msg = (HTML2PDF::textGET('err07'));
+					break;	
+					
+				case 8:
+					$msg = (HTML2PDF::textGET('err08'));
+					$msg = str_replace('[[OTHER]]', $other, $msg); 
+					break;
+					
+				case 9:
+					$msg = (HTML2PDF::textGET('err09'));
+					$msg = str_replace('[[OTHER_0]]', $other[0], $msg); 
+					$msg = str_replace('[[OTHER_1]]', $other[1], $msg); 
+					break;
+			}
+			echo '<span style="color: #AA0000; font-weight: bold;">'.(HTML2PDF::textGET('txt01')).$err.'</span><br>';
+			echo (HTML2PDF::textGET('txt02')).' '.$file.'<br>';
+			echo (HTML2PDF::textGET('txt03')).' '.$line.'<br>';
+			echo '<br>';
+			echo $msg;
+			echo '<br>';
+			if ($html) echo '<br>HTML : ...'.htmlentities($html).'...';
+			exit;	
+		}
+	}
+}
diff --git a/library/html2pdf/langues/ca.txt b/library/html2pdf/langues/ca.txt
index 56034f6d5..4f9dbb9b5 100644
--- a/library/html2pdf/langues/ca.txt
+++ b/library/html2pdf/langues/ca.txt
@@ -1,21 +1,21 @@
-err01	L'etiqueta <b>&lt;[[OTHER]]&gt;</b> encara no existeix.<br><br>Si voleu afegir-la, heu de crear els mètodes <b>o_[[OTHER]]</b> (per l'obertura) i <b>c_[[OTHER]]</b> (pel tancament) seguint el model de les etiquetes existents.<br><br>A més, si creeu nous mètodes, envieu-ho a webmaster@html2pdf.fr per tal d'afegir-los a les següents versions d'HTML2PDF, i que tothom en pugui gaudir.
-err02	Frase de 1000 línies => massa llarga<br><b>Frase :</b> [[OTHER_0]]<br><b>Mida casella :</b> [[OTHER_1]]<br><b>Mida text :</b> [[OTHER_2]]<br>
-err03	Codi HTML no vàlid, una etiqueta té un tancament de més : <b>&lt;[[OTHER]]&gt;</b>
-err04	Codi HTML no vàlid, les etiquetes no estan tancades en l'ordre correcte.<br>Estat : <pre>[[OTHER]]</pre>
-err05	Codi HTML no vàlid, totes les etiquetes han de tenir el seu tancament.<br>Estat : <pre>[[OTHER]]</pre>
-err06	Impossible carregar la imatge <b>[[OTHER]]</b>
-err07	El contingut d'una etiqueta TD no quep en una sola pàgina
-err08	<b>&lt;[[OTHER]]&gt;</b> tag not in a &lt;DRAW&gt; tag
-err09	The using of the <b>&lt;[[OTHER_0]]&gt;</b>> tag has changed, you can not use [[OTHER_1]] anymore. Read the WIKI
-txt01	ERROR n°
-txt02	Fitxer :
-txt03	Línia :
-pdf01	Document generat el [[date_d]]/[[date_m]]/[[date_y]]
-pdf02	Document generat a les [[date_h]]:[[date_i]]
-pdf03	Document generat el [[date_d]]/[[date_m]]/[[date_y]] a les [[date_h]]:[[date_i]]
-pdf04	Pàgina [[current]]/[[nb]]
-pdf05	Els formularis requereixen l'ús de l'Adobe Reader 9
-vue01	CAPÇALERA
-vue02	PEU DE PÀGINA
-vue03	PÀGINA
-vue04	Visualització
+err01	L'etiqueta <b>&lt;[[OTHER]]&gt;</b> encara no existeix.<br><br>Si voleu afegir-la, heu de crear els mètodes <b>o_[[OTHER]]</b> (per l'obertura) i <b>c_[[OTHER]]</b> (pel tancament) seguint el model de les etiquetes existents.<br><br>A més, si creeu nous mètodes, envieu-ho a webmaster@html2pdf.fr per tal d'afegir-los a les següents versions d'HTML2PDF, i que tothom en pugui gaudir.
+err02	Frase de 1000 línies => massa llarga<br><b>Frase :</b> [[OTHER_0]]<br><b>Mida casella :</b> [[OTHER_1]]<br><b>Mida text :</b> [[OTHER_2]]<br>
+err03	Codi HTML no vàlid, una etiqueta té un tancament de més : <b>&lt;[[OTHER]]&gt;</b>
+err04	Codi HTML no vàlid, les etiquetes no estan tancades en l'ordre correcte.<br>Estat : <pre>[[OTHER]]</pre>
+err05	Codi HTML no vàlid, totes les etiquetes han de tenir el seu tancament.<br>Estat : <pre>[[OTHER]]</pre>
+err06	Impossible carregar la imatge <b>[[OTHER]]</b>
+err07	El contingut d'una etiqueta TD no quep en una sola pàgina
+err08	<b>&lt;[[OTHER]]&gt;</b> tag not in a &lt;DRAW&gt; tag
+err09	The using of the <b>&lt;[[OTHER_0]]&gt;</b>> tag has changed, you can not use [[OTHER_1]] anymore. Read the WIKI
+txt01	ERROR n°
+txt02	Fitxer :
+txt03	Línia :
+pdf01	Document generat el [[date_d]]/[[date_m]]/[[date_y]]
+pdf02	Document generat a les [[date_h]]:[[date_i]]
+pdf03	Document generat el [[date_d]]/[[date_m]]/[[date_y]] a les [[date_h]]:[[date_i]]
+pdf04	Pàgina [[current]]/[[nb]]
+pdf05	Els formularis requereixen l'ús de l'Adobe Reader 9
+vue01	CAPÇALERA
+vue02	PEU DE PÀGINA
+vue03	PÀGINA
+vue04	Visualització
diff --git a/library/html2pdf/langues/cs.txt b/library/html2pdf/langues/cs.txt
index b61b2e6b3..083861c70 100644
--- a/library/html2pdf/langues/cs.txt
+++ b/library/html2pdf/langues/cs.txt
@@ -1,21 +1,21 @@
-err01	Element <b>&lt;[[OTHER]]&gt;</b> neexistuje.<br><br>Pokud ho chcete přidat, musíte vytvořit metodu <b>o_[[OTHER]]</b> (pro otevření) a <b>c_[[OTHER]]</b> (pro zavření) k začlenění do modelu jako existující element.<br><br>Pokud vytvoříte metodu, nebojte se poslat email na webmaster@html2pdf.fr k zařazení do další verze HTML2PDF.
-err02	Sentence of 1000 lines => too long<br><b>Sentence :</b> [[OTHER_0]]<br><b>Width box :</b> [[OTHER_1]]<br><b>Length text :</b> [[OTHER_2]]<br>
-err03	Chyba v HTML, element je příliš mnohokrát zavřen: <b>&lt;[[OTHER]]&gt;</b>
-err04	Chyba v HTML, element není uzavřen ve správném pořadí.<br>Stav : <pre>[[OTHER]]</pre>
-err05	Chyba v HTML, všechny elementy musí být zavřeny.<br>Stav : <pre>[[OTHER]]</pre>
-err06	Menohu načíst orbázek <b>[[OTHER]]</b>
-err07	Obsah TD elementu se nevejde na jednu stránku
-err08	<b>&lt;[[OTHER]]&gt;</b> element není v &lt;DRAW&gt; elementu
-err09	The using of the <b>&lt;[[OTHER_0]]&gt;</b>> tag has changed, you can not use [[OTHER_1]] anymore. Read the WIKI
-txt01	CHYBA č.
-txt02	Soubor :
-txt03	Řádek :
-pdf01	Dokument vytvořen dne [[date_d]].[[date_m]].[[date_y]]
-pdf02	Dokument vytvořen v [[date_h]]:[[date_i]]
-pdf03	Dokument vytvořen dne [[date_d]].[[date_m]].[[date_y]] v [[date_h]]:[[date_i]]
-pdf04	Stránka [[current]]/[[nb]]
-pdf05	Formuláře vyžadují Adobe Reader 9
-vue01	HLAVIČKA
-vue02	PATIČKA
-vue03	STRÁNKA
-vue04	POHLED
+err01	Element <b>&lt;[[OTHER]]&gt;</b> neexistuje.<br><br>Pokud ho chcete přidat, musíte vytvořit metodu <b>o_[[OTHER]]</b> (pro otevření) a <b>c_[[OTHER]]</b> (pro zavření) k začlenění do modelu jako existující element.<br><br>Pokud vytvoříte metodu, nebojte se poslat email na webmaster@html2pdf.fr k zařazení do další verze HTML2PDF.
+err02	Sentence of 1000 lines => too long<br><b>Sentence :</b> [[OTHER_0]]<br><b>Width box :</b> [[OTHER_1]]<br><b>Length text :</b> [[OTHER_2]]<br>
+err03	Chyba v HTML, element je příliš mnohokrát zavřen: <b>&lt;[[OTHER]]&gt;</b>
+err04	Chyba v HTML, element není uzavřen ve správném pořadí.<br>Stav : <pre>[[OTHER]]</pre>
+err05	Chyba v HTML, všechny elementy musí být zavřeny.<br>Stav : <pre>[[OTHER]]</pre>
+err06	Menohu načíst orbázek <b>[[OTHER]]</b>
+err07	Obsah TD elementu se nevejde na jednu stránku
+err08	<b>&lt;[[OTHER]]&gt;</b> element není v &lt;DRAW&gt; elementu
+err09	The using of the <b>&lt;[[OTHER_0]]&gt;</b>> tag has changed, you can not use [[OTHER_1]] anymore. Read the WIKI
+txt01	CHYBA č.
+txt02	Soubor :
+txt03	Řádek :
+pdf01	Dokument vytvořen dne [[date_d]].[[date_m]].[[date_y]]
+pdf02	Dokument vytvořen v [[date_h]]:[[date_i]]
+pdf03	Dokument vytvořen dne [[date_d]].[[date_m]].[[date_y]] v [[date_h]]:[[date_i]]
+pdf04	Stránka [[current]]/[[nb]]
+pdf05	Formuláře vyžadují Adobe Reader 9
+vue01	HLAVIČKA
+vue02	PATIČKA
+vue03	STRÁNKA
+vue04	POHLED
diff --git a/library/html2pdf/langues/da.txt b/library/html2pdf/langues/da.txt
index 52e370353..cc169a124 100644
--- a/library/html2pdf/langues/da.txt
+++ b/library/html2pdf/langues/da.txt
@@ -1,21 +1,21 @@
-err01	Tag <b>&lt;[[OTHER]]&gt;</b> endnu ikke eksisterer.<br><br>Hvis du ønsker at tilføje det, skal du oprette de metoder <b>o_[[OTHER]]</b> (for åbning) og <b>c_[[OTHER]]</b> (for lukning) ved at følge den model af eksisterende tags.<br><br>Hvis du opretter disse metoder, så tøv ikke med at send mig en e-mail til webmaster@html2pdf.fr til indsat dem i den næste version af HTML2PDF.
-err02	Sætning af 1000 lines => er for lang<br><b>sætning :</b> [[OTHER_0]]<br><b>Bredde boksen :</b> [[OTHER_1]]<br><b>Længde tekst :</b> [[OTHER_2]]<br>
-err03	HTML-kode er ugyldig, et tag er lukket for mange gange: <b>&lt;[[OTHER]]&gt;</b>
-err04	HTML-kode er ugyldig, tags er ikke afsluttet på en ordentlig måde.<br>Status : <pre>[[OTHER]]</pre>
-err05	HTML-kode er ugyldig, alle tags skal lukkes. <br>Status : <pre>[[OTHER]]</pre>
-err06	Umuligt at indlæse billedet <b>[[OTHER]]</b>
-err07	Indholdet af en TD tag ikke passer på én side
-err08	<b>&lt;[[OTHER]]&gt;</b> tag not in a &lt;DRAW&gt; tag
-err09	The using of the <b>&lt;[[OTHER_0]]&gt;</b>> tag has changed, you can not use [[OTHER_1]] anymore. Read the WIKI
-txt01	FEJL n°
-txt02	File :
-txt03	Linje :
-pdf01	Siden oprettet d. [[date_y]]-[[date_m]]-[[date_d]]
-pdf02	Siden oprettet d. [[date_h]]:[[date_i]]
-pdf03	Siden oprettet d. [[date_y]]-[[date_m]]-[[date_d]] at [[date_h]]:[[date_i]]
-pdf04	Side [[current]]/[[nb]]
-pdf05	De formularer kræver brug af Adobe Reader 9
-vue01	HEADER
-vue02	FOOTER
-vue03	PAGE
-vue04	View
+err01	Tag <b>&lt;[[OTHER]]&gt;</b> endnu ikke eksisterer.<br><br>Hvis du ønsker at tilføje det, skal du oprette de metoder <b>o_[[OTHER]]</b> (for åbning) og <b>c_[[OTHER]]</b> (for lukning) ved at følge den model af eksisterende tags.<br><br>Hvis du opretter disse metoder, så tøv ikke med at send mig en e-mail til webmaster@html2pdf.fr til indsat dem i den næste version af HTML2PDF.
+err02	Sætning af 1000 lines => er for lang<br><b>sætning :</b> [[OTHER_0]]<br><b>Bredde boksen :</b> [[OTHER_1]]<br><b>Længde tekst :</b> [[OTHER_2]]<br>
+err03	HTML-kode er ugyldig, et tag er lukket for mange gange: <b>&lt;[[OTHER]]&gt;</b>
+err04	HTML-kode er ugyldig, tags er ikke afsluttet på en ordentlig måde.<br>Status : <pre>[[OTHER]]</pre>
+err05	HTML-kode er ugyldig, alle tags skal lukkes. <br>Status : <pre>[[OTHER]]</pre>
+err06	Umuligt at indlæse billedet <b>[[OTHER]]</b>
+err07	Indholdet af en TD tag ikke passer på én side
+err08	<b>&lt;[[OTHER]]&gt;</b> tag not in a &lt;DRAW&gt; tag
+err09	The using of the <b>&lt;[[OTHER_0]]&gt;</b>> tag has changed, you can not use [[OTHER_1]] anymore. Read the WIKI
+txt01	FEJL n°
+txt02	File :
+txt03	Linje :
+pdf01	Siden oprettet d. [[date_y]]-[[date_m]]-[[date_d]]
+pdf02	Siden oprettet d. [[date_h]]:[[date_i]]
+pdf03	Siden oprettet d. [[date_y]]-[[date_m]]-[[date_d]] at [[date_h]]:[[date_i]]
+pdf04	Side [[current]]/[[nb]]
+pdf05	De formularer kræver brug af Adobe Reader 9
+vue01	HEADER
+vue02	FOOTER
+vue03	PAGE
+vue04	View
diff --git a/library/html2pdf/langues/de.txt b/library/html2pdf/langues/de.txt
index 24d0aa1c3..654f24b7d 100644
--- a/library/html2pdf/langues/de.txt
+++ b/library/html2pdf/langues/de.txt
@@ -1,21 +1,21 @@
-err01	Das Tag <b>&lt;[[OTHER]]&gt;</b> existiert noch nicht.<br><br>Wenn Sie es hinzufügen möchten, sollen Sie die Methoden<b>o_[[OTHER]]</b> (zu öffnen) und <b>c_[[OTHER]]</b> (zu schließen) nach dem Modell den existierenden Tags.<br><br>Wenn Sie diese Methoden außerdem aufbauen, bitte teilen Sie sie duch eine E-Mail an meine Adresse : webmaster@html2pdf.fr, so daß sie künftig in die nächste Version von HTML2PDF erscheinen.
-err02	1000-Linien Satz => zu lang<br><b>Satz :</b> [[OTHER_0]]<br><b>Breite des Eingabefelds :</b> [[OTHER_1]]<br><b>Länge des Texts :</b> [[OTHER_2]]<br>
-err03	Falsches HTML Code, überzähliges geschloßene Tag : <b>&lt;[[OTHER]]&gt;</b>
-err04	Falsches HTML Code, die Tags sind nicht in richtiger Ordnung geschloßen.<br>Status : <pre>[[OTHER]]</pre>
-err05	Falsches HTML Code, alle Tags sollen geschloßen sein.<br>Status : <pre>[[OTHER]]</pre>
-err06	Ladung des Bilds unmöglich <b>[[OTHER]]</b>
-err07	Er Inhalt eines TD-Tag passt nicht nur auf einer Seite
-err08	<b>&lt;[[OTHER]]&gt;</b> tag not in a &lt;DRAW&gt; tag
-err09	The using of the <b>&lt;[[OTHER_0]]&gt;</b>> tag has changed, you can not use [[OTHER_1]] anymore. Read the WIKI
-txt01	Fehler n°
-txt02	Datei :
-txt03	Linie :
-pdf01	Datei aufgebaut am [[date_d]]/[[date_m]]/[[date_y]]
-pdf02	Datei aufgebaut um [[date_h]]:[[date_m]]
-pdf03	Datei aufgebaut am [[date_d]]/[[date_m]]/[[date_y]] um [[date_h]]:[[date_i]]
-pdf04	Seite [[current]]/[[nb]]
-pdf05	Die Formulare benötigen Sie den Adobe Reader 9
-vue01	Seite-Header
-vue02	Fußzeile
-vue03	Seite
-vue04	Visualisierung
+err01	Das Tag <b>&lt;[[OTHER]]&gt;</b> existiert noch nicht.<br><br>Wenn Sie es hinzufügen möchten, sollen Sie die Methoden<b>o_[[OTHER]]</b> (zu öffnen) und <b>c_[[OTHER]]</b> (zu schließen) nach dem Modell den existierenden Tags.<br><br>Wenn Sie diese Methoden außerdem aufbauen, bitte teilen Sie sie duch eine E-Mail an meine Adresse : webmaster@html2pdf.fr, so daß sie künftig in die nächste Version von HTML2PDF erscheinen.
+err02	1000-Linien Satz => zu lang<br><b>Satz :</b> [[OTHER_0]]<br><b>Breite des Eingabefelds :</b> [[OTHER_1]]<br><b>Länge des Texts :</b> [[OTHER_2]]<br>
+err03	Falsches HTML Code, überzähliges geschloßene Tag : <b>&lt;[[OTHER]]&gt;</b>
+err04	Falsches HTML Code, die Tags sind nicht in richtiger Ordnung geschloßen.<br>Status : <pre>[[OTHER]]</pre>
+err05	Falsches HTML Code, alle Tags sollen geschloßen sein.<br>Status : <pre>[[OTHER]]</pre>
+err06	Ladung des Bilds unmöglich <b>[[OTHER]]</b>
+err07	Er Inhalt eines TD-Tag passt nicht nur auf einer Seite
+err08	<b>&lt;[[OTHER]]&gt;</b> tag not in a &lt;DRAW&gt; tag
+err09	The using of the <b>&lt;[[OTHER_0]]&gt;</b>> tag has changed, you can not use [[OTHER_1]] anymore. Read the WIKI
+txt01	Fehler n°
+txt02	Datei :
+txt03	Linie :
+pdf01	Datei aufgebaut am [[date_d]]/[[date_m]]/[[date_y]]
+pdf02	Datei aufgebaut um [[date_h]]:[[date_m]]
+pdf03	Datei aufgebaut am [[date_d]]/[[date_m]]/[[date_y]] um [[date_h]]:[[date_i]]
+pdf04	Seite [[current]]/[[nb]]
+pdf05	Die Formulare benötigen Sie den Adobe Reader 9
+vue01	Seite-Header
+vue02	Fußzeile
+vue03	Seite
+vue04	Visualisierung
diff --git a/library/html2pdf/langues/en.txt b/library/html2pdf/langues/en.txt
index 633ef62fe..cb18702f0 100644
--- a/library/html2pdf/langues/en.txt
+++ b/library/html2pdf/langues/en.txt
@@ -1,21 +1,21 @@
-err01	The tag <b>&lt;[[OTHER]]&gt;</b> does not yet exist.<br><br>If you want to add it, you must create the methods <b>o_[[OTHER]]</b> (for opening) and <b>c_[[OTHER]]</b> (for closure) by following the model of existing tags.<br><br>If you create these methods, do not hesitate to send me an email to webmaster@html2pdf.fr to included them in the next version of HTML2PDF.
-err02	Sentence of 1000 lines => too long<br><b>Sentence :</b> [[OTHER_0]]<br><b>Width box :</b> [[OTHER_1]]<br><b>Length text :</b> [[OTHER_2]]<br>
-err03	HTML code invalid, a tag is closed too many times: <b>&lt;[[OTHER]]&gt;</b>
-err04	HTML code invalid, the tags are not closed in an orderly fashion.<br>Status : <pre>[[OTHER]]</pre>
-err05	HTML code invalid, all tags must be closed.<br>Status : <pre>[[OTHER]]</pre>
-err06	Impossible to load the image <b>[[OTHER]]</b>
-err07	The content of a TD tag does not fit on only one page
-err08	<b>&lt;[[OTHER]]&gt;</b> tag not in a &lt;DRAW&gt; tag
-err09	The using of the <b>&lt;[[OTHER_0]]&gt;</b>> tag has changed, you can not use [[OTHER_1]] anymore. Read the WIKI
-txt01	ERROR n°
-txt02	File :
-txt03	Line :
-pdf01	Document generated on [[date_y]]-[[date_m]]-[[date_d]]
-pdf02	Document generated at [[date_h]]:[[date_i]]
-pdf03	Document generated on [[date_y]]-[[date_m]]-[[date_d]] at [[date_h]]:[[date_i]]
-pdf04	Page [[current]]/[[nb]]
-pdf05	The forms require the use of Adobe Reader 9
-vue01	HEADER
-vue02	FOOTER
-vue03	PAGE
-vue04	View
+err01	The tag <b>&lt;[[OTHER]]&gt;</b> does not yet exist.<br><br>If you want to add it, you must create the methods <b>o_[[OTHER]]</b> (for opening) and <b>c_[[OTHER]]</b> (for closure) by following the model of existing tags.<br><br>If you create these methods, do not hesitate to send me an email to webmaster@html2pdf.fr to included them in the next version of HTML2PDF.
+err02	Sentence of 1000 lines => too long<br><b>Sentence :</b> [[OTHER_0]]<br><b>Width box :</b> [[OTHER_1]]<br><b>Length text :</b> [[OTHER_2]]<br>
+err03	HTML code invalid, a tag is closed too many times: <b>&lt;[[OTHER]]&gt;</b>
+err04	HTML code invalid, the tags are not closed in an orderly fashion.<br>Status : <pre>[[OTHER]]</pre>
+err05	HTML code invalid, all tags must be closed.<br>Status : <pre>[[OTHER]]</pre>
+err06	Impossible to load the image <b>[[OTHER]]</b>
+err07	The content of a TD tag does not fit on only one page
+err08	<b>&lt;[[OTHER]]&gt;</b> tag not in a &lt;DRAW&gt; tag
+err09	The using of the <b>&lt;[[OTHER_0]]&gt;</b>> tag has changed, you can not use [[OTHER_1]] anymore. Read the WIKI
+txt01	ERROR n°
+txt02	File :
+txt03	Line :
+pdf01	Document generated on [[date_y]]-[[date_m]]-[[date_d]]
+pdf02	Document generated at [[date_h]]:[[date_i]]
+pdf03	Document generated on [[date_y]]-[[date_m]]-[[date_d]] at [[date_h]]:[[date_i]]
+pdf04	Page [[current]]/[[nb]]
+pdf05	The forms require the use of Adobe Reader 9
+vue01	HEADER
+vue02	FOOTER
+vue03	PAGE
+vue04	View
diff --git a/library/html2pdf/langues/es.txt b/library/html2pdf/langues/es.txt
index 908abaa42..6fe74b4ec 100644
--- a/library/html2pdf/langues/es.txt
+++ b/library/html2pdf/langues/es.txt
@@ -1,21 +1,21 @@
-err01	La etiqueta <b>&lt;[[OTHER]]&gt;</b> todavía no existe.<br><br>Si quiere añadirla, debe crear los métodos <b>o_[[OTHER]]</b> (para la apertura) y <b>c_[[OTHER]]</b> (para el cierre) siguiendo el modelo de las etiquetas existentes.<br><br>Si crea nuevos métodos, envíelos a webmaster@html2pdf.fr para añadirlos a las siguientes versiones de HTML2PDF, y que todo el mundo se pueda beneficiar.
-err02	Frase de 1000 líneas => demasiado larga<br><b>Frase :</b> [[OTHER_0]]<br><b>Tamaño casilla :</b> [[OTHER_1]]<br><b>Tamaño texto :</b> [[OTHER_2]]<br>
-err03	Código HTML no válido, una etiqueta tiene un cierre de más : <b>&lt;[[OTHER]]&gt;</b>
-err04	Código HTML no válido, las etiquetas no estan cerradas en el orden correcto.<br>Estado : <pre>[[OTHER]]</pre>
-err05	Código HTML no válido, todas las etiquetas deben tener su cierre.<br>Estado : <pre>[[OTHER]]</pre>
-err06	Imposible cargar la imagen <b>[[OTHER]]</b>
-err07	El contenido de una etiqueta TD no encaja en una sola página
-err08	<b>&lt;[[OTHER]]&gt;</b> tag not in a &lt;DRAW&gt; tag
-err09	The using of the <b>&lt;[[OTHER_0]]&gt;</b>> tag has changed, you can not use [[OTHER_1]] anymore. Read the WIKI
-txt01	ERROR n°
-txt02	Fichero :
-txt03	Línea :
-pdf01	Documento generado el [[date_d]]/[[date_m]]/[[date_y]]
-pdf02	Documento generado a las [[date_h]]:[[date_i]]
-pdf03	Documento generado el [[date_d]]/[[date_m]]/[[date_y]] a las [[date_h]]:[[date_i]]
-pdf04	Página [[current]]/[[nb]]
-pdf05	Los formularios requieren el uso de Adobe Reader 9
-vue01	ENCABEZADO
-vue02	PIE DE PÁGINA
-vue03	PÁGINA
-vue04	Visualización
+err01	La etiqueta <b>&lt;[[OTHER]]&gt;</b> todavía no existe.<br><br>Si quiere añadirla, debe crear los métodos <b>o_[[OTHER]]</b> (para la apertura) y <b>c_[[OTHER]]</b> (para el cierre) siguiendo el modelo de las etiquetas existentes.<br><br>Si crea nuevos métodos, envíelos a webmaster@html2pdf.fr para añadirlos a las siguientes versiones de HTML2PDF, y que todo el mundo se pueda beneficiar.
+err02	Frase de 1000 líneas => demasiado larga<br><b>Frase :</b> [[OTHER_0]]<br><b>Tamaño casilla :</b> [[OTHER_1]]<br><b>Tamaño texto :</b> [[OTHER_2]]<br>
+err03	Código HTML no válido, una etiqueta tiene un cierre de más : <b>&lt;[[OTHER]]&gt;</b>
+err04	Código HTML no válido, las etiquetas no estan cerradas en el orden correcto.<br>Estado : <pre>[[OTHER]]</pre>
+err05	Código HTML no válido, todas las etiquetas deben tener su cierre.<br>Estado : <pre>[[OTHER]]</pre>
+err06	Imposible cargar la imagen <b>[[OTHER]]</b>
+err07	El contenido de una etiqueta TD no encaja en una sola página
+err08	<b>&lt;[[OTHER]]&gt;</b> tag not in a &lt;DRAW&gt; tag
+err09	The using of the <b>&lt;[[OTHER_0]]&gt;</b>> tag has changed, you can not use [[OTHER_1]] anymore. Read the WIKI
+txt01	ERROR n°
+txt02	Fichero :
+txt03	Línea :
+pdf01	Documento generado el [[date_d]]/[[date_m]]/[[date_y]]
+pdf02	Documento generado a las [[date_h]]:[[date_i]]
+pdf03	Documento generado el [[date_d]]/[[date_m]]/[[date_y]] a las [[date_h]]:[[date_i]]
+pdf04	Página [[current]]/[[nb]]
+pdf05	Los formularios requieren el uso de Adobe Reader 9
+vue01	ENCABEZADO
+vue02	PIE DE PÁGINA
+vue03	PÁGINA
+vue04	Visualización
diff --git a/library/html2pdf/langues/fr.txt b/library/html2pdf/langues/fr.txt
index 1f4f93ba0..69c79aa7c 100644
--- a/library/html2pdf/langues/fr.txt
+++ b/library/html2pdf/langues/fr.txt
@@ -1,21 +1,21 @@
-err01	La balise <b>&lt;[[OTHER]]&gt;</b> n'existe pas encore.<br><br>Si vous voulez la rajouter, vous devez créer les méthodes <b>o_[[OTHER]]</b> (pour l'ouverture) et <b>c_[[OTHER]]</b> (pour la fermeture) en suivant le modèle des balises existantes.<br><br>De plus, si vous créez ces méthodes, n'hésitez pas à en faire profiter tout le monde en m'écrivant sur webmaster@html2pdf.fr afin qu'elles se retrouvent dans la prochaine version d'HTML2PDF.
-err02	Phrase de 1000 lignes => trop long<br><b>Phrase :</b> [[OTHER_0]]<br><b>Largeur case :</b> [[OTHER_1]]<br><b>Longueur text :</b> [[OTHER_2]]<br>
-err03	Code HTML non valide, une balise est fermée en trop : <b>&lt;[[OTHER]]&gt;</b>
-err04	Code HTML non valide, les balises ne sont pas fermées dans le bon ordre.<br>Etat : <pre>[[OTHER]]</pre>
-err05	Code HTML non valide, toutes les balises doivent être fermées.<br>Etat : <pre>[[OTHER]]</pre>
-err06	Impossible de charger l'image <b>[[OTHER]]</b>
-err07	le contenu d'une balise TD ne rentre pas sur une seule page
-err08	Balise <b>&lt;[[OTHER]]&gt;</b> non contenu dans une balise &lt;DRAW&gt;
-err09	L'utilisation de la balise <b>&lt;[[OTHER_0]]&gt;</b> a changé, vous ne pouvez plus utiliser [[OTHER_1]]. Lisez le WIKI
-txt01	ERREUR n°
-txt02	Fichier :
-txt03	Ligne :
-pdf01	Document généré le [[date_d]]/[[date_m]]/[[date_y]]
-pdf02	Document généré à [[date_h]]:[[date_i]]
-pdf03	Document généré le [[date_d]]/[[date_m]]/[[date_y]] à [[date_h]]:[[date_i]]
-pdf04	Page [[current]]/[[nb]]
-pdf05	Les formulaires nécessitent  l'utilisation de Adobe Reader 9
-vue01	HEADER
-vue02	FOOTER
-vue03	PAGE
-vue04	Restitution
+err01	La balise <b>&lt;[[OTHER]]&gt;</b> n'existe pas encore.<br><br>Si vous voulez la rajouter, vous devez créer les méthodes <b>o_[[OTHER]]</b> (pour l'ouverture) et <b>c_[[OTHER]]</b> (pour la fermeture) en suivant le modèle des balises existantes.<br><br>De plus, si vous créez ces méthodes, n'hésitez pas à en faire profiter tout le monde en m'écrivant sur webmaster@html2pdf.fr afin qu'elles se retrouvent dans la prochaine version d'HTML2PDF.
+err02	Phrase de 1000 lignes => trop long<br><b>Phrase :</b> [[OTHER_0]]<br><b>Largeur case :</b> [[OTHER_1]]<br><b>Longueur text :</b> [[OTHER_2]]<br>
+err03	Code HTML non valide, une balise est fermée en trop : <b>&lt;[[OTHER]]&gt;</b>
+err04	Code HTML non valide, les balises ne sont pas fermées dans le bon ordre.<br>Etat : <pre>[[OTHER]]</pre>
+err05	Code HTML non valide, toutes les balises doivent être fermées.<br>Etat : <pre>[[OTHER]]</pre>
+err06	Impossible de charger l'image <b>[[OTHER]]</b>
+err07	le contenu d'une balise TD ne rentre pas sur une seule page
+err08	Balise <b>&lt;[[OTHER]]&gt;</b> non contenu dans une balise &lt;DRAW&gt;
+err09	L'utilisation de la balise <b>&lt;[[OTHER_0]]&gt;</b> a changé, vous ne pouvez plus utiliser [[OTHER_1]]. Lisez le WIKI
+txt01	ERREUR n°
+txt02	Fichier :
+txt03	Ligne :
+pdf01	Document généré le [[date_d]]/[[date_m]]/[[date_y]]
+pdf02	Document généré à [[date_h]]:[[date_i]]
+pdf03	Document généré le [[date_d]]/[[date_m]]/[[date_y]] à [[date_h]]:[[date_i]]
+pdf04	Page [[current]]/[[nb]]
+pdf05	Les formulaires nécessitent  l'utilisation de Adobe Reader 9
+vue01	HEADER
+vue02	FOOTER
+vue03	PAGE
+vue04	Restitution
diff --git a/library/html2pdf/langues/it.txt b/library/html2pdf/langues/it.txt
index c6459d50b..b8e3b66d7 100644
--- a/library/html2pdf/langues/it.txt
+++ b/library/html2pdf/langues/it.txt
@@ -1,21 +1,21 @@
-err01	Il tag <b>&lt;[[OTHER]]&gt;</b> non esiste ancora.<br><br>Se si desidera aggiungere, è necessario creare metodi <b>o_[[OTHER]]</b> (di apertura) e <b>C_[[OTHER]]</b> (per la chiusura) secondo il modello esistente di tag.<br><br>Inoltre, se si creare questi metodi, non esitate a portare il mondo intero ha scritto su webmaster@html2pdf.fr in modo che alla fine nella prossima versione di HTML2PDF.
-err02	Citazione di 1000 linee => troppo lungo<br><b>frase :</b> [[OTHER_0]]<br><b>casella Larghezza :</b> [[OTHER_1]]<br><b>Lunghezza testo :</b> [[OTHER_2]]<br>
-err03	HTML non valido, un tag è chiusa troppo <b>&lt;[[OTHER]]&gt;</ b>
-err04	HTML non validi, i tag non sono chiusi nel corretto ordine.<br>Stato :<pre>[[OTHER]]</pre>
-err05	HTML non valido, tutte le tag deve essere chiuso.<br>Stato :<pre>[[OTHER]]</pre>
-err06	Impossibile caricare l'immagine <b>[[OTHER]]</b>
-err07	il contenuto di un tag TD non rientra in una sola pagina
-err08	<b>&lt;[[OTHER]]&gt;</b> tag not in a &lt;DRAW&gt; tag
-err09	The using of the <b>&lt;[[OTHER_0]]&gt;</b>> tag has changed, you can not use [[OTHER_1]] anymore. Read the WIKI
-txt01	ERRORE n°
-txt02	File :
-txt03	Linea :
-pdf01	Documento generato il [[date_d]]/[[date_m]]/[[date_y]]
-pdf02	Documento generato [[date_h]]:[[date_i]]
-pdf03	Documento generato il [[date_d]]/[[date_m]]/[[date_y]] nel [[date_h]]:[[date_i]]
-pdf04	Pagina [[current]]/[[nb]]
-pdf05	I moduli richiedono l'uso di Adobe Reader 9
-vue01	HEADER
-vue02	FOOTER
-vue03	PAGINA
-vue04	Visualization
+err01	Il tag <b>&lt;[[OTHER]]&gt;</b> non esiste ancora.<br><br>Se si desidera aggiungere, è necessario creare metodi <b>o_[[OTHER]]</b> (di apertura) e <b>C_[[OTHER]]</b> (per la chiusura) secondo il modello esistente di tag.<br><br>Inoltre, se si creare questi metodi, non esitate a portare il mondo intero ha scritto su webmaster@html2pdf.fr in modo che alla fine nella prossima versione di HTML2PDF.
+err02	Citazione di 1000 linee => troppo lungo<br><b>frase :</b> [[OTHER_0]]<br><b>casella Larghezza :</b> [[OTHER_1]]<br><b>Lunghezza testo :</b> [[OTHER_2]]<br>
+err03	HTML non valido, un tag è chiusa troppo <b>&lt;[[OTHER]]&gt;</ b>
+err04	HTML non validi, i tag non sono chiusi nel corretto ordine.<br>Stato :<pre>[[OTHER]]</pre>
+err05	HTML non valido, tutte le tag deve essere chiuso.<br>Stato :<pre>[[OTHER]]</pre>
+err06	Impossibile caricare l'immagine <b>[[OTHER]]</b>
+err07	il contenuto di un tag TD non rientra in una sola pagina
+err08	<b>&lt;[[OTHER]]&gt;</b> tag not in a &lt;DRAW&gt; tag
+err09	The using of the <b>&lt;[[OTHER_0]]&gt;</b>> tag has changed, you can not use [[OTHER_1]] anymore. Read the WIKI
+txt01	ERRORE n°
+txt02	File :
+txt03	Linea :
+pdf01	Documento generato il [[date_d]]/[[date_m]]/[[date_y]]
+pdf02	Documento generato [[date_h]]:[[date_i]]
+pdf03	Documento generato il [[date_d]]/[[date_m]]/[[date_y]] nel [[date_h]]:[[date_i]]
+pdf04	Pagina [[current]]/[[nb]]
+pdf05	I moduli richiedono l'uso di Adobe Reader 9
+vue01	HEADER
+vue02	FOOTER
+vue03	PAGINA
+vue04	Visualization
diff --git a/library/html2pdf/langues/nl.txt b/library/html2pdf/langues/nl.txt
index d7271ee09..432d1e01d 100644
--- a/library/html2pdf/langues/nl.txt
+++ b/library/html2pdf/langues/nl.txt
@@ -1,21 +1,21 @@
-err01	De tag <b>&lt;[[OTHER]]&gt;</b> bestaat nog niet.<br><br>Om deze toe te voegen, gebruik de methods <b>o_[[OTHER]]</b> (om te openen) en <b>c_[[OTHER]]</b> (om te sluiten) volgens het model van de bestaande tags.<br><br>Als u deze methods maakt, stuur deze dan a.u.b. via e-mail naar webmaster@html2pdf.fr voor opname in de volgende versie van HTML2PDF.
-err02	Zin van 1000 regels => te lang<br><b>Zin :</b> [[OTHER_0]]<br><b>Kaderbreedte :</b> [[OTHER_1]]<br><b>Tekstlengte :</b> [[OTHER_2]]<br>
-err03	Ongeldige HTML code, overvloedig afgesloten tag : <b>&lt;[[OTHER]]&gt;</b>
-err04	Ongeldige HTML code, de tags zijn niet correct afgesloten.<br>Status : <pre>[[OTHER]]</pre>
-err05	Ongeldige HTML code, alle tags dienen te zijn gesloten.<br>Status : <pre>[[OTHER]]</pre>
-err06	Kan afbeelding niet laden: <b>[[OTHER]]</b>
-err07	De inhoud van de cel (<TD>) past niet op een pagina
-err08	<b>&lt;[[OTHER]]&gt;</b> tag not in a &lt;DRAW&gt; tag
-err09	The using of the <b>&lt;[[OTHER_0]]&gt;</b>> tag has changed, you can not use [[OTHER_1]] anymore. Read the WIKI
-txt01	Fout nr
-txt02	Bestand :
-txt03	Regel :
-pdf01	Document gemaakt op [[date_d]]-[[date_m]]-[[date_y]]
-pdf02	Document gemaakt om [[date_h]]:[[date_i]]
-pdf03	Document gemaakt op [[date_d]]-[[date_m]]-[[date_y]] om [[date_h]]:[[date_i]]
-pdf04	Pagina [[current]] van [[nb]]
-pdf05	De formulieren vereisen het gebruik van Adobe Reader 9
-vue01	Paginakop
-vue02	Paginavoet
-vue03	Pagina
-vue04	Bekijken
+err01	De tag <b>&lt;[[OTHER]]&gt;</b> bestaat nog niet.<br><br>Om deze toe te voegen, gebruik de methods <b>o_[[OTHER]]</b> (om te openen) en <b>c_[[OTHER]]</b> (om te sluiten) volgens het model van de bestaande tags.<br><br>Als u deze methods maakt, stuur deze dan a.u.b. via e-mail naar webmaster@html2pdf.fr voor opname in de volgende versie van HTML2PDF.
+err02	Zin van 1000 regels => te lang<br><b>Zin :</b> [[OTHER_0]]<br><b>Kaderbreedte :</b> [[OTHER_1]]<br><b>Tekstlengte :</b> [[OTHER_2]]<br>
+err03	Ongeldige HTML code, overvloedig afgesloten tag : <b>&lt;[[OTHER]]&gt;</b>
+err04	Ongeldige HTML code, de tags zijn niet correct afgesloten.<br>Status : <pre>[[OTHER]]</pre>
+err05	Ongeldige HTML code, alle tags dienen te zijn gesloten.<br>Status : <pre>[[OTHER]]</pre>
+err06	Kan afbeelding niet laden: <b>[[OTHER]]</b>
+err07	De inhoud van de cel (<TD>) past niet op een pagina
+err08	<b>&lt;[[OTHER]]&gt;</b> tag not in a &lt;DRAW&gt; tag
+err09	The using of the <b>&lt;[[OTHER_0]]&gt;</b>> tag has changed, you can not use [[OTHER_1]] anymore. Read the WIKI
+txt01	Fout nr
+txt02	Bestand :
+txt03	Regel :
+pdf01	Document gemaakt op [[date_d]]-[[date_m]]-[[date_y]]
+pdf02	Document gemaakt om [[date_h]]:[[date_i]]
+pdf03	Document gemaakt op [[date_d]]-[[date_m]]-[[date_y]] om [[date_h]]:[[date_i]]
+pdf04	Pagina [[current]] van [[nb]]
+pdf05	De formulieren vereisen het gebruik van Adobe Reader 9
+vue01	Paginakop
+vue02	Paginavoet
+vue03	Pagina
+vue04	Bekijken
diff --git a/library/html2pdf/langues/pt.txt b/library/html2pdf/langues/pt.txt
index 813dbff95..48eb9d62e 100644
--- a/library/html2pdf/langues/pt.txt
+++ b/library/html2pdf/langues/pt.txt
@@ -1,21 +1,21 @@
-err01	A tag <b>&lt;[[OTHER]]&gt;</b> ainda não existe.<br><br>Se você quer inserí-la, deve criar os métodos <b>o_[[OTHER]]</b> (para abrí-la) e <b>c_[[OTHER]]</b> (para fechá-la) seguindo o modelo das tags existentes.<br><br>Se você criar novos métodos, os envie para webmaster@html2pdf.fr para que as próximas versões de HTML2PDF, e o restante do mundo se beneficie com isso.
-err02	Frase de 1000 linhas => muito grande<br><b>Frase :</b> [[OTHER_0]]<br><b>Tamanho do quadro :</b> [[OTHER_1]]<br><b>Tamanho do texto :</b> [[OTHER_2]]<br>
-err03	Código HTML não válido, uma tag está com fechamento sobrando : <b>&lt;[[OTHER]]&gt;</b>
-err04	Código HTML não válido, as tags não estão fechadas na ordem correta.<br>Estado : <pre>[[OTHER]]</pre>
-err05	Código HTML não válido, todas as tags devem ser fechadas.<br>Estado : <pre>[[OTHER]]</pre>
-err06	Impossível carregar imagem <b>[[OTHER]]</b>
-err07	O conteúdo de uma tag TD não se encaixa em apenas uma página
-err08	<b>&lt;[[OTHER]]&gt;</b> tag not in a &lt;DRAW&gt; tag
-err09	The using of the <b>&lt;[[OTHER_0]]&gt;</b>> tag has changed, you can not use [[OTHER_1]] anymore. Read the WIKI
-txt01	ERRO n°
-txt02	Arquivo :
-txt03	Linha :
-pdf01	Documento generado em [[date_d]]/[[date_m]]/[[date_y]]
-pdf02	Documento generado às [[date_h]]:[[date_i]]
-pdf03	Documento generado em [[date_d]]/[[date_m]]/[[date_y]] às [[date_h]]:[[date_i]]
-pdf04	Página [[current]]/[[nb]]
-pdf05	Os formulários exigem a utilização do Adobe Reader 9
-vue01	CABEÇALHO
-vue02	RODAPÉ
-vue03	PÁGINA
-vue04	Visualização
+err01	A tag <b>&lt;[[OTHER]]&gt;</b> ainda não existe.<br><br>Se você quer inserí-la, deve criar os métodos <b>o_[[OTHER]]</b> (para abrí-la) e <b>c_[[OTHER]]</b> (para fechá-la) seguindo o modelo das tags existentes.<br><br>Se você criar novos métodos, os envie para webmaster@html2pdf.fr para que as próximas versões de HTML2PDF, e o restante do mundo se beneficie com isso.
+err02	Frase de 1000 linhas => muito grande<br><b>Frase :</b> [[OTHER_0]]<br><b>Tamanho do quadro :</b> [[OTHER_1]]<br><b>Tamanho do texto :</b> [[OTHER_2]]<br>
+err03	Código HTML não válido, uma tag está com fechamento sobrando : <b>&lt;[[OTHER]]&gt;</b>
+err04	Código HTML não válido, as tags não estão fechadas na ordem correta.<br>Estado : <pre>[[OTHER]]</pre>
+err05	Código HTML não válido, todas as tags devem ser fechadas.<br>Estado : <pre>[[OTHER]]</pre>
+err06	Impossível carregar imagem <b>[[OTHER]]</b>
+err07	O conteúdo de uma tag TD não se encaixa em apenas uma página
+err08	<b>&lt;[[OTHER]]&gt;</b> tag not in a &lt;DRAW&gt; tag
+err09	The using of the <b>&lt;[[OTHER_0]]&gt;</b>> tag has changed, you can not use [[OTHER_1]] anymore. Read the WIKI
+txt01	ERRO n°
+txt02	Arquivo :
+txt03	Linha :
+pdf01	Documento generado em [[date_d]]/[[date_m]]/[[date_y]]
+pdf02	Documento generado às [[date_h]]:[[date_i]]
+pdf03	Documento generado em [[date_d]]/[[date_m]]/[[date_y]] às [[date_h]]:[[date_i]]
+pdf04	Página [[current]]/[[nb]]
+pdf05	Os formulários exigem a utilização do Adobe Reader 9
+vue01	CABEÇALHO
+vue02	RODAPÉ
+vue03	PÁGINA
+vue04	Visualização
diff --git a/library/html2pdf/langues/tr.txt b/library/html2pdf/langues/tr.txt
index e47063e47..bc09c2cc8 100644
--- a/library/html2pdf/langues/tr.txt
+++ b/library/html2pdf/langues/tr.txt
@@ -1,21 +1,21 @@
-err01	<b>&lt;[[OTHER]]&gt;</b> etiketi bulunamadý.<br><br>Eklemek isterseniz, <b>o_[[OTHER]]</b> þeklinde açýp, <b>c_[[OTHER]]</b> þeklinde kapatabilirsiniz.<br><br> Bu þekilde etiketler üretirseniz lütfen daha sonraki HTML2PDF versiyonuna eklenmek üzere bana gönderin. ( webmaster@html2pdf.fr ).
-err02	Ýçerik 1000 satýrdan fazla ve gerekenden uzun <br><b>Konu :</b> [[OTHER_0]]<br><b>Geniþlik :</b> [[OTHER_1]]<br><b>Yazý boyutu :</b> [[OTHER_2]]<br>
-err03	HTML kodu hatalý, etiket birden fazla defa kapatýlmýþ: <b>&lt;[[OTHER]]&gt;</b>
-err04	HTML kodu hatalý, etiketler gereken düzen içinde kapatýlmamýþ.<br>Durum : <pre>[[OTHER]]</pre>
-err05	HTML kodu hatalý, bütün etiketler kapatýlmalý.<br>Durum : <pre>[[OTHER]]</pre>
-err06	Resim dosyasý okunamýyor <b>[[OTHER]]</b>
-err07	TD içeriði bir sayfaya sýðmýyor
-err08	<b>&lt;[[OTHER]]&gt;</b> tag not in a &lt;DRAW&gt; tag
-err09	The using of the <b>&lt;[[OTHER_0]]&gt;</b>> tag has changed, you can not use [[OTHER_1]] anymore. Read the WIKI
-txt01	HATA n°
-txt02	Dosya :
-txt03	Satýr :
-pdf01	Doküman üretilme tarihi [[date_y]]-[[date_m]]-[[date_d]]
-pdf02	Doküman üretilme tarihi [[date_h]]:[[date_i]]
-pdf03	Doküman üretilme tarihi [[date_y]]-[[date_m]]-[[date_d]] saati [[date_h]]:[[date_i]]
-pdf04	Sayfa [[current]]/[[nb]]
-pdf05	Adobe Reader 9 gerektirir
-vue01	DOSYA ÜSTÜ
-vue02	DOSYA ALTI
-vue03	SAYFA
-vue04	Görünüm
+err01	<b>&lt;[[OTHER]]&gt;</b> etiketi bulunamadý.<br><br>Eklemek isterseniz, <b>o_[[OTHER]]</b> þeklinde açýp, <b>c_[[OTHER]]</b> þeklinde kapatabilirsiniz.<br><br> Bu þekilde etiketler üretirseniz lütfen daha sonraki HTML2PDF versiyonuna eklenmek üzere bana gönderin. ( webmaster@html2pdf.fr ).
+err02	Ýçerik 1000 satýrdan fazla ve gerekenden uzun <br><b>Konu :</b> [[OTHER_0]]<br><b>Geniþlik :</b> [[OTHER_1]]<br><b>Yazý boyutu :</b> [[OTHER_2]]<br>
+err03	HTML kodu hatalý, etiket birden fazla defa kapatýlmýþ: <b>&lt;[[OTHER]]&gt;</b>
+err04	HTML kodu hatalý, etiketler gereken düzen içinde kapatýlmamýþ.<br>Durum : <pre>[[OTHER]]</pre>
+err05	HTML kodu hatalý, bütün etiketler kapatýlmalý.<br>Durum : <pre>[[OTHER]]</pre>
+err06	Resim dosyasý okunamýyor <b>[[OTHER]]</b>
+err07	TD içeriði bir sayfaya sýðmýyor
+err08	<b>&lt;[[OTHER]]&gt;</b> tag not in a &lt;DRAW&gt; tag
+err09	The using of the <b>&lt;[[OTHER_0]]&gt;</b>> tag has changed, you can not use [[OTHER_1]] anymore. Read the WIKI
+txt01	HATA n°
+txt02	Dosya :
+txt03	Satýr :
+pdf01	Doküman üretilme tarihi [[date_y]]-[[date_m]]-[[date_d]]
+pdf02	Doküman üretilme tarihi [[date_h]]:[[date_i]]
+pdf03	Doküman üretilme tarihi [[date_y]]-[[date_m]]-[[date_d]] saati [[date_h]]:[[date_i]]
+pdf04	Sayfa [[current]]/[[nb]]
+pdf05	Adobe Reader 9 gerektirir
+vue01	DOSYA ÜSTÜ
+vue02	DOSYA ALTI
+vue03	SAYFA
+vue04	Görünüm
diff --git a/library/html2pdf/parsingHTML.class.php b/library/html2pdf/parsingHTML.class.php
index e82cc7b3d..196c0a775 100644
--- a/library/html2pdf/parsingHTML.class.php
+++ b/library/html2pdf/parsingHTML.class.php
@@ -1,463 +1,463 @@
-<?php
-/**
- * Logiciel : HTML2PDF - classe ParsingHTML
- *
- * Convertisseur HTML => PDF
- * Distribué sous la licence LGPL. 
- *
- * @author		Laurent MINGUET <webmaster@html2pdf.fr>
- * @version		3.31
- */
-
-class parsingHTML
-{
-	var $html		= '';				// code HTML à parser
-	var $num		= 0;				// numéro de table
-	var $level		= 0;				// niveaux de table
-	var $encoding	= '';				// encodage
-	var $code		= array();			// code HTML parsé
-	
-	/**
-	 * Constructeur
-	 *
-	 * @return	null
-	 */
-	function parsingHTML($encoding = 'ISO-8859-15')
-	{
-		$this->num		= 0;
-		$this->level	= array($this->num);
-		$this->html		= '';
-		$this->code		= array();
-		$this->setEncoding($encoding);
-	}
-	
-	function setEncoding($encoding)
-	{
-		$this->encoding = $encoding;
-	}
-	
-	/**
-	 * Définir le code HTML à parser
-	 *
-	 * @param	string code html
-	 * @return	null
-	 */
-	function setHTML($html)
-	{
-		$html = preg_replace('/<!--(.*)-->/isU', '', $html);
-		$this->html = $html;
-	}
-	
-	/**
-	 * parser le code HTML
-	 *
-	 * @return	null
-	 */
-	function parse()
-	{
-		$parents = array();
-
-		// chercher les balises HTML du code
-		$tmp = array();
-		$this->searchCode($tmp);
-		
-		// identifier les balises une à une
-		$pre_in = false;
-		$pre_br = array(
-					'name' => 'br',
-					'close' => false,
-					'param' => array(
-						'style' => array(),
-						'num'	=> 0
-					)
-				);
-
-		$balises_no_closed = array(
-									'br', 'hr', 'img', 'col',
-									'input', 'link', 'option',
-									'circle', 'ellipse', 'path', 'rect', 'line', 'polygon', 'polyline'
-							);
-		$todos = array();
-		foreach($tmp as $part)
-		{
-			// si c'est un code
-			if ($part[0]=='code')
-			{
-				$res = $this->analiseCode($part[1]);
-				
-				// si le code est bien un code analisable
-				if ($res)
-				{
-					$res['html_pos'] = $part[2];
-					if (!in_array($res['name'], $balises_no_closed))
-					{
-						if ($res['close'])
-						{
-							if (count($parents)<1)
-								HTML2PDF::makeError(3, __FILE__, __LINE__, $res['name'], $this->getHtmlErrorCode($res['html_pos']));
-							else if ($parents[count($parents)-1]!=$res['name'])
-								HTML2PDF::makeError(4, __FILE__, __LINE__, $parents, $this->getHtmlErrorCode($res['html_pos']));
-							else
-								unset($parents[count($parents)-1]);
-						}
-						else
-						{
-							if ($res['autoclose'])
-							{
-								$todos[] = $res;
-								$res['params'] = array();
-								$res['close'] = true;
-							}
-							else
-								$parents[count($parents)] = $res['name'];
-													
-						}
-						if (($res['name']=='pre' || $res['name']=='code') && !$res['autoclose'])
-								$pre_in = !$res['close'];
-					}
-					
-					$todos[] = $res;
-				}
-				// sinon (code non analisable) => on le transforme en texte
-				else
-				{
-					$part[0]='txt';
-				}
-			}
-			// sinon si c'est un texte
-			if ($part[0]=='txt')
-			{
-				// enregistrer l'action correspondante
-				if (!$pre_in)
-				{
-					// remplacer tous les espaces, tabulations, saufs de ligne multiples par de simples espaces
-					$todos[] = array(
-									'name'	=> 'write',
-									'close'	=> false,
-									'param' => array('txt' => $this->prepareTxt($part[1])),
-								);
-				}
-				else
-				{
-					$part[1] = str_replace("\r", '', $part[1]);
-					$part[1] = explode("\n", $part[1]);
-					
-					foreach($part[1] as $k => $txt)
-					{
-						$txt = str_replace("\t", '        ', $txt);
-						$txt = str_replace(' ', '&nbsp;', $txt);
-						if ($k>0) $todos[] = $pre_br;
-
-						$todos[] = array(
-										'name'	=> 'write',
-										'close'	=> false,
-										'param' => array('txt' => $this->prepareTxt($txt, false)),
-									);
-					}
-				}
-			}	
-		}
-
-		// pour chaque action identifiée, il faut nettoyer le début et la fin des textes
-		// en fonction des balises qui l'entourent.
-		$balises_clean = array('page', 'page_header', 'page_footer', 'form',
-								'table', 'thead', 'tfoot', 'tr', 'td', 'th', 'br',
-								'div', 'hr', 'p', 'ul', 'ol', 'li',
-								'h1', 'h2', 'h3', 'h4', 'h5', 'h6',
-								'bookmark', 'fieldset', 'legend',
-								'draw', 'circle', 'ellipse', 'path', 'rect', 'line', 'g', 'polygon', 'polyline');
-		$nb = count($todos);
-		for($k=0; $k<$nb; $k++)
-		{
-			//si c'est un texte
-			if ($todos[$k]['name']=='write')
-			{
-				// et qu'une balise spécifique le précède => on nettoye les espaces du début du texte
-				if ($k>0 && in_array($todos[$k-1]['name'], $balises_clean))
-					$todos[$k]['param']['txt'] = ltrim($todos[$k]['param']['txt']);
-
-				// et qu'une balise spécifique le suit => on nettoye les espaces de la fin du texte
-				if ($k<$nb-1 && in_array($todos[$k+1]['name'], $balises_clean))
-					$todos[$k]['param']['txt'] = rtrim($todos[$k]['param']['txt']);
-				
-				if (!strlen($todos[$k]['param']['txt']))
-					unset($todos[$k]);
-			}
-		}
-		if (count($parents)) HTML2PDF::makeError(5, __FILE__, __LINE__, $parents);
-
-		// liste des actions sauvée
-		$this->code = array_values($todos);
-	}
-	
-	/**
-	 * preparer le texte une seule fois pour gagner du temps. vient de o_WRITE
-	 *
-	 * @param	string texte
-	 * @return	string texte
-	 */
-	function prepareTxt($txt, $spaces = true)
-	{
-		if ($spaces) $txt = preg_replace('/\s+/is', ' ', $txt);
-		$txt = str_replace('&euro;', '€', $txt);
-		$txt = html_entity_decode($txt, ENT_QUOTES, $this->encoding);
-		return $txt;
-	}
-	
-	/**
-	 * parser le code HTML
-	 *
-	 * @param	&array	tableau de retour des données
-	 * @return	null
-	 */
-	function searchCode(&$tmp)
-	{
-		// séparer les balises du texte
-		$tmp = array();
-		$reg = '/(<[^>]+>)|([^<]+)+/isU';
-
-		// pour chaque élément trouvé :
-		$str = '';
-		$offset = 0;
-		while(preg_match($reg, $this->html, $parse, PREG_OFFSET_CAPTURE, $offset))
-		{
-			// si une balise a été détectée
-			if ($parse[1][0])
-			{
-				// sauvegarde du texte précédent si il existe
-				if ($str!=='')	$tmp[] = array('txt',$str);
-	
-				// sauvegarde de la balise
-				$tmp[] = array('code',trim($parse[1][0]), $offset);
-				
-				// initialisation du texte suivant
-				$str = '';
-			}
-			else
-			{
-				// ajout du texte à la fin de celui qui est déjà détecté
-				$str.= $parse[2][0];
-			}
-			// Update offset to the end of the match
-			$offset = $parse[0][1] + strlen($parse[0][0]);
-			unset($parse);
-		}
-		// si un texte est présent à la fin, on l'enregistre
-		if ($str!='') $tmp[] = array('txt',$str);
-		unset($str);
-	}
-	
-	/**
-	 * analyse une balise HTML
-	 *
-	 * @param	string	code HTML à identifier
-	 * @return	array	action correspondante
-	 */
-	function analiseCode($code)
-	{
-		// nom de la balise et ouverture ou fermeture
-		$balise = '<([\/]{0,1})([_a-z0-9]+)([\/>\s]+)';
-		if (!preg_match('/'.$balise.'/isU', $code, $match))
-			return null;
-
-		$close	= ($match[1]=='/' ? true : false);
-		$autoclose = preg_match('/\/>$/isU', $code);
-		$name	= strtolower($match[2]);
-		
-		// paramètres obligatoires en fonction du nom de la balise
-		$param	= array();
-		$param['style'] = '';
-		if ($name=='img')	{ $param['alt'] = '';	$param['src'] = ''; }
-		if ($name=='a')		{ $param['href'] = '';	}
-		
-		// lecture des paramétres du type nom=valeur
-		$prop = '([a-zA-Z0-9_]+)=([^"\'\s>]+)';
-		preg_match_all('/'.$prop.'/is', $code, $match);
-		for($k=0; $k<count($match[0]); $k++)
-			$param[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
-
-		// lecture des paramétres du type nom="valeur"
-		$prop = '([a-zA-Z0-9_]+)=["]([^"]*)["]';
-		preg_match_all('/'.$prop.'/is', $code, $match);
-		for($k=0; $k<count($match[0]); $k++)
-			$param[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
-
-		// lecture des paramétres du type nom='valeur'
-		$prop = "([a-zA-Z0-9_]+)=[']([^']*)[']";
-		preg_match_all('/'.$prop.'/is', $code, $match);
-		for($k=0; $k<count($match[0]); $k++)
-			$param[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
-	
-		// mise en conformité en style de chaque paramètre
-		$color	= "#000000";
-		$border	= null;
-		foreach($param as $key => $val)
-		{
-			$key = strtolower($key);
-			switch($key)
-			{
-				case 'width':
-					unset($param[$key]);
-					$param['style'] .= 'width: '.$val.'px; ';
-					break;
-
-				case 'align':
-					if ($name==='img')
-					{
-						unset($param[$key]);
-						$param['style'] .= 'float: '.$val.'; ';
-					} 
-					elseif ($name!=='table')
-					{
-						unset($param[$key]);
-						$param['style'] .= 'text-align: '.$val.'; ';
-					}
-					break;
-					
-				case 'valign':
-					unset($param[$key]);
-					$param['style'] .= 'vertical-align: '.$val.'; ';
-					break;
-					
-				case 'height':
-					unset($param[$key]);
-					$param['style'] .= 'height: '.$val.'px; ';
-					break;
-
-				case 'bgcolor':
-					unset($param[$key]);
-					$param['style'] .= 'background: '.$val.'; ';
-					break;
-
-				case 'bordercolor':
-					unset($param[$key]);
-					$color = $val;
-					break;
-
-				case 'border':
-					unset($param[$key]);
-					if (preg_match('/^[0-9]+$/isU', $val)) $val = $val.'px';
-					$border = $val;
-					break;
-				
-				case 'cellpadding':
-				case 'cellspacing':
-					if (preg_match('/^([0-9]+)$/isU', $val)) $param[$key] = $val.'px';
-					break;
-					
-				case 'colspan':
-				case 'rowspan':
-					$val = preg_replace('/[^0-9]/isU', '', $val);
-					if (!$val) $val = 1;
-					$param[$key] = $val;
-					break;
-			}
-		}
-		if ($border!==null)
-		{
-			if ($border)	$border = 'border: solid '.$border.' '.$color;
-			else			$border = 'border: none';
-			
-			$param['style'] .= $border.'; ';
-			$param['border'] = $border;
-		}
-		
-		// lecture des styles - décomposition
-		$styles = explode(';', $param['style']);
-		$param['style'] = array();
-		foreach($styles as $style)
-		{
-			$tmp = explode(':', $style);
-			if (count($tmp)>1)
-			{
-				$cod = $tmp[0]; unset($tmp[0]); $tmp = implode(':', $tmp); 
-				$param['style'][trim(strtolower($cod))] = preg_replace('/[\s]+/isU', ' ', trim($tmp));
-			}
-		}
-		
-		// détermination du niveau de table pour les ouverture, avec ajout d'un level
-		if (in_array($name, array('ul', 'ol', 'table')) && !$close)
-		{
-			$this->num++;
-			$this->level[count($this->level)] = $this->num;
-		} 
-		
-		// attribution du niveau de table où se trouve l'élément
-		if (!isset($param['num'])) $param['num'] = $this->level[count($this->level)-1];
-
-		// pour les fins de table : suppression d'un level
-		if (in_array($name, array('ul', 'ol', 'table')) && $close)
-		{
-			unset($this->level[count($this->level)-1]);
-		} 
-
-		if (isset($param['value']))	$param['value']	= $this->prepareTxt($param['value']);
-		if (isset($param['alt']))	$param['alt']	= $this->prepareTxt($param['alt']);
-		if (isset($param['title']))	$param['title']	= $this->prepareTxt($param['title']);
-		if (isset($param['class']))	$param['class']	= $this->prepareTxt($param['class']);
-		
-		// retour de l'action identifiée
-		return array('name' => $name, 'close' => $close ? 1 : 0, 'autoclose' => $autoclose, 'param' => $param);
-	}
-	
-	// récupérer un niveau complet d'HTML entre une ouverture de balise et la fermeture correspondante
-	function getLevel($k)
-	{
-		// si le code n'existe pas : fin
-		if (!isset($this->code[$k])) return array();
-		
-		// quelle balise faudra-t-il détecter
-		$detect = $this->code[$k]['name'];
-		
-		$level = 0;			// niveau de profondeur
-		$end = false;		// etat de fin de recherche
-		$code = array();	// code extrait
-		
-		// tant que c'est pas fini, on boucle
-		while (!$end)
-		{
-			// action courante
-			$row = $this->code[$k];
-			
-			// si write => on ajoute le texte
-			if ($row['name']=='write')
-			{
-				$code[] = $row;
-			}
-			// sinon, c'est une balise html
-			else
-			{
-				$not = false; // indicateur de non prise en compte de la balise courante
-				
-				// si c'est la balise que l'on cherche
-				if ($row['name']==$detect)
-				{
-					if ($level==0) { $not = true; }					// si on est à la premiere balise : on l'ignore
-					$level+= ($row['close'] ? -1 : 1);				// modification du niveau en cours en fonction de l'ouvertre / fermeture
-					if ($level==0) { $not = true; $end = true; }	// si on est au niveau 0 : on a fini
-				}
-				
-				// si on doit prendre en compte la balise courante
-				if (!$not)
-				{
-					if (isset($row['style']['text-align'])) unset($row['style']['text-align']);
-					$code[] = $row;
-				}
-			}
-			
-			// on continue tant qu'il y a du code à analyser...
-			if (isset($this->code[$k+1]))
-				$k++;
-			else
-				$end = true;
-		}
-		
-		// retourne le code extrait
-		return $code;
-	}
-	
-	function getHtmlErrorCode($pos)
-	{
-		return substr($this->html, $pos-30, 70);
-	}
+<?php
+/**
+ * Logiciel : HTML2PDF - classe ParsingHTML
+ *
+ * Convertisseur HTML => PDF
+ * Distribué sous la licence LGPL. 
+ *
+ * @author		Laurent MINGUET <webmaster@html2pdf.fr>
+ * @version		3.31
+ */
+
+class parsingHTML
+{
+	var $html		= '';				// code HTML à parser
+	var $num		= 0;				// numéro de table
+	var $level		= 0;				// niveaux de table
+	var $encoding	= '';				// encodage
+	var $code		= array();			// code HTML parsé
+	
+	/**
+	 * Constructeur
+	 *
+	 * @return	null
+	 */
+	function parsingHTML($encoding = 'ISO-8859-15')
+	{
+		$this->num		= 0;
+		$this->level	= array($this->num);
+		$this->html		= '';
+		$this->code		= array();
+		$this->setEncoding($encoding);
+	}
+	
+	function setEncoding($encoding)
+	{
+		$this->encoding = $encoding;
+	}
+	
+	/**
+	 * Définir le code HTML à parser
+	 *
+	 * @param	string code html
+	 * @return	null
+	 */
+	function setHTML($html)
+	{
+		$html = preg_replace('/<!--(.*)-->/isU', '', $html);
+		$this->html = $html;
+	}
+	
+	/**
+	 * parser le code HTML
+	 *
+	 * @return	null
+	 */
+	function parse()
+	{
+		$parents = array();
+
+		// chercher les balises HTML du code
+		$tmp = array();
+		$this->searchCode($tmp);
+		
+		// identifier les balises une à une
+		$pre_in = false;
+		$pre_br = array(
+					'name' => 'br',
+					'close' => false,
+					'param' => array(
+						'style' => array(),
+						'num'	=> 0
+					)
+				);
+
+		$balises_no_closed = array(
+									'br', 'hr', 'img', 'col',
+									'input', 'link', 'option',
+									'circle', 'ellipse', 'path', 'rect', 'line', 'polygon', 'polyline'
+							);
+		$todos = array();
+		foreach($tmp as $part)
+		{
+			// si c'est un code
+			if ($part[0]=='code')
+			{
+				$res = $this->analiseCode($part[1]);
+				
+				// si le code est bien un code analisable
+				if ($res)
+				{
+					$res['html_pos'] = $part[2];
+					if (!in_array($res['name'], $balises_no_closed))
+					{
+						if ($res['close'])
+						{
+							if (count($parents)<1)
+								HTML2PDF::makeError(3, __FILE__, __LINE__, $res['name'], $this->getHtmlErrorCode($res['html_pos']));
+							else if ($parents[count($parents)-1]!=$res['name'])
+								HTML2PDF::makeError(4, __FILE__, __LINE__, $parents, $this->getHtmlErrorCode($res['html_pos']));
+							else
+								unset($parents[count($parents)-1]);
+						}
+						else
+						{
+							if ($res['autoclose'])
+							{
+								$todos[] = $res;
+								$res['params'] = array();
+								$res['close'] = true;
+							}
+							else
+								$parents[count($parents)] = $res['name'];
+													
+						}
+						if (($res['name']=='pre' || $res['name']=='code') && !$res['autoclose'])
+								$pre_in = !$res['close'];
+					}
+					
+					$todos[] = $res;
+				}
+				// sinon (code non analisable) => on le transforme en texte
+				else
+				{
+					$part[0]='txt';
+				}
+			}
+			// sinon si c'est un texte
+			if ($part[0]=='txt')
+			{
+				// enregistrer l'action correspondante
+				if (!$pre_in)
+				{
+					// remplacer tous les espaces, tabulations, saufs de ligne multiples par de simples espaces
+					$todos[] = array(
+									'name'	=> 'write',
+									'close'	=> false,
+									'param' => array('txt' => $this->prepareTxt($part[1])),
+								);
+				}
+				else
+				{
+					$part[1] = str_replace("\r", '', $part[1]);
+					$part[1] = explode("\n", $part[1]);
+					
+					foreach($part[1] as $k => $txt)
+					{
+						$txt = str_replace("\t", '        ', $txt);
+						$txt = str_replace(' ', '&nbsp;', $txt);
+						if ($k>0) $todos[] = $pre_br;
+
+						$todos[] = array(
+										'name'	=> 'write',
+										'close'	=> false,
+										'param' => array('txt' => $this->prepareTxt($txt, false)),
+									);
+					}
+				}
+			}	
+		}
+
+		// pour chaque action identifiée, il faut nettoyer le début et la fin des textes
+		// en fonction des balises qui l'entourent.
+		$balises_clean = array('page', 'page_header', 'page_footer', 'form',
+								'table', 'thead', 'tfoot', 'tr', 'td', 'th', 'br',
+								'div', 'hr', 'p', 'ul', 'ol', 'li',
+								'h1', 'h2', 'h3', 'h4', 'h5', 'h6',
+								'bookmark', 'fieldset', 'legend',
+								'draw', 'circle', 'ellipse', 'path', 'rect', 'line', 'g', 'polygon', 'polyline');
+		$nb = count($todos);
+		for($k=0; $k<$nb; $k++)
+		{
+			//si c'est un texte
+			if ($todos[$k]['name']=='write')
+			{
+				// et qu'une balise spécifique le précède => on nettoye les espaces du début du texte
+				if ($k>0 && in_array($todos[$k-1]['name'], $balises_clean))
+					$todos[$k]['param']['txt'] = ltrim($todos[$k]['param']['txt']);
+
+				// et qu'une balise spécifique le suit => on nettoye les espaces de la fin du texte
+				if ($k<$nb-1 && in_array($todos[$k+1]['name'], $balises_clean))
+					$todos[$k]['param']['txt'] = rtrim($todos[$k]['param']['txt']);
+				
+				if (!strlen($todos[$k]['param']['txt']))
+					unset($todos[$k]);
+			}
+		}
+		if (count($parents)) HTML2PDF::makeError(5, __FILE__, __LINE__, $parents);
+
+		// liste des actions sauvée
+		$this->code = array_values($todos);
+	}
+	
+	/**
+	 * preparer le texte une seule fois pour gagner du temps. vient de o_WRITE
+	 *
+	 * @param	string texte
+	 * @return	string texte
+	 */
+	function prepareTxt($txt, $spaces = true)
+	{
+		if ($spaces) $txt = preg_replace('/\s+/is', ' ', $txt);
+		$txt = str_replace('&euro;', '€', $txt);
+		$txt = html_entity_decode($txt, ENT_QUOTES, $this->encoding);
+		return $txt;
+	}
+	
+	/**
+	 * parser le code HTML
+	 *
+	 * @param	&array	tableau de retour des données
+	 * @return	null
+	 */
+	function searchCode(&$tmp)
+	{
+		// séparer les balises du texte
+		$tmp = array();
+		$reg = '/(<[^>]+>)|([^<]+)+/isU';
+
+		// pour chaque élément trouvé :
+		$str = '';
+		$offset = 0;
+		while(preg_match($reg, $this->html, $parse, PREG_OFFSET_CAPTURE, $offset))
+		{
+			// si une balise a été détectée
+			if ($parse[1][0])
+			{
+				// sauvegarde du texte précédent si il existe
+				if ($str!=='')	$tmp[] = array('txt',$str);
+	
+				// sauvegarde de la balise
+				$tmp[] = array('code',trim($parse[1][0]), $offset);
+				
+				// initialisation du texte suivant
+				$str = '';
+			}
+			else
+			{
+				// ajout du texte à la fin de celui qui est déjà détecté
+				$str.= $parse[2][0];
+			}
+			// Update offset to the end of the match
+			$offset = $parse[0][1] + strlen($parse[0][0]);
+			unset($parse);
+		}
+		// si un texte est présent à la fin, on l'enregistre
+		if ($str!='') $tmp[] = array('txt',$str);
+		unset($str);
+	}
+	
+	/**
+	 * analyse une balise HTML
+	 *
+	 * @param	string	code HTML à identifier
+	 * @return	array	action correspondante
+	 */
+	function analiseCode($code)
+	{
+		// nom de la balise et ouverture ou fermeture
+		$balise = '<([\/]{0,1})([_a-z0-9]+)([\/>\s]+)';
+		if (!preg_match('/'.$balise.'/isU', $code, $match))
+			return null;
+
+		$close	= ($match[1]=='/' ? true : false);
+		$autoclose = preg_match('/\/>$/isU', $code);
+		$name	= strtolower($match[2]);
+		
+		// paramètres obligatoires en fonction du nom de la balise
+		$param	= array();
+		$param['style'] = '';
+		if ($name=='img')	{ $param['alt'] = '';	$param['src'] = ''; }
+		if ($name=='a')		{ $param['href'] = '';	}
+		
+		// lecture des paramétres du type nom=valeur
+		$prop = '([a-zA-Z0-9_]+)=([^"\'\s>]+)';
+		preg_match_all('/'.$prop.'/is', $code, $match);
+		for($k=0; $k<count($match[0]); $k++)
+			$param[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
+
+		// lecture des paramétres du type nom="valeur"
+		$prop = '([a-zA-Z0-9_]+)=["]([^"]*)["]';
+		preg_match_all('/'.$prop.'/is', $code, $match);
+		for($k=0; $k<count($match[0]); $k++)
+			$param[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
+
+		// lecture des paramétres du type nom='valeur'
+		$prop = "([a-zA-Z0-9_]+)=[']([^']*)[']";
+		preg_match_all('/'.$prop.'/is', $code, $match);
+		for($k=0; $k<count($match[0]); $k++)
+			$param[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
+	
+		// mise en conformité en style de chaque paramètre
+		$color	= "#000000";
+		$border	= null;
+		foreach($param as $key => $val)
+		{
+			$key = strtolower($key);
+			switch($key)
+			{
+				case 'width':
+					unset($param[$key]);
+					$param['style'] .= 'width: '.$val.'px; ';
+					break;
+
+				case 'align':
+					if ($name==='img')
+					{
+						unset($param[$key]);
+						$param['style'] .= 'float: '.$val.'; ';
+					} 
+					elseif ($name!=='table')
+					{
+						unset($param[$key]);
+						$param['style'] .= 'text-align: '.$val.'; ';
+					}
+					break;
+					
+				case 'valign':
+					unset($param[$key]);
+					$param['style'] .= 'vertical-align: '.$val.'; ';
+					break;
+					
+				case 'height':
+					unset($param[$key]);
+					$param['style'] .= 'height: '.$val.'px; ';
+					break;
+
+				case 'bgcolor':
+					unset($param[$key]);
+					$param['style'] .= 'background: '.$val.'; ';
+					break;
+
+				case 'bordercolor':
+					unset($param[$key]);
+					$color = $val;
+					break;
+
+				case 'border':
+					unset($param[$key]);
+					if (preg_match('/^[0-9]+$/isU', $val)) $val = $val.'px';
+					$border = $val;
+					break;
+				
+				case 'cellpadding':
+				case 'cellspacing':
+					if (preg_match('/^([0-9]+)$/isU', $val)) $param[$key] = $val.'px';
+					break;
+					
+				case 'colspan':
+				case 'rowspan':
+					$val = preg_replace('/[^0-9]/isU', '', $val);
+					if (!$val) $val = 1;
+					$param[$key] = $val;
+					break;
+			}
+		}
+		if ($border!==null)
+		{
+			if ($border)	$border = 'border: solid '.$border.' '.$color;
+			else			$border = 'border: none';
+			
+			$param['style'] .= $border.'; ';
+			$param['border'] = $border;
+		}
+		
+		// lecture des styles - décomposition
+		$styles = explode(';', $param['style']);
+		$param['style'] = array();
+		foreach($styles as $style)
+		{
+			$tmp = explode(':', $style);
+			if (count($tmp)>1)
+			{
+				$cod = $tmp[0]; unset($tmp[0]); $tmp = implode(':', $tmp); 
+				$param['style'][trim(strtolower($cod))] = preg_replace('/[\s]+/isU', ' ', trim($tmp));
+			}
+		}
+		
+		// détermination du niveau de table pour les ouverture, avec ajout d'un level
+		if (in_array($name, array('ul', 'ol', 'table')) && !$close)
+		{
+			$this->num++;
+			$this->level[count($this->level)] = $this->num;
+		} 
+		
+		// attribution du niveau de table où se trouve l'élément
+		if (!isset($param['num'])) $param['num'] = $this->level[count($this->level)-1];
+
+		// pour les fins de table : suppression d'un level
+		if (in_array($name, array('ul', 'ol', 'table')) && $close)
+		{
+			unset($this->level[count($this->level)-1]);
+		} 
+
+		if (isset($param['value']))	$param['value']	= $this->prepareTxt($param['value']);
+		if (isset($param['alt']))	$param['alt']	= $this->prepareTxt($param['alt']);
+		if (isset($param['title']))	$param['title']	= $this->prepareTxt($param['title']);
+		if (isset($param['class']))	$param['class']	= $this->prepareTxt($param['class']);
+		
+		// retour de l'action identifiée
+		return array('name' => $name, 'close' => $close ? 1 : 0, 'autoclose' => $autoclose, 'param' => $param);
+	}
+	
+	// récupérer un niveau complet d'HTML entre une ouverture de balise et la fermeture correspondante
+	function getLevel($k)
+	{
+		// si le code n'existe pas : fin
+		if (!isset($this->code[$k])) return array();
+		
+		// quelle balise faudra-t-il détecter
+		$detect = $this->code[$k]['name'];
+		
+		$level = 0;			// niveau de profondeur
+		$end = false;		// etat de fin de recherche
+		$code = array();	// code extrait
+		
+		// tant que c'est pas fini, on boucle
+		while (!$end)
+		{
+			// action courante
+			$row = $this->code[$k];
+			
+			// si write => on ajoute le texte
+			if ($row['name']=='write')
+			{
+				$code[] = $row;
+			}
+			// sinon, c'est une balise html
+			else
+			{
+				$not = false; // indicateur de non prise en compte de la balise courante
+				
+				// si c'est la balise que l'on cherche
+				if ($row['name']==$detect)
+				{
+					if ($level==0) { $not = true; }					// si on est à la premiere balise : on l'ignore
+					$level+= ($row['close'] ? -1 : 1);				// modification du niveau en cours en fonction de l'ouvertre / fermeture
+					if ($level==0) { $not = true; $end = true; }	// si on est au niveau 0 : on a fini
+				}
+				
+				// si on doit prendre en compte la balise courante
+				if (!$not)
+				{
+					if (isset($row['style']['text-align'])) unset($row['style']['text-align']);
+					$code[] = $row;
+				}
+			}
+			
+			// on continue tant qu'il y a du code à analyser...
+			if (isset($this->code[$k+1]))
+				$k++;
+			else
+				$end = true;
+		}
+		
+		// retourne le code extrait
+		return $code;
+	}
+	
+	function getHtmlErrorCode($pos)
+	{
+		return substr($this->html, $pos-30, 70);
+	}
 }
\ No newline at end of file
diff --git a/library/html2pdf/styleHTML.class.php b/library/html2pdf/styleHTML.class.php
index cf72dedcc..189d70a98 100644
--- a/library/html2pdf/styleHTML.class.php
+++ b/library/html2pdf/styleHTML.class.php
@@ -1,1575 +1,1575 @@
-<?php
-/**
- * Logiciel : HTML2PDF - classe styleHTML
- * 
- * Convertisseur HTML => PDF
- * Distribué sous la licence LGPL. 
- *
- * @author		Laurent MINGUET <webmaster@html2pdf.fr>
- * @version		3.31
- */
-
-class styleHTML
-{
-	var $pdf			= null;			// référence au PDF parent
-	var $htmlColor		= array();		// liste des couleurs HTML
-	var $onlyLeft		= false;		// indique si on est dans un sous HTML et qu'on bloque à gauche
-	var $defaultFont	= null;			// fonte par défaut si la fonte demandée n'existe pas
-	
-	var $value			= array();		// valeurs actuelles
-	var $css			= array();		// tableau des CSS
-	var $css_keys		= array();		// tableau des clefs CSS, pour l'ordre d'execution
-	var $table			= array();		// tableau d'empilement pour historisation des niveaux
-	
-	/**
-	 * Constructeur
-	 *
-	 * @param	&pdf		référence à l'objet HTML2PDF parent
-	 * @return	null
-	 */
-	function styleHTML(&$pdf)
-	{
-		$this->init();		// initialisation
-		$this->setPdfParent($pdf);
-	}
-	
-	function setPdfParent(&$pdf)
-	{
-		$this->pdf = &$pdf;
-	}
-	
-	function setOnlyLeft()
-	{
-		$this->value['text-align'] = 'left';
-		$this->onlyLeft = true;
-	}
-
-	function getOldValues()
-	{
-		return isset($this->table[count($this->table)-1]) ? $this->table[count($this->table)-1] : $this->value;
-	}
-	
-	/**
-	* définit la fonte par défaut si aucun fonte n'est spécifiée, ou si la fonte demandée n'existe pas
-	*
-	* @param	string	nom de la fonte par defaut. si null : Arial pour fonte non spécifiée, et erreur pour fonte non existante
-	* @return	string	nom de l'ancienne fonte par defaut
-	*/
-	function setDefaultFont($default = null)
-	{
-		$old = $this->defaultFont;
-		$this->defaultFont = $default;
-		if ($default) $this->value['font-family'] = $default;
-		return $old;
-	}
-	
- 	/**
-	 * Initialisation du style
-	 *
-	 * @return	null
-	 */
-	function init()
-	{
-		global $webcolor;
-		$this->htmlColor = &$webcolor;
-		
-		$this->table = array();
-		$this->value = array();
-		$this->initStyle();
-		
-		// initialisation des styles sans héritages
-		$this->resetStyle();
-	}
-	
-	function initStyle()
-	{
- 		$this->value['id_balise']			= 'body';		// balise
-		$this->value['id_name']				= null;			// name
-		$this->value['id_id']				= null;			// id
-		$this->value['id_class']			= null;			// class
-		$this->value['id_lst']				= array('*');	// lst de dependance
-		$this->value['mini-size']			= 1.;			// rapport de taille	spécifique aux sup, sub
-		$this->value['mini-decal']			= 0;			// rapport de position	spécifique aux sup, sub
-		$this->value['font-family']			= 'Arial';
-		$this->value['font-bold']			= false;
-		$this->value['font-italic']			= false;
-		$this->value['font-underline']		= false;
-		$this->value['font-overline']		= false;
-		$this->value['font-linethrough']	= false;
-		$this->value['text-transform']		= 'none';
-		$this->value['font-size']			= $this->ConvertToMM('10pt');
-		$this->value['text-indent']			= 0;
-		$this->value['text-align']			= 'left';
-		$this->value['vertical-align']		= 'middle';
-		$this->value['line-height']			= 'normal';
-
-		$this->value['position']			= null;
-		$this->value['x']					= null;
-		$this->value['y']					= null;
-		$this->value['width']				= 0;
-		$this->value['height']				= 0;
-		$this->value['top']					= null;
-		$this->value['right']				= null;
-		$this->value['bottom']				= null;
-		$this->value['left']				= null;
-		$this->value['float']				= null;
-		$this->value['display']				= null;
-		$this->value['rotate']				= null;
-		$this->value['overflow']			= 'visible';
-		
-		$this->value['color']				= array(0, 0, 0);
-		$this->value['background']			= array('color' => null, 'image' => null, 'position' => null, 'repeat' => null);
-		$this->value['border']				= array();
-		$this->value['padding']				= array();
-		$this->value['margin']				= array();
-		$this->value['margin-auto']			= false;
-
-		$this->value['list-style-type']		= '';
-		$this->value['list-style-image']	= '';
-
-		$this->value['xc']					= null;
-		$this->value['yc']					= null;
-	}
-	
-	/**
-	 * Initialisation des styles sans héritages
-	 *
-	 * @param	string	balise HTML
-	 * @return	null
-	 */
-	function resetStyle($balise = '')
-	{
-		$collapse = isset($this->value['border']['collapse']) ? $this->value['border']['collapse'] : false;
-		if (!in_array($balise, array('tr', 'td', 'th', 'thead', 'tbody', 'tfoot'))) $collapse = false;
-		
-		$this->value['position']			= null;
-		$this->value['x']					= null;
-		$this->value['y']					= null;
-		$this->value['width']				= 0;
-		$this->value['height']				= 0;
-		$this->value['top']					= null;
-		$this->value['right']				= null;
-		$this->value['bottom']				= null;
-		$this->value['left']				= null;
-		$this->value['float']				= null;
-		$this->value['display']				= null;
-		$this->value['rotate']				= null;
-		$this->value['overflow']			= 'visible';
-		$this->value['background']			= array('color' => null, 'image' => null, 'position' => null, 'repeat' => null);
-		$this->value['border']	= array(
-									't' => $this->readBorder('none'),
-									'r' => $this->readBorder('none'),
-									'b' => $this->readBorder('none'),
-									'l' => $this->readBorder('none'),
-									'radius' => array(
-										'tl' => array(0, 0),
-										'tr' => array(0, 0),
-										'br' => array(0, 0),
-										'bl' => array(0, 0)
-									),
-									'collapse' => $collapse,
-								);
-
-		if (!in_array($balise, array('h1', 'h2', 'h3', 'h4', 'h5', 'h6')))
-			$this->value['margin']	= array('t'=>0,'r'=>0,'b'=>0,'l'=>0);
-		
-		if ($balise=='p')
-		{
-			$this->value['margin']['t'] = null;
-			$this->value['margin']['b'] = null;
-		}
-		$this->value['margin-auto'] = false;
-		
-		if (in_array($balise, array('div', 'fieldset')))
-			$this->value['vertical-align']	 = 'top';
-
-		if (in_array($balise, array('fieldset', 'legend')))
-		{
-			$radius = $this->ConvertToMM('5px');
-			$this->value['border']	= array(
-									't' => $this->readBorder('solid 1px #000000'),
-									'r' => $this->readBorder('solid 1px #000000'),
-									'b' => $this->readBorder('solid 1px #000000'),
-									'l' => $this->readBorder('solid 1px #000000'),
-									'radius' => array(),
-									'collapse' => false,
-			);
-			
-			$this->value['border']['radius'] = array(
-						'tl' => array($radius, $radius),
-						'tr' => array($radius, $radius),
-						'br' => array($radius, $radius),
-						'bl' => array($radius, $radius));
-    		}
-
-		if (in_array($balise, array('ul', 'li')))
-		{
-			$this->value['list-style-type']		= '';
-			$this->value['list-style-image']	= '';
-		}
-
-		if (!in_array($balise, array('tr', 'td')))
-		{
-			$this->value['padding']	= array(
-									't' => 0,
-									'r' => 0,
-									'b' => 0,
-									'l' => 0
-								);
-		}
-		else
-		{
-			$this->value['padding']	= array(
-									't' => $this->ConvertToMM('1px'),
-									'r' => $this->ConvertToMM('1px'),
-									'b' => $this->ConvertToMM('1px'),
-									'l' => $this->ConvertToMM('1px')
-								);
-		}
-		
-		if ($balise=='hr')
-		{
-			$this->value['border']	= array(
-									't' => $this->readBorder('solid 1px #000000'),
-									'r' => $this->readBorder('solid 1px #000000'),
-									'b' => $this->readBorder('solid 1px #000000'),
-									'l' => $this->readBorder('solid 1px #000000'),
-									'radius' => array(
-										'tl' => array(0, 0),
-										'tr' => array(0, 0),
-										'br' => array(0, 0),
-										'bl' => array(0, 0)
-									),
-									'collapse' => false,
-								);
-			$this->ConvertBackground('#FFFFFF', $this->value['background']);
-		}
-
-		$this->value['xc']					= null;
-		$this->value['yc']					= null;
-	}
-	
-	/**
-	 * Initialisation de la font PDF
-	 *
-	 * @return	null
-	 */
-	function FontSet()
-	{
-		$family = strtolower($this->value['font-family']);
-		
-		$b = ($this->value['font-bold']			? 'B' : '');
-		$i = ($this->value['font-italic']		? 'I' : '');
-		$u = ($this->value['font-underline']	? 'U' : '');
-		$d = ($this->value['font-linethrough']	? 'D' : '');
-		$o = ($this->value['font-overline']		? 'O' : '');
-		
-		if ($this->defaultFont)
-		{
-			$style = $b.$i;
-			if($family=='arial')
-				$family='helvetica';
-			elseif($family=='symbol' || $family=='zapfdingbats')
-				$style='';
-			
-			$fontkey = $family.$style;
-			if (!$this->pdf->isLoadedFont($fontkey))
-				$family = $this->defaultFont;
-		}
-		
-		if($family=='arial')
-			$family='helvetica';
-		elseif($family=='symbol' || $family=='zapfdingbats')
-			$style='';
-		
-		// taille en mm, à ramener en pt
-		$size = $this->value['font-size'];
-		$size = 72 * $size / 25.4;
-		
-		$this->pdf->setOverline($o ? true : false);
-		$this->pdf->setLinethrough($d ? true : false);
-		
-		// application de la fonte
-		$this->pdf->SetFont($family, $b.$i.$u, $this->value['mini-size']*$size);
-		$this->pdf->setMyTextColor($this->value['color']);
-		if ($this->value['background']['color'])
-			$this->pdf->setMyFillColor($this->value['background']['color']);
-		else
-			$this->pdf->setMyFillColor(1.);
-	}
-
- 	/**
-	 * Monter d'un niveau dans l'historisation
-	 *
-	 * @return	null
-	 */
-	function save()
-	{
-		$this->table[count($this->table)] = $this->value;
-	}
-	
- 	/**
-	 * Descendre d'un niveau dans l'historisation
-	 *
-	 * @return	null
-	 */
-	function load()
-	{
-		if (count($this->table))
-		{
-			$this->value = $this->table[count($this->table)-1];
-			unset($this->table[count($this->table)-1]);
-		}
-	}
-
-	function restorePosition()
-	{
-		if ($this->value['y']==$this->pdf->getY()) $this->pdf->setY($this->value['yc'], false);
-	}
-	
-	function setPosition()
-	{
-		$current_x = $this->pdf->getX();
-		$current_y = $this->pdf->getY();
-		$this->value['xc'] = $current_x;
-		$this->value['yc'] = $current_y;
-		
-		if ($this->value['position']=='relative' || $this->value['position']=='absolute')
-		{
-			if ($this->value['right']!==null)
-			{
-				$x = $this->getLastWidth(true) - $this->value['right'] - $this->value['width'];
-				if ($this->value['margin']['r']) $x-= $this->value['margin']['r'];
-			}
-			else
-			{
-				$x = $this->value['left'];
-				if ($this->value['margin']['l']) $x+= $this->value['margin']['l'];
-			}
-			
-			if ($this->value['bottom']!==null)
-			{
-				$y = $this->getLastHeight(true) - $this->value['bottom'] - $this->value['height'];
-				if ($this->value['margin']['b']) $y-= $this->value['margin']['b'];
-			}
-			else
-			{
-				$y = $this->value['top'];
-				if ($this->value['margin']['t']) $y+= $this->value['margin']['t'];
-			}
-			
-			if ($this->value['position']=='relative')
-			{
-				$this->value['x'] = $current_x + $x;
-				$this->value['y'] = $current_y + $y;
-			}
-			else
-			{
-				$this->value['x'] = $this->getLastAbsoluteX()+$x;
-				$this->value['y'] = $this->getLastAbsoluteY()+$y;
-			}
-		}
-		else
-		{
-			$this->value['x'] = $current_x;
-			$this->value['y'] = $current_y;
-			if ($this->value['margin']['l'])	$this->value['x']+= $this->value['margin']['l'];
-			if ($this->value['margin']['t'])	$this->value['y']+= $this->value['margin']['t'];
-		}
-		
-		$this->pdf->setXY($this->value['x'], $this->value['y']);
-	}
-
- 	/**
-	 * Analyse un tableau de style provenant du parseurHTML
-	 *
-	 * @param	string	nom de la balise
-	 * @param	array	tableau de style
-	 * @return	null
-	 */
-	
-	function getSvgStyle($balise, &$param)
-	{
-		// preparation
-		$balise = strtolower($balise);
-		$id		= isset($param['id'])		? strtolower(trim($param['id']))	: null; if (!$id)	$id		= null;
-		$name	= isset($param['name'])		? strtolower(trim($param['name']))	: null; if (!$name)	$name	= null;
-		
-		// lecture de la propriete classe
-		$class = array();
-		$tmp	= isset($param['class'])	? strtolower(trim($param['class'])) : '';
-		$tmp = explode(' ', $tmp);
-		foreach($tmp as $k => $v)
-		{
-			$v = trim($v);
-			if ($v) $class[] = $v;
-		}
-		
-		// identification de la balise et des styles direct qui pourraient lui être appliqués
-		$this->value['id_balise']	= $balise;
-		$this->value['id_name']		= $name;
-		$this->value['id_id']		= $id;
-		$this->value['id_class']	= $class;
-		$this->value['id_lst']		= array();
-		$this->value['id_lst'][] = '*';
-		$this->value['id_lst'][] = $balise;
-		if (!isset($this->value['svg']))
-		{
-			$this->value['svg'] = array(
-				'stroke' 		=> null,
-				'stroke-width'	=> $this->ConvertToMM('1pt'),
-				'fill'			=> null,
-				'fill-opacity'	=> null,
-			);
-		}
-		
-		if (count($class))
-		{
-			foreach($class as $v)
-			{
-				$this->value['id_lst'][] = '*.'.$v;
-				$this->value['id_lst'][] = '.'.$v;
-				$this->value['id_lst'][] = $balise.'.'.$v;
-			}
-		}
-		if ($id)
-		{
-			$this->value['id_lst'][] = '*#'.$id;
-			$this->value['id_lst'][] = '#'.$id;
-			$this->value['id_lst'][] = $balise.'#'.$id;
-		}
-		
-		// style CSS
-		$styles = $this->getFromCSS();
-
-		// on ajoute le style propre à la balise
-		$styles = array_merge($styles, $param['style']);
-		
-		if (isset($styles['stroke']))		$this->value['svg']['stroke']		= $this->ConvertToColor($styles['stroke'],	$res);
-		if (isset($styles['stroke-width']))	$this->value['svg']['stroke-width']	= $this->ConvertToMM($styles['stroke-width']);
-		if (isset($styles['fill']))			$this->value['svg']['fill']			= $this->ConvertToColor($styles['fill'],	$res);
-		if (isset($styles['fill-opacity']))	$this->value['svg']['fill-opacity']	= 1.*$styles['fill-opacity'];
-		
-		return $this->value['svg'];
-	}
-	
-	/**
-	 * Analyse un tableau de style provenant du parseurHTML
-	 *
-	 * @param	string	nom de la balise
-	 * @param	array	tableau de style
-	 * @param	array	tableau initialisant des styles
-	 * @return	null
-	 */
-	function analyse($balise, &$param, $heritage = null)
-	{
-		// preparation
-		$balise = strtolower($balise);
-		$id		= isset($param['id'])		? strtolower(trim($param['id']))	: null; if (!$id)	$id		= null;
-		$name	= isset($param['name'])		? strtolower(trim($param['name']))	: null; if (!$name)	$name	= null;
-
-		// lecture de la propriete classe
-		$class = array();
-		$tmp	= isset($param['class'])	? strtolower(trim($param['class']))	: '';
-		$tmp = explode(' ', $tmp);
-		foreach($tmp as $k => $v)
-		{
-			$v = trim($v);
-			if ($v) $class[] = $v;
-		}
-
-		// identification de la balise et des styles direct qui pourraient lui être appliqués
-		$this->value['id_balise']	= $balise;
-		$this->value['id_name']		= $name;
-		$this->value['id_id']		= $id;
-		$this->value['id_class']	= $class;
-		$this->value['id_lst']		= array();
-		$this->value['id_lst'][] = '*';
-		$this->value['id_lst'][] = $balise;
-		if (count($class))
-		{
-			foreach($class as $v)
-			{
-				$this->value['id_lst'][] = '*.'.$v;
-				$this->value['id_lst'][] = '.'.$v;
-				$this->value['id_lst'][] = $balise.'.'.$v;
-			}
-		}
-		if ($id)
-		{
-			$this->value['id_lst'][] = '*#'.$id;
-			$this->value['id_lst'][] = '#'.$id;
-			$this->value['id_lst'][] = $balise.'#'.$id;
-		}
-		
-		// style CSS
-		$styles = $this->getFromCSS();
-
-		// on ajoute le style propre à la balise
-		$styles = array_merge($styles, $param['style']);
-		if (isset($param['allwidth']) && !isset($styles['width'])) $styles['width'] = '100%';
-
-		// mise à zero des styles non hérités
-		$this->resetStyle($balise);
-		if ($heritage)
-		{
-			foreach($heritage as $he_nom => $he_val)
-			{
-				if (is_array($he_val))
-				{
-					foreach($he_val as $he2_nom => $he2_val)
-						$this->value[$he_nom][$he2_nom] = $he2_val;
-				}
-				else
-					$this->value[$he_nom] = $he_val;
-			}
-		}
-		
-		// interpreration des nouvelles valeurs
-		$correct_width = false;
-		$no_width = true;
-
-		foreach($styles as $nom => $val)
-		{
-			switch($nom)
-			{
-				case 'font-family':
-					$val = explode(',', $val);
-					$val = trim($val[0]);
-
-					if ($val) $this->value['font-family'] = $val;
-					break;
-				
-				case 'font-weight':
-					$this->value['font-bold'] = ($val=='bold');
-					break;
-				
-				case 'font-style':
-					$this->value['font-italic'] = ($val=='italic');
-					break;
-				
-				case 'text-decoration':
-					$val = explode(' ', $val);
-					$this->value['font-underline']		= (in_array('underline',	$val));
-					$this->value['font-overline']		= (in_array('overline',		$val));
-					$this->value['font-linethrough']	= (in_array('line-through',	$val));
-					break;
-				
-				case 'text-indent':
-					$this->value['text-indent']			= $this->ConvertToMM($val);
-					break;
-				
-				case 'text-transform':
-					if (!in_array($val, array('none', 'capitalize', 'uppercase', 'lowercase'))) $val = 'none';
-					$this->value['text-transform']		= $val;
-					break;
-				
-				case 'font-size':
-					$val = $this->ConvertToMM($val, $this->value['font-size']);
-					if ($val) $this->value['font-size'] = $val;
-					break;
-				
-				case 'color':
-					$res = null;
-					$this->value['color'] = $this->ConvertToColor($val, $res);
-					
-					if ($balise=='hr')
-					{
-						$this->value['border']['l']['color'] = $this->value['color'];
-						$this->value['border']['t']['color'] = $this->value['color'];
-						$this->value['border']['r']['color'] = $this->value['color'];
-						$this->value['border']['b']['color'] = $this->value['color'];
-					}
-					break;
-				
-				case 'text-align':
-					$val = strtolower($val);
-					if (!in_array($val, array('left', 'right', 'center', 'justify', 'li_right'))) $val = 'left';
-					$this->value['text-align'] = $val;
-					break;
-				
-				case 'vertical-align':
-					$this->value['vertical-align'] = $val;
-					break;
-				
-				case 'width':
-					$this->value['width'] = $this->ConvertToMM($val, $this->getLastWidth());
-					if ($this->value['width'] && substr($val, -1)=='%') $correct_width=true;
-					$no_width = false;
-					break;
-				
-				case 'height':
-					$this->value['height'] = $this->ConvertToMM($val, $this->getLastHeight());
-					break;
-				
-				case 'line-height':
-					if (preg_match('/^[0-9\.]+$/isU', $val)) $val = floor($val*100).'%';
-					$this->value['line-height'] = $val;
-					break;
-				
-				case 'rotate':
-					if (!in_array($val, array(0, -90, 90, 180, 270, -180, -270))) $val = null;
-					if ($val<0) $val+= 360;
-					$this->value['rotate'] = $val;
-					break;
-				
-				case 'overflow':
-					if (!in_array($val, array('visible', 'hidden'))) $val = 'visible';
-					$this->value['overflow'] = $val;
-					break;
-				
-				case 'padding':
-					$val = explode(' ', $val);
-					foreach($val as $k => $v)
-					{
-						$v = trim($v);
-						if ($v!='') $val[$k] = $v;
-						else	unset($val[$k]);
-					}
-					$val = array_values($val);
-					$this->duplicateBorder($val);
-
-					$this->value['padding']['t'] = $this->ConvertToMM($val[0], 0);
-					$this->value['padding']['r'] = $this->ConvertToMM($val[1], 0);
-					$this->value['padding']['b'] = $this->ConvertToMM($val[2], 0);
-					$this->value['padding']['l'] = $this->ConvertToMM($val[3], 0);
-					break;
-				
-				case 'padding-top':
-					$this->value['padding']['t'] = $this->ConvertToMM($val, 0);
-					break;
-
-				case 'padding-right':
-					$this->value['padding']['r'] = $this->ConvertToMM($val, 0);
-					break;
-
-				case 'padding-bottom':
-					$this->value['padding']['b'] = $this->ConvertToMM($val, 0);
-					break;
-
-				case 'padding-left':
-					$this->value['padding']['l'] = $this->ConvertToMM($val, 0);
-					break;
-				
-				case 'margin':
-					if ($val=='auto')
-					{
-						$this->value['margin-auto'] = true;
-						break;
-					}
-					$val = explode(' ', $val);
-					foreach($val as $k => $v)
-					{
-						$v = trim($v);
-						if ($v!='') $val[$k] = $v;
-						else	unset($val[$k]);
-					}
-					$val = array_values($val);
-					$this->duplicateBorder($val);
-
-					$this->value['margin']['t'] = $this->ConvertToMM($val[0], 0);
-					$this->value['margin']['r'] = $this->ConvertToMM($val[1], 0);
-					$this->value['margin']['b'] = $this->ConvertToMM($val[2], 0);
-					$this->value['margin']['l'] = $this->ConvertToMM($val[3], 0);
-					break;
-				
-				case 'margin-top':
-					$this->value['margin']['t'] = $this->ConvertToMM($val, 0);
-					break;
-
-				case 'margin-right':
-					$this->value['margin']['r'] = $this->ConvertToMM($val, 0);
-					break;
-
-				case 'margin-bottom':
-					$this->value['margin']['b'] = $this->ConvertToMM($val, 0);
-					break;
-
-				case 'margin-left':
-					$this->value['margin']['l'] = $this->ConvertToMM($val, 0);
-					break;
-
-				case 'border':
-					$val = $this->readBorder($val);
-					$this->value['border']['t'] = $val;
-					$this->value['border']['r'] = $val;
-					$this->value['border']['b'] = $val;
-					$this->value['border']['l'] = $val;
-					break;
-				
-				case 'border-style':
-					$val = explode(' ', $val);
-					foreach($val as $val_k => $val_v)
-						if (!in_array($val_v, array('solid', 'dotted', 'dashed')))
-							$val[$val_k] = null;
-					$this->duplicateBorder($val);
-					
-					if ($val[0]) $this->value['border']['t']['type'] = $val[0];
-					if ($val[1]) $this->value['border']['r']['type'] = $val[1];
-					if ($val[2]) $this->value['border']['b']['type'] = $val[2];
-					if ($val[3]) $this->value['border']['l']['type'] = $val[3];
-					break;
-
-				case 'border-top-style':
-					if (in_array($val, array('solid', 'dotted', 'dashed')))
-						$this->value['border']['t']['type'] = $val;
-					break;
-
-				case 'border-right-style':
-					if (in_array($val, array('solid', 'dotted', 'dashed')))
-						$this->value['border']['r']['type'] = $val;
-					break;
-
-				case 'border-bottom-style':
-					if (in_array($val, array('solid', 'dotted', 'dashed')))
-						$this->value['border']['b']['type'] = $val;
-					break;
-
-				case 'border-left-style':
-					if (in_array($val, array('solid', 'dotted', 'dashed')))
-						$this->value['border']['l']['type'] = $val;
-					break;
-
-				case 'border-color':
-					$res = false;
-					$val = preg_replace('/,[\s]+/', ',', $val);
-					$val = explode(' ', $val);
-
-					foreach($val as $val_k => $val_v)
-					{
-							$val[$val_k] = $this->ConvertToColor($val_v, $res);
-							if (!$res) $val[$val_k] = null;
-					}
-					$this->duplicateBorder($val);
-
-					if (is_array($val[0])) $this->value['border']['t']['color'] = $val[0];
-					if (is_array($val[1])) $this->value['border']['r']['color'] = $val[1];
-					if (is_array($val[2])) $this->value['border']['b']['color'] = $val[2];
-					if (is_array($val[3])) $this->value['border']['l']['color'] = $val[3];
-					
-					break;
-
-				case 'border-top-color':
-					$res = false;
-					$val = $this->ConvertToColor($val, $res);
-					if ($res) $this->value['border']['t']['color'] = $val;
-					break;
-
-				case 'border-right-color':
-					$res = false;
-					$val = $this->ConvertToColor($val, $res);
-					if ($res) $this->value['border']['r']['color'] = $val;
-					break;
-
-				case 'border-bottom-color':
-					$res = false;
-					$val = $this->ConvertToColor($val, $res);
-					if ($res) $this->value['border']['b']['color'] = $val;
-					break;
-
-				case 'border-left-color':
-					$res = false;
-					$val = $this->ConvertToColor($val, $res);
-					if ($res) $this->value['border']['l']['color'] = $val;
-					break;
-				
-				case 'border-width':
-					$val = explode(' ', $val);
-					foreach($val as $val_k => $val_v)
-					{
-							$val[$val_k] = $this->ConvertToMM($val_v, 0);
-					}
-					$this->duplicateBorder($val);
-					
-					if ($val[0]) $this->value['border']['t']['width'] = $val[0];
-					if ($val[1]) $this->value['border']['r']['width'] = $val[1];
-					if ($val[2]) $this->value['border']['b']['width'] = $val[2];
-					if ($val[3]) $this->value['border']['l']['width'] = $val[3];
-					break;
-
-				case 'border-top-width':
-					$val = $this->ConvertToMM($val, 0);
-					if ($val) $this->value['border']['t']['width'] = $val;
-					break;
-
-				case 'border-right-width':
-					$val = $this->ConvertToMM($val, 0);
-					if ($val) $this->value['border']['r']['width'] = $val;
-					break;
-
-				case 'border-bottom-width':
-					$val = $this->ConvertToMM($val, 0);
-					if ($val) $this->value['border']['b']['width'] = $val;
-					break;
-
-				case 'border-left-width':
-					$val = $this->ConvertToMM($val, 0);
-					if ($val) $this->value['border']['l']['width'] = $val;
-					break;
-				
-				case 'border-collapse':
-					if ($balise=='table') $this->value['border']['collapse'] = ($val=='collapse');
-					break;
-				
-				case 'border-radius':
-					$val = explode('/', $val); if (count($val)>2) break;
-
-					$val_h = $this->ConvertToRadius(trim($val[0]));
-					if (count($val_h)<1 || count($val_h)>4) break;
-					if (!isset($val_h[1])) $val_h[1] = $val_h[0];
-					if (!isset($val_h[2])) $val_h = array($val_h[0], $val_h[0], $val_h[1], $val_h[1]);
-					if (!isset($val_h[3])) $val_h[3] = $val_h[1];
-					
-					if (isset($val[1]))
-					{
-						$val_v = $this->ConvertToRadius(trim($val[1]));
-						if (count($val_v)<1 || count($val_v)>4) break;
-						if (!isset($val_v[1])) $val_v[1] = $val_v[0];
-						if (!isset($val_v[2])) $val_v = array($val_v[0], $val_v[0], $val_v[1], $val_v[1]);
-						if (!isset($val_v[3])) $val_v[3] = $val_v[1];
-					}
-					else
-						$val_v = $val_h;
-					
-					$this->value['border']['radius'] = array(
-								'tl' => array($val_h[0], $val_v[0]),
-								'tr' => array($val_h[1], $val_v[1]),
-								'br' => array($val_h[2], $val_v[2]),
-								'bl' => array($val_h[3], $val_v[3])
-							);
-					break;
-				
-				case 'border-top-left-radius':
-					$val = $this->ConvertToRadius($val);
-					if (count($val)<1 || count($val)>2) break;
-					$this->value['border']['radius']['tl'] = array($val[0], isset($val[1]) ? $val[1] : $val[0]);
-					break;
-				
-				case 'border-top-right-radius':
-					$val = $this->ConvertToRadius($val);
-					if (count($val)<1 || count($val)>2) break;
-					$this->value['border']['radius']['tr'] = array($val[0], isset($val[1]) ? $val[1] : $val[0]);
-					break;
-
-				case 'border-bottom-right-radius':
-					$val = $this->ConvertToRadius($val);
-					if (count($val)<1 || count($val)>2) break;
-					$this->value['border']['radius']['br'] = array($val[0], isset($val[1]) ? $val[1] : $val[0]);
-					break;
-
-				case 'border-bottom-left-radius':
-					$val = $this->ConvertToRadius($val);
-					if (count($val)<1 || count($val)>2) break;
-					$this->value['border']['radius']['bl'] = array($val[0], isset($val[1]) ? $val[1] : $val[0]);
-					break;
-
-				case 'border-top':
-					$this->value['border']['t'] = $this->readBorder($val);
-					break;
-
-				case 'border-right':
-					$this->value['border']['r'] = $this->readBorder($val);
-					break;
-
-				case 'border-bottom':
-					$this->value['border']['b'] = $this->readBorder($val);
-					break;
-
-				case 'border-left':
-					$this->value['border']['l'] = $this->readBorder($val);
-					break;
-				
-				case 'background-color':
-					$this->value['background']['color'] = $this->ConvertBackgroundColor($val);
-					break;
-
-				case 'background-image':
-					$this->value['background']['image'] = $this->ConvertBackgroundImage($val);
-					break;
-
-				case 'background-position':
-					$res = null;
-					$this->value['background']['position'] = $this->ConvertBackgroundPosition($val, $res);
-					break;
-
-				case 'background-repeat':
-					$this->value['background']['repeat'] = $this->ConvertBackgroundRepeat($val);
-					break;
-
-				case 'background':
-					$this->ConvertBackground($val, $this->value['background']);
-					break;
-
-				case 'position':
-					if ($val=='absolute')		$this->value['position'] = 'absolute';
-					else if ($val=='relative')	$this->value['position'] = 'relative';
-					else						$this->value['position'] = null;
-					break;
-
-				case 'float':
-					if ($val=='left')			$this->value['float'] = 'left';
-					else if ($val=='right')		$this->value['float'] = 'right';
-					else						$this->value['float'] = null;
-					break;
-
-				case 'display':
-					if ($val=='inline')			$this->value['display'] = 'inline';
-					else if ($val=='block')		$this->value['display'] = 'block';
-					else if ($val=='none')		$this->value['display'] = 'none';
-					else						$this->value['display'] = null;
-					break;
-				
-				case 'top':
-				case 'bottom':
-				case 'left':
-				case 'right':
-					$this->value[$nom] = $val;
-					break;
-
-				case 'list-style':
-				case 'list-style-type':
-				case 'list-style-image':
-					if ($nom=='list-style') $nom = 'list-style-type';
-					$this->value[$nom] = $val;
-					break;
-				
-				default:
-					break;
-			}
-		}
-
-		$return = true;
-
-		if ($this->value['margin']['t']===null) $this->value['margin']['t'] = $this->value['font-size'];
-		if ($this->value['margin']['b']===null) $this->value['margin']['b'] = $this->value['font-size'];
-		
-		if ($this->onlyLeft) $this->value['text-align'] = 'left';
-		
-		// correction de la largeur pour correspondre au modèle de boite quick
-		if ($no_width && in_array($balise, array('div', 'fieldset')) && $this->value['position']!='absolute')
-		{
-			$this->value['width'] = $this->getLastWidth();
-			$this->value['width']-= $this->value['margin']['l'] + $this->value['margin']['r'];
-		}
-		else
-		{
-			if ($correct_width)
-			{
-				if (!in_array($balise, array('table', 'div', 'fieldset', 'hr')))
-				{
-					$this->value['width']-= $this->value['padding']['l'] + $this->value['padding']['r'];
-					$this->value['width']-= $this->value['border']['l']['width'] + $this->value['border']['r']['width'];
-				}
-				if (in_array($balise, array('th', 'td')))
-				{
-					$this->value['width']-= $this->ConvertToMM(isset($param['cellspacing']) ? $param['cellspacing'] : '2px');
-					$return = false;
-				}
-				if ($this->value['width']<0) $this->value['width']=0;
-			}
-			else
-			{
-				if ($this->value['width'])
-				{
-					if ($this->value['border']['l']['width'])	$this->value['width']	+= $this->value['border']['l']['width'];
-					if ($this->value['border']['r']['width'])	$this->value['width']	+= $this->value['border']['r']['width'];
-					if ($this->value['padding']['l'])			$this->value['width']	+= $this->value['padding']['l'];
-					if ($this->value['padding']['r'])			$this->value['width']	+= $this->value['padding']['r'];
-				}
-			}
-		}
-		if ($this->value['height'])
-		{
-			if ($this->value['border']['b']['width']) { $this->value['height']	+= $this->value['border']['b']['width']; }
-			if ($this->value['border']['t']['width']) { $this->value['height']	+= $this->value['border']['t']['width']; }
-			if ($this->value['padding']['b'])			$this->value['height']	+= $this->value['padding']['b'];
-			if ($this->value['padding']['t'])			$this->value['height']	+= $this->value['padding']['t'];
-		}
-		
-		if ($this->value['top']!=null)		$this->value['top']		= $this->ConvertToMM($this->value['top'],		$this->getLastHeight(true));
-		if ($this->value['bottom']!=null)	$this->value['bottom']	= $this->ConvertToMM($this->value['bottom'],	$this->getLastHeight(true));
-		if ($this->value['left']!=null)		$this->value['left']	= $this->ConvertToMM($this->value['left'],		$this->getLastWidth(true));
-		if ($this->value['right']!=null)	$this->value['right']	= $this->ConvertToMM($this->value['right'],		$this->getLastWidth(true));
-		
-		if ($this->value['top'] && $this->value['bottom'] && $this->value['height'])	$this->value['bottom']	= null;
-		if ($this->value['left'] && $this->value['right'] && $this->value['width'])		$this->value['right']	= null;
-		
-		return $return;
-	}
-	
- 	/**
-	 * Récupération de la hauteur de ligne courante
-	 *
-	 * @return	float	hauteur en mm
-	 */
-	function getLineHeight()
-	{
-		$val = $this->value['line-height'];
-		if ($val=='normal') $val = '108%';
-		return $this->ConvertToMM($val, $this->value['font-size']);
-	}
-	
- 	/**
-	 * Récupération de la largeur de l'objet parent
-	 *
-	 * @return	float	largeur
-	 */
-	function getLastWidth($mode = false)
-	{
-		for($k=count($this->table)-1; $k>=0; $k--)
-		{
-			if ($this->table[$k]['width'])
-			{
-				$w = $this->table[$k]['width'];
-				if ($mode)
-				{
-					$w+= $this->table[$k]['border']['l']['width'] + $this->table[$k]['padding']['l'] + 0.02;
-					$w+= $this->table[$k]['border']['r']['width'] + $this->table[$k]['padding']['r'] + 0.02;
-				}
-				return $w;
-			}
-		}
-		return $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
-	}
-
- 	/**
-	 * Récupération de la hauteur de l'objet parent
-	 *
-	 * @return	float	hauteur
-	 */
-	function getLastHeight($mode = false)
-	{
-		for($k=count($this->table)-1; $k>=0; $k--)
-		{
-			if ($this->table[$k]['height'])
-			{
-				$h = $this->table[$k]['height'];
-				if ($mode)
-				{
-					$h+= $this->table[$k]['border']['t']['width'] + $this->table[$k]['padding']['t'] + 0.02;
-					$h+= $this->table[$k]['border']['b']['width'] + $this->table[$k]['padding']['b'] + 0.02;
-				}
-				return $h;
-			}
-		}
-		return $this->pdf->getH() - $this->pdf->gettMargin() - $this->pdf->getbMargin();
-	}
-	
-	function getFloat()
-	{
-		if ($this->value['float']=='left')	return 'left';
-		if ($this->value['float']=='right')	return 'right';
-		return null;
-	}
-	
-	function getLastValue($key)
-	{
-		$nb = count($this->table);
-		if ($nb>0)
-			return $this->table[$nb-1][$key];
-		return null;
-	}
-
-	function getLastAbsoluteX()
-	{
-		for($k=count($this->table)-1; $k>=0; $k--)
-		{
-			if ($this->table[$k]['x'] && $this->table[$k]['position']) return $this->table[$k]['x'];
-		}
-		return $this->pdf->getlMargin();
-	}
-	
-	function getLastAbsoluteY()
-	{
-		for($k=count($this->table)-1; $k>=0; $k--)
-		{
-			if ($this->table[$k]['y'] && $this->table[$k]['position']) return $this->table[$k]['y'];
-		}
-		return $this->pdf->gettMargin();
-	}
-	
-	/**
-	 * Récupération des propriétés CSS de la balise en cours
-	 *
-	 * @return	array()		tableau des propriétés CSS
-	 */
-	function getFromCSS()
-	{
-		$styles	= array();	// style à appliquer
-		$getit	= array();	// styles à récuperer
-
-		// identification des styles direct, et ceux des parents
-		$lst = array();
-		$lst[] = $this->value['id_lst'];
-		for($i=count($this->table)-1; $i>=0; $i--) $lst[] = $this->table[$i]['id_lst'];
-
-		// identification des styles à récuperer
-		foreach($this->css_keys as $key => $num)
-			if ($this->getReccursiveStyle($key, $lst))
-				$getit[$key] = $num;
-
-		// si des styles sont à recuperer
-		if (count($getit))
-		{
-			// on les récupère, mais dans l'odre de définition, afin de garder les priorités
-			asort($getit);
-			foreach($getit as $key => $val) $styles = array_merge($styles, $this->css[$key]);
-		}
-		
-		return $styles;
-	}
-	
-	/**
-	 * Identification des styles à récuperer, en fonction de la balise et de ses parents
-	 *
-	 * @param	string		clef CSS à analyser
-	 * @param	array()		tableau des styles direct, et ceux des parents
-	 * @param	string		prochaine etape
-	 * @return	boolean		clef autorisée ou non
-	 */
-	function getReccursiveStyle($key, $lst, $next = null)
-	{
-		// si propchaine etape, on construit les valeurs
-		if ($next!==null)
-		{
-			if ($next) $key = trim(substr($key, 0, -strlen($next))); // on elève cette etape
-			unset($lst[0]);
-			if (!count($lst)) return false; // pas d'etape possible
-			$lst = array_values($lst);
-		}
-		
-		// pour chaque style direct possible de l'etape en cours
-		foreach($lst[0] as $nom)
-		{
-			if ($key==$nom) return true; // si la clef conrrespond => ok
-			if (substr($key, -strlen(' '.$nom))==' '.$nom && $this->getReccursiveStyle($key, $lst, $nom)) return true; // si la clef est la fin, on analyse ce qui précède
-		}
-
-		// si on est pas à la premiere etape, on doit analyse toutes les sous etapes
-		if ($next!==null && $this->getReccursiveStyle($key, $lst, '')) return true;
-		
-		// aucun style trouvé
-		return false;
-	}
-	
-	/**
-	 * Analyse d'une propriété Border
-	 *
-	 * @param	string		propriété border
-	 * @return	array()		propriété décodée
-	 */
-	function readBorder($val)
-	{
-		$none = array('type' => 'none', 'width' => 0, 'color' => array(0, 0, 0));
-
-		// valeurs par défault
-		$type	= 'solid';
-		$width	= $this->ConvertToMM('1pt');
-		$color	= array(0, 0, 0);
-
-		// nettoyage des valeurs
-		$val = explode(' ', $val);
-		foreach($val as $k => $v)
-		{
-			$v = trim($v);
-			if ($v)	$val[$k] = $v;
-			else	unset($val[$k]);
-		}
-		$val = array_values($val);
-		// identification des valeurs
-		$res = null;
-		foreach($val as $key)
-		{
-			if ($key=='none' || $key=='hidden') return $none;
-			
-			if ($this->ConvertToMM($key)!==null)
-				$width = $this->ConvertToMM($key);
-			else if (in_array($key, array('solid', 'dotted', 'dashed', 'double')))
-				$type = $key;
-			else
-			{
-				$tmp = $this->ConvertToColor($key, $res);
-				if ($res) $color = $tmp;
-			}
-		}
-		if (!$width) return $none;
-		return array('type' => $type, 'width' => $width, 'color' => $color);
-	}
-	
-	function duplicateBorder(&$val)
-	{
-		if (count($val)==1)
-		{
-			$val[1] = $val[0];
-			$val[2] = $val[0];
-			$val[3] = $val[0];
-		}
-		else if (count($val)==2)
-		{
-			$val[2] = $val[0];
-			$val[3] = $val[1];
-		}
-		else if (count($val)==3)
-		{
-			$val[3] = $val[1];
-		}
-	}
-
-	function ConvertBackground($stl, &$res)
-	{
-		// Image
-		$text = '/url\(([^)]*)\)/isU';
-		if (preg_match($text, $stl, $match))
-		{
-			$res['image'] = $this->ConvertBackgroundImage($match[0]);
-			$stl = preg_replace($text, '', $stl);
-			$stl = preg_replace('/[\s]+/', ' ', $stl);
-		}
-		
-		// protection des espaces
-		$stl = preg_replace('/,[\s]+/', ',', $stl);
-		$lst = explode(' ', $stl);
-		
-		$pos = '';
-		foreach($lst as $val)
-		{
-			$ok = false;
-			$color = $this->ConvertToColor($val, $ok);
-			
-			if ($ok)
-			{
-				$res['color'] = $color;
-			}
-			else if ($val=='transparent')
-			{
-				$res['color'] = null;
-			}
-			else
-			{
-				$repeat = $this->ConvertBackgroundRepeat($val);
-				if ($repeat)
-				{
-					$res['repeat'] = $repeat;
-				}
-				else
-				{
-					$pos.= ($pos ? ' ' : '').$val;
-				}
-			}
-		}
-		if ($pos)
-		{
-			$pos = $this->ConvertBackgroundPosition($pos, $ok);
-			if ($ok) $res['position'] = $pos;
-		}
-	}
-
-	function ConvertBackgroundColor($val)
-	{
-		$res = null;
-		if ($val=='transparent')	return null;
-		else						return $this->ConvertToColor($val, $res);
-	}
-
-	function ConvertBackgroundImage($val)
-	{
-		if ($val=='none')
-			return null;
-		else if (preg_match('/^url\(([^)]*)\)$/isU', $val, $match))
-			return $match[1];
-		else
-			return null;
-	}
-	
-	function ConvertBackgroundPosition($val, &$res)
-	{
-		$val = explode(' ', $val);
-		if (count($val)<2)
-		{
-			if (!$val[0]) return null;
-			$val[1] = 'center';
-		}
-		if (count($val)>2) return null;
-
-		$x = 0;
-		$y = 0;
-		$res = true;
-		
-		if ($val[0]=='left')		$x = '0%';
-		else if ($val[0]=='center')	$x = '50%';
-		else if ($val[0]=='right')	$x = '100%';
-		else if ($val[0]=='top')	$y = '0%';
-		else if ($val[0]=='bottom')	$y = '100%';
-		else if (preg_match('/^[-]?[0-9\.]+%$/isU',	$val[0])) $x = $val[0];
-		else if ($this->ConvertToMM($val[0])) $x = $this->ConvertToMM($val[0]);
-		else $res = false;
-		
-		if ($val[1]=='left')		$x = '0%';
-		else if ($val[1]=='right')	$x = '100%';
-		else if ($val[1]=='top')	$y = '0%';
-		else if ($val[1]=='center')	$y = '50%';
-		else if ($val[1]=='bottom')	$y = '100%';
-		else if (preg_match('/^[-]?[0-9\.]+%$/isU',	$val[1])) $y = $val[1];
-		else if ($this->ConvertToMM($val[1])) $y = $this->ConvertToMM($val[1]);
-		else $res = false;
-
-		$val[0] = $x;
-		$val[1] = $y;
-		
-		return $val;
-	}
-	
- 	function ConvertBackgroundRepeat($val)
-	{
-		switch($val)
-		{
-			case 'repeat':
-				return array(true, true);
-			case 'repeat-x':
-				return array(true, false);
-			case 'repeat-y':
-				return array(false, true);
-			case 'no-repeat':
-				return array(false, false);
-		}
-		return null;
-	}
- 	/**
-	 * Convertir une longueur en mm
-	 *
-	 * @param	string			longueur, avec unité, à convertir
-	 * @param	float			longueur du parent
-	 * @return	float			longueur exprimée en mm
-	 */
-	function ConvertToMM($val, $old=0.)
-	{
-		$val = trim($val);
-		if (preg_match('/^[0-9\.\-]+$/isU', $val))			$val.= 'px';
-		if (preg_match('/^[0-9\.\-]+px$/isU', $val))		$val = 25.4/96. * str_replace('px', '', $val);
-		else if (preg_match('/^[0-9\.\-]+pt$/isU', $val))	$val = 25.4/72. * str_replace('pt', '', $val);
-		else if (preg_match('/^[0-9\.\-]+in$/isU', $val))	$val = 25.4 * str_replace('in', '', $val);
-		else if (preg_match('/^[0-9\.\-]+mm$/isU', $val))	$val = 1.*str_replace('mm', '', $val);
-		else if (preg_match('/^[0-9\.\-]+%$/isU', $val))	$val = 1.*$old*str_replace('%', '', $val)/100.;
-		else												$val = null;
-
-		return $val;
-	}
-	
-	function ConvertToRadius($val)
-	{
-		$val = explode(' ', $val);
-		foreach($val as $k => $v)
-		{
-			$v = trim($v);
-			if ($v)
-			{
-				$v = $this->ConvertToMM($v, 0);
-				if ($v!==null)
-					$val[$k] = $v;
-				else
-					unset($val[$k]);
-			}
-			else	unset($val[$k]);
-		}
-		return array_values($val);
-	}
-	
- 	/**
-	 * Décomposition d'un code couleur HTML
-	 *
-	 * @param	string			couleur au format CSS
-	 * @return	array(r, v, b)	couleur exprimé par ses comporantes R, V, B, de 0 à 255.
-	 */
-	function ConvertToColor($val, &$res)
-	{
-		$val = trim($val);
-		$res = true;
-		
-		if (strtolower($val)=='transparent') return array(null, null, null);
-		if (isset($this->htmlColor[strtolower($val)]))
-		{
-			$val = $this->htmlColor[strtolower($val)];
-			$r = floatVal(hexdec(substr($val, 0, 2)));
-			$v = floatVal(hexdec(substr($val, 2, 2)));
-			$b = floatVal(hexdec(substr($val, 4, 2)));
-			$col = array($r/255., $v/255., $b/255.);
-		}
-		elseif (preg_match('/^#[0-9A-Fa-f]{6}$/isU', $val))
-		{
-			$r = floatVal(hexdec(substr($val, 1, 2)));
-			$v = floatVal(hexdec(substr($val, 3, 2)));
-			$b = floatVal(hexdec(substr($val, 5, 2)));
-			$col = array($r/255., $v/255., $b/255.);
-		}
-		elseif (preg_match('/^#[0-9A-F]{3}$/isU', $val))
-		{
-			$r = floatVal(hexdec(substr($val, 1, 1).substr($val, 1, 1)));
-			$v = floatVal(hexdec(substr($val, 2, 1).substr($val, 2, 1)));
-			$b = floatVal(hexdec(substr($val, 3, 1).substr($val, 3, 1)));
-			$col = array($r/255., $v/255., $b/255.);
-		}
-		elseif (preg_match('/rgb\([\s]*([0-9%\.]+)[\s]*,[\s]*([0-9%\.]+)[\s]*,[\s]*([0-9%\.]+)[\s]*\)/isU', $val, $match))
-		{
-			$r = $this->ConvertSubColor($match[1]);
-			$v = $this->ConvertSubColor($match[2]);
-			$b = $this->ConvertSubColor($match[3]);
-			$col = array($r, $v, $b);
-		}
-		elseif (preg_match('/cmyk\([\s]*([0-9%\.]+)[\s]*,[\s]*([0-9%\.]+)[\s]*,[\s]*([0-9%\.]+)[\s]*,[\s]*([0-9%\.]+)[\s]*\)/isU', $val, $match))
-		{
-			$c = $this->ConvertSubColor($match[1]);
-			$m = $this->ConvertSubColor($match[2]);
-			$y = $this->ConvertSubColor($match[3]);
-			$k = $this->ConvertSubColor($match[4]);
-			$col = array($c, $m, $y, $k);
-		}
-		else
-		{
-			$col = array(0., 0., 0.);
-			$res = false;
-		}
-		
-		return $col;
-	}
-	
-	function ConvertSubColor($c)
-	{
-		if (substr($c, -1)=='%') $c = floatVal(substr($c, 0, -1))/100.;
-		else
-		{
-			$c = floatVal($c);
-			if ($c>1) $c = $c/255.;
-		}
-		return $c;
-	}
-	
-	/**
-	 * Analyser une feuille de style
-	 *
-	 * @param	string			code CSS
-	 * @return	null
-	 */
-	function analyseStyle(&$code)
-	{
-		// on remplace tous les espaces, tab, \r, \n, par des espaces uniques
-		$code = preg_replace('/[\s]+/', ' ', $code);
-
-		// on enlève les commentaires
-		$code = preg_replace('/\/\*.*?\*\//s', '', $code);
-
-		// on analyse chaque style
-		preg_match_all('/([^{}]+){([^}]*)}/isU', $code, $match);
-		for($k=0; $k<count($match[0]); $k++)
-		{
-			// noms
-			$noms	= strtolower(trim($match[1][$k]));
-			
-			// style, séparé par des; => on remplie le tableau correspondant
-			$styles	= trim($match[2][$k]);
-			$styles = explode(';', $styles);
-			$stl = array();
-			foreach($styles as $style)
-			{
-				$tmp = explode(':', $style);
-				if (count($tmp)>1)
-				{
-					$cod = $tmp[0]; unset($tmp[0]); $tmp = implode(':', $tmp);
-					$stl[trim(strtolower($cod))] = trim($tmp);
-				}
-			}
-			
-			// décomposition des noms par les ,
-			$noms = explode(',', $noms);
-			foreach($noms as $nom)
-			{
-				$nom = trim($nom);
-				// Si il a une fonction spécifique, comme :hover => on zap
-				if (strpos($nom, ':')!==false) continue;
-				if (!isset($this->css[$nom]))
-					$this->css[$nom] = $stl;
-				else
-					$this->css[$nom] = array_merge($this->css[$nom], $stl);
-				
-			}
-		}
-		
-		$this->css_keys = array_flip(array_keys($this->css));
-	}
-	
-	/**
-	 * Extraction des feuille de style du code HTML
-	 *
-	 * @param	string			code HTML
-	 * @return	null
-	 */
-	function readStyle(&$html)
-	{
-		$style = ' ';
-
-		// extraction des balises link, et suppression de celles-ci dans le code HTML
-		preg_match_all('/<link([^>]*)>/isU', $html, $match);
-		$html = preg_replace('/<link[^>]*>/isU',	'', $html);
-		$html = preg_replace('/<\/link[^>]*>/isU',	'', $html);
-		
-		// analyse de chaque balise
-		foreach($match[1] as $code)
-		{
-			$tmp = array();
-			// lecture des paramétres du type nom=valeur
-			$prop = '([a-zA-Z0-9_]+)=([^"\'\s>]+)';
-			preg_match_all('/'.$prop.'/is', $code, $match);
-			for($k=0; $k<count($match[0]); $k++)
-				$tmp[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
-
-			// lecture des paramétres du type nom="valeur"
-			$prop = '([a-zA-Z0-9_]+)=["]([^"]*)["]';
-			preg_match_all('/'.$prop.'/is', $code, $match);
-			for($k=0; $k<count($match[0]); $k++)
-				$tmp[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
-
-			// lecture des paramétres du type nom='valeur'
-			$prop = "([a-zA-Z0-9_]+)=[']([^']*)[']";
-			preg_match_all('/'.$prop.'/is', $code, $match);
-			for($k=0; $k<count($match[0]); $k++)
-				$tmp[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
-
-			// si de type text/css => on garde
-			if (isset($tmp['type']) && strtolower($tmp['type'])=='text/css' && isset($tmp['href']))
-			{
-				$content = @file_get_contents($tmp['href']);
-				$url = $tmp['href'];
-				if (strpos($url, 'http://')!==false)
-				{
-					$url = str_replace('http://', '', $url);
-					$url = explode('/', $url);
-					$url_main = 'http://'.$url[0].'/';
-					$url_self = $url; unset($url_self[count($url_self)-1]); $url_self = 'http://'.implode('/', $url_self).'/';
-
-					$content = preg_replace('/url\(([^\\\\][^)]*)\)/isU', 'url('.$url_self.'$1)', $content);
-					$content = preg_replace('/url\((\\\\[^)]*)\)/isU', 'url('.$url_main.'$1)', $content);
-				}
-				else
-				{
-					// @todo
-					// $content = preg_replace('/url\(([^)]*)\)/isU', 'url('.dirname($url).'/$1)', $content);
-				}
-				$style.= $content."\n";
-			}
-		}
-
-
-		// extraction des balises style, et suppression de celles-ci dans le code HTML
-		preg_match_all('/<style[^>]*>(.*)<\/style[^>]*>/isU', $html, $match);
-		$html = preg_replace('/<style[^>]*>(.*)<\/style[^>]*>/isU', '', $html);
-
-		// analyse de chaque balise
-		foreach($match[1] as $code)
-		{
-			$code = str_replace('<!--', '', $code);
-			$code = str_replace('-->', '', $code);
-			$style.= $code."\n";
-		}
-		
-		$this->analyseStyle($style);
-	}
+<?php
+/**
+ * Logiciel : HTML2PDF - classe styleHTML
+ * 
+ * Convertisseur HTML => PDF
+ * Distribué sous la licence LGPL. 
+ *
+ * @author		Laurent MINGUET <webmaster@html2pdf.fr>
+ * @version		3.31
+ */
+
+class styleHTML
+{
+	var $pdf			= null;			// référence au PDF parent
+	var $htmlColor		= array();		// liste des couleurs HTML
+	var $onlyLeft		= false;		// indique si on est dans un sous HTML et qu'on bloque à gauche
+	var $defaultFont	= null;			// fonte par défaut si la fonte demandée n'existe pas
+	
+	var $value			= array();		// valeurs actuelles
+	var $css			= array();		// tableau des CSS
+	var $css_keys		= array();		// tableau des clefs CSS, pour l'ordre d'execution
+	var $table			= array();		// tableau d'empilement pour historisation des niveaux
+	
+	/**
+	 * Constructeur
+	 *
+	 * @param	&pdf		référence à l'objet HTML2PDF parent
+	 * @return	null
+	 */
+	function styleHTML(&$pdf)
+	{
+		$this->init();		// initialisation
+		$this->setPdfParent($pdf);
+	}
+	
+	function setPdfParent(&$pdf)
+	{
+		$this->pdf = &$pdf;
+	}
+	
+	function setOnlyLeft()
+	{
+		$this->value['text-align'] = 'left';
+		$this->onlyLeft = true;
+	}
+
+	function getOldValues()
+	{
+		return isset($this->table[count($this->table)-1]) ? $this->table[count($this->table)-1] : $this->value;
+	}
+	
+	/**
+	* définit la fonte par défaut si aucun fonte n'est spécifiée, ou si la fonte demandée n'existe pas
+	*
+	* @param	string	nom de la fonte par defaut. si null : Arial pour fonte non spécifiée, et erreur pour fonte non existante
+	* @return	string	nom de l'ancienne fonte par defaut
+	*/
+	function setDefaultFont($default = null)
+	{
+		$old = $this->defaultFont;
+		$this->defaultFont = $default;
+		if ($default) $this->value['font-family'] = $default;
+		return $old;
+	}
+	
+ 	/**
+	 * Initialisation du style
+	 *
+	 * @return	null
+	 */
+	function init()
+	{
+		global $webcolor;
+		$this->htmlColor = &$webcolor;
+		
+		$this->table = array();
+		$this->value = array();
+		$this->initStyle();
+		
+		// initialisation des styles sans héritages
+		$this->resetStyle();
+	}
+	
+	function initStyle()
+	{
+ 		$this->value['id_balise']			= 'body';		// balise
+		$this->value['id_name']				= null;			// name
+		$this->value['id_id']				= null;			// id
+		$this->value['id_class']			= null;			// class
+		$this->value['id_lst']				= array('*');	// lst de dependance
+		$this->value['mini-size']			= 1.;			// rapport de taille	spécifique aux sup, sub
+		$this->value['mini-decal']			= 0;			// rapport de position	spécifique aux sup, sub
+		$this->value['font-family']			= 'Arial';
+		$this->value['font-bold']			= false;
+		$this->value['font-italic']			= false;
+		$this->value['font-underline']		= false;
+		$this->value['font-overline']		= false;
+		$this->value['font-linethrough']	= false;
+		$this->value['text-transform']		= 'none';
+		$this->value['font-size']			= $this->ConvertToMM('10pt');
+		$this->value['text-indent']			= 0;
+		$this->value['text-align']			= 'left';
+		$this->value['vertical-align']		= 'middle';
+		$this->value['line-height']			= 'normal';
+
+		$this->value['position']			= null;
+		$this->value['x']					= null;
+		$this->value['y']					= null;
+		$this->value['width']				= 0;
+		$this->value['height']				= 0;
+		$this->value['top']					= null;
+		$this->value['right']				= null;
+		$this->value['bottom']				= null;
+		$this->value['left']				= null;
+		$this->value['float']				= null;
+		$this->value['display']				= null;
+		$this->value['rotate']				= null;
+		$this->value['overflow']			= 'visible';
+		
+		$this->value['color']				= array(0, 0, 0);
+		$this->value['background']			= array('color' => null, 'image' => null, 'position' => null, 'repeat' => null);
+		$this->value['border']				= array();
+		$this->value['padding']				= array();
+		$this->value['margin']				= array();
+		$this->value['margin-auto']			= false;
+
+		$this->value['list-style-type']		= '';
+		$this->value['list-style-image']	= '';
+
+		$this->value['xc']					= null;
+		$this->value['yc']					= null;
+	}
+	
+	/**
+	 * Initialisation des styles sans héritages
+	 *
+	 * @param	string	balise HTML
+	 * @return	null
+	 */
+	function resetStyle($balise = '')
+	{
+		$collapse = isset($this->value['border']['collapse']) ? $this->value['border']['collapse'] : false;
+		if (!in_array($balise, array('tr', 'td', 'th', 'thead', 'tbody', 'tfoot'))) $collapse = false;
+		
+		$this->value['position']			= null;
+		$this->value['x']					= null;
+		$this->value['y']					= null;
+		$this->value['width']				= 0;
+		$this->value['height']				= 0;
+		$this->value['top']					= null;
+		$this->value['right']				= null;
+		$this->value['bottom']				= null;
+		$this->value['left']				= null;
+		$this->value['float']				= null;
+		$this->value['display']				= null;
+		$this->value['rotate']				= null;
+		$this->value['overflow']			= 'visible';
+		$this->value['background']			= array('color' => null, 'image' => null, 'position' => null, 'repeat' => null);
+		$this->value['border']	= array(
+									't' => $this->readBorder('none'),
+									'r' => $this->readBorder('none'),
+									'b' => $this->readBorder('none'),
+									'l' => $this->readBorder('none'),
+									'radius' => array(
+										'tl' => array(0, 0),
+										'tr' => array(0, 0),
+										'br' => array(0, 0),
+										'bl' => array(0, 0)
+									),
+									'collapse' => $collapse,
+								);
+
+		if (!in_array($balise, array('h1', 'h2', 'h3', 'h4', 'h5', 'h6')))
+			$this->value['margin']	= array('t'=>0,'r'=>0,'b'=>0,'l'=>0);
+		
+		if ($balise=='p')
+		{
+			$this->value['margin']['t'] = null;
+			$this->value['margin']['b'] = null;
+		}
+		$this->value['margin-auto'] = false;
+		
+		if (in_array($balise, array('div', 'fieldset')))
+			$this->value['vertical-align']	 = 'top';
+
+		if (in_array($balise, array('fieldset', 'legend')))
+		{
+			$radius = $this->ConvertToMM('5px');
+			$this->value['border']	= array(
+									't' => $this->readBorder('solid 1px #000000'),
+									'r' => $this->readBorder('solid 1px #000000'),
+									'b' => $this->readBorder('solid 1px #000000'),
+									'l' => $this->readBorder('solid 1px #000000'),
+									'radius' => array(),
+									'collapse' => false,
+			);
+			
+			$this->value['border']['radius'] = array(
+						'tl' => array($radius, $radius),
+						'tr' => array($radius, $radius),
+						'br' => array($radius, $radius),
+						'bl' => array($radius, $radius));
+    		}
+
+		if (in_array($balise, array('ul', 'li')))
+		{
+			$this->value['list-style-type']		= '';
+			$this->value['list-style-image']	= '';
+		}
+
+		if (!in_array($balise, array('tr', 'td')))
+		{
+			$this->value['padding']	= array(
+									't' => 0,
+									'r' => 0,
+									'b' => 0,
+									'l' => 0
+								);
+		}
+		else
+		{
+			$this->value['padding']	= array(
+									't' => $this->ConvertToMM('1px'),
+									'r' => $this->ConvertToMM('1px'),
+									'b' => $this->ConvertToMM('1px'),
+									'l' => $this->ConvertToMM('1px')
+								);
+		}
+		
+		if ($balise=='hr')
+		{
+			$this->value['border']	= array(
+									't' => $this->readBorder('solid 1px #000000'),
+									'r' => $this->readBorder('solid 1px #000000'),
+									'b' => $this->readBorder('solid 1px #000000'),
+									'l' => $this->readBorder('solid 1px #000000'),
+									'radius' => array(
+										'tl' => array(0, 0),
+										'tr' => array(0, 0),
+										'br' => array(0, 0),
+										'bl' => array(0, 0)
+									),
+									'collapse' => false,
+								);
+			$this->ConvertBackground('#FFFFFF', $this->value['background']);
+		}
+
+		$this->value['xc']					= null;
+		$this->value['yc']					= null;
+	}
+	
+	/**
+	 * Initialisation de la font PDF
+	 *
+	 * @return	null
+	 */
+	function FontSet()
+	{
+		$family = strtolower($this->value['font-family']);
+		
+		$b = ($this->value['font-bold']			? 'B' : '');
+		$i = ($this->value['font-italic']		? 'I' : '');
+		$u = ($this->value['font-underline']	? 'U' : '');
+		$d = ($this->value['font-linethrough']	? 'D' : '');
+		$o = ($this->value['font-overline']		? 'O' : '');
+		
+		if ($this->defaultFont)
+		{
+			$style = $b.$i;
+			if($family=='arial')
+				$family='helvetica';
+			elseif($family=='symbol' || $family=='zapfdingbats')
+				$style='';
+			
+			$fontkey = $family.$style;
+			if (!$this->pdf->isLoadedFont($fontkey))
+				$family = $this->defaultFont;
+		}
+		
+		if($family=='arial')
+			$family='helvetica';
+		elseif($family=='symbol' || $family=='zapfdingbats')
+			$style='';
+		
+		// taille en mm, à ramener en pt
+		$size = $this->value['font-size'];
+		$size = 72 * $size / 25.4;
+		
+		$this->pdf->setOverline($o ? true : false);
+		$this->pdf->setLinethrough($d ? true : false);
+		
+		// application de la fonte
+		$this->pdf->SetFont($family, $b.$i.$u, $this->value['mini-size']*$size);
+		$this->pdf->setMyTextColor($this->value['color']);
+		if ($this->value['background']['color'])
+			$this->pdf->setMyFillColor($this->value['background']['color']);
+		else
+			$this->pdf->setMyFillColor(1.);
+	}
+
+ 	/**
+	 * Monter d'un niveau dans l'historisation
+	 *
+	 * @return	null
+	 */
+	function save()
+	{
+		$this->table[count($this->table)] = $this->value;
+	}
+	
+ 	/**
+	 * Descendre d'un niveau dans l'historisation
+	 *
+	 * @return	null
+	 */
+	function load()
+	{
+		if (count($this->table))
+		{
+			$this->value = $this->table[count($this->table)-1];
+			unset($this->table[count($this->table)-1]);
+		}
+	}
+
+	function restorePosition()
+	{
+		if ($this->value['y']==$this->pdf->getY()) $this->pdf->setY($this->value['yc'], false);
+	}
+	
+	function setPosition()
+	{
+		$current_x = $this->pdf->getX();
+		$current_y = $this->pdf->getY();
+		$this->value['xc'] = $current_x;
+		$this->value['yc'] = $current_y;
+		
+		if ($this->value['position']=='relative' || $this->value['position']=='absolute')
+		{
+			if ($this->value['right']!==null)
+			{
+				$x = $this->getLastWidth(true) - $this->value['right'] - $this->value['width'];
+				if ($this->value['margin']['r']) $x-= $this->value['margin']['r'];
+			}
+			else
+			{
+				$x = $this->value['left'];
+				if ($this->value['margin']['l']) $x+= $this->value['margin']['l'];
+			}
+			
+			if ($this->value['bottom']!==null)
+			{
+				$y = $this->getLastHeight(true) - $this->value['bottom'] - $this->value['height'];
+				if ($this->value['margin']['b']) $y-= $this->value['margin']['b'];
+			}
+			else
+			{
+				$y = $this->value['top'];
+				if ($this->value['margin']['t']) $y+= $this->value['margin']['t'];
+			}
+			
+			if ($this->value['position']=='relative')
+			{
+				$this->value['x'] = $current_x + $x;
+				$this->value['y'] = $current_y + $y;
+			}
+			else
+			{
+				$this->value['x'] = $this->getLastAbsoluteX()+$x;
+				$this->value['y'] = $this->getLastAbsoluteY()+$y;
+			}
+		}
+		else
+		{
+			$this->value['x'] = $current_x;
+			$this->value['y'] = $current_y;
+			if ($this->value['margin']['l'])	$this->value['x']+= $this->value['margin']['l'];
+			if ($this->value['margin']['t'])	$this->value['y']+= $this->value['margin']['t'];
+		}
+		
+		$this->pdf->setXY($this->value['x'], $this->value['y']);
+	}
+
+ 	/**
+	 * Analyse un tableau de style provenant du parseurHTML
+	 *
+	 * @param	string	nom de la balise
+	 * @param	array	tableau de style
+	 * @return	null
+	 */
+	
+	function getSvgStyle($balise, &$param)
+	{
+		// preparation
+		$balise = strtolower($balise);
+		$id		= isset($param['id'])		? strtolower(trim($param['id']))	: null; if (!$id)	$id		= null;
+		$name	= isset($param['name'])		? strtolower(trim($param['name']))	: null; if (!$name)	$name	= null;
+		
+		// lecture de la propriete classe
+		$class = array();
+		$tmp	= isset($param['class'])	? strtolower(trim($param['class'])) : '';
+		$tmp = explode(' ', $tmp);
+		foreach($tmp as $k => $v)
+		{
+			$v = trim($v);
+			if ($v) $class[] = $v;
+		}
+		
+		// identification de la balise et des styles direct qui pourraient lui être appliqués
+		$this->value['id_balise']	= $balise;
+		$this->value['id_name']		= $name;
+		$this->value['id_id']		= $id;
+		$this->value['id_class']	= $class;
+		$this->value['id_lst']		= array();
+		$this->value['id_lst'][] = '*';
+		$this->value['id_lst'][] = $balise;
+		if (!isset($this->value['svg']))
+		{
+			$this->value['svg'] = array(
+				'stroke' 		=> null,
+				'stroke-width'	=> $this->ConvertToMM('1pt'),
+				'fill'			=> null,
+				'fill-opacity'	=> null,
+			);
+		}
+		
+		if (count($class))
+		{
+			foreach($class as $v)
+			{
+				$this->value['id_lst'][] = '*.'.$v;
+				$this->value['id_lst'][] = '.'.$v;
+				$this->value['id_lst'][] = $balise.'.'.$v;
+			}
+		}
+		if ($id)
+		{
+			$this->value['id_lst'][] = '*#'.$id;
+			$this->value['id_lst'][] = '#'.$id;
+			$this->value['id_lst'][] = $balise.'#'.$id;
+		}
+		
+		// style CSS
+		$styles = $this->getFromCSS();
+
+		// on ajoute le style propre à la balise
+		$styles = array_merge($styles, $param['style']);
+		
+		if (isset($styles['stroke']))		$this->value['svg']['stroke']		= $this->ConvertToColor($styles['stroke'],	$res);
+		if (isset($styles['stroke-width']))	$this->value['svg']['stroke-width']	= $this->ConvertToMM($styles['stroke-width']);
+		if (isset($styles['fill']))			$this->value['svg']['fill']			= $this->ConvertToColor($styles['fill'],	$res);
+		if (isset($styles['fill-opacity']))	$this->value['svg']['fill-opacity']	= 1.*$styles['fill-opacity'];
+		
+		return $this->value['svg'];
+	}
+	
+	/**
+	 * Analyse un tableau de style provenant du parseurHTML
+	 *
+	 * @param	string	nom de la balise
+	 * @param	array	tableau de style
+	 * @param	array	tableau initialisant des styles
+	 * @return	null
+	 */
+	function analyse($balise, &$param, $heritage = null)
+	{
+		// preparation
+		$balise = strtolower($balise);
+		$id		= isset($param['id'])		? strtolower(trim($param['id']))	: null; if (!$id)	$id		= null;
+		$name	= isset($param['name'])		? strtolower(trim($param['name']))	: null; if (!$name)	$name	= null;
+
+		// lecture de la propriete classe
+		$class = array();
+		$tmp	= isset($param['class'])	? strtolower(trim($param['class']))	: '';
+		$tmp = explode(' ', $tmp);
+		foreach($tmp as $k => $v)
+		{
+			$v = trim($v);
+			if ($v) $class[] = $v;
+		}
+
+		// identification de la balise et des styles direct qui pourraient lui être appliqués
+		$this->value['id_balise']	= $balise;
+		$this->value['id_name']		= $name;
+		$this->value['id_id']		= $id;
+		$this->value['id_class']	= $class;
+		$this->value['id_lst']		= array();
+		$this->value['id_lst'][] = '*';
+		$this->value['id_lst'][] = $balise;
+		if (count($class))
+		{
+			foreach($class as $v)
+			{
+				$this->value['id_lst'][] = '*.'.$v;
+				$this->value['id_lst'][] = '.'.$v;
+				$this->value['id_lst'][] = $balise.'.'.$v;
+			}
+		}
+		if ($id)
+		{
+			$this->value['id_lst'][] = '*#'.$id;
+			$this->value['id_lst'][] = '#'.$id;
+			$this->value['id_lst'][] = $balise.'#'.$id;
+		}
+		
+		// style CSS
+		$styles = $this->getFromCSS();
+
+		// on ajoute le style propre à la balise
+		$styles = array_merge($styles, $param['style']);
+		if (isset($param['allwidth']) && !isset($styles['width'])) $styles['width'] = '100%';
+
+		// mise à zero des styles non hérités
+		$this->resetStyle($balise);
+		if ($heritage)
+		{
+			foreach($heritage as $he_nom => $he_val)
+			{
+				if (is_array($he_val))
+				{
+					foreach($he_val as $he2_nom => $he2_val)
+						$this->value[$he_nom][$he2_nom] = $he2_val;
+				}
+				else
+					$this->value[$he_nom] = $he_val;
+			}
+		}
+		
+		// interpreration des nouvelles valeurs
+		$correct_width = false;
+		$no_width = true;
+
+		foreach($styles as $nom => $val)
+		{
+			switch($nom)
+			{
+				case 'font-family':
+					$val = explode(',', $val);
+					$val = trim($val[0]);
+
+					if ($val) $this->value['font-family'] = $val;
+					break;
+				
+				case 'font-weight':
+					$this->value['font-bold'] = ($val=='bold');
+					break;
+				
+				case 'font-style':
+					$this->value['font-italic'] = ($val=='italic');
+					break;
+				
+				case 'text-decoration':
+					$val = explode(' ', $val);
+					$this->value['font-underline']		= (in_array('underline',	$val));
+					$this->value['font-overline']		= (in_array('overline',		$val));
+					$this->value['font-linethrough']	= (in_array('line-through',	$val));
+					break;
+				
+				case 'text-indent':
+					$this->value['text-indent']			= $this->ConvertToMM($val);
+					break;
+				
+				case 'text-transform':
+					if (!in_array($val, array('none', 'capitalize', 'uppercase', 'lowercase'))) $val = 'none';
+					$this->value['text-transform']		= $val;
+					break;
+				
+				case 'font-size':
+					$val = $this->ConvertToMM($val, $this->value['font-size']);
+					if ($val) $this->value['font-size'] = $val;
+					break;
+				
+				case 'color':
+					$res = null;
+					$this->value['color'] = $this->ConvertToColor($val, $res);
+					
+					if ($balise=='hr')
+					{
+						$this->value['border']['l']['color'] = $this->value['color'];
+						$this->value['border']['t']['color'] = $this->value['color'];
+						$this->value['border']['r']['color'] = $this->value['color'];
+						$this->value['border']['b']['color'] = $this->value['color'];
+					}
+					break;
+				
+				case 'text-align':
+					$val = strtolower($val);
+					if (!in_array($val, array('left', 'right', 'center', 'justify', 'li_right'))) $val = 'left';
+					$this->value['text-align'] = $val;
+					break;
+				
+				case 'vertical-align':
+					$this->value['vertical-align'] = $val;
+					break;
+				
+				case 'width':
+					$this->value['width'] = $this->ConvertToMM($val, $this->getLastWidth());
+					if ($this->value['width'] && substr($val, -1)=='%') $correct_width=true;
+					$no_width = false;
+					break;
+				
+				case 'height':
+					$this->value['height'] = $this->ConvertToMM($val, $this->getLastHeight());
+					break;
+				
+				case 'line-height':
+					if (preg_match('/^[0-9\.]+$/isU', $val)) $val = floor($val*100).'%';
+					$this->value['line-height'] = $val;
+					break;
+				
+				case 'rotate':
+					if (!in_array($val, array(0, -90, 90, 180, 270, -180, -270))) $val = null;
+					if ($val<0) $val+= 360;
+					$this->value['rotate'] = $val;
+					break;
+				
+				case 'overflow':
+					if (!in_array($val, array('visible', 'hidden'))) $val = 'visible';
+					$this->value['overflow'] = $val;
+					break;
+				
+				case 'padding':
+					$val = explode(' ', $val);
+					foreach($val as $k => $v)
+					{
+						$v = trim($v);
+						if ($v!='') $val[$k] = $v;
+						else	unset($val[$k]);
+					}
+					$val = array_values($val);
+					$this->duplicateBorder($val);
+
+					$this->value['padding']['t'] = $this->ConvertToMM($val[0], 0);
+					$this->value['padding']['r'] = $this->ConvertToMM($val[1], 0);
+					$this->value['padding']['b'] = $this->ConvertToMM($val[2], 0);
+					$this->value['padding']['l'] = $this->ConvertToMM($val[3], 0);
+					break;
+				
+				case 'padding-top':
+					$this->value['padding']['t'] = $this->ConvertToMM($val, 0);
+					break;
+
+				case 'padding-right':
+					$this->value['padding']['r'] = $this->ConvertToMM($val, 0);
+					break;
+
+				case 'padding-bottom':
+					$this->value['padding']['b'] = $this->ConvertToMM($val, 0);
+					break;
+
+				case 'padding-left':
+					$this->value['padding']['l'] = $this->ConvertToMM($val, 0);
+					break;
+				
+				case 'margin':
+					if ($val=='auto')
+					{
+						$this->value['margin-auto'] = true;
+						break;
+					}
+					$val = explode(' ', $val);
+					foreach($val as $k => $v)
+					{
+						$v = trim($v);
+						if ($v!='') $val[$k] = $v;
+						else	unset($val[$k]);
+					}
+					$val = array_values($val);
+					$this->duplicateBorder($val);
+
+					$this->value['margin']['t'] = $this->ConvertToMM($val[0], 0);
+					$this->value['margin']['r'] = $this->ConvertToMM($val[1], 0);
+					$this->value['margin']['b'] = $this->ConvertToMM($val[2], 0);
+					$this->value['margin']['l'] = $this->ConvertToMM($val[3], 0);
+					break;
+				
+				case 'margin-top':
+					$this->value['margin']['t'] = $this->ConvertToMM($val, 0);
+					break;
+
+				case 'margin-right':
+					$this->value['margin']['r'] = $this->ConvertToMM($val, 0);
+					break;
+
+				case 'margin-bottom':
+					$this->value['margin']['b'] = $this->ConvertToMM($val, 0);
+					break;
+
+				case 'margin-left':
+					$this->value['margin']['l'] = $this->ConvertToMM($val, 0);
+					break;
+
+				case 'border':
+					$val = $this->readBorder($val);
+					$this->value['border']['t'] = $val;
+					$this->value['border']['r'] = $val;
+					$this->value['border']['b'] = $val;
+					$this->value['border']['l'] = $val;
+					break;
+				
+				case 'border-style':
+					$val = explode(' ', $val);
+					foreach($val as $val_k => $val_v)
+						if (!in_array($val_v, array('solid', 'dotted', 'dashed')))
+							$val[$val_k] = null;
+					$this->duplicateBorder($val);
+					
+					if ($val[0]) $this->value['border']['t']['type'] = $val[0];
+					if ($val[1]) $this->value['border']['r']['type'] = $val[1];
+					if ($val[2]) $this->value['border']['b']['type'] = $val[2];
+					if ($val[3]) $this->value['border']['l']['type'] = $val[3];
+					break;
+
+				case 'border-top-style':
+					if (in_array($val, array('solid', 'dotted', 'dashed')))
+						$this->value['border']['t']['type'] = $val;
+					break;
+
+				case 'border-right-style':
+					if (in_array($val, array('solid', 'dotted', 'dashed')))
+						$this->value['border']['r']['type'] = $val;
+					break;
+
+				case 'border-bottom-style':
+					if (in_array($val, array('solid', 'dotted', 'dashed')))
+						$this->value['border']['b']['type'] = $val;
+					break;
+
+				case 'border-left-style':
+					if (in_array($val, array('solid', 'dotted', 'dashed')))
+						$this->value['border']['l']['type'] = $val;
+					break;
+
+				case 'border-color':
+					$res = false;
+					$val = preg_replace('/,[\s]+/', ',', $val);
+					$val = explode(' ', $val);
+
+					foreach($val as $val_k => $val_v)
+					{
+							$val[$val_k] = $this->ConvertToColor($val_v, $res);
+							if (!$res) $val[$val_k] = null;
+					}
+					$this->duplicateBorder($val);
+
+					if (is_array($val[0])) $this->value['border']['t']['color'] = $val[0];
+					if (is_array($val[1])) $this->value['border']['r']['color'] = $val[1];
+					if (is_array($val[2])) $this->value['border']['b']['color'] = $val[2];
+					if (is_array($val[3])) $this->value['border']['l']['color'] = $val[3];
+					
+					break;
+
+				case 'border-top-color':
+					$res = false;
+					$val = $this->ConvertToColor($val, $res);
+					if ($res) $this->value['border']['t']['color'] = $val;
+					break;
+
+				case 'border-right-color':
+					$res = false;
+					$val = $this->ConvertToColor($val, $res);
+					if ($res) $this->value['border']['r']['color'] = $val;
+					break;
+
+				case 'border-bottom-color':
+					$res = false;
+					$val = $this->ConvertToColor($val, $res);
+					if ($res) $this->value['border']['b']['color'] = $val;
+					break;
+
+				case 'border-left-color':
+					$res = false;
+					$val = $this->ConvertToColor($val, $res);
+					if ($res) $this->value['border']['l']['color'] = $val;
+					break;
+				
+				case 'border-width':
+					$val = explode(' ', $val);
+					foreach($val as $val_k => $val_v)
+					{
+							$val[$val_k] = $this->ConvertToMM($val_v, 0);
+					}
+					$this->duplicateBorder($val);
+					
+					if ($val[0]) $this->value['border']['t']['width'] = $val[0];
+					if ($val[1]) $this->value['border']['r']['width'] = $val[1];
+					if ($val[2]) $this->value['border']['b']['width'] = $val[2];
+					if ($val[3]) $this->value['border']['l']['width'] = $val[3];
+					break;
+
+				case 'border-top-width':
+					$val = $this->ConvertToMM($val, 0);
+					if ($val) $this->value['border']['t']['width'] = $val;
+					break;
+
+				case 'border-right-width':
+					$val = $this->ConvertToMM($val, 0);
+					if ($val) $this->value['border']['r']['width'] = $val;
+					break;
+
+				case 'border-bottom-width':
+					$val = $this->ConvertToMM($val, 0);
+					if ($val) $this->value['border']['b']['width'] = $val;
+					break;
+
+				case 'border-left-width':
+					$val = $this->ConvertToMM($val, 0);
+					if ($val) $this->value['border']['l']['width'] = $val;
+					break;
+				
+				case 'border-collapse':
+					if ($balise=='table') $this->value['border']['collapse'] = ($val=='collapse');
+					break;
+				
+				case 'border-radius':
+					$val = explode('/', $val); if (count($val)>2) break;
+
+					$val_h = $this->ConvertToRadius(trim($val[0]));
+					if (count($val_h)<1 || count($val_h)>4) break;
+					if (!isset($val_h[1])) $val_h[1] = $val_h[0];
+					if (!isset($val_h[2])) $val_h = array($val_h[0], $val_h[0], $val_h[1], $val_h[1]);
+					if (!isset($val_h[3])) $val_h[3] = $val_h[1];
+					
+					if (isset($val[1]))
+					{
+						$val_v = $this->ConvertToRadius(trim($val[1]));
+						if (count($val_v)<1 || count($val_v)>4) break;
+						if (!isset($val_v[1])) $val_v[1] = $val_v[0];
+						if (!isset($val_v[2])) $val_v = array($val_v[0], $val_v[0], $val_v[1], $val_v[1]);
+						if (!isset($val_v[3])) $val_v[3] = $val_v[1];
+					}
+					else
+						$val_v = $val_h;
+					
+					$this->value['border']['radius'] = array(
+								'tl' => array($val_h[0], $val_v[0]),
+								'tr' => array($val_h[1], $val_v[1]),
+								'br' => array($val_h[2], $val_v[2]),
+								'bl' => array($val_h[3], $val_v[3])
+							);
+					break;
+				
+				case 'border-top-left-radius':
+					$val = $this->ConvertToRadius($val);
+					if (count($val)<1 || count($val)>2) break;
+					$this->value['border']['radius']['tl'] = array($val[0], isset($val[1]) ? $val[1] : $val[0]);
+					break;
+				
+				case 'border-top-right-radius':
+					$val = $this->ConvertToRadius($val);
+					if (count($val)<1 || count($val)>2) break;
+					$this->value['border']['radius']['tr'] = array($val[0], isset($val[1]) ? $val[1] : $val[0]);
+					break;
+
+				case 'border-bottom-right-radius':
+					$val = $this->ConvertToRadius($val);
+					if (count($val)<1 || count($val)>2) break;
+					$this->value['border']['radius']['br'] = array($val[0], isset($val[1]) ? $val[1] : $val[0]);
+					break;
+
+				case 'border-bottom-left-radius':
+					$val = $this->ConvertToRadius($val);
+					if (count($val)<1 || count($val)>2) break;
+					$this->value['border']['radius']['bl'] = array($val[0], isset($val[1]) ? $val[1] : $val[0]);
+					break;
+
+				case 'border-top':
+					$this->value['border']['t'] = $this->readBorder($val);
+					break;
+
+				case 'border-right':
+					$this->value['border']['r'] = $this->readBorder($val);
+					break;
+
+				case 'border-bottom':
+					$this->value['border']['b'] = $this->readBorder($val);
+					break;
+
+				case 'border-left':
+					$this->value['border']['l'] = $this->readBorder($val);
+					break;
+				
+				case 'background-color':
+					$this->value['background']['color'] = $this->ConvertBackgroundColor($val);
+					break;
+
+				case 'background-image':
+					$this->value['background']['image'] = $this->ConvertBackgroundImage($val);
+					break;
+
+				case 'background-position':
+					$res = null;
+					$this->value['background']['position'] = $this->ConvertBackgroundPosition($val, $res);
+					break;
+
+				case 'background-repeat':
+					$this->value['background']['repeat'] = $this->ConvertBackgroundRepeat($val);
+					break;
+
+				case 'background':
+					$this->ConvertBackground($val, $this->value['background']);
+					break;
+
+				case 'position':
+					if ($val=='absolute')		$this->value['position'] = 'absolute';
+					else if ($val=='relative')	$this->value['position'] = 'relative';
+					else						$this->value['position'] = null;
+					break;
+
+				case 'float':
+					if ($val=='left')			$this->value['float'] = 'left';
+					else if ($val=='right')		$this->value['float'] = 'right';
+					else						$this->value['float'] = null;
+					break;
+
+				case 'display':
+					if ($val=='inline')			$this->value['display'] = 'inline';
+					else if ($val=='block')		$this->value['display'] = 'block';
+					else if ($val=='none')		$this->value['display'] = 'none';
+					else						$this->value['display'] = null;
+					break;
+				
+				case 'top':
+				case 'bottom':
+				case 'left':
+				case 'right':
+					$this->value[$nom] = $val;
+					break;
+
+				case 'list-style':
+				case 'list-style-type':
+				case 'list-style-image':
+					if ($nom=='list-style') $nom = 'list-style-type';
+					$this->value[$nom] = $val;
+					break;
+				
+				default:
+					break;
+			}
+		}
+
+		$return = true;
+
+		if ($this->value['margin']['t']===null) $this->value['margin']['t'] = $this->value['font-size'];
+		if ($this->value['margin']['b']===null) $this->value['margin']['b'] = $this->value['font-size'];
+		
+		if ($this->onlyLeft) $this->value['text-align'] = 'left';
+		
+		// correction de la largeur pour correspondre au modèle de boite quick
+		if ($no_width && in_array($balise, array('div', 'fieldset')) && $this->value['position']!='absolute')
+		{
+			$this->value['width'] = $this->getLastWidth();
+			$this->value['width']-= $this->value['margin']['l'] + $this->value['margin']['r'];
+		}
+		else
+		{
+			if ($correct_width)
+			{
+				if (!in_array($balise, array('table', 'div', 'fieldset', 'hr')))
+				{
+					$this->value['width']-= $this->value['padding']['l'] + $this->value['padding']['r'];
+					$this->value['width']-= $this->value['border']['l']['width'] + $this->value['border']['r']['width'];
+				}
+				if (in_array($balise, array('th', 'td')))
+				{
+					$this->value['width']-= $this->ConvertToMM(isset($param['cellspacing']) ? $param['cellspacing'] : '2px');
+					$return = false;
+				}
+				if ($this->value['width']<0) $this->value['width']=0;
+			}
+			else
+			{
+				if ($this->value['width'])
+				{
+					if ($this->value['border']['l']['width'])	$this->value['width']	+= $this->value['border']['l']['width'];
+					if ($this->value['border']['r']['width'])	$this->value['width']	+= $this->value['border']['r']['width'];
+					if ($this->value['padding']['l'])			$this->value['width']	+= $this->value['padding']['l'];
+					if ($this->value['padding']['r'])			$this->value['width']	+= $this->value['padding']['r'];
+				}
+			}
+		}
+		if ($this->value['height'])
+		{
+			if ($this->value['border']['b']['width']) { $this->value['height']	+= $this->value['border']['b']['width']; }
+			if ($this->value['border']['t']['width']) { $this->value['height']	+= $this->value['border']['t']['width']; }
+			if ($this->value['padding']['b'])			$this->value['height']	+= $this->value['padding']['b'];
+			if ($this->value['padding']['t'])			$this->value['height']	+= $this->value['padding']['t'];
+		}
+		
+		if ($this->value['top']!=null)		$this->value['top']		= $this->ConvertToMM($this->value['top'],		$this->getLastHeight(true));
+		if ($this->value['bottom']!=null)	$this->value['bottom']	= $this->ConvertToMM($this->value['bottom'],	$this->getLastHeight(true));
+		if ($this->value['left']!=null)		$this->value['left']	= $this->ConvertToMM($this->value['left'],		$this->getLastWidth(true));
+		if ($this->value['right']!=null)	$this->value['right']	= $this->ConvertToMM($this->value['right'],		$this->getLastWidth(true));
+		
+		if ($this->value['top'] && $this->value['bottom'] && $this->value['height'])	$this->value['bottom']	= null;
+		if ($this->value['left'] && $this->value['right'] && $this->value['width'])		$this->value['right']	= null;
+		
+		return $return;
+	}
+	
+ 	/**
+	 * Récupération de la hauteur de ligne courante
+	 *
+	 * @return	float	hauteur en mm
+	 */
+	function getLineHeight()
+	{
+		$val = $this->value['line-height'];
+		if ($val=='normal') $val = '108%';
+		return $this->ConvertToMM($val, $this->value['font-size']);
+	}
+	
+ 	/**
+	 * Récupération de la largeur de l'objet parent
+	 *
+	 * @return	float	largeur
+	 */
+	function getLastWidth($mode = false)
+	{
+		for($k=count($this->table)-1; $k>=0; $k--)
+		{
+			if ($this->table[$k]['width'])
+			{
+				$w = $this->table[$k]['width'];
+				if ($mode)
+				{
+					$w+= $this->table[$k]['border']['l']['width'] + $this->table[$k]['padding']['l'] + 0.02;
+					$w+= $this->table[$k]['border']['r']['width'] + $this->table[$k]['padding']['r'] + 0.02;
+				}
+				return $w;
+			}
+		}
+		return $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
+	}
+
+ 	/**
+	 * Récupération de la hauteur de l'objet parent
+	 *
+	 * @return	float	hauteur
+	 */
+	function getLastHeight($mode = false)
+	{
+		for($k=count($this->table)-1; $k>=0; $k--)
+		{
+			if ($this->table[$k]['height'])
+			{
+				$h = $this->table[$k]['height'];
+				if ($mode)
+				{
+					$h+= $this->table[$k]['border']['t']['width'] + $this->table[$k]['padding']['t'] + 0.02;
+					$h+= $this->table[$k]['border']['b']['width'] + $this->table[$k]['padding']['b'] + 0.02;
+				}
+				return $h;
+			}
+		}
+		return $this->pdf->getH() - $this->pdf->gettMargin() - $this->pdf->getbMargin();
+	}
+	
+	function getFloat()
+	{
+		if ($this->value['float']=='left')	return 'left';
+		if ($this->value['float']=='right')	return 'right';
+		return null;
+	}
+	
+	function getLastValue($key)
+	{
+		$nb = count($this->table);
+		if ($nb>0)
+			return $this->table[$nb-1][$key];
+		return null;
+	}
+
+	function getLastAbsoluteX()
+	{
+		for($k=count($this->table)-1; $k>=0; $k--)
+		{
+			if ($this->table[$k]['x'] && $this->table[$k]['position']) return $this->table[$k]['x'];
+		}
+		return $this->pdf->getlMargin();
+	}
+	
+	function getLastAbsoluteY()
+	{
+		for($k=count($this->table)-1; $k>=0; $k--)
+		{
+			if ($this->table[$k]['y'] && $this->table[$k]['position']) return $this->table[$k]['y'];
+		}
+		return $this->pdf->gettMargin();
+	}
+	
+	/**
+	 * Récupération des propriétés CSS de la balise en cours
+	 *
+	 * @return	array()		tableau des propriétés CSS
+	 */
+	function getFromCSS()
+	{
+		$styles	= array();	// style à appliquer
+		$getit	= array();	// styles à récuperer
+
+		// identification des styles direct, et ceux des parents
+		$lst = array();
+		$lst[] = $this->value['id_lst'];
+		for($i=count($this->table)-1; $i>=0; $i--) $lst[] = $this->table[$i]['id_lst'];
+
+		// identification des styles à récuperer
+		foreach($this->css_keys as $key => $num)
+			if ($this->getReccursiveStyle($key, $lst))
+				$getit[$key] = $num;
+
+		// si des styles sont à recuperer
+		if (count($getit))
+		{
+			// on les récupère, mais dans l'odre de définition, afin de garder les priorités
+			asort($getit);
+			foreach($getit as $key => $val) $styles = array_merge($styles, $this->css[$key]);
+		}
+		
+		return $styles;
+	}
+	
+	/**
+	 * Identification des styles à récuperer, en fonction de la balise et de ses parents
+	 *
+	 * @param	string		clef CSS à analyser
+	 * @param	array()		tableau des styles direct, et ceux des parents
+	 * @param	string		prochaine etape
+	 * @return	boolean		clef autorisée ou non
+	 */
+	function getReccursiveStyle($key, $lst, $next = null)
+	{
+		// si propchaine etape, on construit les valeurs
+		if ($next!==null)
+		{
+			if ($next) $key = trim(substr($key, 0, -strlen($next))); // on elève cette etape
+			unset($lst[0]);
+			if (!count($lst)) return false; // pas d'etape possible
+			$lst = array_values($lst);
+		}
+		
+		// pour chaque style direct possible de l'etape en cours
+		foreach($lst[0] as $nom)
+		{
+			if ($key==$nom) return true; // si la clef conrrespond => ok
+			if (substr($key, -strlen(' '.$nom))==' '.$nom && $this->getReccursiveStyle($key, $lst, $nom)) return true; // si la clef est la fin, on analyse ce qui précède
+		}
+
+		// si on est pas à la premiere etape, on doit analyse toutes les sous etapes
+		if ($next!==null && $this->getReccursiveStyle($key, $lst, '')) return true;
+		
+		// aucun style trouvé
+		return false;
+	}
+	
+	/**
+	 * Analyse d'une propriété Border
+	 *
+	 * @param	string		propriété border
+	 * @return	array()		propriété décodée
+	 */
+	function readBorder($val)
+	{
+		$none = array('type' => 'none', 'width' => 0, 'color' => array(0, 0, 0));
+
+		// valeurs par défault
+		$type	= 'solid';
+		$width	= $this->ConvertToMM('1pt');
+		$color	= array(0, 0, 0);
+
+		// nettoyage des valeurs
+		$val = explode(' ', $val);
+		foreach($val as $k => $v)
+		{
+			$v = trim($v);
+			if ($v)	$val[$k] = $v;
+			else	unset($val[$k]);
+		}
+		$val = array_values($val);
+		// identification des valeurs
+		$res = null;
+		foreach($val as $key)
+		{
+			if ($key=='none' || $key=='hidden') return $none;
+			
+			if ($this->ConvertToMM($key)!==null)
+				$width = $this->ConvertToMM($key);
+			else if (in_array($key, array('solid', 'dotted', 'dashed', 'double')))
+				$type = $key;
+			else
+			{
+				$tmp = $this->ConvertToColor($key, $res);
+				if ($res) $color = $tmp;
+			}
+		}
+		if (!$width) return $none;
+		return array('type' => $type, 'width' => $width, 'color' => $color);
+	}
+	
+	function duplicateBorder(&$val)
+	{
+		if (count($val)==1)
+		{
+			$val[1] = $val[0];
+			$val[2] = $val[0];
+			$val[3] = $val[0];
+		}
+		else if (count($val)==2)
+		{
+			$val[2] = $val[0];
+			$val[3] = $val[1];
+		}
+		else if (count($val)==3)
+		{
+			$val[3] = $val[1];
+		}
+	}
+
+	function ConvertBackground($stl, &$res)
+	{
+		// Image
+		$text = '/url\(([^)]*)\)/isU';
+		if (preg_match($text, $stl, $match))
+		{
+			$res['image'] = $this->ConvertBackgroundImage($match[0]);
+			$stl = preg_replace($text, '', $stl);
+			$stl = preg_replace('/[\s]+/', ' ', $stl);
+		}
+		
+		// protection des espaces
+		$stl = preg_replace('/,[\s]+/', ',', $stl);
+		$lst = explode(' ', $stl);
+		
+		$pos = '';
+		foreach($lst as $val)
+		{
+			$ok = false;
+			$color = $this->ConvertToColor($val, $ok);
+			
+			if ($ok)
+			{
+				$res['color'] = $color;
+			}
+			else if ($val=='transparent')
+			{
+				$res['color'] = null;
+			}
+			else
+			{
+				$repeat = $this->ConvertBackgroundRepeat($val);
+				if ($repeat)
+				{
+					$res['repeat'] = $repeat;
+				}
+				else
+				{
+					$pos.= ($pos ? ' ' : '').$val;
+				}
+			}
+		}
+		if ($pos)
+		{
+			$pos = $this->ConvertBackgroundPosition($pos, $ok);
+			if ($ok) $res['position'] = $pos;
+		}
+	}
+
+	function ConvertBackgroundColor($val)
+	{
+		$res = null;
+		if ($val=='transparent')	return null;
+		else						return $this->ConvertToColor($val, $res);
+	}
+
+	function ConvertBackgroundImage($val)
+	{
+		if ($val=='none')
+			return null;
+		else if (preg_match('/^url\(([^)]*)\)$/isU', $val, $match))
+			return $match[1];
+		else
+			return null;
+	}
+	
+	function ConvertBackgroundPosition($val, &$res)
+	{
+		$val = explode(' ', $val);
+		if (count($val)<2)
+		{
+			if (!$val[0]) return null;
+			$val[1] = 'center';
+		}
+		if (count($val)>2) return null;
+
+		$x = 0;
+		$y = 0;
+		$res = true;
+		
+		if ($val[0]=='left')		$x = '0%';
+		else if ($val[0]=='center')	$x = '50%';
+		else if ($val[0]=='right')	$x = '100%';
+		else if ($val[0]=='top')	$y = '0%';
+		else if ($val[0]=='bottom')	$y = '100%';
+		else if (preg_match('/^[-]?[0-9\.]+%$/isU',	$val[0])) $x = $val[0];
+		else if ($this->ConvertToMM($val[0])) $x = $this->ConvertToMM($val[0]);
+		else $res = false;
+		
+		if ($val[1]=='left')		$x = '0%';
+		else if ($val[1]=='right')	$x = '100%';
+		else if ($val[1]=='top')	$y = '0%';
+		else if ($val[1]=='center')	$y = '50%';
+		else if ($val[1]=='bottom')	$y = '100%';
+		else if (preg_match('/^[-]?[0-9\.]+%$/isU',	$val[1])) $y = $val[1];
+		else if ($this->ConvertToMM($val[1])) $y = $this->ConvertToMM($val[1]);
+		else $res = false;
+
+		$val[0] = $x;
+		$val[1] = $y;
+		
+		return $val;
+	}
+	
+ 	function ConvertBackgroundRepeat($val)
+	{
+		switch($val)
+		{
+			case 'repeat':
+				return array(true, true);
+			case 'repeat-x':
+				return array(true, false);
+			case 'repeat-y':
+				return array(false, true);
+			case 'no-repeat':
+				return array(false, false);
+		}
+		return null;
+	}
+ 	/**
+	 * Convertir une longueur en mm
+	 *
+	 * @param	string			longueur, avec unité, à convertir
+	 * @param	float			longueur du parent
+	 * @return	float			longueur exprimée en mm
+	 */
+	function ConvertToMM($val, $old=0.)
+	{
+		$val = trim($val);
+		if (preg_match('/^[0-9\.\-]+$/isU', $val))			$val.= 'px';
+		if (preg_match('/^[0-9\.\-]+px$/isU', $val))		$val = 25.4/96. * str_replace('px', '', $val);
+		else if (preg_match('/^[0-9\.\-]+pt$/isU', $val))	$val = 25.4/72. * str_replace('pt', '', $val);
+		else if (preg_match('/^[0-9\.\-]+in$/isU', $val))	$val = 25.4 * str_replace('in', '', $val);
+		else if (preg_match('/^[0-9\.\-]+mm$/isU', $val))	$val = 1.*str_replace('mm', '', $val);
+		else if (preg_match('/^[0-9\.\-]+%$/isU', $val))	$val = 1.*$old*str_replace('%', '', $val)/100.;
+		else												$val = null;
+
+		return $val;
+	}
+	
+	function ConvertToRadius($val)
+	{
+		$val = explode(' ', $val);
+		foreach($val as $k => $v)
+		{
+			$v = trim($v);
+			if ($v)
+			{
+				$v = $this->ConvertToMM($v, 0);
+				if ($v!==null)
+					$val[$k] = $v;
+				else
+					unset($val[$k]);
+			}
+			else	unset($val[$k]);
+		}
+		return array_values($val);
+	}
+	
+ 	/**
+	 * Décomposition d'un code couleur HTML
+	 *
+	 * @param	string			couleur au format CSS
+	 * @return	array(r, v, b)	couleur exprimé par ses comporantes R, V, B, de 0 à 255.
+	 */
+	function ConvertToColor($val, &$res)
+	{
+		$val = trim($val);
+		$res = true;
+		
+		if (strtolower($val)=='transparent') return array(null, null, null);
+		if (isset($this->htmlColor[strtolower($val)]))
+		{
+			$val = $this->htmlColor[strtolower($val)];
+			$r = floatVal(hexdec(substr($val, 0, 2)));
+			$v = floatVal(hexdec(substr($val, 2, 2)));
+			$b = floatVal(hexdec(substr($val, 4, 2)));
+			$col = array($r/255., $v/255., $b/255.);
+		}
+		elseif (preg_match('/^#[0-9A-Fa-f]{6}$/isU', $val))
+		{
+			$r = floatVal(hexdec(substr($val, 1, 2)));
+			$v = floatVal(hexdec(substr($val, 3, 2)));
+			$b = floatVal(hexdec(substr($val, 5, 2)));
+			$col = array($r/255., $v/255., $b/255.);
+		}
+		elseif (preg_match('/^#[0-9A-F]{3}$/isU', $val))
+		{
+			$r = floatVal(hexdec(substr($val, 1, 1).substr($val, 1, 1)));
+			$v = floatVal(hexdec(substr($val, 2, 1).substr($val, 2, 1)));
+			$b = floatVal(hexdec(substr($val, 3, 1).substr($val, 3, 1)));
+			$col = array($r/255., $v/255., $b/255.);
+		}
+		elseif (preg_match('/rgb\([\s]*([0-9%\.]+)[\s]*,[\s]*([0-9%\.]+)[\s]*,[\s]*([0-9%\.]+)[\s]*\)/isU', $val, $match))
+		{
+			$r = $this->ConvertSubColor($match[1]);
+			$v = $this->ConvertSubColor($match[2]);
+			$b = $this->ConvertSubColor($match[3]);
+			$col = array($r, $v, $b);
+		}
+		elseif (preg_match('/cmyk\([\s]*([0-9%\.]+)[\s]*,[\s]*([0-9%\.]+)[\s]*,[\s]*([0-9%\.]+)[\s]*,[\s]*([0-9%\.]+)[\s]*\)/isU', $val, $match))
+		{
+			$c = $this->ConvertSubColor($match[1]);
+			$m = $this->ConvertSubColor($match[2]);
+			$y = $this->ConvertSubColor($match[3]);
+			$k = $this->ConvertSubColor($match[4]);
+			$col = array($c, $m, $y, $k);
+		}
+		else
+		{
+			$col = array(0., 0., 0.);
+			$res = false;
+		}
+		
+		return $col;
+	}
+	
+	function ConvertSubColor($c)
+	{
+		if (substr($c, -1)=='%') $c = floatVal(substr($c, 0, -1))/100.;
+		else
+		{
+			$c = floatVal($c);
+			if ($c>1) $c = $c/255.;
+		}
+		return $c;
+	}
+	
+	/**
+	 * Analyser une feuille de style
+	 *
+	 * @param	string			code CSS
+	 * @return	null
+	 */
+	function analyseStyle(&$code)
+	{
+		// on remplace tous les espaces, tab, \r, \n, par des espaces uniques
+		$code = preg_replace('/[\s]+/', ' ', $code);
+
+		// on enlève les commentaires
+		$code = preg_replace('/\/\*.*?\*\//s', '', $code);
+
+		// on analyse chaque style
+		preg_match_all('/([^{}]+){([^}]*)}/isU', $code, $match);
+		for($k=0; $k<count($match[0]); $k++)
+		{
+			// noms
+			$noms	= strtolower(trim($match[1][$k]));
+			
+			// style, séparé par des; => on remplie le tableau correspondant
+			$styles	= trim($match[2][$k]);
+			$styles = explode(';', $styles);
+			$stl = array();
+			foreach($styles as $style)
+			{
+				$tmp = explode(':', $style);
+				if (count($tmp)>1)
+				{
+					$cod = $tmp[0]; unset($tmp[0]); $tmp = implode(':', $tmp);
+					$stl[trim(strtolower($cod))] = trim($tmp);
+				}
+			}
+			
+			// décomposition des noms par les ,
+			$noms = explode(',', $noms);
+			foreach($noms as $nom)
+			{
+				$nom = trim($nom);
+				// Si il a une fonction spécifique, comme :hover => on zap
+				if (strpos($nom, ':')!==false) continue;
+				if (!isset($this->css[$nom]))
+					$this->css[$nom] = $stl;
+				else
+					$this->css[$nom] = array_merge($this->css[$nom], $stl);
+				
+			}
+		}
+		
+		$this->css_keys = array_flip(array_keys($this->css));
+	}
+	
+	/**
+	 * Extraction des feuille de style du code HTML
+	 *
+	 * @param	string			code HTML
+	 * @return	null
+	 */
+	function readStyle(&$html)
+	{
+		$style = ' ';
+
+		// extraction des balises link, et suppression de celles-ci dans le code HTML
+		preg_match_all('/<link([^>]*)>/isU', $html, $match);
+		$html = preg_replace('/<link[^>]*>/isU',	'', $html);
+		$html = preg_replace('/<\/link[^>]*>/isU',	'', $html);
+		
+		// analyse de chaque balise
+		foreach($match[1] as $code)
+		{
+			$tmp = array();
+			// lecture des paramétres du type nom=valeur
+			$prop = '([a-zA-Z0-9_]+)=([^"\'\s>]+)';
+			preg_match_all('/'.$prop.'/is', $code, $match);
+			for($k=0; $k<count($match[0]); $k++)
+				$tmp[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
+
+			// lecture des paramétres du type nom="valeur"
+			$prop = '([a-zA-Z0-9_]+)=["]([^"]*)["]';
+			preg_match_all('/'.$prop.'/is', $code, $match);
+			for($k=0; $k<count($match[0]); $k++)
+				$tmp[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
+
+			// lecture des paramétres du type nom='valeur'
+			$prop = "([a-zA-Z0-9_]+)=[']([^']*)[']";
+			preg_match_all('/'.$prop.'/is', $code, $match);
+			for($k=0; $k<count($match[0]); $k++)
+				$tmp[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
+
+			// si de type text/css => on garde
+			if (isset($tmp['type']) && strtolower($tmp['type'])=='text/css' && isset($tmp['href']))
+			{
+				$content = @file_get_contents($tmp['href']);
+				$url = $tmp['href'];
+				if (strpos($url, 'http://')!==false)
+				{
+					$url = str_replace('http://', '', $url);
+					$url = explode('/', $url);
+					$url_main = 'http://'.$url[0].'/';
+					$url_self = $url; unset($url_self[count($url_self)-1]); $url_self = 'http://'.implode('/', $url_self).'/';
+
+					$content = preg_replace('/url\(([^\\\\][^)]*)\)/isU', 'url('.$url_self.'$1)', $content);
+					$content = preg_replace('/url\((\\\\[^)]*)\)/isU', 'url('.$url_main.'$1)', $content);
+				}
+				else
+				{
+					// @todo
+					// $content = preg_replace('/url\(([^)]*)\)/isU', 'url('.dirname($url).'/$1)', $content);
+				}
+				$style.= $content."\n";
+			}
+		}
+
+
+		// extraction des balises style, et suppression de celles-ci dans le code HTML
+		preg_match_all('/<style[^>]*>(.*)<\/style[^>]*>/isU', $html, $match);
+		$html = preg_replace('/<style[^>]*>(.*)<\/style[^>]*>/isU', '', $html);
+
+		// analyse de chaque balise
+		foreach($match[1] as $code)
+		{
+			$code = str_replace('<!--', '', $code);
+			$code = str_replace('-->', '', $code);
+			$style.= $code."\n";
+		}
+		
+		$this->analyseStyle($style);
+	}
 }
\ No newline at end of file
-- 
2.11.4.GIT