--- HTML-WebMake-0.5/lib/Text/EtText/EtText2HTML.pm	Mon Sep 11 00:47:32 2000
+++ webmake/lib/Text/EtText/EtText2HTML.pm	Mon Sep 11 17:00:05 2000
@@ -272,7 +272,7 @@
   }
 
   # add <p> tags to <li> items.
-  $html =~ s{<li>(.*?)<\/li>}{<li><p>$1</p></li>}gis;
+  # $html =~ s{<li>(.*?)<\/li>}{<li><p>$1</p></li>}gis;
 
   # handle <etleft> and <etright> blocks, used to do sidebars
   # or images on paragraphs
@@ -415,6 +415,13 @@
     elsif (/^</) {
       $html .= $self->indent_list_end () . $_ . "\n";
     }
+  	elsif (s/^([ \t]+)(\*|\d+\.)//) {
+		my ($indent, $rest) = ($1, $2.$');
+		$indent =~ s/\t/        /g;
+      	my $pre = $self->indent_item_end () . "\n";
+		my $postfix = $self->indent_item_start (length ($indent), $rest) . "\n";
+		$html .= $pre . $postfix;
+	}
     else {
       $html .= $_ . "\n";
     }
@@ -431,13 +438,12 @@
   my $listblock = undef;
   my $itemtag = undef;
   $self->get_current_indent_level();
-
   if ($line =~ s/^\*\s+//) {
     $listblock = 'ul';
     $itemtag = 'li';
     $line = "<li>".$line;
   }
-  elsif ($line =~ s/^1.\s+//) {
+  elsif ($line =~ s/^\d+\.\s+//) {
     $listblock = 'ol';
     $itemtag = 'li';
     $line = "<li>".$line;