Changeset 15176 for gsdl/trunk/perllib/plugins/HTMLPlug.pm

Timestamp:

2008-04-07T16:17:34+12:00 (16 years ago)

Author:

ak19

Message:

1. No longer does GLI add anchor tags around img tags (images embedded in html files. That means that no_image_links has become the default behaviour. 2. This has also overcome the problem that no_image_links previously had of not displaying images, so that the embedded images are now displayed while there are no unnecessary a href tags around them anymore

File:

• gsdl/trunk/perllib/plugins/HTMLPlug.pm (modified) (3 diffs)

gsdl/trunk/perllib/plugins/HTMLPlug.pm

@@ -114 +114 @@
         'desc' => "{HTMLPlug.old_style_HDL}",
     'type' => "flag"},
-      { 'name' => "no_image_links",
-        'desc' => "{HTMLPlug.no_image_links}",
+      { 'name' => "no_image_links",            # in future think about removing this option,
+        'desc' => "{HTMLPlug.no_image_links}", # since it has become the default behaviour
     'type' => "flag"},  
       ];
@@ -890 +890 @@
 
     # trap images
-   if(!$self->{'no_image_links'}){
-    $$textref =~ s/(<(?:img|embed|table|tr|td)[^>]*?(?:src|background)\s*=\s*)([\"\'][^\"\']+[\"\']|[^\s>]+)([^>]*>)/
-        $self->replace_images ($1, $2, $3, $base_dir, $file, $doc_obj, $cursection)/isge;
-    }
+
+    # Previously, by default, HTMLPlug would embed <img> tags inside anchor tags
+    # i.e. <a href="image><img src="image"></a> in order to overcome a problem that
+    # turned regular text succeeding images into links. That is, by embedding <imgs>
+    # inside <a href=""></a>, the text following images were no longer misbehaving.
+    # However, there would be many occasions whereby images were not meant to link
+    # to their source images but where the images would link to another web page.
+    # To allow this, the no_image_links option was introduced: it would prevent
+    # the behaviour of embedding images into links that referenced the source images.
+
+    # Somewhere along the line, the problem of normal text turning into links when 
+    # such text followed images which were not embedded in <a href=""></a> ceased 
+    # to occur. This is why the following lines have been commented out (as well as 
+    # two lines in replace_images). They appear to no longer apply.
+
+    # If at any time, there is a need for having images embedded in <a> anchor tags,
+    # then it might be better to turn that into an HTMLPlug option rather than make
+    # it the default behaviour. Also, eventually, no_image_links needs to become
+    # a deprecated option for HTMLPlug as it has now become the default behaviour.
+
+    #if(!$self->{'no_image_links'}){
+    $$textref =~ s/(<(?:img|embed|table|tr|td)[^>]*?(?:src|background)\s*=\s*)([\"\'][^\"\']+[\"\']|[^\s>]+)([^>]*>)/
+    $self->replace_images ($1, $2, $3, $base_dir, $file, $doc_obj, $cursection)/isge;
+    #}
 
     # add text to document object
@@ -934 +954 @@
 
     my $image_link = $front . $img_file .$back;
-    my $anchor_link = "<a href=\"$img_file\" >".$image_link."</a>";  
-
-    return $anchor_link;    
+    return $image_link;
+
+    # The reasons for why the following two lines are no longer necessary can be 
+    # found in subroutine process_section
+    #my $anchor_link = "<a href=\"$img_file\" >".$image_link."</a>";  
+    #return $anchor_link;   
+    
     #return $front . $img_file . $back . $anchor_name;
 }