diff options
| author | Joey Hess <joey@kitenet.net> | 2013-02-12 11:27:29 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-02-12 11:27:29 -0400 |
| commit | 480d6f93c13ac3f0fbe931c9abfbcb105f235fd0 (patch) | |
| tree | 792f1cbd730ea83041dd1faf2c8400e3dbd9cb3b | |
| parent | 22146aa4a34074bed465de7fb5999ea121808524 (diff) | |
| download | ikiwiki-480d6f93c13ac3f0fbe931c9abfbcb105f235fd0.tar ikiwiki-480d6f93c13ac3f0fbe931c9abfbcb105f235fd0.tar.gz | |
highlight: Now adds a span with class highlight-<extension> around highlighted content, allowing for language-specific css styling.
| -rw-r--r-- | IkiWiki/Plugin/highlight.pm | 7 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm index 4e86207f1..fbe7ddff4 100644 --- a/IkiWiki/Plugin/highlight.pm +++ b/IkiWiki/Plugin/highlight.pm @@ -89,7 +89,7 @@ sub checkconfig () { id => $file, call => sub { my %params=@_; - highlight($langfile, $params{content}); + highlight($langfile, $file, $params{content}); }, longname => sprintf(gettext("Source code: %s"), $file), @opts, @@ -106,7 +106,7 @@ sub htmlizeformat { return; } - return Encode::decode_utf8(highlight($langfile, shift)); + return Encode::decode_utf8(highlight($langfile, $format, shift)); } my %ext2lang; @@ -172,6 +172,7 @@ sub ext2langfile ($) { # Interface to the highlight C library. sub highlight ($$) { my $langfile=shift; + my $extorfile=shift; my $input=shift; eval q{use highlight}; @@ -200,7 +201,7 @@ sub highlight ($$) { $gen=$highlighters{$langfile}; } - return $gen->generateString($input); + return "<div class=\"highlight-$extorfile\">".$gen->generateString($input)."</div>"; } 1 diff --git a/debian/changelog b/debian/changelog index 4e396e60f..b12cf19e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ ikiwiki (3.20121213) UNRELEASED; urgency=low dynamic cgi pages, which cannot use trail anyway. * Deal with empty diffurl in configuration. * cvs: Various fixes. + * highlight: Now adds a span with class highlight-<extension> around + highlighted content, allowing for language-specific css styling. -- Joey Hess <joeyh@debian.org> Sat, 22 Dec 2012 16:15:24 -0400 |