Ticket #1973: to_texi2html_v1.diff

doc/configure.ac

@@ -75 +75 @@
 
 AC_CHECK_PROGS(PERL,perl)
 
-TEXI2WWW='$(PERL) $(top_srcdir)/tools/texi2www/texi2www'
-AC_SUBST(TEXI2WWW)
+AC_CHECK_PROGS(TEXI2HTML,texi2html)
+AC_SUBST(TEXI2HTML)
 
 AC_CHECK_PROGS(GS,gs)
 AM_CONDITIONAL(GS,test x"$GS" != x"")

doc/main.am

@@ -2 +2 @@
 html_projectdir = $(htmldir)/$(PROJECT)
 endif
 
-TEXI2WWW_ARGS=\
--I $(srcdir) -I $(top_srcdir) -I $(top_builddir) \
--dirfile ../index.html \
--header rtems_header.html \
--footer rtems_footer.html \
--icons ../images
+#TEXI2WWW_ARGS=\
+#-I $(srcdir) -I $(top_srcdir) -I $(top_builddir) \
+#-dirfile ../index.html \
+#-header rtems_header.html \
+#-footer rtems_footer.html \
+#-icons ../images
+
+TEXI2HTML_ARGS=\
+-D use-html --split node \
+-I $(srcdir) -I $(top_srcdir) -I $(top_builddir)

doc/project.am

@@ -51 +51 @@
         -e s%\@VERSION\@%@VERSION@%g \
         < $< > $@
 
+# $(TEXI2WWW) $(TEXI2WWW_ARGS) -base $(PROJECT) $<
 index.html $(PROJECT)*.html: $(PROJECT).texi $($(PROJECT)_TEXINFOS) \
     rtems_header.html rtems_footer.html 
-        $(TEXI2WWW) $(TEXI2WWW_ARGS) -base $(PROJECT) $<
+        rm -rf $(PROJECT).html
+        $(TEXI2HTML) $(TEXI2HTML_ARGS) --menu $< $<
 
 MOSTLYCLEANFILES += index.html $(PROJECT)*.html rtems_header.html \
    rtems_footer.html

doc/ada_user/ada_user.texi

@@ -115 +115 @@
 @include user/dirstat.texi
 @include example.texi
 @include user/glossary.texi
-@ifinfo
 @node Top, List of Figures, (dir), (dir)
 @top ada_user
 
@@ -159 +158 @@
 * Concept Index::
 @end menu
 
-@end ifinfo
 @c 
 @c 
 @c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here

doc/ada_user/example.texi

@@ -6 +6 @@
 @c  $Id: example.texi,v 1.5 2002/01/17 21:47:44 joel Exp $
 @c
 
-@ifinfo
 @node Example Application, Glossary, Directive Status Codes, Top
-@end ifinfo
 @chapter Example Application
 
 @example

doc/bsp_howto/bsp_howto.texi

@@ -78 +78 @@
 @include analog.texi
 @include discrete.texi
 
-@ifinfo
 @node Top, Introduction, (dir), (dir)
 @top bsp_howto
 
@@ -108 +107 @@
 * Concept Index::
 @end menu
 
-@end ifinfo
 @c 
 @c 
 @c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here

doc/cpu_supplement/cpu_supplement.texi

@@ -71 +71 @@
 @include sh.texi
 @include sparc.texi
 @include sparc64.texi
-@ifinfo
 @node Top, Preface, (dir), (dir)
 @top cpu_supplement
 
@@ -95 +94 @@
 * Concept Index::
 @end menu
 
-@end ifinfo
 @c 
 @c 
 @c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here

doc/cpu_supplement/preface.texi

@@ -6 +6 @@
 @c  $Id: preface.texi,v 1.3 2009/09/14 14:50:39 joel Exp $
 @c
 
-@ifinfo
 @node Preface, Port Specific Information, Top, Top
-@end ifinfo
 @unnumbered Preface
 
 The Real Time Executive for Multiprocessor Systems

doc/develenv/develenv.texi

@@ -77 +77 @@
 @include sample.texi
 @include utils.texi
 
-@ifinfo
 @node Top, Introduction, (dir), (dir)
 @top develenv
 
@@ -92 +91 @@
 * Concept Index::
 @end menu
 
