gitweb: Better support for non-CSS aware web browsers

Add option to replace SPC (' ') with hard (non-breakable) space HTML
entity ' ' in esc_html subroutine.

Replace ' ' with ' ' for the code/diff display part in git_blob
and git_patchset_body; this is to be able to view code and diffs in
web browsers which doesn't understand "white-space: pre;" CSS
declaration.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index dfb15c1ef9e56e28c131fcde4eceb19f19a9ad41..3dfa59f616c78cea8147e58aee1accde68c58046 100755 (executable)
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -554,12 +554,17 @@ sub esc_url {
 }
 
 # replace invalid utf8 character with SUBSTITUTION sequence
 }
 
 # replace invalid utf8 character with SUBSTITUTION sequence

-sub esc_html {
+sub esc_html ($;%) {

        my $str = shift;
        my $str = shift;

+       my %opts = @_;
+

        $str = to_utf8($str);
        $str = escapeHTML($str);
        $str =~ s/\014/^L/g; # escape FORM FEED (FF) character (e.g. in COPYING file)
        $str =~ s/\033/^[/g; # "escape" ESCAPE (\e) character (e.g. commit 20a3847d8a5032ce41f90dcc68abfb36e6fee9b1)
        $str = to_utf8($str);
        $str = escapeHTML($str);
        $str =~ s/\014/^L/g; # escape FORM FEED (FF) character (e.g. in COPYING file)
        $str =~ s/\033/^[/g; # "escape" ESCAPE (\e) character (e.g. commit 20a3847d8a5032ce41f90dcc68abfb36e6fee9b1)

+       if ($opts{'-nbsp'}) {
+               $str =~ s/ / /g;
+       }

        return $str;
 }
 
        return $str;
 }
 


@@ -784,7 +789,7 @@ sub format_diff_line {
                $diff_class = " incomplete";
        }
        $line = untabify($line);
                $diff_class = " incomplete";
        }
        $line = untabify($line);

-       return "<div class=\"diff$diff_class\">" . esc_html($line) . "</div>\n";
+       return "<div class=\"diff$diff_class\">" . esc_html($line, -nbsp=>1) . "</div>\n";

 }
 
 ## ----------------------------------------------------------------------
 }
 
 ## ----------------------------------------------------------------------


@@ -2944,7 +2949,7 @@ sub git_blob {
                $nr++;
                $line = untabify($line);
                printf "<div class=\"pre\"><a id=\"l%i\" href=\"#l%i\" class=\"linenr\">%4i</a> %s</div>\n",
                $nr++;
                $line = untabify($line);
                printf "<div class=\"pre\"><a id=\"l%i\" href=\"#l%i\" class=\"linenr\">%4i</a> %s</div>\n",

-                      $nr, $nr, $nr, esc_html($line);
+                      $nr, $nr, $nr, esc_html($line, -nbsp=>1);

        }
        close $fd
                or print "Reading blob failed.\n";
        }
        close $fd
                or print "Reading blob failed.\n";