texinfo/makeinfo footnote.c,1.6,1.7 insertion.c,1.36,1.37

[dirt]

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

Modified Files:
        footnote.c insertion.c 
Log Message:
2004-04-06  Alper Ersoy  <address@hidden>

        * makeinfo/insertion.c (end_insertion): <pre> blocks implicitly ends
        the previous paragraph, so avoid </p> after the end tag.

        * makeinfo/footnote.c (output_pending_notes): made Footnotes anchor
        non translatable, and changed it to "texinfo-footnotes-in-document" to
        lessen the chance of getting in the way of another Footnotes anchor.



Index: footnote.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/footnote.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** footnote.c  1 Mar 2004 15:28:06 -0000       1.6
--- footnote.c  6 Apr 2004 20:15:42 -0000       1.7
***************
*** 299,303 ****
           (as the node name) for entries defined in footnotes.  */
        if (!splitting)
!         add_word_args ("<a name=\"%s\"></a>", _("Footnotes"));
        add_word_args ("<h4>%s</h4>", (char *) _("Footnotes"));
      }
--- 299,303 ----
           (as the node name) for entries defined in footnotes.  */
        if (!splitting)
!         add_word ("<a name=\"texinfo-footnotes-in-document\"></a>");
        add_word_args ("<h4>%s</h4>", (char *) _("Footnotes"));
      }

Index: insertion.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/insertion.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** insertion.c 19 Mar 2004 16:39:43 -0000      1.36
--- insertion.c 6 Apr 2004 20:15:42 -0000       1.37
***************
*** 1118,1127 ****
        current_indent -= default_indentation_increment;
        if (html)
!         add_word ("</ol>\n");
        break;
  
      case flushleft:
        if (html)
!         add_word ("</div>\n");
        close_insertion_paragraph ();
        break;
--- 1118,1127 ----
        current_indent -= default_indentation_increment;
        if (html)
!         add_html_block_elt ("</ol>\n");
        break;
  
      case flushleft:
        if (html)
!         add_html_block_elt ("</div>\n");
        close_insertion_paragraph ();
        break;
***************
*** 1129,1133 ****
      case cartouche:
        if (html)
!       add_word ("</td></tr></table>\n");
        close_insertion_paragraph ();
        break;
--- 1129,1133 ----
      case cartouche:
        if (html)
!       add_html_block_elt ("</td></tr></table>\n");
        close_insertion_paragraph ();
        break;
***************
*** 1221,1224 ****
--- 1221,1228 ----
        if (!xml || docbook)
          close_insertion_paragraph ();
+ 
+       /* </pre> closes paragraph without messing with </p>.  */
+       if (html && type != quotation)
+           paragraph_is_open = 0;
        break;