-@end ifinfo
 @c 
 @c 
 @c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here

doc/develenv/intro.texi

@@ -6 +6 @@
 @c  $Id: intro.texi,v 1.6 2007/11/27 19:31:05 joel Exp $
 @c
 
-@ifinfo
 @node Introduction, Directory Structure, Top, Top
-@end ifinfo
 @chapter Introduction
 
 This document describes the RTEMS development

doc/filesystem/filesystem.texi

@@ -67 +67 @@
 @include imfs.texi
 @include miniimfs.texi
 @include tftp.texi
-@ifinfo
 @node Top, Preface, (dir), (dir)
 @top filesystem
 
@@ -87 +86 @@
 * Concept Index::
 @end menu
 
-@end ifinfo
 @c 
 @c 
 @c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here

doc/filesystem/preface.texi

@@ -6 +6 @@
 @c  $Id: preface.texi,v 1.6 2002/01/17 21:47:45 joel Exp $
 @c
 
-@ifinfo
 @node Preface, , Top, Top
-@end ifinfo
 @unnumbered Preface
 
 This document describes the implementation of the RTEMS filesystem

doc/networking/networking.texi

@@ -65 +65 @@
 @include testing.texi
 @include servers.texi
 @include decdriver.texi
-@ifinfo
 @node Top, Preface, (dir), (dir)
 @top networking
 
@@ -83 +82 @@
 * Concept Index::
 @end menu
 
-@end ifinfo
 @c 
 @c 
 @c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here

doc/networking/preface.texi

@@ -6 +6 @@
 @c  $Id: preface.texi,v 1.7 2003/10/02 12:52:38 joel Exp $
 @c
 
-@ifinfo
 @node Preface, Network Task Structure and Data Flow, Top, Top
-@end ifinfo
 @unnumbered Preface
 
 This document describes the RTEMS specific parts of the FreeBSD TCP/IP

doc/new_chapters/new_chapters.texi

@@ -82 +82 @@
 
 @include error.texi
 @include monitor.texi
-@ifinfo
 @node Top, , (dir), (dir)
 @top posix_users_new
 
@@ -95 +94 @@
 * Concept Index::
 @end menu
 
-@end ifinfo
 @c 
 @c 
 @c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here

doc/porting/porting.texi

@@ -94 +94 @@
 @include prioritybitmap.texi
 @include codetuning.texi
 @include miscellaneous.texi
-@ifinfo
 @node Top, Preface, (dir), (dir)
 @top porting
 
@@ -116 +115 @@
 * Concept Index::
 @end menu
 
-@end ifinfo
 @c 
 @c 
 @c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here

doc/porting/preface.texi

@@ -6 +6 @@
 @c  $Id: preface.texi,v 1.3 2002/01/17 21:47:45 joel Exp $
 @c
 
-@ifinfo
 @node Preface, Development Tools, Top, Top
-@end ifinfo
 @unnumbered Preface
 
 The purpose of this manual is to provide a roadmap to those people porting

doc/posix_users/posix_users.texi

@@ -104 +104 @@
 @include libc.texi
 @include libm.texi
 @include status.texi
-@ifinfo
 @node Top, Preface, (dir), (dir)
 @top posix_users
 
@@ -138 +137 @@
 * Concept Index::
 @end menu
 
-@end ifinfo
 @c
 @c
 @c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here

doc/posix_users/preface.texi

@@ -6 +6 @@
 @c  $Id: preface.texi,v 1.11 2009/02/27 18:04:44 joel Exp $
 @c
 
-@ifinfo
 @node Preface, , Top, Top
-@end ifinfo
 @unnumbered Preface
 
 This is the User's Guide for the POSIX API support 

doc/relnotes/install.texi

@@ -6 +6 @@
 @c  $Id: install.texi,v 1.8 2003/09/19 18:03:51 joel Exp $
 @c
 
-@ifinfo
 @node Installation Procedure, Installation Procedure Introduction, Introduction Documentation, Top
-@end ifinfo
 @chapter Installation Procedure
-@ifinfo
 @menu
 * Installation Procedure Introduction::
 * Installation Procedure RTEMS FTP Site Organization::
@@ -18 +15 @@
 * Installation Procedure Installing a Cross-Development GNU Toolset::
 * Installation Procedure Installing RTEMS::
 @end menu
