texinfo/makeinfo makeinfo.c,1.20,1.21

[dirt]

Update of /cvsroot/texinfo/texinfo/makeinfo
In directory sheep:/tmp/cvs-serv9866/makeinfo

Modified Files:
        makeinfo.c 
Log Message:
2003-12-31  Alper Ersoy  <address@hidden>

        * makeinfo/makeinfo.c (add_char, handle_menu_entry): end <ul> block
        before inserting <p>, and restart afterwards.



Index: makeinfo.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** makeinfo.c  2003/12/31 09:42:41     1.20
--- makeinfo.c  2003/12/31 10:08:01     1.21
***************
*** 144,147 ****
--- 144,150 ----
  static int executing_macro = 0;
  
+ /* True when we are inside a <li> block of a menu.  */
+ static int in_menu_item = 0;
+ 
  typedef struct brace_element
  {
***************
*** 1876,1883 ****
        if (in_paragraph)
          {
!           add_html_block_elt ("</p>");
            in_paragraph = 0;
          }
  
        add_html_block_elt ("<li><a");
        if (next_menu_item_number <= 9)
--- 1879,1889 ----
        if (in_paragraph)
          {
!           add_html_block_elt ("</p>\n");
!           add_html_block_elt ("<ul class=\"menu\">\n");
            in_paragraph = 0;
          }
  
+       in_menu_item = 1;
+ 
        add_html_block_elt ("<li><a");
        if (next_menu_item_number <= 9)
***************
*** 2663,2666 ****
--- 2669,2677 ----
              if (html && !in_html_block_level_elt)
                {
+                 if ((in_menu || in_detailmenu) && in_menu_item)
+                   {
+                     insert_string ("</li></ul>\n");
+                     in_menu_item = 0;
+                   }
                  insert_string ("<p>");
                  in_paragraph = 1;