diff -2rcN texinfo-3.1/INSTALL texinfo-3.1-amiga/INSTALL
*** texinfo-3.1/INSTALL	Wed Dec  9 01:32:49 1992
--- texinfo-3.1-amiga/INSTALL	Thu Feb 24 10:14:50 1994
***************
*** 34,39 ****
  
  By default, `make install' will install the package's files in
! /usr/local/bin, /usr/local/lib, /usr/local/man, etc.  You can specify
! an installation prefix other than /usr/local by giving `configure' the
  option `--prefix=PATH'.  Alternately, you can do so by giving a value
  for the `prefix' variable when you run `make', e.g.,
--- 34,39 ----
  
  By default, `make install' will install the package's files in
! /gnu/bin, /gnu/lib, /gnu/man, etc.  You can specify
! an installation prefix other than /gnu by giving `configure' the
  option `--prefix=PATH'.  Alternately, you can do so by giving a value
  for the `prefix' variable when you run `make', e.g.,
diff -2rcN texinfo-3.1/INTRODUCTION texinfo-3.1-amiga/INTRODUCTION
*** texinfo-3.1/INTRODUCTION	Tue May 11 22:27:18 1993
--- texinfo-3.1-amiga/INTRODUCTION	Thu Feb 24 10:14:42 1994
***************
*** 92,96 ****
  
    * Move the `texinfo.tex' file to an appropriate directory; the current
!     directory will do.  (`/usr/local/lib/tex/inputs' might be a good place.
      See ``Preparing to Use TeX'' in the Texinfo manual, for more
      information.)
--- 92,96 ----
  
    * Move the `texinfo.tex' file to an appropriate directory; the current
!     directory will do.  (`/gnu/lib/tex/inputs' might be a good place.
      See ``Preparing to Use TeX'' in the Texinfo manual, for more
      information.)
diff -2rcN texinfo-3.1/Makefile.in texinfo-3.1-amiga/Makefile.in
*** texinfo-3.1/Makefile.in	Sun May 23 10:43:09 1993
--- texinfo-3.1-amiga/Makefile.in	Thu Feb 24 10:13:04 1994
***************
*** 42,49 ****
  SHELL = /bin/sh
  
! CFLAGS = -g
! LDFLAGS = -g
  
! prefix = /usr/local
  exec_prefix = $(prefix)
  bindir = $(exec_prefix)/bin
--- 42,49 ----
  SHELL = /bin/sh
  
! CFLAGS = -O2
! LDFLAGS =
  
! prefix = /gnu
  exec_prefix = $(prefix)
  bindir = $(exec_prefix)/bin
diff -2rcN texinfo-3.1/configure texinfo-3.1-amiga/configure
*** texinfo-3.1/configure	Sun May 23 10:29:42 1993
--- texinfo-3.1-amiga/configure	Thu Feb 24 10:53:46 1994
***************
*** 98,102 ****
    # Try the directory containing this script, then `..'.
    prog=$0
!   confdir=`echo $prog|sed 's%/[^/][^/]*$%%'`
    test "X$confdir" = "X$prog" && confdir=.
    srcdir=$confdir
--- 98,102 ----
    # Try the directory containing this script, then `..'.
    prog=$0
!   confdir=`echo $prog| sed 's|/$||' | sed 's|//|/|' | sed 's|/[^/]*$||'`
    test "X$confdir" = "X$prog" && confdir=.
    srcdir=$confdir
***************
*** 253,258 ****
  
  echo checking for POSIXized ISC
! if test -d /etc/conf/kconfig.d &&
!   grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
  then
    ISC=1 # If later tests want to check for ISC.
--- 253,258 ----
  
  echo checking for POSIXized ISC
! if test -d /gnu/etc/conf/kconfig.d &&
!   grep _POSIX_VERSION /gnu/include/sys/unistd.h >/dev/null 2>&1
  then
    ISC=1 # If later tests want to check for ISC.
***************
*** 474,478 ****
  EOF
  eval $compile
! if test -s conftest && (./conftest; exit) 2>/dev/null; then
    {
  test -n "$verbose" && \
--- 474,481 ----
  EOF
  eval $compile
! # The Amiga is a non-reversed system.  Instead of the test program getting
! # a segfault, it causes enforcer hits or other nastiness, so don't run
! # the test program.
! if test -s conftest && false 2>/dev/null; then
    {
  test -n "$verbose" && \
***************
*** 503,507 ****
  rm -f conftest*
  
! decl="#ifdef __GNUC__
  #define alloca __builtin_alloca
  #else
--- 506,512 ----
  rm -f conftest*
  
! echo checking for alloca
! cat > conftest.c <<EOF
! #ifdef __GNUC__
  #define alloca __builtin_alloca
  #else
***************
*** 516,523 ****
  #endif
  #endif
- "
- echo checking for alloca
- cat > conftest.c <<EOF
- $decl
  int main() { exit(0); }
  int t() { char *p = (char *) alloca(1); }
--- 521,524 ----
***************
*** 729,733 ****
  exec_prefix\\1=\\2$exec_prefix%"
  fi
! DEFS="`echo \"$DEFS\" | sed 's%[&\\\]%\\\&%g'`"
  
  trap 'rm -f config.status; exit 1' 1 3 15
--- 730,734 ----
  exec_prefix\\1=\\2$exec_prefix%"
  fi
! DEFS="`/bin/echo $DEFS | sed 's%[&\\\]%\\\&%g'`"
  
  trap 'rm -f config.status; exit 1' 1 3 15
diff -2rcN texinfo-3.1/info/Makefile.in texinfo-3.1-amiga/info/Makefile.in
*** texinfo-3.1/info/Makefile.in	Sun May 23 03:05:14 1993
--- texinfo-3.1-amiga/info/Makefile.in	Thu Feb 24 10:20:21 1994
***************
*** 46,53 ****
  SHELL = /bin/sh
  
! CFLAGS = -g
! LDFLAGS = -g
  
! prefix = /usr/local
  exec_prefix = $(prefix)
  bindir = $(exec_prefix)/bin
--- 46,53 ----
  SHELL = /bin/sh
  
! CFLAGS = -O2
! LDFLAGS =
  
! prefix = /gnu
  exec_prefix = $(prefix)
  bindir = $(exec_prefix)/bin
diff -2rcN texinfo-3.1/info/filesys.h texinfo-3.1-amiga/info/filesys.h
*** texinfo-3.1/info/filesys.h	Tue May 11 20:18:38 1993
--- texinfo-3.1-amiga/info/filesys.h	Thu Feb 24 10:20:05 1994
***************
*** 71,75 ****
  /* The default value of INFOPATH. */
  #if !defined (DEFAULT_INFOPATH)
! #  define DEFAULT_INFOPATH "/usr/gnu/info:/local/gnu/info:/usr/gnu/lib/info:/usr/gnu/lib/emacs/info:/usr/local/gnu/info:/usr/local/gnu/lib/info:/usr/local/gnu/lib/emacs/info:/usr/local/lib/info:/usr/local/lib/emacs/info:/usr/local/emacs/info:."
  #endif /* !DEFAULT_INFOPATH */
  
--- 71,75 ----
  /* The default value of INFOPATH. */
  #if !defined (DEFAULT_INFOPATH)
! #  define DEFAULT_INFOPATH "/gnu/info:/local/info:/gnu/lib/emacs/info:/local/lib/emacs/info:."
  #endif /* !DEFAULT_INFOPATH */
  
diff -2rcN texinfo-3.1/info/nodemenu.c texinfo-3.1-amiga/info/nodemenu.c
*** texinfo-3.1/info/nodemenu.c	Mon Feb  1 18:47:48 1993
--- texinfo-3.1-amiga/info/nodemenu.c	Thu Feb 24 10:17:54 1994
***************
*** 40,46 ****
    (File)Node                        Lines   Size   Containing File
    ----------                        -----   ----   ---------------
! * (emacs)Buffers::                  48      2230   /usr/gnu/info/emacs/emacs-1
! * (autoconf)Writing configure.in::  123     58789  /usr/gnu/info/autoconf/autoconf-1
! * (dir)Top::			    40      589    /usr/gnu/info/dir
  */
  static char *
--- 40,46 ----
    (File)Node                        Lines   Size   Containing File
    ----------                        -----   ----   ---------------
! * (emacs)Buffers::                  48      2230   /gnu/info/emacs/emacs-1
! * (autoconf)Writing configure.in::  123     58789  /gnu/info/autoconf/autoconf-1
! * (dir)Top::			    40      589    /gnu/info/dir
  */
  static char *
diff -2rcN texinfo-3.1/info/nodes.h texinfo-3.1-amiga/info/nodes.h
*** texinfo-3.1/info/nodes.h	Mon Feb  8 22:48:16 1993
--- texinfo-3.1-amiga/info/nodes.h	Thu Feb 24 10:21:24 1994
***************
*** 39,43 ****
     node's file is a subfile.  In that case, NODE->parent is the logical
     name of the file containing this node.  Both names are given as full
!    paths, so you might have: node->filename = "/usr/gnu/info/emacs-1",
     with node->parent = "/usr/gnu/info/emacs". */
  typedef struct {
--- 39,43 ----
     node's file is a subfile.  In that case, NODE->parent is the logical
     name of the file containing this node.  Both names are given as full
!    paths, so you might have: node->filename = "/gnu/info/emacs-1",
     with node->parent = "/usr/gnu/info/emacs". */
  typedef struct {
diff -2rcN texinfo-3.1/info/tilde.c texinfo-3.1-amiga/info/tilde.c
*** texinfo-3.1/info/tilde.c	Mon Feb  1 18:40:20 1993
--- texinfo-3.1-amiga/info/tilde.c	Thu Feb 24 11:17:55 1994
***************
*** 226,230 ****
  	  if (!temp_home)
  	    {
! 	      extern struct passwd *getpwuid ();
  	      struct passwd *entry;
  
--- 226,230 ----
  	  if (!temp_home)
  	    {
! 	      /* extern struct passwd *getpwuid (); */
  	      struct passwd *entry;
  
diff -2rcN texinfo-3.1/libtxi/Makefile.in texinfo-3.1-amiga/libtxi/Makefile.in
*** texinfo-3.1/libtxi/Makefile.in	Fri May 21 18:31:58 1993
--- texinfo-3.1-amiga/libtxi/Makefile.in	Thu Feb 24 10:17:16 1994
***************
*** 43,50 ****
  SHELL = /bin/sh
  
! CFLAGS = -g
! LDFLAGS = -g
  
! prefix = /usr/local
  exec_prefix = $(prefix)
  bindir = $(exec_prefix)/bin
--- 43,50 ----
  SHELL = /bin/sh
  
! CFLAGS = -O2
! LDFLAGS =
  
! prefix = /gnu
  exec_prefix = $(prefix)
  bindir = $(exec_prefix)/bin
diff -2rcN texinfo-3.1/makeinfo/Makefile.in texinfo-3.1-amiga/makeinfo/Makefile.in
*** texinfo-3.1/makeinfo/Makefile.in	Fri May 21 18:30:18 1993
--- texinfo-3.1-amiga/makeinfo/Makefile.in	Thu Feb 24 10:20:34 1994
***************
*** 40,47 ****
  SHELL = /bin/sh
  
! CFLAGS = -g
! LDFLAGS = -g
  
! prefix = /usr/local
  exec_prefix = $(prefix)
  bindir = $(exec_prefix)/bin
--- 40,47 ----
  SHELL = /bin/sh
  
! CFLAGS = -O2
! LDFLAGS =
  
! prefix = /gnu
  exec_prefix = $(prefix)
  bindir = $(exec_prefix)/bin
diff -2rcN texinfo-3.1/makeinfo/makeinfo.c texinfo-3.1-amiga/makeinfo/makeinfo.c
*** texinfo-3.1/makeinfo/makeinfo.c	Sat May 22 23:29:46 1993
--- texinfo-3.1-amiga/makeinfo/makeinfo.c	Sat Jul 23 14:29:47 1994
***************
*** 73,77 ****
--- 73,79 ----
  #include <sys/stat.h>
  #include <ctype.h>
+ #if !defined (amigados)
  #include <pwd.h>
+ #endif /* amigados */
  #include <errno.h>
  #if defined (HAVE_VARARGS_H)
***************
*** 445,448 ****
--- 447,457 ----
  int verbose_mode = 0;
  
+ /* Non-zero means converting to AmigaGuide hypertext format. */
+ int amiga_guide = 0;
+ 
+ /* Non-zero means we are writing an AmigaGuide button. */
+ 
+ int in_amiga_guide_button = 0;
+ 
  /* The list of commands that we hack in texinfo.  Each one
     has an associated function.  When the command is encountered in the
***************
*** 768,771 ****
--- 777,781 ----
    { "verbose", 0, &verbose_mode, 1 },		/* formerly -verbose */
    { "version", 0, 0, 'V' },
+   { "amiga", 0, &amiga_guide, 1},               /* convert to AmigaGuideŽ */
    {NULL, 0, NULL, 0}
  };
***************
*** 876,879 ****
--- 886,893 ----
      print_version_info ();
  
+   /* if --amiga option is specified, do not split large files */
+   if (amiga_guide)
+      splitting=0;
+ 
    /* Remaining arguments are file names of texinfo files.
       Convert them, one by one. */
***************
*** 979,983 ****
                        either be `separate' to place footnotes in their own\n\
                        node, or `end', to place the footnotes at the end of\n\
!                       the node in which they are defined (the default).\n\n",
  	   progname, paragraph_start_indent,
  	   fill_column, max_error_level, reference_warning_limit);
--- 993,998 ----
                        either be `separate' to place footnotes in their own\n\
                        node, or `end', to place the footnotes at the end of\n\
!                       the node in which they are defined (the default).\n\
! `--amiga'             to convert to AmigaGuideŽ hypertext format \n\n",
  	   progname, paragraph_start_indent,
  	   fill_column, max_error_level, reference_warning_limit);
***************
*** 999,1003 ****
     function to something, or you will lose the chain. */
  GENERIC_LIST *
! reverse_list (list)
       register GENERIC_LIST *list;
  {
--- 1014,1018 ----
     function to something, or you will lose the chain. */
  GENERIC_LIST *
! reverse_list (list) 
       register GENERIC_LIST *list;
  {
***************
*** 1176,1182 ****
       char *filename;
  {
!   char *basename;
  
!   basename = strrchr (filename, '/');
    if (!basename)
      basename = filename;
--- 1191,1198 ----
       char *filename;
  {
!   char *basename=strrchr (filename, '/'),
!        *basename2=strrchr (filename, ':');
  
!   basename = (int)basename > (int)basename2 ? basename : basename2;
    if (!basename)
      basename = filename;
***************
*** 1212,1219 ****
--- 1228,1243 ----
    i = strlen (filename) - 1;
  
+ #if !defined (amigados)
    while (i && filename[i] != '/')
      i--;
    if (filename[i] == '/')
      i++;
+ #else /* amigados */
+   while (i && (filename[i] != '/') && (filename[i] != ':'))
+     i--;
+   if ((filename[i] == '/') || (filename[i] == ':'))
+    i++;
+ 
+ #endif /* amigados */
  
    if (i)
***************
*** 1233,1236 ****
--- 1257,1262 ----
  {
    char *full_pathname ();
+ 
+ #if !defined(amigados)
    filename = full_pathname (filename);
  
***************
*** 1258,1261 ****
--- 1284,1314 ----
      }
    return (filename);
+ #else /* amigados */
+ 
+   int i = 0;
+   char *result;
+ 
+   filename = full_pathname (filename);
+ 
+   while(filename[i] && filename[i] != ':')
+     i++;
+ 
+   if (!*input_name || filename[i] == ':') return(filename);
+ 
+   i = strlen (input_name) - 1;
+ 
+   result = (char *)xmalloc (1 + strlen (input_name) + strlen (filename));
+   strcpy (result, input_name);
+ 
+   while (i && result[i] != '/' && result[i] != ':')
+     i--;
+   if (result[i] == '/' || result[i] == ':')
+     i++;
+ 
+   strcpy (&result[i], filename);
+   free (filename);
+   return (result);
+ 
+ #endif /* amigados */
  }
  
***************
*** 1265,1268 ****
--- 1318,1322 ----
       char *filename;
  {
+ #if !defined(amigados)
    int initial_character;
  
***************
*** 1328,1331 ****
--- 1382,1388 ----
        return (savestring (filename));
      }
+ #else /* amigados */
+     return (savestring (filename));
+ #endif /* amigados */
  }
  
***************
*** 1785,1789 ****
  
    canon_white (output_filename);
!   printf ("Making info file `%s' from `%s'.\n", output_filename, name);
  
    if (verbose_mode)
--- 1842,1854 ----
  
    canon_white (output_filename);
! 
!   if (amiga_guide) {
!     if (no_headers)
!       printf ("Making ASCII file `%s' from `%s'.\n", output_filename, name);
!     else
!       printf ("Making AmigaGuideŽ file `%s' from `%s'.\n", output_filename, name);
!   }
!   else
!     printf ("Making info file `%s' from `%s'.\n", output_filename, name);
  
    if (verbose_mode)
***************
*** 1828,1834 ****
    if (!no_headers)
      {
!       add_word_args ("This is Info file %s, produced by Makeinfo-%d.%d from ",
! 		     output_filename, major_version, minor_version);
!       add_word_args ("the input file %s.\n", input_filename);
      }
  
--- 1893,1921 ----
    if (!no_headers)
      {
!       if (amiga_guide)
!         {
!           int old_paragraph_indentation = inhibit_paragraph_indentation;
!           int old_filling_enabled = filling_enabled;
! 
!           inhibit_paragraph_indentation=1;
!           filling_enabled = 0;
! 
!           add_word_args ("@database %s\n",output_filename);
!           add_word_args ("\n@Master %s\n", input_filename);
!           add_word_args ("\n@Width %d\n",fill_column);
! 
!           add_word_args ("\n\nThis is the AmigaGuideŽ file %s, produced by Makeinfo-%d.%d from ",
!                      output_filename, major_version, minor_version);
!           add_word_args ("\nthe input file %s.\n\n", input_filename);
! 
!           inhibit_paragraph_indentation = old_paragraph_indentation;
!           filling_enabled = old_filling_enabled;
!         }
!       else
!         {
!           add_word_args ("This is Info file %s, produced by Makeinfo-%d.%d from ",
!                       output_filename, major_version, minor_version);
!           add_word_args ("the input file %s.\n", input_filename);
!         }
      }
  
***************
*** 1846,1854 ****
  	{
  	  tag_table = (TAG_ENTRY *) reverse_list (tag_table);
! 	  if (!no_headers)
  	    write_tag_table ();
  	}
  
!       if (output_stream != stdout)
  	fclose (output_stream);
  
--- 1933,1947 ----
  	{
  	  tag_table = (TAG_ENTRY *) reverse_list (tag_table);
! 	  if (!no_headers && !amiga_guide)
  	    write_tag_table ();
  	}
  
!       if (amiga_guide && !no_headers)
!         {
!           inhibit_paragraph_indentation = 1;
!           add_word("\n\n@EndNode\n\n");
!         }
! 
!      if (output_stream != stdout)
  	fclose (output_stream);
  
***************
*** 1977,1980 ****
--- 2070,2074 ----
  	    {
  	      char *glean_node_from_menu (), *tem;
+               int amiga_guide_convert_menu ();
  
  	      /* Note that the value of TEM is discarded, since it is
***************
*** 1982,1985 ****
--- 2076,2085 ----
  		 called with a non-zero argument. */
  	      tem = glean_node_from_menu (1);
+ 
+               if (amiga_guide && !no_headers)
+                 {
+                   if (amiga_guide_convert_menu())
+                     continue;
+                 }
  	    }
  	}
***************
*** 2246,2249 ****
--- 2346,2352 ----
  int line_already_broken = 0;
  
+ /* AmigaGuide --- Set to the number of hidden chars in the last @Node */
+ int amiga_guide_hidden_chars = 0;
+ 
  /* When non-zero we have finished an insertion (see end_insertion ()) and we
     want to ignore false continued paragraph closings. */
***************
*** 2266,2270 ****
        must_start_paragraph = 0;
        line_already_broken = 0;	/* The line is no longer broken. */
!       if (current_indent > output_column)
  	{
  	  indent (current_indent - output_column);
--- 2369,2373 ----
        must_start_paragraph = 0;
        line_already_broken = 0;	/* The line is no longer broken. */
!       if ((current_indent > output_column) && (!amiga_guide || !in_amiga_guide_button))
  	{
  	  indent (current_indent - output_column);
***************
*** 2294,2298 ****
  	  output_column = 0;
  
! 	  if (!no_indent && paragraph_is_open)
  	    indent (output_column = current_indent);
  	  break;
--- 2397,2401 ----
  	  output_column = 0;
  
! 	  if ((!no_indent && paragraph_is_open) && (!amiga_guide || !in_amiga_guide_button))
  	    indent (output_column = current_indent);
  	  break;
***************
*** 2342,2346 ****
  	       then discard all of the pending whitespace.  Otherwise, we
  	       let the whitespace stay. */
! 	    if (!paragraph_start_indent)
  	      indent (pending_indent);
  	    pending_indent = 0;
--- 2445,2449 ----
  	       then discard all of the pending whitespace.  Otherwise, we
  	       let the whitespace stay. */
! 	    if (!paragraph_start_indent && (!amiga_guide || !in_amiga_guide_button))
  	      indent (pending_indent);
  	    pending_indent = 0;
***************
*** 2435,2438 ****
--- 2538,2543 ----
  			  }
  			output_column = 0;
+                         if (amiga_guide && !strncmp("@{\"", &output_paragraph[temp+current_indent], 3))
+                           output_column = -amiga_guide_hidden_chars;
  			while (temp < output_paragraph_offset)
  			  output_column +=
***************
*** 2711,2715 ****
  
        /* If doing indentation, then insert the appropriate amount. */
!       if (!no_indent)
  	{
  	  if (inhibit_paragraph_indentation)
--- 2816,2820 ----
  
        /* If doing indentation, then insert the appropriate amount. */
!       if (!no_indent && (!amiga_guide || !in_amiga_guide_button))
  	{
  	  if (inhibit_paragraph_indentation)
***************
*** 3068,3072 ****
        inhibit_paragraph_indentation = 1;
  
!       if (!no_headers)
  	add_word ("* Menu:\n");
  
--- 3173,3177 ----
        inhibit_paragraph_indentation = 1;
  
!       if (!no_headers && !amiga_guide)
  	add_word ("* Menu:\n");
  
***************
*** 3983,3986 ****
--- 4088,4100 ----
  	  l--;
  	}
+       else if (amiga_guide)
+         {
+           if (string[i] == '/')
+             string[i] = '-';
+           else
+           if (string[i] == '\"')
+             string[i] = '`';
+ 
+         }
      }
    if (stricmp (string, "Top") == 0)
***************
*** 4054,4057 ****
--- 4168,4172 ----
    char *node, *prev, *next, *up;
    int new_node_pos, defaulting, this_section, no_warn = 0;
+   static amiga_guide_first_node = 1;
    extern int already_outputting_pending_notes;
  
***************
*** 4084,4089 ****
    no_indent = 1;
    if (!no_headers)
!     add_word_args ("\037\nFile: %s,  Node: %s", pretty_output_filename, node);
! 
    /* Check for defaulting of this node's next, prev, and up fields. */
    defaulting = ((strlen (next) == 0) &&
--- 4199,4221 ----
    no_indent = 1;
    if (!no_headers)
!     {
!       if (amiga_guide)
!         /* if amiga_guide_first_node is set to 1, then we are
!            considering the first node of the database. */
!         {
!           if (amiga_guide_first_node)
!             {
!               add_word_args ("\n@Node Main \"%s\"", output_filename);
!               amiga_guide_first_node = 0;
!             }
!           else
!             {
!               add_word_args("\n@EndNode\n\n");
!               add_word_args ("@Node \"%s\" \"%s/%s\"",node,pretty_output_filename,node);
!             }
!         }
!       else
!         add_word_args ("\037\nFile: %s,  Node: %s", pretty_output_filename, node);
!     }
    /* Check for defaulting of this node's next, prev, and up fields. */
    defaulting = ((strlen (next) == 0) &&
***************
*** 4150,4155 ****
  			free (next);
  			next = nodename_from_menu;
! 			prev = savestring ("(DIR)");
! 			up = savestring ("(DIR)");
  		      }
  		  }
--- 4282,4290 ----
  			free (next);
  			next = nodename_from_menu;
! 			if (!amiga_guide)
!                           {
! 			    prev = savestring ("(DIR)");
! 			    up = savestring ("(DIR)");
!                           }
  		      }
  		  }
***************
*** 4206,4217 ****
    if (!no_headers)
      {
!       if (*next)
! 	add_word_args (",  Next: %s", next);
! 
!       if (*prev)
! 	add_word_args (",  Prev: %s", prev);
! 
!       if (*up)
! 	add_word_args (",  Up: %s", up);
      }
  
--- 4341,4386 ----
    if (!no_headers)
      {
!       if (amiga_guide)
!         {
!           if (*next)
!              {
!                 if (stricmp (next, "Top") == 0)
!                    add_word_args ("\n@Next \"Main\"");
!                 else
!                    add_word_args ("\n@Next \"%s\"", next);
!              }
! 
!           if (*prev)
!             {
!               if (stricmp (prev, "(DIR)") != 0)
!                 {
!                 if (stricmp (prev, "Top") == 0)
!                    add_word_args ("\n@Prev \"Main\"");
!                  else
!                     add_word_args ("\n@Prev \"%s\"", prev);
!                 }
!              }
!           if (*up)
!              {
!                if (stricmp (up, "(DIR)") != 0)
!                 {
!                 if (stricmp (up, "Top") == 0)
!                    add_word_args ("\n@Toc \"Main\"");
!                 else
!                    add_word_args ("\n@Toc \"%s\"", up);
!                 }
!              }
!         }
!       else
!         {
!           if (*next)
! 	    add_word_args (",  Next: %s", next);
! 
! 	  if (*prev)
! 	    add_word_args (",  Prev: %s", prev);
! 
! 	  if (*up)
! 	    add_word_args (",  Up: %s", up);
!         }
      }
  
***************
*** 4871,4874 ****
--- 5040,5134 ----
  }
  
+ int
+ amiga_guide_convert_menu ()
+ {
+   int i;
+   char *gadgetname;
+ 
+   if (strncmp (&input_text[input_text_offset + 1],
+                menu_starter,
+                strlen (menu_starter)) != 0)
+     return(0);
+   else
+     input_text_offset += strlen (menu_starter) + 1;
+ 
+   get_until_in_line (":", &gadgetname);
+ 
+   input_text_offset++;
+ 
+   if (curchar () == ':')
+     {
+       input_text_offset++;
+       canon_white (gadgetname);
+       normalize_node_name (gadgetname);
+       in_amiga_guide_button = 1;
+       output_column -= (strlen("@{\"\" Link \"\"}") +
+                         strlen(gadgetname));
+       execute_string ("\n@w{ @@@{\" %s \" Link \"%s\"@} }", gadgetname, gadgetname);
+       in_amiga_guide_button = 0;
+     }
+   else
+     {
+       char *set_p(char *);
+ 
+       char *nodename;
+       int nodestart;
+ 
+       nodestart = input_text_offset;
+       get_until_in_line (".", &nodename);
+ 
+   /* Special hack: If the nodename follows the menu item name,
+      then we have to read the rest of the line in order to find
+      out what the nodename is.  But we still have to read the
+      line later, in order to process any formatting commands that
+      might be present.  So un-count the carriage return that has just
+      been counted.
+       line_number--; */
+ 
+       canon_white (nodename);
+       normalize_node_name (nodename);
+ 
+       if (*nodename == '(')
+         {
+           for(i=1; i<strlen(nodename); i++)
+             if (nodename[i] == ')') break;
+ 
+           if (i == strlen(nodename)) return(0);
+ 
+           nodename[i] = 0;
+ 
+           in_amiga_guide_button = 1;
+           output_column -= (strlen("@{\"\" Link \"/\"}") +
+                             strlen(nodename+1)+strlen(nodename+i+1));
+           execute_string ("\n@w{ @@@{\" %s \" Link \"%s/%s\"@} }", gadgetname, nodename+1, nodename+i+1);
+           in_amiga_guide_button = 0;
+ 
+         }
+       else
+         {
+           in_amiga_guide_button = 1;
+           output_column -= (strlen("@{\"\" Link \"\"}") +
+                             strlen(nodename));
+           execute_string ("\n@w{ @@@{\" %s \" Link \"%s\"@} }", gadgetname, nodename);
+           in_amiga_guide_button = 0;
+         }
+ 
+       if (set_p("AmigaGuide-expand-menus"))
+         {
+           input_text_offset = nodestart;
+         }
+       else
+         {
+           for(i=0; i<input_text_offset-nodestart; i++) insert(' ');
+           input_text_offset++;
+         }
+ 
+       free(nodename);
+     }
+ 
+   free(gadgetname);
+   return(1);
+ }
+ 
  cm_menu ()
  {
***************
*** 4896,4899 ****
--- 5156,5160 ----
  
  int px_ref_flag = 0;		/* Controls initial output string. */
+ int ref_flag = 0;               /* Controls initial output string, too. */
  
  /* Make a cross reference. */
***************
*** 4910,4913 ****
--- 5171,5182 ----
        arg5 = get_xref_token ();
  
+       if (amiga_guide) normalize_node_name(arg1);
+ 
+       if (amiga_guide)
+         {
+           if (!ref_flag)
+             add_word_args("%s", px_ref_flag ? "see " : "See ");
+         }
+       else
        add_word_args ("%s", px_ref_flag ? "*note " : "*Note ");
  
***************
*** 4926,4930 ****
  	    node_name = arg2;
  
! 	  execute_string ("%s: (%s)%s", node_name, arg4, arg1);
  	  return;
  	}
--- 5195,5217 ----
  	    node_name = arg2;
  
!           if (amiga_guide)
!             {
!               if (no_headers)
!                 {
!                   execute_string ("%s/%s", arg4, node_name);
!                 }
!               else
!                 {
!                   in_amiga_guide_button = 1;
!                   output_column -= (amiga_guide_hidden_chars = strlen("@{\"\" Link \"/\"}") +
!                                     strlen(arg4)+strlen(arg1));
!                   canon_white(node_name);
!                   execute_string ("@w{@@@{\"%s\" Link \"%s/%s\"@}}", node_name, arg4, arg1);
!                   in_amiga_guide_button = 0;
! 
!                 }
!             }
!           else
! 	    execute_string ("%s: (%s)%s", node_name, arg4, arg1);
  	  return;
  	}
***************
*** 4934,4948 ****
        if (*arg3)
  	{
! 	  if (!*arg2)
! 	    execute_string ("%s: %s", arg3, arg1);
! 	  else
! 	    execute_string ("%s: %s", arg2, arg1);
  	  return;
  	}
  
!       if (*arg2)
! 	execute_string ("%s: %s", arg2, arg1);
!       else
! 	execute_string ("%s::", arg1);
      }
    else
--- 5221,5295 ----
        if (*arg3)
  	{
!           if (amiga_guide)
!             {
!               if (no_headers)
!                 {
!                   execute_string (arg1);
!                 }
!               else
!                 {
!                   in_amiga_guide_button = 1;
! 
!                   if (!*arg2)
!                     {
!                       output_column -= (amiga_guide_hidden_chars = strlen("@{\"\" Link \"\"}") +
!                                         +strlen(arg1));
!                       canon_white(arg3);
!                       execute_string ("@w{@@@{\"%s\" Link \"%s\"@}}", arg3, arg1);
!                     }
!                   else
!                     {
!                       output_column -= (amiga_guide_hidden_chars = strlen("@{\"\" Link \"\"}") +
!                                         +strlen(arg1));
!                       canon_white(arg2);
!                       execute_string ("@w{@@@{\"%s\" Link \"%s\"@}}", arg2, arg1);
!                     }
!                   in_amiga_guide_button = 0;
!                 }
!             }
!           else
!             {
! 	      if (!*arg2)
! 	        execute_string ("%s: %s", arg3, arg1);
! 	      else
! 	        execute_string ("%s: %s", arg2, arg1);
!             }
  	  return;
  	}
  
!     if (amiga_guide)
!       {
!         if (no_headers)
!           {
!             execute_string (arg1);
!           }
!         else
!           {
!             in_amiga_guide_button = 1;
! 
!             if (*arg2)
!               {
!                 output_column -= (amiga_guide_hidden_chars = strlen("@{\"\" Link \"\"}") +
!                                   +strlen(arg1));
!                 canon_white(arg2);
!                 execute_string ("@w{@@@{\"%s\" Link \"%s\"@}}", arg2, arg1);
!               }
!             else
!               {
!                 output_column -= (amiga_guide_hidden_chars = strlen("@{\"\" Link \"\"}") +
!                                   +strlen(arg1));
!                 canon_white(arg1);
!                 execute_string ("@w{@@@{\"%s\" Link \"%s\"@}}", arg1, arg1);
!               }
!               in_amiga_guide_button = 0;
!           }
!       }
!     else
!       {
!         if (*arg2)
! 	  execute_string ("%s: %s", arg2, arg1);
!         else
! 	  execute_string ("%s::", arg1);
!       }
      }
    else
