texinfo update (Sun Dec 5 18:52:01 EST 2004)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.420
retrieving revision 1.421
diff -c -r1.420 -r1.421
*** ChangeLog   2 Dec 2004 16:33:17 -0000       1.420
--- ChangeLog   5 Dec 2004 23:33:07 -0000       1.421
***************
*** 1,3 ****
--- 1,9 ----
+ 2004-12-05  Karl Berry  <address@hidden>
+ 
+       * makeinfo/makeinfo.c (reader_loop): <wbr> didn't make it into
+       HTML 4, remove it.  Sigh.
+       texinfo-pretest mail from wl, 05 Dec 2004 23:39:05 +0100.
+ 
  2004-12-02  Karl Berry  <address@hidden>
  
        * configure.ac (install-warnings): simplify default case.  From te.
Index: makeinfo/makeinfo.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -c -r1.71 -r1.72
*** makeinfo/makeinfo.c 26 Nov 2004 18:17:37 -0000      1.71
--- makeinfo/makeinfo.c 5 Dec 2004 23:33:08 -0000       1.72
***************
*** 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.
--- 1,5 ----
  /* makeinfo -- convert Texinfo source into other formats.
!    $Id: makeinfo.c,v 1.72 2004/12/05 23:33:08 karl Exp $
  
     Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
     2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
***************
*** 2148,2154 ****
                      if (dash_count >= 2)
                        {
                          if (html)
!                           add_word ("&mdash;<wbr>");
                          else
                            xml_insert_entity ("mdash");
                          dash_count -= 2;
--- 2148,2154 ----
                      if (dash_count >= 2)
                        {
                          if (html)
!                           add_word ("&mdash;");
                          else
                            xml_insert_entity ("mdash");
                          dash_count -= 2;
P ChangeLog
P makeinfo/makeinfo.c