texinfo update (Sun Jan 16 19:22:01 EST 2005)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.448
retrieving revision 1.449
diff -c -r1.448 -r1.449
*** ChangeLog   15 Jan 2005 23:30:06 -0000      1.448
--- ChangeLog   17 Jan 2005 00:20:22 -0000      1.449
***************
*** 1,3 ****
--- 1,8 ----
+ 2005-01-16  Torsten Bronger <address@hidden>
+ 
+       * makeinfo/cmds.c (cm_tie): use &nbsp; for HTML, &#xa0; for
+               XML/Docbook.
+ 
  2005-01-15  Karl Berry  <address@hidden>
  
        * makeinfo/xref.c (cm_xref): output *note for @ref, instead of
Index: makeinfo/cmds.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/cmds.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -c -r1.55 -r1.56
*** makeinfo/cmds.c     14 Dec 2004 00:15:36 -0000      1.55
--- makeinfo/cmds.c     17 Jan 2005 00:20:22 -0000      1.56
***************
*** 1,5 ****
  /* cmds.c -- Texinfo commands.
!    $Id: cmds.c,v 1.55 2004/12/14 00:15:36 karl Exp $
  
     Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
     Foundation, Inc.
--- 1,5 ----
  /* cmds.c -- Texinfo commands.
!    $Id: cmds.c,v 1.56 2005/01/17 00:20:22 karl Exp $
  
     Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
     Foundation, Inc.
***************
*** 1283,1299 ****
  
  /* An unbreakable word space.  Same as @w{ } for makeinfo, but different
     for TeX (the space stretches and stretches, and does not inhibit
!    hyphenation).  */
  void
  cm_tie (int arg)
  {
    if (arg == START)
      {
        cm_w (START);
        add_char (' ');
      }
    else
!     cm_w (END);
  }
  
  /* Explain that this command is obsolete, thus the user shouldn't
--- 1283,1305 ----
  
  /* An unbreakable word space.  Same as @w{ } for makeinfo, but different
     for TeX (the space stretches and stretches, and does not inhibit
!    hyphenation).  For XML and HTML, insert the non-breaking-space
!    character and entity, respectively */
  void
  cm_tie (int arg)
  {
    if (arg == START)
+     if (html)
+       insert_string ("&nbsp;");
+     else if (xml)
+       insert_string ("&#xa0;");
+     else
      {
        cm_w (START);
        add_char (' ');
      }
    else
!     if (!html && !xml) cm_w (END);
  }
  
  /* Explain that this command is obsolete, thus the user shouldn't
P ChangeLog
P makeinfo/cmds.c