[Mapbender-commits] r4534 - in branches/2.6/http/classes: . fonts

[svn_mapbender at osgeo.org]

Author: marc
Date: 2009-08-26 16:41:33 -0400 (Wed, 26 Aug 2009)
New Revision: 4534

Added:
   branches/2.6/http/classes/fonts/LiberationMono-Regular.ttf
   branches/2.6/http/classes/fonts/LiberationSans-Regular.ttf
Modified:
   branches/2.6/http/classes/class.pdf.php
Log:
http://trac.osgeo.org/mapbender/ticket/429

Modified: branches/2.6/http/classes/class.pdf.php
===================================================================
--- branches/2.6/http/classes/class.pdf.php	2009-08-26 09:11:44 UTC (rev 4533)
+++ branches/2.6/http/classes/class.pdf.php	2009-08-26 20:41:33 UTC (rev 4534)
@@ -1447,15 +1447,23 @@
       // should be for all non-basic fonts), then load it into an object and put the
       // references into the font object
       $basefile = substr($fontName,0,strlen($fontName)-4);
-      if (file_exists($basefile.'.pfb')){
-        $fbtype = 'pfb';
-      } else if (file_exists($basefile.'.ttf')){
+      if (file_exists($basefile.'.pfb')){  
+        $fbtype = 'pfb';  
+      } 
+      else if (file_exists($basefile.'.ttf')){  
         $fbtype = 'ttf';
-      } else {
+      } 
+      else {  
         $fbtype='';
       }
-      $fbfile = $basefile.'.'.$fbtype;
-      
+      if($fbtype == 'ttf'){
+        $fbfile = $basefile.'.'.$fbtype;
+      }
+      else{  
+        $fbfile = $basefile;
+      } 
+
+
 //      $pfbfile = substr($fontName,0,strlen($fontName)-4).'.pfb';
 //      $ttffile = substr($fontName,0,strlen($fontName)-4).'.ttf';
       $this->addMessage('selectFont: checking for - '.$fbfile);
@@ -3020,7 +3028,7 @@
 * used to add messages for use in debugging
 */
 function addMessage($message){
-  $this->messages.=$message."\n";
+  $this->messages.=$message."<br />";
 }
 
 /**
@@ -3072,4 +3080,4 @@
 
 } // end of class
 
-?>
\ No newline at end of file
+?>

Added: branches/2.6/http/classes/fonts/LiberationMono-Regular.ttf
===================================================================
(Binary files differ)


Property changes on: branches/2.6/http/classes/fonts/LiberationMono-Regular.ttf
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.6/http/classes/fonts/LiberationSans-Regular.ttf
===================================================================
(Binary files differ)


Property changes on: branches/2.6/http/classes/fonts/LiberationSans-Regular.ttf
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream