texinfo update (Sun Dec 19 12:22:01 EST 2004)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.439
retrieving revision 1.441
diff -c -r1.439 -r1.441
*** ChangeLog   19 Dec 2004 15:08:55 -0000      1.439
--- ChangeLog   19 Dec 2004 17:15:42 -0000      1.441
***************
*** 1,3 ****
--- 1,18 ----
+ 2004-12-19  Karl Berry  <address@hidden>
+ 
+       * pretest version 4.7.93.
+ 
+       * automake 1.9.4.
+ 
+       * makeinfo/xml.c (try_docbook_image): new fn.
+       (xml_insert_docbook_image): call it, trying additional formats
+       pdf, svg, etc.
+       * makeinfo/makeinfo.c (cm_image): check for gif too.
+       http://www.gnu.org/philosophy/gif.html says:
+       "we can and will include support for displaying GIF files in GNU
+        software."  Leaving it undocumented, though.
+       Based on patch from Jens Elkner, 18 Dec 2004 01:56:28 +0100.
+ 
  2004-12-19  Torsten Bronger  <address@hidden>
  
        * util/texinfo.dtd: define most entities, add <neos>.
Index: NEWS
===================================================================
RCS file: /cvsroot/texinfo/texinfo/NEWS,v
retrieving revision 1.101
retrieving revision 1.102
diff -c -r1.101 -r1.102
*** NEWS        13 Dec 2004 13:36:32 -0000      1.101
--- NEWS        19 Dec 2004 17:02:22 -0000      1.102
***************
*** 1,4 ****
! $Id: NEWS,v 1.101 2004/12/13 13:36:32 karl Exp $
  This file records noteworthy changes, very tersely.
  See the manual for detailed information.
  
--- 1,4 ----
! $Id: NEWS,v 1.102 2004/12/19 17:02:22 karl Exp $
  This file records noteworthy changes, very tersely.
  See the manual for detailed information.
  
***************
*** 35,40 ****
--- 35,41 ----
        to them can continue to work.
      - "g_t" prefixed to targets for node names beginning with a
        nonletter, for XHTML compatibility.
+   . Docbook output: recognize more image formats.
  * texi2dvi:
    . new option --recode, to call recode for input character translation.
  * Distribution:
***************
*** 42,48 ****
    . some cross-compiling support in configure && make.
    . new configure option --disable-install-warnings, for TeX.
      distributions which do have the files installed.
!   . automake 1.9.3.
  
  4.7 (9 April 2004)
  * Language:
--- 43,49 ----
    . some cross-compiling support in configure && make.
    . new configure option --disable-install-warnings, for TeX.
      distributions which do have the files installed.
!   . automake 1.9.4.
  
  4.7 (9 April 2004)
  * Language:
