Re: [PATCH] gitweb: highlight: replace tabs with spaces
From: Jakub Narebski <hidden>
Date: 2016-06-15 22:50:48
Kevin Cernekee [off-list ref] writes:
Consider the following code fragment:
/*
* test
*/
vim ":set list" mode shows that the first character on each line is a
tab:
^I/*$
^I * test$
^I */$
By default, the "highlight" program will retain the tabs in the HTML
output:
$ highlight --fragment --syntax c test.c
<span class="hl com">/*</span>
<span class="hl com"> * test</span>
<span class="hl com"> */</span>
vim list mode:
^I<span class="hl com">/*</span>$
<span class="hl com">^I * test</span>$
<span class="hl com">^I */</span>$
In gitweb, this winds up looking something like:
1 /*
2 * test
3 */
I tried both Firefox and Opera and saw the same behavior.
The desired output is:
1 /*
2 * test
3 */
This can be accomplished by specifying "--replace-tabs=8" on the
highlight command line.Very well written commit message.
Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
I was wondering if ancient highlight (2.4.5) that I use supports --replace-tabs option... but it does. So for what it is worth: Acked-by: Jakub Narebski <redacted>
quoted hunk ↗ jump to hunk
--- gitweb/gitweb.perl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index d171ad5..649e10a 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl@@ -3485,7 +3485,7 @@ sub run_highlighter { close $fd; open $fd, quote_command(git_cmd(), "cat-file", "blob", $hash)." | ". quote_command($highlight_bin). - " --fragment --syntax $syntax |" + " --replace-tabs=8 --fragment --syntax $syntax |" or die_error(500, "Couldn't open file or run syntax highlighter"); return $fd; }
I wonder if we should synchronize this value with '8' in untabify(), but I think it is out of scope of this patch. BTW., weren't there patch that made tab width customizable? What happened to it? -- Jakub Narebski Poland ShadeHawk on #git