***************
*** 4988,4992 ****
      }
    else
!     add_char ('.');
  }
  
--- 5335,5353 ----
      }
    else
!     if (!amiga_guide)
!       {
!         add_char ('.');
!       }
! }
! 
! cm_ref (arg)
!      int arg;
! {
!   if (arg == START)
!     {
!       ref_flag++;
!       cm_xref (arg);
!       ref_flag--;
!     }
  }
  
***************
*** 5002,5006 ****
        file = get_xref_token ();
  
!       execute_string ("*note %s: (%s)%s", pname, file, node);
      }
  }
--- 5363,5386 ----
        file = get_xref_token ();
  
!       if (amiga_guide)
!         {
!           add_word("See ");
! 
!           if (no_headers)
!             {
!               execute_string ("%s/%s", file, node);
!             }
!           else
!             {
!               in_amiga_guide_button = 1;
!               output_column -= (amiga_guide_hidden_chars = strlen("@{\"\" Link \"/\"}") +
!                                 strlen(file)+strlen(node));
!               canon_white(pname);
!               execute_string ("@w{@@@{\"%s\" Link \"%s/%s\"@}}", pname, file, node);
!               in_amiga_guide_button = 0;
!             }
!         }
!       else
!         execute_string ("*note %s: (%s)%s", pname, file, node);
      }
  }