-@end ifinfo
 
-@ifinfo
 @node Installation Procedure Introduction, Installation Procedure RTEMS FTP Site Organization, Installation Procedure, Installation Procedure
-@end ifinfo
 @section Introduction
 
 This chapter describes the process of installing and
 configuring RTEMS and a cross-development environment based on
 freely available tools and libraries.
 
-@ifinfo
 @node Installation Procedure RTEMS FTP Site Organization, Installation Procedure Unarchiving the RTEMS and GNU Components, Installation Procedure Introduction, Installation Procedure
-@end ifinfo
 @section RTEMS FTP Site Organization
 
 RTEMS is distributed only via anonymous ftp.
@@ -57 +49 @@
 The complete source code and documentation set for
 the C language implementation of RTEMS is provided.
 
-@ifinfo
 @node Installation Procedure Unarchiving the RTEMS and GNU Components, Installation Procedure Installing a Cross-Development GNU Toolset, Installation Procedure RTEMS FTP Site Organization, Installation Procedure
-@end ifinfo
 @section Unarchiving the RTEMS and GNU Components
 
 Many of the components of the RTEMS release are
@@ -124 +114 @@
 @end group
 @end example
 
-@ifinfo
 @node Installation Procedure Installing a Cross-Development GNU Toolset, Installation Procedure Installing RTEMS, Installation Procedure Unarchiving the RTEMS and GNU Components, Installation Procedure
-@end ifinfo
 @section Installing a Cross-Development GNU Toolset
 
 This sections describes how to build and install the
@@ -164 +152 @@
 NOTE: For "UNIX" processors, the native compiler binary utilities
 should be used.
 
-@ifinfo
 @node Installation Procedure Installing RTEMS, Development Environment Status, Installation Procedure Installing a Cross-Development GNU Toolset, Installation Procedure
-@end ifinfo
 @section Installing RTEMS
 
 For instructions on building and installing RTEMS, please refer to 

doc/relnotes/intro.texi

@@ -6 +6 @@
 @c  $Id: intro.texi,v 1.11 2004/09/29 20:21:37 joel Exp $
 @c
 
-@ifinfo
 @node Introduction, Introduction Supporting Tools, Top, Top
-@end ifinfo
 @chapter Introduction
-@ifinfo
 @menu
 * Introduction Supporting Tools::
 * Introduction Documentation::
 @end menu
-@end ifinfo
 
 This document describes the contents, installation
 procedure, and current status of Release @value{VERSION} of the RTEMS
@@ -54 +50 @@
 Please replace rtems_user@@your_email_goes_here.com with your
 email address.
 
-@ifinfo
 @node Introduction Supporting Tools, GNU Development Tools, Introduction, Introduction
-@end ifinfo
 @section Supporting Tools
-@ifinfo
 @menu
 * GNU Development Tools::
 * ANSI C Libraries::
 * GNU C Library::
 * Cygnus NEWLIB C Library::
 @end menu
-@end ifinfo
 
 This section discusses the freely available tools and
 libraries which are part of the RTEMS Development Environment.
@@ -90 +82 @@
 email address.  The FAQ for crossgcc is in the /pub/embedded/crossgcc
 directory on ftp.cygnus.com (205.180.83.42).
 
-@ifinfo
 @node GNU Development Tools, ANSI C Libraries, Introduction Supporting Tools, Introduction Supporting Tools
-@end ifinfo
 @subsection GNU Development Tools
 
 Numerous GNU tools are used in the RTEMS Development
@@ -121 +111 @@
 embedded developers.  Of especial interest on this site are the
 directories /pub/newlib and /pub/embedded.
 
-@ifinfo
 @node ANSI C Libraries, GNU C Library, GNU Development Tools, Introduction Supporting Tools
-@end ifinfo
 @subsection ANSI C Libraries
 
 This section discusses the following freely
@@ -139 +127 @@
 distribution.  It is the responsibility of the user to obtain
 and install a C Library separately.
 
-@ifinfo
 @node GNU C Library, Cygnus NEWLIB C Library, ANSI C Libraries, Introduction Supporting Tools
-@end ifinfo
 @subsection GNU C Library
 
 The GNU C Library is a robust and well-documented C
