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

Timestamp:

2013-01-15T20:53:38+13:00 (11 years ago)

Author:

davidb

Message:

Working on obtaining the correct font information for text elements on an html page.

File:

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

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

@@ -77 +77 @@
     my $exp_font_family = "s"; # t
     my $exp_font_face = "r";
-    my $exp_font_size = "14";
+    my $exp_font_size = "18";
 
 #    if (defined $css_attr->{'font-family'}) {
@@ -84 +84 @@
 
     if (defined $css_attr->{'font-size'}) {
-    my $css_font_size = $css_attr->{'font-size'};
-    $exp_font_size = CssStyleToExpAttr::convert_font_size($css_font_size);
-    }
-
+        
+        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);  
+
+        if(defined $new_exp_font_family){
+            $exp_font_family = $new_exp_font_family;
+        }
+    }
+    
+    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-weight'}){
+        print STDERR "Font weight attribute found: ".$css_attr->{'font-weight'}."\n";
+    }
+    
 #    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;
-
+     $exp_attr->{'f'} = $exp_font_family.$exp_font_face.$exp_font_size;
+     
+     print STDERR "**** final converted Expeditee font: ".$exp_attr->{'f'};
+     
     # background color
 
 
     if (defined $css_attr->{'background-color'}) {
-    my $css_color = $css_attr->{'background-color'};
-
-    my $exp_color = CssStyleToExpAttr::convert_color($css_color);
-
-    $exp_attr->{'e'} = $exp_color;
+        my $css_color = $css_attr->{'background-color'};
+
+        my $exp_color = CssStyleToExpAttr::convert_color($css_color);
+
+        $exp_attr->{'e'} = $exp_color;
     }
 
@@ -550 +578 @@
         }
     }
+    
+    #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);
@@ -578 +611 @@
     }
     elsif ($type eq "text") {
+    
     my $text = $html_node->{'text'};
 
@@ -584 +618 @@
     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)
     $y += 16; # y-value of text item in Expeditee is it's base line