texinfo update (Fri Nov 26 13:22:01 EST 2004)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.415
retrieving revision 1.416
diff -c -r1.415 -r1.416
*** ChangeLog   26 Nov 2004 00:48:35 -0000      1.415
--- ChangeLog   26 Nov 2004 18:17:36 -0000      1.416
***************
*** 1,3 ****
--- 1,7 ----
+ 2004-11-26  Karl Berry  <address@hidden>
+ 
+       * makeinfo/makeinfo.c (reader_loop): allow <wbr> after &mdash;
+ 
  2004-11-25  Karl Berry  <address@hidden>
  
        * doc/texinfo.txi (Fonts): document new command @sansserif.
Index: makeinfo/makeinfo.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -c -r1.70 -r1.71
*** makeinfo/makeinfo.c 11 Nov 2004 18:34:28 -0000      1.70
--- makeinfo/makeinfo.c 26 Nov 2004 18:17:37 -0000      1.71
***************
*** 1,5 ****
  /* makeinfo -- convert Texinfo source into other formats.
!    $Id: makeinfo.c,v 1.70 2004/11/11 18:34:28 karl Exp $
  
     Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
     2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
--- 1,5 ----
  /* makeinfo -- convert Texinfo source into other formats.
!    $Id: makeinfo.c,v 1.71 2004/11/26 18:17:37 karl Exp $
  
     Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
     2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
***************
*** 2147,2158 ****
                    {
                      if (dash_count >= 2)
                        {
!                         html ? add_word ("&mdash;") : xml_insert_entity 
("mdash");
                          dash_count -= 2;
                        }
                      else if (dash_count >= 1)
                        {
!                         html ? add_word ("&ndash;") : xml_insert_entity 
("ndash");
                          dash_count--;
                        }
                    }
--- 2147,2164 ----
                    {
                      if (dash_count >= 2)
                        {
!                         if (html)
!                           add_word ("&mdash;<wbr>");
!                         else
!                           xml_insert_entity ("mdash");
                          dash_count -= 2;
                        }
                      else if (dash_count >= 1)
                        {
!                         if (html)
!                           add_word ("&ndash;");
!                         else
!                           xml_insert_entity ("ndash");
                          dash_count--;
                        }
                    }
P ChangeLog
P makeinfo/makeinfo.c