***************
*** 6417,6421 ****
  cm_ignore_sentence_ender ()
  {
!   add_char (META ((*command)));
  }
  
--- 6797,6802 ----
  cm_ignore_sentence_ender ()
  {
!   if (amiga_guide) add_char (META ((*command - 32)));
!   else add_char (META ((*command)));
  }
  
***************
*** 6886,6890 ****
    inhibit_paragraph_indentation = 1;
    close_paragraph ();
!   add_word ("* Menu:\n\n");
  
    printing_index = 1;
--- 7267,7279 ----
    inhibit_paragraph_indentation = 1;
    close_paragraph ();
! 
!   if (amiga_guide)
!     {
!       add_word ("\x80");
!       output_paragraph_offset--;
!       add_word ("\n\n");
!     }
!    else
!      add_word ("* Menu:\n\n");
  
    printing_index = 1;
***************
*** 6897,6913 ****
        line_number = index->defining_line;
  
!       /* If this particular entry should be printed as a "code" index,
! 	 then wrap the entry with "@code{...}". */
!       if (index->code)
! 	execute_string ("* @code{%s}: ", index->entry);
!       else
! 	execute_string ("* %s: ", index->entry);
  
!       /* Pad the front of the destination nodename so that
! 	 the output looks nice. */
!       if (fill_column > 40 && output_column < 40)
! 	indent (40 - output_column);
  
