texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

texinfo/makeinfo makeinfo.c,1.55,1.56


From: dirt
Subject: texinfo/makeinfo makeinfo.c,1.55,1.56
Date: Sun, 29 Feb 2004 23:31:38 +0100

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

Modified Files:
        makeinfo.c 
Log Message:
2004-03-01  Alper Ersoy  <address@hidden>

        * makeinfo/makeinfo.c (cm_image): insert magic cookie only if there's
        a bitmap file (if all we have is a text file, skip the cookie.)



Index: makeinfo.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** makeinfo.c  29 Feb 2004 12:43:06 -0000      1.55
--- makeinfo.c  29 Feb 2004 22:31:35 -0000      1.56
***************
*** 3328,3338 ****
                int image_in_brackets = paragraph_is_open;
  
                inhibit_paragraph_indentation = 1;
                filling_enabled = 0;
                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');
--- 3328,3343 ----
                int image_in_brackets = paragraph_is_open;
  
+               /* Write magic address@hidden address@hidden cookie in the info 
file, if
+                  there's an accompanying bitmap.  Otherwise just include the
+                  text image.  In the plaintext output, always include the text
+                  image without the magic cookie.  */
+               int use_magic_cookie = !no_headers
+                 && access (fullname, R_OK) == 0 && !STREQ (fullname, txtname);
+ 
                inhibit_paragraph_indentation = 1;
                filling_enabled = 0;
                last_char_was_newline = 0;
  
!               if (use_magic_cookie)
                  {
                    add_char ('\0');
***************
*** 3349,3353 ****
                if (image_file != NULL)
                  {
!                   if (!no_headers)
                      add_word (" text=\"");
  
--- 3354,3358 ----
                if (image_file != NULL)
                  {
!                   if (use_magic_cookie)
                      add_word (" text=\"");
  
***************
*** 3361,3365 ****
                    while ((ch = getc (image_file)) != EOF)
                      {
!                       if (!no_headers && (ch == '"' || ch == '\\'))
                          add_char ('\\');
                        add_char (ch);
--- 3366,3370 ----
                    while ((ch = getc (image_file)) != EOF)
                      {
!                       if (use_magic_cookie && (ch == '"' || ch == '\\'))
                          add_char ('\\');
                        add_char (ch);
***************
*** 3369,3373 ****
                      add_char (']');
                    
!                   if (!no_headers)
                      add_char ('"');
  
--- 3374,3378 ----
                      add_char (']');
                    
!                   if (use_magic_cookie)
                      add_char ('"');
  
***************
*** 3379,3383 ****
                filling_enabled = save_filling_enabled;
  
!               if (!no_headers)
                  {
                    add_char ('\0');
--- 3384,3388 ----
                filling_enabled = save_filling_enabled;
  
!               if (use_magic_cookie)
                  {
                    add_char ('\0');



reply via email to

[Prev in Thread] Current Thread [Next in Thread]