Index: book.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/book.module,v
retrieving revision 1.297
diff -u -F^f -r1.297 book.module
--- book.module	6 May 2005 08:43:21 -0000	1.297
+++ book.module	7 May 2005 07:00:56 -0000
@@ -608,7 +608,8 @@ function book_print($nid = 0, $depth = 1
       // Allow modules to change $node->body before viewing.
       node_invoke_nodeapi($node, 'view', $node->body, false);
 
-      $output .= '<h1 id="'. $node->nid .'" name="'. $node->nid .'" class="book-h'. $depth .'">'. check_plain($node->title) .'</h1>';
+      $output .= '<div id="node-'.$node->nid. '" class="section-'.$depth.'">';
+      $output .= '<h1 class="book-heading">'. check_plain($node->title) .'</h1>';
 
       if ($node->body) {
         $output .= $node->body;
@@ -617,6 +618,7 @@ function book_print($nid = 0, $depth = 1
   }
 
   $output .= book_print_recurse($nid, $depth + 1);
+  $output .= "</div>\n";
 
   $html = '<html><head><title>'. check_plain($node->title) .'</title>';
   $html .= '<base href="'. $base_url .'/" />';
@@ -646,13 +648,15 @@ function book_print_recurse($parent = ''
       // Allow modules to change $node->body before viewing.
       node_invoke_nodeapi($node, 'view', $node->body, false);
 
-      $output .= '<h1 id="'. $node->nid .'" name="'. $node->nid .'" class="book-h'. $depth .'">'. check_plain($node->title) .'</h1>';
+      $output .= '<div id="node-'.$node->nid. '" class="section-'.$depth.'">';
+      $output .= '<h1 class="book-heading">'. check_plain($node->title) .'</h1>';
 
       if ($node->body) {
-        $output .= '<ul>'. $node->body .'</ul>';
+        $output .= $node->body;
       }
 
       $output .= book_print_recurse($node->nid, $depth + 1);
+      $output .= "</div>\n";
     }
   }
 