!       execute_string ("%s.\n", index->node);
  
        line_number = real_line_number;
--- 7286,7346 ----
        line_number = index->defining_line;
  
!       if (amiga_guide)
!         {
!           /* If this particular entry should be printed as a "code" index,
!              then wrap the entry with "@code{...}". */
! 
!           if (no_headers)
!             {
!               if (index->code)
!                 {
!                   execute_string (" `%s'", index->entry);
!                 }
!               else
!                 {
!                   execute_string (" %s", index->entry);
!                 }
!             }
!           else
!             {
!               in_amiga_guide_button = 1;
!               if (index->code)
!                 {
!                   output_column -= (amiga_guide_hidden_chars = strlen("@{\"\" Link \"\"}") +
!                                     strlen(index->node));
!                   execute_string ("@w{ @@@{\" @code{%s} \" Link \"%s\"@} }", index->entry, index->node);
!                 }
!               else
!                 {
!                   output_column -= (amiga_guide_hidden_chars = strlen("@{\"\" Link \"\"}") +
!                                     strlen(index->node));
!                   execute_string ("@w{ @@@{\" %s \" Link \"%s\"@} }", index->entry, index->node);
!                 }
!               in_amiga_guide_button = 0;
!             }
! 
!           /* Pad the front of the destination nodename so that
!              the output looks nice. */
!           if (fill_column > 40 && output_column < 40)
!             indent (40 - output_column);
  
!           execute_string ("%s\n", index->node);
!         }
!       else
!         {
!           /* If this particular entry should be printed as a "code" index,
! 	     then wrap the entry with "@code{...}". */
!           if (index->code)
! 	    execute_string ("* @code{%s}: ", index->entry);
!           else
! 	    execute_string ("* %s: ", index->entry);
! 
!           /* Pad the front of the destination nodename so that
! 	     the output looks nice. */
!           if (fill_column > 40 && output_column < 40)
! 	    indent (40 - output_column);
  
!           execute_string ("%s.\n", index->node);
!         }
  
        line_number = real_line_number;
