Merge pull request #104 from harlong/urls

URLs support

Author: henck

src/Html/HtmlFormatter.php

@@ -54,13 +54,14 @@ public function Format(Document $document)
     array_push($this->states, $this->state);
 
     // Keep track of opened html tags
-    $this->openedTags = array('span' => false, 'p' => false);
+    $this->openedTags = array('span' => false, 'p' => false, 'a' => false);
     // Create the first paragraph
     $this->OpenTag('p');
     // Begin format
     $this->ProcessGroup($document->root);
     // Instead of removing opened tags, we close them
       $append = $this->openedTags['span'] ? '</span>' : '';
+      $append .= $this->openedTags['a'] ? '</a>' : '';
       $append .= $this->openedTags['p'] ? '</p>' : '';
 
       return $this->output . $append;
@@ -240,6 +241,11 @@ protected function ProcessGroup($group)
     // Pictures extraction not yet supported
     //if(substr($group->GetType(), 0, 4) == "pict") return;
 
+    // If a destination was a HYPERLINK
+    if ($this->state->href) {
+        $this->OpenTag('a','target="_blank" href='.$this->state->href);
+    }
+
     // Push a new state onto the stack:
     $this->state = clone $this->state;
     array_push($this->states, $this->state);
@@ -262,6 +268,10 @@ protected function ProcessDestination($dest)
       for ($i=2;$i<$c;$i++)
         $this->FormatEntry($dest[$i]);
       }
+    if ($dest[1]->word == "fldinst" && count($dest)>=2 && substr($dest[2]->text,0,10)=="HYPERLINK " ) {
+      $url=substr($dest[2]->text,10);
+      $this->state->href=$url;
+    }
   }
 
   protected function FormatEntry($entry)
@@ -452,9 +462,11 @@ protected function CloseTag($tag)
 
   protected function CloseTags()
   {
-    // Close all opened tags
+    // Close all opened tags but p
     foreach ($this->openedTags as $tag => $b)
-      $this->CloseTag($tag);
+      if ($tag!='p') $this->CloseTag($tag);
+    // And than close p as a last one
+    if ($this->openedTags['p']) $this->CloseTag('p');
   }
 
   protected function FormatControlSymbol($symbol)

src/Html/State.php

@@ -60,6 +60,7 @@ public function Reset($defaultFont = null)
     $this->background = null;
     $this->hcolor = null;
     $this->font = isset($defaultFont) ? $defaultFont : null;
+    $this->href = null;
   }
 
   public function PrintStyle()
@@ -122,6 +123,9 @@ public function equals($state)
     // Compare fonts
     if ($this->font != $state->font) return false;
 
+    // Compare urls
+    if ($this->href != $state->href) return false;
+    
     return true;
   }
 
@@ -304,4 +308,4 @@ public function setFont($font): self
 
     return $this;
   }
-}
+}