about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2019-01-27 11:36:22 +0000
committerEric Wong <e@80x24.org>2019-01-27 11:43:34 +0000
commitfd8e62c1ed9b9f7eb851a263a9ada2cb8c182193 (patch)
tree2079d02e62e6b33b096574400971cfc923532324
parent3998cdd1c94661687cee413b01b95422cf02c34a (diff)
downloadpublic-inbox-fd8e62c1ed9b9f7eb851a263a9ada2cb8c182193.tar.gz
hlmod: disable enclosing <pre> tag
We already have a <pre> tag in ViewVCS, and nesting <pre>
inside the pre-existing <pre> overrides the "white-space:pre"
we use to align line numbers.
-rw-r--r--lib/PublicInbox/HlMod.pm1
-rw-r--r--t/hl_mod.t2
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/PublicInbox/HlMod.pm b/lib/PublicInbox/HlMod.pm
index 5cbfb298..237ffaca 100644
--- a/lib/PublicInbox/HlMod.pm
+++ b/lib/PublicInbox/HlMod.pm
@@ -99,7 +99,6 @@ sub do_hl {
         my $gen = $self->{$langpath} ||= do {
                 my $g = highlight::CodeGenerator::getInstance($highlight::HTML);
                 $g->setFragmentCode(1); # generate html fragment
-                $g->setHTMLEnclosePreTag(1); # include <pre>
 
                 # whatever theme works
                 my $themepath = $dir->getThemePath('print.theme');
diff --git a/t/hl_mod.t b/t/hl_mod.t
index 62cc6248..80f88907 100644
--- a/t/hl_mod.t
+++ b/t/hl_mod.t
@@ -27,7 +27,7 @@ my $orig = $str;
                 require File::Temp;
                 my $cmd = [ qw(w3m -T text/html -dump -config /dev/null) ];
                 my ($out, $err) = ('', '');
-                IPC::Run::run($cmd, $ref, \$out, \$err);
+                IPC::Run::run($cmd, \('<pre>'.$$ref.'</pre>'), \$out, \$err);
                 # expand tabs and normalize whitespace,
                 # w3m doesn't preserve tabs
                 $orig =~ s/\t/        /gs;