Re: GDB assumes texinfo 4.0 ...

[Andrew Cagney <ac131313 at cygnus dot com>]

> On Sun, 20 Jan 2002, Andrew Cagney wrote:
> 
> 
>> I've a fuzzy memory that once GDB started assuming 4.0 some chunks of 
>> the doco files could be simplified.  Anyone?
> 
> 
> That'd be the @if... nuisance: Texinfo 3.x couldn't have some
> commands (@top, I think) inside some conditional, like @ifnottex, so
> we have the Top node twice: once @ifinfo, the other @ifhtml.  This
> kludge should be dropped, and the @top node and its menu should be
> simply in @ifnottex.
> 
> Likewise, I think you can now have @contents at the beginning, rather
> than having it twice, once @iftex and the other for @ifinfo/@ifhtml.
> 
> In general, grep doc/*.tex* for "3.12", and you will find what you are
> looking for ;-)  And don't forget to grep mi/*.tex*, too!
> 
> 
How about the attached?


Andrew


Index: doc/ChangeLog
2002-01-21  Andrew Cagney  <ac131313@redhat.com>

	* gdb.texinfo: Remove makeinfo 3.12 hacks.
	* gdbint.texinfo: Ditto.

Index: mi/ChangeLog
2002-01-21  Andrew Cagney  <ac131313@redhat.com>

	* gdbmi.texinfo: Remove makeinfo 3.12 hacks.

Index: doc/gdb.texinfo
===================================================================
RCS file: /cvs/src/src/gdb/doc/gdb.texinfo,v
retrieving revision 1.78
diff -p -r1.78 gdb.texinfo
*** gdb.texinfo	2002/01/21 23:27:40	1.78
--- gdb.texinfo	2002/01/22 00:03:08
***************
*** 33,39 ****
  @c !!set GDB manual's revision date
  @set DATE December 2001
  
! @c THIS MANUAL REQUIRES TEXINFO 3.12 OR LATER.
  
  @c This is a dir.info fragment to support semi-automated addition of
  @c manuals to an info tree.
--- 33,39 ----
  @c !!set GDB manual's revision date
  @set DATE December 2001
  
! @c THIS MANUAL REQUIRES TEXINFO 4.0 OR LATER.
  
  @c This is a dir.info fragment to support semi-automated addition of
  @c manuals to an info tree.
*************** development.''
*** 105,111 ****
  @end titlepage
  @page
  
! @ifinfo
  @node Top, Summary, (dir), (dir)
  
  @top Debugging with @value{GDBN}
--- 105,111 ----
  @end titlepage
  @page
  
! @ifnottex
  @node Top, Summary, (dir), (dir)
  
  @top Debugging with @value{GDBN}
*************** Copyright (C) 1988-2002 Free Software Fo
*** 156,224 ****
  * GNU Free Documentation License::  The license for this documentation
  * Index::                       Index
  @end menu
- 
- @end ifinfo
- 
- @c the replication sucks, but this avoids a texinfo 3.12 lameness
- 
- @ifhtml
- @node Top
- 
- @top Debugging with @value{GDBN}
- 
- This file describes @value{GDBN}, the @sc{gnu} symbolic debugger.
- 
- This is the @value{EDITION} Edition, @value{DATE}, for @value{GDBN} Version
- @value{GDBVN}.
- 
- Copyright (C) 1988-2000 Free Software Foundation, Inc.
- 
- @menu
- * Summary::                     Summary of @value{GDBN}
- * Sample Session::              A sample @value{GDBN} session
- 
- * Invocation::                  Getting in and out of @value{GDBN}
- * Commands::                    @value{GDBN} commands
- * Running::                     Running programs under @value{GDBN}
- * Stopping::                    Stopping and continuing
- * Stack::                       Examining the stack
- * Source::                      Examining source files
- * Data::                        Examining data
- * Tracepoints::                 Debugging remote targets non-intrusively
- * Overlays::                    Debugging programs that use overlays
- 
- * Languages::                   Using @value{GDBN} with different languages
- 
- * Symbols::                     Examining the symbol table
- * Altering::                    Altering execution
- * GDB Files::                   @value{GDBN} files
- * Targets::                     Specifying a debugging target
- * Remote Debugging::            Debugging remote programs
- * Configurations::              Configuration-specific information
- * Controlling GDB::             Controlling @value{GDBN}
- * Sequences::                   Canned sequences of commands
- * TUI::                         @value{GDBN} Text User Interface
- * Emacs::                       Using @value{GDBN} under @sc{gnu} Emacs
- * Annotations::                 @value{GDBN}'s annotation interface.
- * GDB/MI::                      @value{GDBN}'s Machine Interface.
- 
- * GDB Bugs::                    Reporting bugs in @value{GDBN}
- * Formatting Documentation::    How to format and print @value{GDBN} documentation
- 
- * Command Line Editing::        Command Line Editing
- * Using History Interactively:: Using History Interactively
- * Installing GDB::              Installing GDB
- * Maintenance Commands::        Maintenance Commands
- * GNU Free Documentation License::  The license for this documentation
- * Index::                       Index
- @end menu
  
! @end ifhtml
  
- @c TeX can handle the contents at the start but makeinfo 3.12 can not
- @iftex
  @contents
- @end iftex
  
  @node Summary
  @unnumbered Summary of @value{GDBN}
--- 156,165 ----
  * GNU Free Documentation License::  The license for this documentation
  * Index::                       Index
  @end menu
  
! @end ifnottex
  
  @contents
  
  @node Summary
  @unnumbered Summary of @value{GDBN}
*************** Shared library events.
*** 14902,14914 ****
  \page\colophon
  % Blame: doc@cygnus.com, 1991.
  @end tex
- 
- @c TeX can handle the contents at the start but makeinfo 3.12 can not
- @ifinfo
- @contents
- @end ifinfo
- @ifhtml
- @contents
- @end ifhtml
  
  @bye
--- 14843,14847 ----
Index: doc/gdbint.texinfo
===================================================================
RCS file: /cvs/src/src/gdb/doc/gdbint.texinfo,v
retrieving revision 1.60
diff -p -r1.60 gdbint.texinfo
*** gdbint.texinfo	2002/01/20 19:26:50	1.60
--- gdbint.texinfo	2002/01/22 00:03:21
*************** this GNU Manual, like GNU software.  Cop
*** 64,73 ****
  Software Foundation raise funds for GNU development.''
  @end titlepage
  
- @c TeX can handle the contents at the start but makeinfo 3.12 can not
- @iftex
  @contents
- @end iftex
  
  @node Top
  @c Perhaps this should be the title of the document (but only for info,
--- 64,70 ----
*************** exec.c
*** 5371,5383 ****
  @unnumbered Index
  
  @printindex cp
- 
- @c TeX can handle the contents at the start but makeinfo 3.12 can not
- @ifinfo
- @contents
- @end ifinfo
- @ifhtml
- @contents
- @end ifhtml
  
  @bye
--- 5368,5372 ----
Index: mi/gdbmi.texinfo
===================================================================
RCS file: /cvs/src/src/gdb/mi/gdbmi.texinfo,v
retrieving revision 1.24
diff -p -r1.24 gdbmi.texinfo
*** gdbmi.texinfo	2001/12/30 06:25:14	1.24
--- gdbmi.texinfo	2002/01/22 00:03:31
*************** Elena Zannoni.
*** 109,114 ****
--- 109,119 ----
  * GDB/MI Data Manipulation::
  * GDB/MI Program Control::
  * GDB/MI Miscellaneous Commands::
+ @ignore
+ * GDB/MI Kod Commands::
+ * GDB/MI Memory Overlay Commands::
+ * GDB/MI Signal Handling Commands::
+ @end ignore
  * GDB/MI Stack Manipulation::
  * GDB/MI Symbol Query::
  * GDB/MI Target Manipulation::
*************** Elena Zannoni.
*** 116,131 ****
  * GDB/MI Tracepoint Commands::
  * GDB/MI Variable Objects::
  @end menu
- 
- @c When these are implemented, they should be moved to be between Misc and
- @c Stack Manipulation in the above menu.  They are now outside the menu
- @c because makeinfo 3.12 barfs if it sees @ignore or @comments in the
- @c middle of a menu.
- @ignore
- * GDB/MI Kod Commands::
- * GDB/MI Memory Overlay Commands::
- * GDB/MI Signal Handling Commands::
- @end ignore
  
  @c %%%%%%%%%%%%%%%%%%%%%%%%%%%% SECTION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  @node GDB/MI Command Syntax
--- 121,126 ----