***************
*** 7170,7176 ****
  	    xmalloc ((strlen (current_node)) + (strlen ("-Footnotes")) + 1);
  
! 	  add_word_args (" (*note %s-Footnotes::)", current_node);
  	  strcpy (temp_string, current_node);
  	  strcat (temp_string, "-Footnotes");
  	  remember_node_reference (temp_string, line_number, followed_reference);
  	  free (temp_string);
--- 7603,7629 ----
  	    xmalloc ((strlen (current_node)) + (strlen ("-Footnotes")) + 1);
  
!           if (amiga_guide)
!             {
!               if (no_headers)
!                 {
!                   execute_string ("%s-Footnotes", current_node);
!                 }
!               else
!                 {
!                   in_amiga_guide_button = 1;
! 
!                   output_column -= (amiga_guide_hidden_chars = strlen("@{\"\" Link \"-Footnotes\"}")
!                                     +strlen(current_node));
!                   execute_string ("@w{@@@{\"%s-Footnotes\" Link \"%s-Footnotes\"@}}", current_node, current_node);
!                   in_amiga_guide_button = 0;
!                 }
!             }
!           else
!             {
!               add_word_args (" (*note %s-Footnotes::)", current_node);
!             }
  	  strcpy (temp_string, current_node);
  	  strcat (temp_string, "-Footnotes");
+           if (amiga_guide) normalize_node_name(temp_string);
  	  remember_node_reference (temp_string, line_number, followed_reference);
  	  free (temp_string);
***************
*** 7513,7516 ****
--- 7966,7970 ----
      path = ".";
  
+ #if !defined(amigados)
    /* Handle absolute pathnames. "./foo", "/foo", "../foo". */
    if (*filename == '/' ||
***************
*** 7524,7527 ****
--- 7978,7982 ----
  	return ((char *)NULL);
      }
+ #endif
  
    while (dir = extract_colon_unit (path, &index))
***************
*** 7536,7540 ****
--- 7991,8001 ----
  
        fullpath = (char *)xmalloc (2 + strlen (dir) + strlen (filename));
+ 
+ #if !defined(amigados)
        sprintf (fullpath, "%s/%s", dir, filename);
