File gri-perl-5.26.patch of Package gri
Index: gri-2.12.23/doc/texinfo2HTML
===================================================================
--- gri-2.12.23.orig/doc/texinfo2HTML
+++ gri-2.12.23/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 , G<FONT SIZE=-1>RI</FONT> ,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:\@code{([^}]*)}:`<font color="$ex_color"><code>$1</code></font>':og;
+ $the_item =~ s:\@code\{([^}]*)}:`<font color="$ex_color"><code>$1</code></font>':og;
print "<dt> $start_item$the_item$end_item\n<dd>";
} else {
print "<p>" 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,<<,<<,g;
s,>>,>>,g;
- s,\@emph{([^}]*)},<em>$1</em>,g;
- s,\@strong{([^}]*)},<b>$1</b>,g;
- s,\@footnote{([^}]*)}, [$1],g;
- s,\@b{([^}]*)},<b>$1</b>,g;
+ s,\@emph\{([^}]*)},<em>$1</em>,g;
+ s,\@strong\{([^}]*)},<b>$1</b>,g;
+ s,\@footnote\{([^}]*)}, [$1],g;
+ s,\@b\{([^}]*)},<b>$1</b>,g;
- s,\@code{([^}]*)},`<font color="$ex_color"><code>$1</code></font>',g;
+ s,\@code\{([^}]*)},`<font color="$ex_color"><code>$1</code></font>',g;
s,\@\@,\@,g;
- s,\@samp{([^}]*)},`<font color="$ex_color"><samp>$1</samp></font>',g;
- s,\@key{([^}]*)},`<font color="$ex_color"><kbd>$1</kbd></font>',g;
- s,\@kbd{([^}]*)},`<font color="$ex_color"><kbd>$1</kbd></font>',g;
- s,\@file{([^}]*)},`<font color="$ex_color"><samp>$1</samp></font>',g;
+ s,\@samp\{([^}]*)},`<font color="$ex_color"><samp>$1</samp></font>',g;
+ s,\@key\{([^}]*)},`<font color="$ex_color"><kbd>$1</kbd></font>',g;
+ s,\@kbd\{([^}]*)},`<font color="$ex_color"><kbd>$1</kbd></font>',g;
+ s,\@file\{([^}]*)},`<font color="$ex_color"><samp>$1</samp></font>',g;
s,TEXINFO2HTML-CLOSE-BRACE,},g;
s,TEXINFO2HTML-AT-AT,\@,g;
s,TEXINFO2HTML-ACCENT-ACUTE-a,á,g;