texinfo update (Mon Jul 10 19:22:01 EDT 2006)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.623
retrieving revision 1.624
diff -u -r1.623 -r1.624
--- ChangeLog   9 Jul 2006 23:34:02 -0000       1.623
+++ ChangeLog   10 Jul 2006 23:07:12 -0000      1.624
@@ -1,3 +1,16 @@
+2006-07-10  <address@hidden>
+
+       * makeinfo/html.c (insert_html_tag_with_attribute): Treat `samp'
+       special, to allow it to nest.
+       * makeinfo/cmds.c (cm_code): use insert_html_tag to add `samp'
+       instead of add_word, so that the roll-back of outer tags works
+       correctly.  (This fixes @option inside of @emph causing badly
+       nested tags in the HTML output, see 8 Jun 2006 00:12:55 +0200 mail.
+       The general problem still remains.)
+       * makeinfo/tests/emph-option: New test.
+       * makeinfo/tests/emph-option.txi: New file.
+       * makeinfo/tests/Makefile.am: Adjust.
+
 2006-07-09  Karl Berry  <address@hidden>
 
        * doc/texinfo.txi (makeinfo Pointer Creation, Writing a Menu):
Index: NEWS
===================================================================
RCS file: /sources/texinfo/texinfo/NEWS,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- NEWS        7 Jul 2006 21:54:56 -0000       1.129
+++ NEWS        10 Jul 2006 23:07:12 -0000      1.130
@@ -1,4 +1,4 @@
-$Id: NEWS,v 1.129 2006/07/07 21:54:56 karl Exp $
+$Id: NEWS,v 1.130 2006/07/10 23:07:12 karl Exp $
 This NEWS file records noteworthy changes, very tersely.
 See the manual for detailed information.
 
@@ -62,7 +62,7 @@
   . when calling man, use -a if no explicit section is found.
   . avoid showing the top(1) man page for nonexistent info files.
 * Distribution:
-  . automake 1.9.6, gettext 0.14.5.
+  . autoconf 2.60, automake 1.9.6, gettext 0.14.6.
   . gettext support now [external].
   . new translations: hu (Hungarian), rw (Kinyarwandan), vi (Vietnamese).
   . most common functionality imported from gnulib.
Index: makeinfo/cmds.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/cmds.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- makeinfo/cmds.c     5 May 2006 16:31:37 -0000       1.64
+++ makeinfo/cmds.c     10 Jul 2006 23:07:12 -0000      1.65
@@ -1,5 +1,5 @@
 /* cmds.c -- Texinfo commands.
-   $Id: cmds.c,v 1.64 2006/05/05 16:31:37 karl Exp $
+   $Id: cmds.c,v 1.65 2006/07/10 23:07:12 karl Exp $
 
    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
@@ -837,12 +837,12 @@
             { /* If @samp specifically, add quotes a la TeX output.  */
               if (STREQ (command, "samp"))
                add_word ("&lsquo;");
-              add_word ("<samp>");
+             insert_html_tag (arg, "samp");
             }
           insert_html_tag_with_attribute (arg, "span", "class=\"%s\"",command);
           if (arg == END)
             {
-              add_word ("</samp>");
+             insert_html_tag (arg, "samp");
               if (STREQ (command, "samp"))
                add_word ("&rsquo;");
             }
Index: makeinfo/html.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/html.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- makeinfo/html.c     1 Jun 2006 23:48:33 -0000       1.34
+++ makeinfo/html.c     10 Jul 2006 23:07:12 -0000      1.35
@@ -1,5 +1,5 @@
 /* html.c -- html-related utilities.
-   $Id: html.c,v 1.34 2006/06/01 23:48:33 karl Exp $
+   $Id: html.c,v 1.35 2006/07/10 23:07:12 karl Exp $
 
    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software
    Foundation, Inc.
@@ -557,6 +557,7 @@
   /* texinfo.tex doesn't support more than one font attribute
      at the same time.  */
   if ((start_or_end == START) && old_tag && *old_tag
+      && !STREQ (old_tag, "samp")
       && !rollback_empty_tag (old_tag))
     add_word_args ("</%s>", old_tag);
 
@@ -564,13 +565,13 @@
     {
       if (start_or_end == START)
         add_word_args (format ? "<%s %s>" : "<%s>", tag, formatted_attribs);
-      else if (!rollback_empty_tag (tag))
+      else if (STREQ (tag, "samp") || !rollback_empty_tag (tag))
         /* Insert close tag only if we didn't rollback,
            in which case the opening tag is removed.  */
         add_word_args ("</%s>", tag);
     }
 
-  if ((start_or_end != START) && old_tag && *old_tag)
+  if ((start_or_end != START) && old_tag && *old_tag && !STREQ (old_tag, 
"samp"))
     add_word_args (strlen (old_attribs) > 0 ? "<%s %s>" : "<%s>",
         old_tag, old_attribs);
 
Index: makeinfo/tests/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/tests/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- makeinfo/tests/Makefile.am  5 Jul 2006 13:39:05 -0000       1.6
+++ makeinfo/tests/Makefile.am  10 Jul 2006 23:07:12 -0000      1.7
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.6 2006/07/05 13:39:05 karl Exp $
+# $Id: Makefile.am,v 1.7 2006/07/10 23:07:12 karl Exp $
 # Makefile.am for texinfo/tests/makeinfo.
 #
 # This file is free software; as a special exception the author gives
@@ -13,6 +13,7 @@
   cond \
   copying \
   defxcond \
+  emph-option \
   html-docdesc html-extrali html-min html-manuals html-para html-title \
   html-top \
   include-value \
@@ -29,6 +30,7 @@
   accent.txi accentenc.txi accent-text.txi \
   cond.txi copying.txi \
   defxcond.txi \
+  emph-option.txi \
   html-docdesc.txi html-extrali.txi html-min.txi html-para.txi html-title.txi \
   html-top.txi \
   include-value.txi incl-incl.txi \
P ChangeLog
P NEWS
P makeinfo/cmds.c
P makeinfo/html.c
P makeinfo/tests/Makefile.am
U makeinfo/tests/emph-option
U makeinfo/tests/emph-option.txi