texinfo update (Mon Aug 1 18:52:01 EDT 2005)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.521
retrieving revision 1.522
diff -c -r1.521 -r1.522
*** ChangeLog   10 Jul 2005 17:39:02 -0000      1.521
--- ChangeLog   1 Aug 2005 22:49:37 -0000       1.522
***************
*** 1,3 ****
--- 1,8 ----
+ 2005-07-31  Per Bothner  <address@hidden>
+ 
+       * makeinfo/cmds.c (cm_code): For html output use lsquo and rsquot
+       entities around @samp.
+ 
  2005-07-10  Stepan Kasal  <address@hidden>
  
        * doc/texinfo.tex (\texinfoversion): Update.
Index: makeinfo/cmds.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/cmds.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -c -r1.60 -r1.61
*** makeinfo/cmds.c     15 May 2005 00:00:07 -0000      1.60
--- makeinfo/cmds.c     1 Aug 2005 22:49:37 -0000       1.61
***************
*** 1,5 ****
  /* cmds.c -- Texinfo commands.
!    $Id: cmds.c,v 1.60 2005/05/15 00:00:07 karl Exp $
  
     Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free
     Software Foundation, Inc.
--- 1,5 ----
  /* cmds.c -- Texinfo commands.
!    $Id: cmds.c,v 1.61 2005/08/01 22:49:37 karl Exp $
  
     Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free
     Software Foundation, Inc.
***************
*** 833,846 ****
          { /* Use <samp> tag in general to get typewriter.  */
            if (arg == START)
              { /* If @samp specifically, add quotes a la TeX output.  */
!               if (STREQ (command, "samp")) add_char ('`');
                add_word ("<samp>");
              }
            insert_html_tag_with_attribute (arg, "span", 
"class=\"%s\"",command);
            if (arg == END)
              {
                add_word ("</samp>");
!               if (STREQ (command, "samp")) add_char ('\'');
              }
          }
      }
--- 833,848 ----
          { /* Use <samp> tag in general to get typewriter.  */
            if (arg == START)
              { /* If @samp specifically, add quotes a la TeX output.  */
!               if (STREQ (command, "samp"))
!               add_word ("&lsquo;");
                add_word ("<samp>");
              }
            insert_html_tag_with_attribute (arg, "span", 
"class=\"%s\"",command);
            if (arg == END)
              {
                add_word ("</samp>");
!               if (STREQ (command, "samp"))
!               add_word ("&rsquo;");
              }
          }
      }
P ChangeLog
P makeinfo/cmds.c