texinfo update (Mon Aug 30 18:22:01 EDT 2004)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.385
retrieving revision 1.386
diff -c -r1.385 -r1.386
*** ChangeLog   27 Aug 2004 22:22:09 -0000      1.385
--- ChangeLog   30 Aug 2004 22:11:39 -0000      1.386
***************
*** 1,3 ****
--- 1,22 ----
+ 2004-08-30  Karl Berry  <address@hidden>
+ 
+       * makeinfo/makeinfo.c (maybe_escaped_expansion): new routine, like
+               expansion but does HTML escapes.
+       * makeinfo/makeinfo.h (maybe_escaped_expansion): declare.
+       * makeinfo/index.c (cm_printindex): call it.
+       This is @cindex Kahrs, J@"urgen does not get
+       gawk.texi:23425: Unknown command `&quot;urgen'.
+       (in gawk 3.1.4).
+       Report from: Stepan Kasal <address@hidden>, 24 Aug 2004 12:36:34 +0200.
+ 
+ 2004-08-29  Karl Berry  <address@hidden>
+ 
+       * makeinfo/node.c (split_file): do not search for output file
+               along the path when calling find_and_load (can cause seg
+               fault when cross-compiling).
+       From: Martin Husemann <address@hidden>, 29 Aug 2004 08:40:33 +0200.
+       http://www.netbsd.org/cgi-bin/query-pr-single.pl?number=26791
+ 
  2004-08-27  Karl Berry  <address@hidden>
  
        * doc/texinfo.txi (Macro details): more warnings about macro usage.
Index: makeinfo/index.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/index.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -c -r1.15 -r1.16
*** makeinfo/index.c    7 Jun 2004 00:52:08 -0000       1.15
--- makeinfo/index.c    30 Aug 2004 22:11:39 -0000      1.16
***************
*** 1,5 ****
  /* index.c -- indexing for Texinfo.
!    $Id: index.c,v 1.15 2004/06/07 00:52:08 karl Exp $
  
     Copyright (C) 1998, 1999, 2002, 2003, 2004 Free Software Foundation,
     Inc.
--- 1,5 ----
  /* index.c -- indexing for Texinfo.
!    $Id: index.c,v 1.16 2004/08/30 22:11:39 karl Exp $
  
     Copyright (C) 1998, 1999, 2002, 2003, 2004 Free Software Foundation,
     Inc.
***************
*** 823,856 ****
              }
  
            if (html)
-             /* fixme: html: we should use specific index anchors pointing
-            to the actual location of the indexed position (but then we
-            have to find something to wrap the anchor around). */
              {
!               /* In the HTML case, the expanded index entry is not
!                  good for us, since it was expanded for non-HTML mode
!                  inside sort_index.  So we need to HTML-escape and
!                  expand the original entry text here.  */
!               char *escaped_entry = xstrdup (index->entry_text);
!               char *expanded_entry;
! 
!               /* expansion() doesn't HTML-escape the argument, so need
!                  to do it separately.  */
!               escaped_entry = escape_string (escaped_entry);
!               expanded_entry = expansion (escaped_entry, index->code);
                add_html_block_elt_args ("\n<li><a href=\"%s#index-",
!                   (splitting && index->output_file)
!                    ? index->output_file : "");
                add_escaped_anchor_name (index->entry_text);
                add_word_args ("-%d\">%s</a>: ", index->entry_number,
!                   expanded_entry);
!               free (escaped_entry);
!               free (expanded_entry);
  
                add_word ("<a href=\"");
                if (index->node && *index->node)
                  {
!                   /* Make sure any non-macros in the node name are expanded.  
*/
                    char *expanded_index;
  
                    in_fixed_width_font++;
--- 823,850 ----
              }
  
            if (html)
              {
!               /* For HTML, we need to expand and HTML-escape the
!                  original entry text, at the same time.  Consider
!                  @cindex J@"urgen.  We want J&uuml;urgen.  We can't
!                  expand and then escape since we'll end up with
!                  J&amp;uuml;rgen.  We can't escape and then expand
!                  because then `expansion' will see J@&quot;urgen, and
!                  @&quot;urgen is not a command.  */
!               char *html_entry =
!                 maybe_escaped_expansion (index->entry_text, index->code, 1);
! 
                add_html_block_elt_args ("\n<li><a href=\"%s#index-",
!                   (splitting && index->output_file) ? index->output_file : 
"");
                add_escaped_anchor_name (index->entry_text);
                add_word_args ("-%d\">%s</a>: ", index->entry_number,
!                   html_entry);
!               free (html_entry);
  
                add_word ("<a href=\"");
                if (index->node && *index->node)
                  {
!                   /* Ensure any non-macros in the node name are expanded.  */
                    char *expanded_index;
  
                    in_fixed_width_font++;
Index: makeinfo/makeinfo.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -c -r1.65 -r1.66
*** makeinfo/makeinfo.c 27 Jul 2004 00:06:31 -0000      1.65
--- makeinfo/makeinfo.c 30 Aug 2004 22:11:39 -0000      1.66
***************
*** 1,5 ****
  /* makeinfo -- convert Texinfo source into other formats.
!    $Id: makeinfo.c,v 1.65 2004/07/27 00:06:31 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.66 2004/08/30 22:11:39 karl Exp $
  
     Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
     2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
***************
*** 3988,4000 ****
  
  
  /* Return what would be output for STR (in newly-malloced memory), i.e.,
!    expand Texinfo commands.  If IMPLICIT_CODE is set, expand @code{STR}.
!    This is generally used for short texts; filling, indentation, and
!    html escapes are disabled.  */
  
  char *
  expansion (char *str, int implicit_code)
  {
    char *result;
  
    /* Inhibit indentation and filling, so that extra newlines
--- 3988,4010 ----
  
  
  /* Return what would be output for STR (in newly-malloced memory), i.e.,
!    expand Texinfo commands according to the current output format.  If
!    IMPLICIT_CODE is set, expand @code{STR}.  This is generally used for
!    short texts; filling, indentation, and html escapes are disabled.  */
  
  char *
  expansion (char *str, int implicit_code)
  {
+   return maybe_escaped_expansion (str, implicit_code, 0);
+ }
+ 
+ 
+ /* Do HTML escapes according to DO_HTML_ESCAPE.  Needed in
+    cm_printindex, q.v.  */
+ 
+ char *
+ maybe_escaped_expansion (char *str, int implicit_code, int do_html_escape)
+ {
    char *result;
  
    /* Inhibit indentation and filling, so that extra newlines
***************
*** 4008,4014 ****
    filling_enabled = 0;
    indented_fill = 0;
    no_indent = 1;
!   escape_html = 0;
  
    result = full_expansion (str, implicit_code);
  
--- 4018,4024 ----
    filling_enabled = 0;
    indented_fill = 0;
    no_indent = 1;
!   escape_html = do_html_escape;
  
    result = full_expansion (str, implicit_code);
  
***************
*** 4023,4029 ****
  
  /* Expand STR (or @code{STR} if IMPLICIT_CODE is nonzero).  No change to
     any formatting parameters -- filling, indentation, html escapes,
!    etc., are not reset.  */
  
  char *
  full_expansion (char *str, int implicit_code)
--- 4033,4039 ----
  
  /* Expand STR (or @code{STR} if IMPLICIT_CODE is nonzero).  No change to
     any formatting parameters -- filling, indentation, html escapes,
!    etc., are not reset.  Always returned in new memory.  */
  
  char *
  full_expansion (char *str, int implicit_code)
Index: makeinfo/makeinfo.h
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/makeinfo.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -c -r1.14 -r1.15
*** makeinfo/makeinfo.h 11 Apr 2004 17:56:47 -0000      1.14
--- makeinfo/makeinfo.h 30 Aug 2004 22:11:39 -0000      1.15
***************
*** 1,7 ****
  /* makeinfo.h -- declarations for Makeinfo.
!    $Id: makeinfo.h,v 1.14 2004/04/11 17:56:47 karl Exp $
  
!    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free
     Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,7 ----
  /* makeinfo.h -- declarations for Makeinfo.
!    $Id: makeinfo.h,v 1.15 2004/08/30 22:11:39 karl Exp $
  
!    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free
     Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
***************
*** 316,321 ****
--- 316,322 ----
  extern char *info_trailer (void),
    *expansion (char *str, int implicit_code),
    *text_expansion (char *str),
+   *maybe_escaped_expansion (char *str, int implicit_code, int do_escape_html),
    *full_expansion (char *str, int implicit_code);
  
  extern void free_and_clear (char **pointer),
P ChangeLog
P makeinfo/index.c
P makeinfo/makeinfo.c
P makeinfo/makeinfo.h