texinfo update (Tue Apr 5 17:22:01 EDT 2005)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.488
retrieving revision 1.489
diff -c -r1.488 -r1.489
*** ChangeLog   4 Apr 2005 21:21:22 -0000       1.488
--- ChangeLog   5 Apr 2005 21:04:16 -0000       1.489
***************
*** 1,3 ****
--- 1,12 ----
+ 2005-04-05  Matthias Kilian  <address@hidden>  (tiny changes)
+ 
+       * makeinfo/html.c (rollback_empty_tag): be sure to avoid negative
+       array indexing.
+       * makeinfo/multi.c (env): make static.
+       * makeinfo/tests/cond, html-extrali, include-value: use grep -c,
+       instead of piping to wc -l, since that avoids the output files
+       being treated as binary on BSD.
+ 
  2005-04-04  Stepan Kasal  <address@hidden>
  
        * makeinfo/makeinfo.c (usage): Add indentation to the examples and
***************
*** 6,12 ****
        * doc/Makefile.am (makeinfo.1): Add a sed command to postprocess
          the generated manpage.
        * doc/makefile.1: Refresh.
- 
        Thanks to Jim Razmus for the bug report.
  
  2005-04-04  Torsten Bronger  <address@hidden>  (tiny changes)
--- 15,20 ----
Index: makeinfo/html.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/html.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -c -r1.29 -r1.30
*** makeinfo/html.c     12 Mar 2005 23:59:39 -0000      1.29
--- makeinfo/html.c     5 Apr 2005 21:04:16 -0000       1.30
***************
*** 1,5 ****
  /* html.c -- html-related utilities.
!    $Id: html.c,v 1.29 2005/03/12 23:59:39 karl Exp $
  
     Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
     Foundation, Inc.
--- 1,5 ----
  /* html.c -- html-related utilities.
!    $Id: html.c,v 1.30 2005/04/05 21:04:16 karl Exp $
  
     Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
     Foundation, Inc.
***************
*** 440,446 ****
    int check_position = output_paragraph_offset;
    int taglen = strlen (tag);
    int rollback_happened = 0;
!   char *contents = "";
    char *contents_canon_white = "";
  
    /* If output_paragraph is empty, we cannot rollback :-\  */
--- 440,448 ----
    int check_position = output_paragraph_offset;
    int taglen = strlen (tag);
    int rollback_happened = 0;
!   char *contents = "";                        /* FIXME (ptr to constant, later
!                                          assigned to malloc'd address).
!                                        */
    char *contents_canon_white = "";
  
    /* If output_paragraph is empty, we cannot rollback :-\  */
***************
*** 448,454 ****
      return 0;
  
    /* Find the end of the previous tag.  */
!   while (output_paragraph[check_position-1] != '>' && check_position > 0)
      check_position--;
  
    /* Save stuff between tag's end to output_paragraph's end.  */
--- 450,456 ----
      return 0;
  
    /* Find the end of the previous tag.  */
!   while (check_position > 0 && output_paragraph[check_position-1] != '>')
      check_position--;
  
    /* Save stuff between tag's end to output_paragraph's end.  */
***************
*** 465,471 ****
      }
  
    /* Find the start of the previous tag.  */
!   while (output_paragraph[check_position-1] != '<' && check_position > 0)
      check_position--;
  
    /* Check to see if this is the tag.  */
--- 467,473 ----
      }
  
    /* Find the start of the previous tag.  */
!   while (check_position > 0 && output_paragraph[check_position-1] != '<')
      check_position--;
  
    /* Check to see if this is the tag.  */
Index: makeinfo/multi.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/multi.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -c -r1.8 -r1.9
*** makeinfo/multi.c    11 Apr 2004 17:56:47 -0000      1.8
--- makeinfo/multi.c    5 Apr 2005 21:04:16 -0000       1.9
***************
*** 1,5 ****
  /* multi.c -- multiple-column tables (@multitable) for makeinfo.
!    $Id: multi.c,v 1.8 2004/04/11 17:56:47 karl Exp $
  
     Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2004 Free Software
     Foundation, Inc.
--- 1,5 ----
  /* multi.c -- multiple-column tables (@multitable) for makeinfo.
!    $Id: multi.c,v 1.9 2005/04/05 21:04:16 karl Exp $
  
     Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2004 Free Software
     Foundation, Inc.
***************
*** 54,60 ****
  
  /* contents of an output environment */
  /* some more vars may end up being needed here later @@ */
