texinfo/makeinfo makeinfo.c,1.15,1.16

[dirt]

Update of /cvsroot/texinfo/texinfo/makeinfo
In directory sheep:/tmp/cvs-serv7914/makeinfo

Modified Files:
        makeinfo.c 
Log Message:
2003-12-30  Alper Ersoy  <address@hidden>

        * makeinfo/makeinfo.c (cm_image): do not write magic cookie when
        output format is plaintext.



Index: makeinfo.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** makeinfo.c  2003/12/30 11:27:29     1.15
--- makeinfo.c  2003/12/30 11:33:44     1.16
***************
*** 3822,3839 ****
                last_char_was_newline = 0;
  
!               /* Write magic address@hidden address@hidden cookie in the info 
file.  */
!               add_char ('\0');
!               add_word ("\010[image");
  
!               if (access (fullname, R_OK) == 0
!                   || (pathname != NULL && access (pathname, R_OK) == 0))
!                 add_word_args (" src=\"%s\"", fullname);
  
!               if (*alt_arg)
!                 add_word_args (" alt=\"%s\"", alt_arg);
  
                if (image_file != NULL)
                  {
!                   add_word (" text=\"");
                    /* Maybe we need to remove the final newline if the image
                       file is only one line to allow in-line images.  On the
--- 3822,3845 ----
                last_char_was_newline = 0;
  
!               /* Write magic address@hidden address@hidden cookie in the info 
file,
!                  but not in the plaintext output.  */
!               if (!no_headers)
!                 {
!                   add_char ('\0');
!                   add_word ("\010[image");
  
!                   if (access (fullname, R_OK) == 0
!                       || (pathname != NULL && access (pathname, R_OK) == 0))
!                     add_word_args (" src=\"%s\"", fullname);
  
!                   if (*alt_arg)
!                     add_word_args (" alt=\"%s\"", alt_arg);
!                 }
  
                if (image_file != NULL)
                  {
!                   if (!no_headers)
!                     add_word (" text=\"");
! 
                    /* Maybe we need to remove the final newline if the image
                       file is only one line to allow in-line images.  On the
***************
*** 3846,3850 ****
                        add_char (ch);
                      }
!                   add_char ('"');
  
                    if (fclose (image_file) != 0)
--- 3852,3858 ----
                        add_char (ch);
                      }
!                   
!                   if (!no_headers)
!                     add_char ('"');
  
                    if (fclose (image_file) != 0)
***************
*** 3855,3860 ****
                filling_enabled = save_filling_enabled;
  
!               add_char ('\0');
!               add_word ("\010]");
              }
            else
--- 3863,3871 ----
                filling_enabled = save_filling_enabled;
  
!               if (!no_headers)
!                 {
!                   add_char ('\0');
!                   add_word ("\010]");
!                 }
              }
            else