Changeset 10037 in spip-zone

Timestamp:

Mar 1, 2007, 11:30:04 PM (14 years ago)

Author:

real3t@…

Message:

la regexp pouvait pas trouver h3 (ne cherchait pas de chiffre).

Du coup, autant trait de h2 à h6

File:

• _plugins_/_test_/article_pdf/pdf/lib_pdf_global.php (modified) (3 diffs)

_plugins_/_test_/article_pdf/pdf/lib_pdf_global.php

@@ -115 +115 @@
   {
                 //Balise 
-        $Balise= preg_match(',<(?=[/a-zA-Z])(/)?([/a-zA-Z]+)((\s.*|/)?)>,',$e,$match);
+        $Balise= preg_match(',<(?=[/a-zA-Z0-9])(/)?([/a-zA-Z0-9]+)((\s.*|/)?)>,',$e,$match);
         if ($Balise){
       $tag=strtoupper($match[2]);
@@ -282 +282 @@
         }
         
+        if($tag=='H2')
+        {
+                $this->maxLineWidth = max($this->maxLineWidth,$this->x);
+                $this->Ln($LineFeedHeight*3);
+                $this->SetStyle($tag='B',true,24);
+                $this->texteAddSpace = false;
+        }
+
         if($tag=='H3')
+        {
+                $this->maxLineWidth = max($this->maxLineWidth,$this->x);
+                $this->Ln($LineFeedHeight*3);
+                $this->SetStyle($tag='B',true,20);
+                $this->texteAddSpace = false;
+        }
+
+        if($tag=='H4')
+        {
+                $this->maxLineWidth = max($this->maxLineWidth,$this->x);
+                $this->Ln($LineFeedHeight*3);
+                $this->SetStyle($tag='B',true,18);
+                $this->texteAddSpace = false;
+        }
+
+        if($tag=='H5')
         {
                 $this->maxLineWidth = max($this->maxLineWidth,$this->x);
                 $this->Ln($LineFeedHeight*3);
                 $this->SetStyle($tag='B',true,14);
+                $this->texteAddSpace = false;
+        }
+
+        if($tag=='H6')
+        {
+                $this->maxLineWidth = max($this->maxLineWidth,$this->x);
+                $this->Ln($LineFeedHeight*3);
+                $this->SetStyle($tag='B',true,12);
                 $this->texteAddSpace = false;
         }
@@ -495 +527 @@
         }
 
-        if($tag=='H3'){         
+        if(($tag=='H2') OR ($tag=='H3') OR ($tag=='H4') OR ($tag=='H5') OR ($tag=='H6')){               
                 $this->SetStyle($tag='B',false,10);
                 $this->maxLineWidth = max($this->maxLineWidth,$this->x);