 @@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.11 2015/11/03 21:34:02 agc Exp $
+$NetBSD: distinfo,v 1.12 2017/06/17 19:42:26 joerg Exp $
 SHA1 (gri-2.12.23.tar.gz) = 75856cc100040da28ba7d667e12301293e7dd5a5
 RMD160 (gri-2.12.23.tar.gz) = 9cd7861c88f7db0ec9a23e9cc2a2971a9d763842
 SHA512 (gri-2.12.23.tar.gz) = 0b028c56e9603fd00480ad7a92461c1e60f7879d89bffb5b83a2ee52c8870546e584c75478777dbb2d4934095fe9a9d4efd2aa2ff756c1860459a1e0cc0b4216
 Size (gri-2.12.23.tar.gz) = 1668587 bytes
 SHA1 (patch-aa) = bce867b76177e0625e36f7dead764cce9ba8cb6f
 SHA1 (patch-ab) = a6bfac5aa9d3dd1228a35d31900e3b553a293552
 SHA1 (patch-ac) = 23ff5c44f023395a0af21e329c887bb846d9dfba
 SHA1 (patch-ae) = f3f25302a8893b3cbe23f909ffd5c8a2782c5b1f
 SHA1 (patch-doc_Makefile_am) = 990c56b17bbc6bf35076e9ac9cd8768b9d3e7f2c
 SHA1 (patch-doc_texinfo2HTML) = 0be027738a703da6811911b18b5b7c9b3af5994c

