Eli Zaretskii <eliz@gnu.org> writes:

[...]

> I think you are on the right track, so please show a patch to do that,
> and let's take it from there.

Thanks for getting back to me.  I attached the patch below.