Index: makeinfo/makeinfo.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -c -r1.73 -r1.74
*** makeinfo/makeinfo.c 14 Dec 2004 00:15:36 -0000      1.73
--- makeinfo/makeinfo.c 19 Dec 2004 17:15:42 -0000      1.74
***************
*** 1,5 ****
  /* makeinfo -- convert Texinfo source into other formats.
!    $Id: makeinfo.c,v 1.73 2004/12/14 00:15:36 karl Exp $
  
     Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
     2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
--- 1,5 ----
  /* makeinfo -- convert Texinfo source into other formats.
!    $Id: makeinfo.c,v 1.74 2004/12/19 17:15:42 karl Exp $
  
     Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
     2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
***************
*** 3284,3301 ****
        else
          {
            sprintf (fullname, "%s.png", name_arg);
!           if (access (fullname, R_OK) != 0)
!             {
!               pathname = get_file_info_in_path (fullname,
!                                                include_files_path, 
&file_info);
!               if (pathname == NULL)
!                 {
!                   sprintf (fullname, "%s.jpg", name_arg);
!                   if (access (fullname, R_OK) != 0)
!                     pathname = get_file_info_in_path (fullname,
                                                 include_files_path, 
&file_info);
                  }
              }
          }
  
        if (html)
--- 3284,3303 ----
        else
          {
            sprintf (fullname, "%s.png", name_arg);
!           if (access (fullname, R_OK) != 0) {
!             pathname = get_file_info_in_path (fullname,
!                                               include_files_path, &file_info);
!             if (pathname == NULL) {
!               sprintf (fullname, "%s.jpg", name_arg);
!               if (access (fullname, R_OK) != 0) {
!                 sprintf (fullname, "%s.gif", name_arg);
!                 if (access (fullname, R_OK) != 0) {
!                   pathname = get_file_info_in_path (fullname,
                                                 include_files_path, 
&file_info);
                  }
+               }
              }
+           }
          }
  
        if (html)
Index: makeinfo/xml.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/xml.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -c -r1.51 -r1.52
*** makeinfo/xml.c      26 Nov 2004 00:48:35 -0000      1.51
--- makeinfo/xml.c      19 Dec 2004 17:02:23 -0000      1.52
***************
*** 1,5 ****
  /* xml.c -- xml output.
!    $Id: xml.c,v 1.51 2004/11/26 00:48:35 karl Exp $
  
     Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
  
--- 1,5 ----
  /* xml.c -- xml output.
!    $Id: xml.c,v 1.52 2004/12/19 17:02:23 karl Exp $
  
     Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
  
***************
*** 619,625 ****
      print_warnings = save_print_warnings;
    }
  
!   insert_string ("?>");
  
    if (docbook)
      {
--- 619,625 ----
      print_warnings = save_print_warnings;
    }
  
!   insert_string ("?>\n");
  
    if (docbook)
      {
***************
*** 1608,1616 ****
--- 1608,1643 ----
    free (fullname);
  }
  
+ /* If NAME.EXT is accessible or FORCE is nonzero, insert a docbook
+    imagedata element for FMT.  Return 1 if inserted something, 0 else.  */
+ 
+ static int
+ try_docbook_image (const char *name, const char *ext, const char *fmt,
+                    int force)
+ {
+   int used = 0;
+   char *fullname = xmalloc (strlen (name) + 1 + strlen (ext) + 1);
+   sprintf (fullname, "%s.%s", name, ext);
+ 
+   if (force || access (fullname, R_OK) == 0)
+    {
+      xml_insert_element (IMAGEOBJECT, START);
+      xml_insert_element_with_attribute (IMAGEDATA, START,
+        "fileref=\"%s\" format=\"%s\"", fullname, fmt);
+      xml_insert_element (IMAGEDATA, END);
+      xml_insert_element (IMAGEOBJECT, END);
+      used = 1;
+    }
+  
+  free (fullname);
+  return used;
+ }
+ 
+ 
  void
  xml_insert_docbook_image (char *name_arg)
  {
+   int found = 0;
    int elt = xml_in_para ? INLINEIMAGE : MEDIAOBJECT;
  
    if (is_in_insertion_of_type (floatenv))
***************
*** 1622,1641 ****
  
    xml_insert_element (elt, START);
  
!   xml_insert_element (IMAGEOBJECT, START);
!   xml_insert_element_with_attribute (IMAGEDATA,
!       START, "fileref=\"%s.eps\" format=\"EPS\"", name_arg);
!   xml_insert_element (IMAGEDATA, END);
!   xml_insert_element (IMAGEOBJECT, END);
! 
!   xml_insert_element (IMAGEOBJECT, START);
!   xml_insert_element_with_attribute (IMAGEDATA,
!       START, "fileref=\"%s.jpg\" format=\"JPG\"", name_arg);
!   xml_insert_element (IMAGEDATA, END);
!   xml_insert_element (IMAGEOBJECT, END);
! 
    xml_insert_text_file (name_arg);
- 
    xml_insert_element (elt, END);
  
    xml_no_para--;
--- 1649,1675 ----
  
    xml_insert_element (elt, START);
  
!   /* A selected few from http://docbook.org/tdg/en/html/imagedata.html.  */
!   if (try_docbook_image (name_arg, "eps", "EPS", 0))
!     found++;
!   if (try_docbook_image (name_arg, "gif", "GIF", 0))
!     found++;
!   if (try_docbook_image (name_arg, "jpg", "JPG", 0))
!     found++;
!   if (try_docbook_image (name_arg, "jpeg", "JPEG", 0))
!     found++;
!   if (try_docbook_image (name_arg, "pdf", "PDF", 0))
!     found++;
!   if (try_docbook_image (name_arg, "png", "PNG", 0))
!     found++;
!   if (try_docbook_image (name_arg, "svg", "SVG", 0))
!     found++;
! 
!   /* If no luck so far, just assume we'll eventually have a jpg.  */
!   if (!found)
!     try_docbook_image (name_arg, "jpg", "JPG", 1);
!  
    xml_insert_text_file (name_arg);
    xml_insert_element (elt, END);
  
    xml_no_para--;
P ChangeLog
P NEWS
P makeinfo/makeinfo.c
P makeinfo/xml.c