@@ -163 +149 @@
 The primary ftp site for this library is
 prep.ai.mit.edu (18.71.0.38).
 
-@ifinfo
 @node Cygnus NEWLIB C Library, Introduction Documentation, GNU C Library, Introduction Supporting Tools
-@end ifinfo
 @subsection Cygnus NEWLIB C Library
 
 The Cygnus NEWLIB C Library was specifically designed
@@ -177 +161 @@
 
 The primary ftp site for this library is ftp.cygnus.com (205.180.83.42).
 
-@ifinfo
 @node Introduction Documentation, Installation Procedure, Cygnus NEWLIB C Library, Introduction
-@end ifinfo
 @section Documentation
 
 The RTEMS Documentation Set is provided online at 

doc/relnotes/probrep.texi

@@ -8 +8 @@
 
 
 
-@ifinfo
 @node RTEMS PROBLEM REPORT, Command and Variable Index, RTEMS Problem Reporting, Top
-@end ifinfo
 @chapter RTEMS PROBLEM REPORT
 
 @example

doc/relnotes/relnotes.texi

@@ -76 +76 @@
 @include status.texi
 @include probrep.texi
 
-@ifinfo
 @node Top, Introduction, (dir), (dir)
 @top relnotes
 
@@ -91 +90 @@
 * Concept Index::
 @end menu
 
-@end ifinfo
 @c 
 @c 
 @c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here

doc/relnotes/status.texi

@@ -6 +6 @@
 @c  $Id: status.texi,v 1.11 2009/10/14 13:08:39 ralf Exp $
 @c
 
-@ifinfo
 @node Development Environment Status, Development Environment Status RTEMS Executive Status, Installation Procedure Installing RTEMS, Top
-@end ifinfo
 @chapter Development Environment Status
-@ifinfo
 @menu
 * Development Environment Status RTEMS Executive Status::
 * Development Environment Status Development Environment Status::
 * Development Environment Status Known Problems::
 @end menu
-@end ifinfo
 
 This chapter will describe the current status of
 release version @value{VERSION} of the RTEMS Development Environment.
 
-@ifinfo
 @node Development Environment Status RTEMS Executive Status, Development Environment Status Development Environment Status, Development Environment Status, Development Environment Status
-@end ifinfo
 @section RTEMS Executive Status
 
 Release @value{VERSION} of the RTEMS Executive contains support
@@ -112 +106 @@
 I/O only using this library.  Support for the reentrancy
 capabilities of newlib is provided in the RTEMS distribution.
 
-@ifinfo
 @node Development Environment Status Development Environment Status, Development Environment Status Known Problems, Development Environment Status RTEMS Executive Status, Development Environment Status
-@end ifinfo
 @section Development Environment Status
 
 This section details the versions of the tools used
@@ -131 +123 @@
 @end itemize
 
 
-@ifinfo
 @node Development Environment Status Known Problems, Executive Problems, Development Environment Status Development Environment Status, Development Environment Status
-@end ifinfo
 @section Known Problems
-@ifinfo
 @menu
 * Executive Problems::
 * Development Environment Problems::
 * RTEMS Problem Reporting::
 @end menu
-@end ifinfo
 
 Problems which are known to exist at the time of
 release are described in the following sections.  These are
 provided as warnings to the user and where possible, workarounds
 are provided until the problem is corrected.
 
-@ifinfo
 @node Executive Problems, Development Environment Problems, Development Environment Status Known Problems, Development Environment Status Known Problems
-@end ifinfo
 @subsection Executive Problems
 
 There are no known bugs in the executive itself.
 
-@ifinfo
 @node Development Environment Problems, RTEMS Problem Reporting, Executive Problems, Development Environment Status Known Problems
-@end ifinfo
 @subsection Development Environment Problems
 
 There are no known major problems with the
 development environment.
 
-@ifinfo
 @node RTEMS Problem Reporting, RTEMS PROBLEM REPORT, Development Environment Problems, Development Environment Status Known Problems
-@end ifinfo
 @subsection RTEMS Problem Reporting
 
 The RTEMS Project uses the GNATS Problem Reporting and Tracking System.

doc/shell/preface.texi

@@ -6 +6 @@
 @c  $Id: preface.texi,v 1.5 2011/02/28 21:58:30 joel Exp $
 @c
 
