Changeset 26729 for gs3-extensions/html-to-expeditee

Timestamp:

2013-01-15T23:15:34+13:00 (11 years ago)

Author:

davidb

Message:

Now correctly accounts for bold, italic and bold-italic text.

Location:

gs3-extensions/html-to-expeditee/trunk/src

Files:

• perllib/CssStyleToExpAttr.pm (modified) (1 diff)
• perllib/ExpediteeFrameIO.pm (modified) (1 diff)
• src/js/html-to-expeditee.js (modified) (4 diffs)

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

@@ -367 +367 @@
     if(lc($css_font_face) eq "bold"){
             $exp_font_face = "b";
-    }else{      #for now - also need to take into account italic and italic bold.
+    }elsif(lc($css_font_face) eq "italic"){     #for now - also need to take into account italic and italic bold.
+        $exp_font_face = "i";
+    }elsif(lc($css_font_face) eq "bold-italic"){
+        $exp_font_face = "p";
+    }else{
         $exp_font_face = "r";
     }

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

@@ -99 +99 @@
     }
     
+    my $css_font_style;
+    my $css_font_face;
+    
     if(defined $css_attr->{'font-style'}){
-        print STDERR "Font style attribute found: ".$css_attr->{'font-style'}."\n";
-    }
-    
-    if(defined $css_attr->{'font-weight'}){
-        print STDERR "Font weight attribute found: ".$css_attr->{'font-weight'}."\n";
-        
-        my $css_font_face = $css_attr->{'font-weight'};
+        $css_font_style = $css_attr->{'font-style'};
+        $exp_font_face = CssStyleToExpAttr::convert_font_face($css_font_style);
+    }
+    
+    if(defined $css_attr->{'font-weight'}){ 
+        $css_font_face = $css_attr->{'font-weight'};
         $exp_font_face = CssStyleToExpAttr::convert_font_face($css_font_face);
+    }
+    
+    if(defined $css_attr->{'font-style'} && defined $css_attr->{'font-weight'}){
+        my $font_face_param = $css_attr->{'font-weight'}.'-'.$css_attr->{'font-style'};
+        print STDERR "$font_face_param **** \n";
+        $exp_font_face = CssStyleToExpAttr::convert_font_face($font_face_param);
     }
     

gs3-extensions/html-to-expeditee/trunk/src/src/js/html-to-expeditee.js

@@ -6 +6 @@
 var font_color;
 var font_weight;
+var font_style;
 
 Element.prototype.getElementWidth = function() {
@@ -161 +162 @@
             
             var new_font_weight = getStyle(parent,"font-weight");
+            var new_font_style = getStyle(parent,"font-style");
             
             if(new_font_family !== undefined && new_font_family !== null)
@@ -173 +175 @@
             if(new_font_weight !== undefined && new_font_weight !== null)
                 font_weight = new_font_weight;
+                
+            if(new_font_style !== undefined && new_font_style !== null)
+                font_style = new_font_style;
             
             var data = parent.attributes["data"];
@@ -185 +190 @@
             style["color"]            = font_color;
             style["font-weight"]      = font_weight;
+            style["font-style"]       = font_style;
             
             //TODO: if parent node is a <b> element, then set style["font-weight"] to be "bold".