! struct env
  {
    unsigned char *output_paragraph;
    int output_paragraph_offset;
--- 54,60 ----
  
  /* contents of an output environment */
  /* some more vars may end up being needed here later @@ */
! static struct env
  {
    unsigned char *output_paragraph;
    int output_paragraph_offset;
Index: makeinfo/tests/cond
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/tests/cond,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -r1.2 -r1.3
*** makeinfo/tests/cond 11 Apr 2004 17:56:47 -0000      1.2
--- makeinfo/tests/cond 5 Apr 2005 21:04:16 -0000       1.3
***************
*** 8,26 ****
  ../makeinfo -o cond.out $srcdir/cond.txi || exit 1
  egrep 'This is (ifnothtml|ifinfo|ifnottex) text' cond.out >/dev/null \
    || exit 2
! test `fgrep ' text.' cond.out | wc -l` -eq 3 || exit 3
  
  # Default HTML output.
  ../makeinfo --no-split --html -o cond.out $srcdir/cond.txi || exit 1
  egrep 'This is (html|ifhtml|ifnotinfo|ifnottex) text' cond.out >/dev/null \
   || exit 2
! test `fgrep ' text.' cond.out | wc -l` -eq 4 || exit 3
  
  # --ifhtml off, --ifinfo off, --iftex off.
  ../makeinfo --no-ifhtml --no-ifinfo --no-iftex -o cond.out $srcdir/cond.txi 
|| exit 1
  egrep 'This is ifnot(html|info|tex) text' cond.out >/dev/null \
   || exit 2
! test `fgrep ' text.' cond.out | wc -l` -eq 3 || exit 3
  
  # Do we really need to test all the other permutations?
  
--- 8,26 ----
  ../makeinfo -o cond.out $srcdir/cond.txi || exit 1
  egrep 'This is (ifnothtml|ifinfo|ifnottex) text' cond.out >/dev/null \
    || exit 2
! test `fgrep -c ' text.' cond.out` -eq 3 || exit 3
  
  # Default HTML output.
  ../makeinfo --no-split --html -o cond.out $srcdir/cond.txi || exit 1
  egrep 'This is (html|ifhtml|ifnotinfo|ifnottex) text' cond.out >/dev/null \
   || exit 2
! test `fgrep -c ' text.' cond.out` -eq 4 || exit 3
  
  # --ifhtml off, --ifinfo off, --iftex off.
  ../makeinfo --no-ifhtml --no-ifinfo --no-iftex -o cond.out $srcdir/cond.txi 
|| exit 1
  egrep 'This is ifnot(html|info|tex) text' cond.out >/dev/null \
   || exit 2
! test `fgrep -c ' text.' cond.out` -eq 3 || exit 3
  
  # Do we really need to test all the other permutations?
  
***************
*** 28,33 ****
  ../makeinfo --ifhtml --ifinfo --iftex -o cond.out $srcdir/cond.txi || exit 1
  egrep 'This is (html|ifhtml|ifinfo|tex|iftex) text' cond.out >/dev/null \
   || exit 2
! test `fgrep ' text.' cond.out | wc -l` -eq 5 || exit 3
  
  rm -f cond.out cond.info
--- 28,33 ----
  ../makeinfo --ifhtml --ifinfo --iftex -o cond.out $srcdir/cond.txi || exit 1
  egrep 'This is (html|ifhtml|ifinfo|tex|iftex) text' cond.out >/dev/null \
   || exit 2
! test `fgrep -c ' text.' cond.out` -eq 5 || exit 3
  
  rm -f cond.out cond.info
Index: makeinfo/tests/html-extrali
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/tests/html-extrali,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** makeinfo/tests/html-extrali 25 Aug 2002 23:38:39 -0000      1.1
--- makeinfo/tests/html-extrali 5 Apr 2005 21:04:16 -0000       1.2
***************
*** 4,11 ****
  : ${srcdir=.}
  
  li_count=`../makeinfo --no-split --html -o - $srcdir/html-extrali.txi 
2>/dev/null \
! | grep '<li>' \
! | wc -l`
  
  if test "$li_count" -ne 1; then
    echo "$li_count <li>s instead of one." >&2
--- 4,10 ----
  : ${srcdir=.}
  
  li_count=`../makeinfo --no-split --html -o - $srcdir/html-extrali.txi 
2>/dev/null \
! | grep -c '<li>'`
  
  if test "$li_count" -ne 1; then
    echo "$li_count <li>s instead of one." >&2
Index: makeinfo/tests/include-value
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/tests/include-value,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -r1.3 -r1.4
*** makeinfo/tests/include-value        11 Apr 2004 17:56:47 -0000      1.3
--- makeinfo/tests/include-value        5 Apr 2005 21:04:16 -0000       1.4
***************
*** 1,5 ****
  #!/bin/sh
! # $Id: include-value,v 1.3 2004/04/11 17:56:47 karl Exp $
  # Test @value expansion in @include and @verbatiminclude names.
  
  unset TEXINFO_OUTPUT
--- 1,5 ----
  #!/bin/sh
! # $Id: include-value,v 1.4 2005/04/05 21:04:16 karl Exp $
  # Test @value expansion in @include and @verbatiminclude names.
  
  unset TEXINFO_OUTPUT
***************
*** 11,20 ****
  if test $exit_status = 0; then
    # should have three instances of _included_,
    # and three of {included}.
!   count=`grep _included_ include-value.info | wc -l`
    test $count = 3 || exit_status=`expr $exit_status + 1`
  
!   count=`grep '{included}' include-value.info | wc -l`
    test $count = 3 || exit_status=`expr $exit_status + 1`
  fi
  
--- 11,20 ----
  if test $exit_status = 0; then
    # should have three instances of _included_,
    # and three of {included}.
!   count=`grep -c _included_ include-value.info`
    test $count = 3 || exit_status=`expr $exit_status + 1`
  
!   count=`grep -c '{included}' include-value.info`
    test $count = 3 || exit_status=`expr $exit_status + 1`
  fi
  
P ChangeLog
P makeinfo/html.c
P makeinfo/multi.c
P makeinfo/tests/cond
P makeinfo/tests/html-extrali
P makeinfo/tests/include-value