item for options wasn't being properly processed; (2) tidy section
titles (no dot after chap.sect).
-# $Cambridge: exim/doc/doc-scripts/g2h,v 1.2 2005/01/27 10:25:35 ph10 Exp $
+# $Cambridge: exim/doc/doc-scripts/g2h,v 1.3 2005/02/17 12:17:09 ph10 Exp $
# This is a script that turns the SGCAL source of Exim's documentation into
# HTML. It can be used for both the filter document and the main Exim
# This is a script that turns the SGCAL source of Exim's documentation into
# HTML. It can be used for both the filter document and the main Exim
# Some displays have emphasis inside them
# Some displays have emphasis inside them
elsif (/^\.em\b/)
{
print OUT "<font color=green>" if ! $inem;
$inem = 1;
elsif (/^\.em\b/)
{
print OUT "<font color=green>" if ! $inem;
$inem = 1;
elsif (/^\.nem\b/)
{
print OUT "</font>" if $inem;
$inem = 0;
elsif (/^\.nem\b/)
{
print OUT "</font>" if $inem;
$inem = 0;
# There are occasional instances of .if [!]~~sys.fancy inside displays.
# In both cases we want the non-fancy alternative. (The only thing that
# There are occasional instances of .if [!]~~sys.fancy inside displays.
# In both cases we want the non-fancy alternative. (The only thing that
# Ignore .newline and .linelength
elsif (/^\.newline\b/ || /^\.linelength\b/) {}
# Ignore .newline and .linelength
elsif (/^\.newline\b/ || /^\.linelength\b/) {}
-
- elsif (/^\.(\s|$)/) {}
+
+ elsif (/^\.(\s|$)/) {}
# There shouldn't be any other directives inside displays
# There shouldn't be any other directives inside displays
# Handle configuration option definitions
# Handle configuration option definitions
-elsif (/^\.startconf\s+(.*)/)
+elsif (/^\.startconf\s+(.*)/)
+ $confuse = &handle_text($1);
&setpar(0);
&handle_index($option, 0);
print OUT "<h3>$option</h3>\n" .
&setpar(0);
&handle_index($option, 0);
print OUT "<h3>$option</h3>\n" .
- "<i>Use:</i> $confuse<br>" .
+ "<i>Use:</i> $confuse<br>" .
"<i>Type:</i> $type<br><i>Default:</i> $default<br>\n";
}
"<i>Type:</i> $type<br><i>Default:</i> $default<br>\n";
}
$_ = <IN>;
# Skip on till we hit the start of the first chapter, but note if we
$_ = <IN>;
# Skip on till we hit the start of the first chapter, but note if we
-# pass ".set chapter -1", which is used to indicate no chapter numbering for
+# pass ".set chapter -1", which is used to indicate no chapter numbering for
# the first chapter (we number is 0). Keep track of whether we are in macro
# definitions or not, and when not, notice occurrences of .index, because this
# are the "x see y" type entries.
# the first chapter (we number is 0). Keep track of whether we are in macro
# definitions or not, and when not, notice occurrences of .index, because this
# are the "x see y" type entries.
# Open the TOC file
open (TOC, ">$html/${file_base}_toc.html") ||
# Open the TOC file
open (TOC, ">$html/${file_base}_toc.html") ||
# Loop for handling chapters. At the start of this loop, $_ is either EOF,
# or contains a .chapter line.
# Loop for handling chapters. At the start of this loop, $_ is either EOF,
# or contains a .chapter line.
-$firstchapter = $thischapter + 1;
+$firstchapter = $thischapter + 1;
print TOC "<ul>\n" if !$insection;
$insection = 1;
print TOC "<ul>\n" if !$insection;
$insection = 1;
- my($title) = (($thischapter > 0)? "$thischapter." : "") .
- "$thissection. " . &handle_text($1, 0);
+ my($title) = (($thischapter > 0)? "$thischapter.$thissection " :
+ "$thissection. ") . &handle_text($1, 0);
print OUT "<font color=green>" if ! $inem;
$inem = 1;
# Used to handle it here - but that fails if it is .section.
print OUT "<font color=green>" if ! $inem;
$inem = 1;
# Used to handle it here - but that fails if it is .section.
- # Just let the next iteration of the loop handle it.
+ # Just let the next iteration of the loop handle it.
- my($aa) = $a;
- my($bb) = $b;
-
+ my($aa) = $a;
+ my($bb) = $b;
+
$aa =~ s/^\x93//; # Seems like the actual char values are
$bb =~ s/^\x93//; # set by this time, not "“"
$aa =~ s/^\x93//; # Seems like the actual char values are
$bb =~ s/^\x93//; # set by this time, not "“"
-
- return ("\L$aa" eq "\L$bb")? ("$aa" cmp "$bb") : ("\L$aa" cmp "\L$bb");
+
+ return ("\L$aa" eq "\L$bb")? ("$aa" cmp "$bb") : ("\L$aa" cmp "\L$bb");