[Texi2html-bug] @value{} not expanded after @includeverbatim

[Thorsten Meyer]

Hi,

thanks for texi2html. It is a really nice tool.
I am using texi2html (1.78-1 with debian/testing) to generate the html
documentation for GNU octave.
Doing this texi2html produces errors for lines like this:
   @verbatiminclude @value{abs_top_srcdir}/examples/myfile
because it does not expand the @value in the filename of @verbatiminclude.

the error reads for example:
# Writing to octave/octave_380.html .*** Can't find
@value{abs_top_srcdir}/examples/myfeval.c, skipping (in ./dynamic.texi
l. 1705 in longexamplefile)

This seems to be a bug or at least an incompatibility versus makeinfo,
as makeinfo does expand those @values (and is supposed to according to
the documentation).

Also texi2html cannot deal with "@" characters in the filename given
after @verbatiminclude (which are written as @@ to make makeinfo happy
for some reason):

error:
*** Can't find /home/thorsten/hg/octave/examples/@@polynomial/double.m,
skipping (in ./oop.texi l. 553 in polynomialfile)
while the actual file has .../@polynomial/... and makeinfo finds it.

With the attached patch, I solved the problem for my situation (but it's
rather a quick hack I think).

Regards

Thorsten Meyer


*** /usr/bin/texi2html    2007-07-23 13:41:23.000000000 +0200
--- /home/thorsten/bin/texi2html    2009-06-07 19:56:10.000000000 +0200
*************** sub misc_command_text($$$$$$)
*** 11473,11478 ****
--- 11473,11482 ----
          if ($line =~ /\s+(.+)/)
          {
              my $arg = $1;
+             $arg =~ s/address@hidden([^}]+)\}/
+                        $value{$1}?$value{$1}:qq|{No value for "$1"}|/egx;
+             $arg =~ s/address@hidden@/\@/g;
+             # print "arg: $arg\n";
              my $file = locate_include_file($arg);
              if (defined($file))
              {