Changeset 26731 for gs3-extensions/html-to-expeditee/trunk/src/perllib/CssStyleToExpAttr.pm

Timestamp:

2013-01-16T18:56:21+13:00 (11 years ago)

Author:

davidb

Message:

Can now correctly obtain colours and size of text when generating Expeditee frames. Also accounted for when the web browser being used is Firefox (FF uses "700" instead of the word "bold" for font-weight). The width of text items is also calculated and written to Expeditee. Parameters have also been provided so the user can decide whether they want the correct font information and text width used or to just use default values.

File:

• gs3-extensions/html-to-expeditee/trunk/src/perllib/CssStyleToExpAttr.pm (modified) (2 diffs)

gs3-extensions/html-to-expeditee/trunk/src/perllib/CssStyleToExpAttr.pm

@@ -352 +352 @@
     my $exp_font_size = undef;
 
-    
     if ($css_font_size =~ m/^(\d+(?:\.\d*))px$/) {
         $exp_font_size = int($1);
-    }
+    }else{  
+        #FF rounds sizes, e.g. 16.13px will just be 16px.
+        my $end_index = length($css_font_size) - 2;
+        $exp_font_size = substr($css_font_size,0,$end_index);
+    }
     
     return $exp_font_size;
@@ -365 +368 @@
     my $exp_font_face = undef;
     
-    if(lc($css_font_face) eq "bold"){
+    #Firefox uses '700' instead of 'bold' for font-weight.
+    if(lc($css_font_face) eq "bold" || $css_font_face eq "700"){
             $exp_font_face = "b";
-    }elsif(lc($css_font_face) eq "italic"){     #for now - also need to take into account italic and italic bold.
+    }elsif(lc($css_font_face) eq "italic"){
         $exp_font_face = "i";
-    }elsif(lc($css_font_face) eq "bold-italic"){
+    }elsif(lc($css_font_face) eq "bold-italic" || $css_font_face eq "700-italic"){
         $exp_font_face = "p";
     }else{
         $exp_font_face = "r";
     }
-
+    
     return $exp_font_face;
 }