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

Timestamp:

2013-01-15T22:49:23+13:00 (11 years ago)

Author:

davidb

Message:

Can now successfully obtain font size, font weight, font colour and font family information about each piece of text on a web page and convert to a corresponding text item on an Expeditee frame. Still need to account for text nodes with parents such as bold elements or heading elements.

File:

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

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

@@ -87 +87 @@
         my $css_font_size = $css_attr->{'font-size'};
         $exp_font_size = CssStyleToExpAttr::convert_font_size($css_font_size);
-        
-        print STDERR "CSS Font Size is defined: ".$css_font_size."\n";
-        print STDERR "Equivalent expeditee font size: ".$exp_font_size."\n";
+
     }
     
     if(defined $css_attr->{'font-family'}){
         my $obtain_font_family = $css_attr->{'font-family'};
-        print STDERR "Font family attribute found: ".$obtain_font_family."\n";
         my $new_exp_font_family = CssStyleToExpAttr::convert_font_family($obtain_font_family);  
 
@@ -102 +99 @@
     }
     
-    if(defined $css_attr->{'font-face'}){
-        print STDERR "Font face attribute found: ".$css_attr->{'font-face'}."\n";
-        
-        #now need to call a method from CssStyleToExpAttr.pm to extract the matching
-        #font symbol
-        #s - 
+    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'};
+        $exp_font_face = CssStyleToExpAttr::convert_font_face($css_font_face);
     }
     
-#    if (defined $css_attr->{'font-face'}) {
-#   $font = conver_font_face($css_attr->{'font-face'});
-#    }
-
      $exp_attr->{'f'} = $exp_font_family.$exp_font_face.$exp_font_size;
-     
-     print STDERR "**** final converted Expeditee font: ".$exp_attr->{'f'};
+     print STDERR "exp attribute obtained: ".$exp_attr->{'f'}." ****\n";
      
     # background color
@@ -581 +572 @@
     #don't want to add font information to non-text items!
     my $deleted = delete $attr->{'f'};
-    
-    print STDERR "**** DELETED: $deleted \n";
 
     $self->addRect($xl,$yt,$xr,$yb,$attr);
@@ -617 +606 @@
     my $y = $html_node->{'yt'};
     my $w = $html_node->{'xr'} - $x +1;
-
-    print STDERR "**** CHECKING STYLE NODE: ".$html_node->{'style'}."\n";
+    
     my $attr = convertStyleToAttr($html_node->{'style'});
-    
-    #DEBUGGING
-    if(defined $attr->{'f'}){
-        print STDERR "***** Checking text attributes:".$attr->{'f'}."\n";
-        print STDERR "****************************************\n";
-    }
     
     # fudge factor for now (based on default font size used)