+ #else /* amigados */
+       if (strcmp (dir, ".")) sprintf (fullpath, "%s/%s", dir, filename);
+       else sprintf (fullpath, "%s", filename);
+ #endif /* amigados */
        free (dir);
  
diff -2rcN texinfo-3.1/texi.texi texinfo-3.1-amiga/texi.texi
*** texinfo-3.1/texi.texi	Fri May 21 20:56:56 1993
--- texinfo-3.1-amiga/texi.texi	Thu Feb 24 10:16:17 1994
***************
*** 822,830 ****
  
  @c !!! dir file may be located in one of many places:
! @c     /usr/local/emacs/info            mentioned in info.c DEFAULT_INFOPATH
! @c     /usr/local/lib/emacs/info        mentioned in info.c DEFAULT_INFOPATH
! @c     /usr/gnu/info                    mentioned in info.c DEFAULT_INFOPATH
! @c     /usr/local/info
! @c     /usr/local/lib/info 
  The @file{dir} file in the @file{info} directory serves as the
  departure point for the whole Info system.  From it, you can reach the
--- 822,827 ----
  
  @c !!! dir file may be located in one of many places:
! @c     /gnu/lib/emacs/info        mentioned in info.c DEFAULT_INFOPATH
! @c     /gnu/lib/info              mentioned in info.c DEFAULT_INFOPATH
  The @file{dir} file in the @file{info} directory serves as the
  departure point for the whole Info system.  From it, you can reach the
***************
*** 6409,6413 ****
  @example
  The @@file@{.el@} files are in 
! the @@file@{/usr/local/emacs/lisp@} directory.
  @end example
  
--- 6406,6410 ----
  @example
  The @@file@{.el@} files are in 
! the @@file@{/gnu/emacs/lisp@} directory.
  @end example
  
***************
*** 6417,6421 ****
  @quotation
  The @file{.el} files are in 
! the @file{/usr/local/emacs/lisp} directory.
  @end quotation
  
--- 6414,6418 ----
  @quotation
  The @file{.el} files are in 
! the @file{/gnu/emacs/lisp} directory.
  @end quotation
  
***************
*** 7228,7232 ****
  @@cartouche
  % pwd
! /usr/local/lib/emacs/info
  @@end cartouche
  @@end example
--- 7225,7229 ----
  @@cartouche
  % pwd
! /gnu/lib/emacs/info
  @@end cartouche
  @@end example
***************
*** 7245,7249 ****
  @cartouche
  % pwd
! /usr/local/lib/emacs/info
  @end cartouche
  @end group
--- 7242,7246 ----
  @cartouche
  % pwd
! /gnu/lib/emacs/info
  @end cartouche
  @end group
***************
*** 12133,12137 ****
  
  @smallexample
! setenv INFOPATH .:~bob/manuals:/usr/local/emacs/info
  @end smallexample
  
--- 12130,12134 ----
  
  @smallexample
! setenv INFOPATH .:~bob/manuals:/gnu/emacs/info
  @end smallexample
  
***************
*** 12141,12145 ****
  
  @smallexample
! INFOPATH=.:~bob/manuals:/usr/local/emacs/info
  export INFOPATH
  @end smallexample
--- 12138,12142 ----
  
  @smallexample
! INFOPATH=.:~bob/manuals:/gnu/emacs/info
  export INFOPATH
  @end smallexample
***************
*** 12149,12153 ****
  Either form would cause Info to look first in the current directory,
  indicated by the @samp{.}, then in the @file{~bob/manuals} directory,
! and finally in the @file{/usr/local/emacs/info} directory (which is
  a common location for the standard Info directory).@refill
  
--- 12146,12150 ----
  Either form would cause Info to look first in the current directory,
  indicated by the @samp{.}, then in the @file{~bob/manuals} directory,
! and finally in the @file{/gnu/emacs/info} directory (which is
  a common location for the standard Info directory).@refill
  
diff -2rcN texinfo-3.1/util/Makefile.in texinfo-3.1-amiga/util/Makefile.in
*** texinfo-3.1/util/Makefile.in	Sun May 23 00:01:53 1993
--- texinfo-3.1-amiga/util/Makefile.in	Thu Feb 24 10:20:45 1994
***************
*** 39,46 ****
  SHELL = /bin/sh
  
! CFLAGS = -g
! LDFLAGS = -g
  
! prefix = /usr/local
  exec_prefix = $(prefix)
  bindir = $(exec_prefix)/bin
--- 39,46 ----
  SHELL = /bin/sh
  
! CFLAGS = -O2
! LDFLAGS =
  
! prefix = /gnu
  exec_prefix = $(prefix)
  bindir = $(exec_prefix)/bin
diff -2rcN texinfo-3.1/util/fixfonts texinfo-3.1-amiga/util/fixfonts
*** texinfo-3.1/util/fixfonts	Fri Apr 16 10:35:07 1993
--- texinfo-3.1-amiga/util/fixfonts	Thu Feb 24 10:21:13 1994
***************
*** 6,10 ****
  # already defined in the environment. 
  if test "z${prefix}" = "z" ; then
!   prefix=/usr/local
  else
    # prefix may contain references to other variables, thanks to make.
--- 6,10 ----
  # already defined in the environment. 
  if test "z${prefix}" = "z" ; then
!   prefix=/local
  else
    # prefix may contain references to other variables, thanks to make.
diff -2rcN texinfo-3.1/util/texindex.c texinfo-3.1-amiga/util/texindex.c
*** texinfo-3.1/util/texindex.c	Fri Dec 11 16:19:49 1992
--- texinfo-3.1-amiga/util/texindex.c	Thu Feb 24 11:20:13 1994
***************
*** 188,192 ****
  #define MAX_IN_CORE_SORT 500000
  
! void
  main (argc, argv)
       int argc;
--- 188,192 ----
  #define MAX_IN_CORE_SORT 500000
  
! int
  main (argc, argv)
       int argc;