From 6227ea1c494104c69370cb21170eb74933099b91 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Mon, 2 Apr 2007 10:47:08 +0000
Subject: [PATCH] =?UTF-8?q?correction=20mineure=20suite=20=E0=20la=20compa?=
 =?UTF-8?q?raison=20de=20la=20nouvelle=20version=20de=20TCPDF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/includes/fpdf/fpdf/fpdf.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/includes/fpdf/fpdf/fpdf.php b/htdocs/includes/fpdf/fpdf/fpdf.php
index db218fcce74..9b6391fd12e 100644
--- a/htdocs/includes/fpdf/fpdf/fpdf.php
+++ b/htdocs/includes/fpdf/fpdf/fpdf.php
@@ -780,7 +780,7 @@ function SetFont($family,$style='',$size=0)
 			$this->fonts[$fontkey]=array('i'=>$i,'type'=>'core','name'=>$this->CoreFonts[$fontkey],'up'=>-100,'ut'=>50,'cw'=>$fpdf_charwidths[$fontkey]);
 		}
 		else
-			$this->Error('Undefined font: '.$family.' '.$style);
+			$this->Error('Undefined font - family: '.$family.' - style: '.$style);
 	}
 	//Select it
 	$this->FontFamily=$family;
@@ -1871,7 +1871,7 @@ function _out($s)
 		function writeHTML($html, $ln=true, $fill=0) {
 						
 			// store some variables
-			$html=strip_tags($html,"<h1><h2><h3><h4><h5><h6><b><u><i><a><img><p><br><strong><em><font><blockquote><li><ul><ol><hr><td><th><tr><table><sup><sub><small>"); //remove all unsupported tags
+			$html=strip_tags($html,"<h1><h2><h3><h4><h5><h6><b><u><i><a><img><p><br><br/><strong><em><font><blockquote><li><ul><ol><hr><td><th><tr><table><sup><sub><small>"); //remove all unsupported tags
 			//replace carriage returns, newlines and tabs
 			$repTable = array("\t" => " ", "\n" => "<br>", "\r" => " ", "\0" => " ", "\x0B" => " "); 
 			$html = strtr($html, $repTable);
@@ -2190,7 +2190,7 @@ function _out($s)
 						$this->issetcolor=true;
 					}
 					if (isset($attr['face']) and in_array(strtolower($attr['face']), $this->fontlist)) {
-						$this->SetFont(strtolower($attr['FACE']));
+						$this->SetFont(strtolower($attr['face']));
 						$this->issetfont=true;
 					}
 					if (isset($attr['size'])) {
@@ -2249,9 +2249,11 @@ function _out($s)
 				}
 				case 'strong': {
 					$this->setStyle('b', false);
+					break;
 				}
 				case 'em': {
 					$this->setStyle('i', false);
+					break;
 				}
 				case 'b':
 				case 'i':