$NetBSD: patch-doc_texinfo2HTML,v 1.1 2017/06/17 19:42:26 joerg Exp $ 5.26 requires quoting of { in certain regex contexts. --- doc/texinfo2HTML.orig 2017-06-10 18:03:25.861306247 +0000 +++ doc/texinfo2HTML @@ -120,7 +120,7 @@ while(get_a_line()) { next; } # Process image commands (NOT...it's there already) - if (/\@image{(.*)}/) { + if (/\@image\{(.*)\}/) { #print "<img src=\"$1.gif\" border=\"1\">\n"; next; } @@ -208,12 +208,12 @@ while(get_a_line()) { s,<,<,og; # Special tweak to make 'Gri' look cooler. # s, Gri , GRI ,og; - s,\@code{\@\@},\@code{TEXINFO2HTML-AT-AT},og; + s,\@code\{\@\@\},\@code{TEXINFO2HTML-AT-AT},og; s,\@},TEXINFO2HTML-CLOSE-BRACE,og; # retain inside e.g. @code{} s,\@\@,TEXINFO2HTML-AT-AT,og; - s,\@{,{,og; - s,\@TeX{},TeX,og; - s,\@dots{},...,og; + s,\@\{,{,og; + s,\@TeX\{\},TeX,og; + s,\@dots\{\},...,og; # Put in place-holders for some accents. I should check for all # of them, but for now, I'm just kludging in a couple, # to solve an immediate problem and to serve as a place-holder @@ -237,18 +237,18 @@ while(get_a_line()) { } next; } - while (/\@url{([^}]*)}/) { + while (/\@url\{([^}]*)\}/) { $the_url = $1; - s:\@url{[^}]*}:<a href="$the_url">\@code{$the_url}</a>:; + s:\@url\{[^}]*\}:<a href="$the_url">\@code{$the_url}</a>:; } - while (/\@uref{([^}]*)}/) { + while (/\@uref\{([^}]*)\}/) { @items = split(/,/, $1); if ($#items == 0) { - s:\@uref{[^}]*}:<a href="$items[0]">$items[0]</a>:; + s:\@uref\{[^}]*\}:<a href="$items[0]">$items[0]</a>:; } elsif ($#items == 1) { - s:\@uref{[^}]*}:<a href="$items[0]">$items[1]</a>:; + s:\@uref\{[^}]*\}:<a href="$items[0]">$items[1]</a>:; } elsif ($#items == 2) { - s:\@uref{[^}]*}:\@code{$items[2]}:; + s:\@uref\{[^}]*\}:\@code{$items[2]}:; } else { die "Cannot have more than 3 items in a 'uref' at \"$_\""; } @@ -330,7 +330,7 @@ while(get_a_line()) { while(get_a_line()) { next if /\@sp/; next if /\@cindex/; - s|\@anchor{([^}]*)}|<a name=\"$1\"></a>|g; + s|\@anchor\{([^}]*)\}|<a name=\"$1\"></a>|g; &process_examples(); # Handle HTML inserts if (/^\@c HTML (.*)/o) { @@ -346,10 +346,10 @@ while(get_a_line()) { } if (/\s*\@item\s*(.*)/o) { $the_item = $1; - $the_item =~ s:\@{:{:og; - $the_item =~ s:\@}:}:og; + $the_item =~ s:\@\{:{:og; + $the_item =~ s:\@\}:}:og; $the_item =~ s:\@\@:\@:og; - $the_item =~ s:\@code{([^}]*)}:`<code>$1</code>':og; + $the_item =~ s:\@code\{([^}]*)\}:`<code>$1</code>':og; print "<dt> $start_item$the_item$end_item\n<dd>"; } else { print "" if (/^$/o); @@ -402,38 +402,38 @@ sub process_examples() { } else { s,\@value\{([^}]*)\},$value{$1},g; # Substitute set/value pair s,\@},},og; - s,\@{,{,og; + s,\@\{,{,og; } } sub sub_refs { - die "line $. of file: cannot have multiple refs on one line" if (/\@[px]*ref{(.*)}(.*)\@[px]*ref{(.*)}/); + die "line $. of file: cannot have multiple refs on one line" if (/\@[px]*ref\{(.*)\}(.*)\@[px]*ref\{(.*)\}/); # anchors - s|\@anchor{([^}]*)}|<a name=\"$1\"></a>|g; + s|\@anchor\{([^}]*)\}|<a name=\"$1\"></a>|g; # Change e.g. # @xref{Viewing} # into # <a href="#Viewing">see Viewing</a> #if (/\@ref/){print "AAA[$_]AAA\n"; - s|\@ref{([^}]*)}|see <a href="#$1">$1</a>|g; + s|\@ref\{([^}]*)\}|see <a href="#$1">$1</a>|g; #print "BBB[$_]BBB\n";} - s|\@xref{([^}]*)}|see <a href="#$1">$1</a>|g; - s|\@pxref{([^}]*)}|see <a href="#$1">$1.</a>|g; - while (/\@url{([^}]*)}/) { + s|\@xref\{([^}]*)\}|see <a href="#$1">$1</a>|g; + s|\@pxref\{([^}]*)\}|see <a href="#$1">$1.</a>|g; + while (/\@url\{([^}]*)\}/) { $the_url = $1; - s:\@url{[^}]*}:<a href="$the_url">\@code{$the_url}</a>:; + s:\@url\{[^}]*\}:<a href="$the_url">\@code{$the_url}</a>:; } - while (/\@uref{([^}]*)}/) { + while (/\@uref\{([^}]*)\}/) { @items = split(/,/, $1); if ($#items == 0) { - s:\@uref{[^}]*}:<a href="$items[0]">$items[0]</a>:; + s:\@uref\{[^}]*\}:<a href="$items[0]">$items[0]</a>:; } elsif ($#items == 1) { - s:\@uref{[^}]*}:<a href="$items[0]">$items[1]</a>:; + s:\@uref\{[^}]*\}:<a href="$items[0]">$items[1]</a>:; } elsif ($#items == 2) { - s:\@uref{[^}]*}:\@code{$items[2]}:; + s:\@uref\{[^}]*\}:\@code{$items[2]}:; } else { die "Cannot have more than 3 items in a 'uref' at \"$_\""; } @@ -466,17 +466,17 @@ sub sub_headings { sub sub_emphasis { s,<<,&lt&lt,g; s,>>,&gt&gt,g; - s,\@emph{([^}]*)},$1,g; - s,\@strong{([^}]*)},$1,g; - s,\@footnote{([^}]*)}, [$1],g; - s,\@b{([^}]*)},$1,g; + s,\@emph\{([^}]*)\},$1,g; + s,\@strong\{([^}]*)\},$1,g; + s,\@footnote\{([^}]*)\}, [$1],g; + s,\@b\{([^}]*)\},$1,g; - s,\@code{([^}]*)},`<code>$1</code>',g; + s,\@code\{([^}]*)\},`<code>$1</code>',g; s,\@\@,\@,g; - s,\@samp{([^}]*)},`<samp>$1</samp>',g; - s,\@key{([^}]*)},`<kbd>$1</kbd>',g; - s,\@kbd{([^}]*)},`<kbd>$1</kbd>',g; - s,\@file{([^}]*)},`<samp>$1</samp>',g; + s,\@samp\{([^}]*)\},`<samp>$1</samp>',g; + s,\@key\{([^}]*)\},`<kbd>$1</kbd>',g; + s,\@kbd\{([^}]*)\},`<kbd>$1</kbd>',g; + s,\@file\{([^}]*)\},`<samp>$1</samp>',g; s,TEXINFO2HTML-CLOSE-BRACE,},g; s,TEXINFO2HTML-AT-AT,\@,g; s,TEXINFO2HTML-ACCENT-ACUTE-a,&#225,g;