-@ifinfo
 @node Preface, Configuration and Initialization, Top, Top
-@end ifinfo
 @unnumbered Preface
 
 Real-time embedded systems vary widely based upon their 

doc/shell/shell.texi

@@ -72 +72 @@
 @include memory.texi
 @include rtems.texi
 @include network.texi
-@ifinfo
 @node Top, Preface, (dir), (dir)
 @top shell
 
@@ -91 +90 @@
 * Command Index::
 @end menu
 
-@end ifinfo
 @c 
 @c 
 @c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here

doc/started/started.texi

@@ -67 +67 @@
 @include nextstep.texi
 @include nt.texi
 
-@ifinfo
 @node Top, Introduction, (dir), (dir)
 @top started
 
@@ -86 +85 @@
 
 @c * Command and Variable Index::
 @c * Concept Index::
-@end ifinfo
 @c 
 @c 
 @c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here

doc/tools/Makefile.am

@@ -3 +3 @@
 
 EXTRA_DIST = word-replace2
 
-SUBDIRS = bmenu texi2www
+SUBDIRS = bmenu
+#texi2www

doc/tools/configure.ac

@@ -21 +21 @@
 dnl Checks for library functions.
 AC_CHECK_FUNCS(strdup strstr)
 
+# texi2www/Makefile
 AC_CONFIG_FILES([Makefile
 bmenu/Makefile
-texi2www/Makefile
 ])
 AC_OUTPUT

doc/tools/bmenu/bmenu2.c

@@ -777 +777 @@
 
       if ( menu_items == 0 ) {
         new_line = AllocateLine();
-        strcpy( new_line->Contents, "@ifinfo" );
+        strcpy( new_line->Contents, "" ); /* "@ifinfo" ); */
         _Chain_Insert( menu_insert_point->Node.previous, &new_line->Node );
 
         new_line = AllocateLine();
@@ -808 +808 @@
       _Chain_Insert( menu_insert_point->Node.previous, &new_line->Node );
 
       new_line = AllocateLine();
-      strcpy( new_line->Contents, "@end ifinfo" );
+      strcpy( new_line->Contents, "" ); /* "@end ifinfo" ); */
       _Chain_Insert( menu_insert_point->Node.previous, &new_line->Node );
     }
 

doc/user/c_user.texi

@@ -38 +38 @@
 @c @syncodeindex fn cp
 @c variable substitution info:
 @c
-@set is-C
+@set is-C 1
 @clear is-Ada
 @set LANGUAGE C
 @set STRUCTURE structure
@@ -114 +114 @@
 @include dirstat.texi
 @include example.texi
 @include glossary.texi
-@ifinfo
 @node Top, List of Figures, (dir), (dir)
 @top c_user
 
@@ -158 +157 @@
 * Concept Index::
 @end menu
 
-@end ifinfo
 @c 
 @c 
 @c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here

doc/user/dirstat.texi

@@ -6 +6 @@
 @c  $Id: dirstat.texi,v 1.14 2010/08/13 17:31:37 joel Exp $
 @c
 
-@ifinfo
 @node Directive Status Codes, Example Application, Chains Prepend a Node, Top
-@end ifinfo
 @chapter Directive Status Codes
 @table @b
 @item @code{@value{RPREFIX}SUCCESSFUL} - successful completion

doc/user/example.texi

@@ -6 +6 @@
 @c  $Id: example.texi,v 1.12 2007/04/05 15:27:18 joel Exp $
 @c
 
-@ifinfo
 @node Example Application, Glossary, Directive Status Codes, Top
-@end ifinfo
 @chapter Example Application
 
 @example

doc/user/glossary.texi

@@ -6 +6 @@
 @c  $Id: glossary.texi,v 1.7 2002/01/17 21:47:47 joel Exp $
 @c
 
-@ifinfo
 @node Glossary, Command and Variable Index, Example Application, Top
-@end ifinfo
 @chapter Glossary
 
 @table @b

doc/user/preface.texi

@@ -6 +6 @@
 @c  $Id: preface.texi,v 1.18 2009/11/09 14:36:14 joel Exp $
 @c
 
-@ifinfo
 @node Preface, Overview, List of Figures, Top
-@end ifinfo
 @unnumbered Preface
 
 In recent years, the cost required to develop a