From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 2/6] hlmod: hoist out do_hl_lang sub
Date: Tue, 5 Feb 2019 11:10:49 +0000 [thread overview]
Message-ID: <20190205111053.7155-3-e@80x24.org> (raw)
In-Reply-To: <20190205111053.7155-1-e@80x24.org>
We'll want to use to support highlighting syntax used by
Markdown and possibly other markup languages (while retaining
the raw plain-text layout and formatting).
---
lib/PublicInbox/HlMod.pm | 15 ++++++++++-----
t/hl_mod.t | 2 ++
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/lib/PublicInbox/HlMod.pm b/lib/PublicInbox/HlMod.pm
index decfd71..284e4b1 100644
--- a/lib/PublicInbox/HlMod.pm
+++ b/lib/PublicInbox/HlMod.pm
@@ -83,19 +83,24 @@ sub _path2lang ($$) {
sub do_hl {
my ($self, $str, $path) = @_;
my $lang = _path2lang($self, $path) if defined $path;
+ do_hl_lang($self, $str, $lang);
+}
+
+sub do_hl_lang {
+ my ($self, $str, $lang) = @_;
+
my $dir = $self->{-dir};
my $langpath;
+
if (defined $lang) {
$langpath = $dir->getLangPath("$lang.lang") or return;
- $langpath = undef unless -f $langpath;
+ $lang = undef unless -f $langpath
}
- unless (defined $langpath) {
+ unless (defined $lang) {
$lang = _shebang2lang($self, $str) or return;
$langpath = $dir->getLangPath("$lang.lang") or return;
- $langpath = undef unless -f $langpath;
+ return unless -f $langpath
}
- return unless defined $langpath;
-
my $gen = $self->{$langpath} ||= do {
my $g = highlight::CodeGenerator::getInstance($highlight::HTML);
$g->setFragmentCode(1); # generate html fragment
diff --git a/t/hl_mod.t b/t/hl_mod.t
index c402f1f..238f8ec 100644
--- a/t/hl_mod.t
+++ b/t/hl_mod.t
@@ -22,6 +22,8 @@ my $orig = $str;
ok(utf8::valid($$ref), 'resulting string is utf8::valid');
like($$ref, qr/I can see you!/, 'we can see ourselves in output');
like($$ref, qr/&&/, 'escaped');
+ my $lref = $hls->do_hl_lang(\$str, 'perl');
+ is($$ref, $$lref, 'do_hl_lang matches do_hl');
use PublicInbox::Spawn qw(which);
if (eval { require IPC::Run } && which('w3m')) {
--
EW
next prev parent reply other threads:[~2019-02-05 11:10 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-05 11:10 [PATCH 0/6] highlighting cleanups + help update Eric Wong
2019-02-05 11:10 ` [PATCH 1/6] viewvcs: cleanup utf8 handling Eric Wong
2019-02-05 11:10 ` Eric Wong [this message]
2019-02-05 11:10 ` [PATCH 3/6] hlmod: make into a singleton Eric Wong
2019-02-05 11:10 ` [PATCH 4/6] hlmod: do_hl* performs src_escape immediately Eric Wong
2019-02-05 11:10 ` [PATCH 5/6] hlmod: support "```$LANG" blocks in text Eric Wong
2019-02-05 11:10 ` [PATCH 6/6] wwwtext: inline sample CSS and use highlight Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190205111053.7155-3-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).