texinfo ChangeLog doc/texinfo.tex doc/texinfo.txi

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       11/11/06 16:59:18

Modified files:
        .              : ChangeLog 
        doc            : texinfo.tex texinfo.txi 

Log message:
        try .pdf/.PDF first for pdfTeX

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1276&r2=1.1277
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.tex?cvsroot=texinfo&r1=1.351&r2=1.352
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.395&r2=1.396

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1276
retrieving revision 1.1277
diff -u -b -r1.1276 -r1.1277
--- ChangeLog   31 Oct 2011 14:58:58 -0000      1.1276
+++ ChangeLog   6 Nov 2011 16:59:17 -0000       1.1277
@@ -1,7 +1,22 @@
+2011-11-06  Karl Berry  <address@hidden>
+
+       * doc/texinfo.tex (\dopdfimage): try .pdf and .PDF first.
+       * doc/texinfo.txi (Image Syntax): document this.
+       (implied by help-texinfo report from Rick Jones,
+       28 Oct 2011 11:09:33).
+
+       * doc/texinfo.txi (Configuration Variables): rename from
+       address@hidden Configuration Variables'.
+
+2011-11-04  Karl Berry  <address@hidden>
+
+       * doc/texinfo.txi (Other Configuration Variables): mention
+       CPP_LINE_DIRECTIVES.
+
 2011-10-31  Patrice Dumas  <address@hidden>
 
-       * doc/texinfo.txi(Other Configuration Variables): TOP_FILE is only for 
-       HTML
+       * doc/texinfo.txi (Other Configuration Variables): TOP_FILE is only
+       for HTML.
 
 2011-10-28  Karl Berry  <address@hidden>
 

Index: doc/texinfo.tex
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -b -r1.351 -r1.352
--- doc/texinfo.tex     19 Oct 2011 15:56:06 -0000      1.351
+++ doc/texinfo.tex     6 Nov 2011 16:59:17 -0000       1.352
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2011-10-19.08}
+\def\texinfoversion{2011-11-06.08}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -1194,22 +1194,20 @@
     \def\imagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}%
     \def\imageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
     %
-    % pdftex (and the PDF format) support .png, .jpg, .pdf (among
-    % others).  Let's try in that order.
+    % pdftex (and the PDF format) support .pdf, .png, .jpg (among
+    % others).  Let's try in that order, PDF first since if
+    % someone has a scalable image, presumably better to use that than a
+    % bitmap.
     \let\pdfimgext=\empty
     \begingroup
+      \openin 1 #1.pdf \ifeof 1
+        \openin 1 #1.PDF \ifeof 1
       \openin 1 #1.png \ifeof 1
         \openin 1 #1.jpg \ifeof 1
           \openin 1 #1.jpeg \ifeof 1
             \openin 1 #1.JPG \ifeof 1
-              \openin 1 #1.pdf \ifeof 1
-                \openin 1 #1.PDF \ifeof 1
                   \errhelp = \nopdfimagehelp
                   \errmessage{Could not find image file #1 for pdf}%
-                \else \gdef\pdfimgext{PDF}%
-                \fi
-              \else \gdef\pdfimgext{pdf}%
-              \fi
             \else \gdef\pdfimgext{JPG}%
             \fi
           \else \gdef\pdfimgext{jpeg}%
@@ -1218,6 +1216,10 @@
         \fi
       \else \gdef\pdfimgext{png}%
       \fi
+        \else \gdef\pdfimgext{PDF}%
+        \fi
+      \else \gdef\pdfimgext{pdf}%
+      \fi
       \closein 1
     \endgroup
     %

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -b -r1.395 -r1.396
--- doc/texinfo.txi     31 Oct 2011 14:58:59 -0000      1.395
+++ doc/texinfo.txi     6 Nov 2011 16:59:17 -0000       1.396
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.395 2011/10/31 14:58:59 pertusus Exp $
address@hidden $Id: texinfo.txi,v 1.396 2011/11/06 16:59:17 karl Exp $
 @c Ordinarily, Texinfo files have the extension .texi.  But texinfo.texi
 @c clashes with texinfo.tex on 8.3 filesystems, so we use texinfo.txi.
 
@@ -608,7 +608,7 @@
 * Invoking texi2any::           How to run @command{texi2any} and 
@command{makeinfo} 
                                 from a shell.
 * Pointer Validation::          How to check that pointers point somewhere.
-* @command{texi2any} Configuration Variables:: Configuring @command{texi2any}.
+* Configuration Variables::     Configuring @command{texi2any}.
 
 Creating and Installing Info Files
 
@@ -9606,23 +9606,24 @@
 @itemize @bullet
 @item
 @pindex eps image format
address@hidden reads the file @address@hidden (Encapsulated PostScript
-format).
address@hidden (DVI output) reads the file @address@hidden
+(Encapsulated PostScript format).
 @item
 @pindex address@hidden, and images}
 @pindex png image format
 @pindex jpeg image format
 @pindex pdf image inclusions
address@hidden reads @address@hidden, @address@hidden,
address@hidden@var{filename}.jpeg}, or @address@hidden (in that
address@hidden reads @address@hidden, @address@hidden,
address@hidden@var{filename}.jpg}, or @address@hidden (in that
 order).  It also tries uppercase versions of the extensions.  The PDF
-format cannot support EPS images, so they must be converted first.
+format does not support EPS images, so such must be converted first.
 @item
 @code{makeinfo} includes @address@hidden verbatim for
 Info output (more or less as if it was an @code{@@example}).
 @item
 @code{makeinfo} uses the optional fifth argument @var{extension} to
address@hidden@@image} for the filename extension, if it is specified.  For 
example:
address@hidden@@image} for the filename extension, if it is specified.  Any
+leading period should be included in @var{extension}.  For example:
 
 @pindex XPM image format
 @example
@@ -9631,7 +9632,6 @@
 
 @noindent
 will cause @code{makeinfo} to look for @file{foo.xpm} before any others.
-
 @end itemize
 
 If you want to install image files for use by Info readers too, we
@@ -16168,7 +16168,7 @@
 @menu
 * Invoking texi2any::           How to run @command{texi2any} from a shell.
 * Pointer Validation::          How to check that pointers point somewhere.
-* @command{texi2any} Configuration Variables::  Configuring @command{texi2any}.
+* Configuration Variables::     Configuring @command{texi2any}.
 @end menu
 
 
@@ -16565,8 +16565,7 @@
 Set the configuration variable @var{var} to @var{value}.  Many aspects
 of the behavior and output may be modified by modifying configuration
 variables, beyond what can be set in the document by @@-commands and
-with other command line switches.  @address@hidden Configuration
-Variables}.
+with other command line switches.  @xref{Configuration Variables}.
 
 @item address@hidden
 @itemx --no-split
@@ -16686,8 +16685,8 @@
 @end enumerate
 
 
address@hidden @command{texi2any} Configuration Variables
address@hidden @command{texi2any} Configuration Variables
address@hidden Configuration Variables
address@hidden Configuration Variables
 
 @cartouche
 @quotation Warning
@@ -16850,6 +16849,10 @@
 @item COMPLEX_FORMAT_IN_TABLE
 For address@hidden  If set, use tables for indentation of complex formats.
 
address@hidden CPP_LINE_DIRECTIVES
+Recognize @code{#line} directives in a ``preprocessing'' pass.
address@hidden xxref somewhere
+
 @item CSS_LINES
 CSS output, automatically determined in the default case
 (@pxref{HTML CSS}).
@@ -18782,7 +18785,7 @@
 @file{texinfo.txi} would be supplemented by a file
 @file{texinfo-noderename}.cnf.  (This name can be overridden by
 setting the @file{RENAMED_NODES_FILE} configuration variable;
address@hidden@command{texi2any} Configuration Variables}).
address@hidden Variables}).
 
 The file is read in pairs of lines, as follows:
 
@@ -21100,7 +21103,7 @@
 (@url{http://www.gnu.org/software/rcs}) version control systems, which
 expand it into a string such as:
 @example
-$Id: texinfo.txi,v 1.395 2011/10/31 14:58:59 pertusus Exp $
+$Id: texinfo.txi,v 1.396 2011/11/06 16:59:17 karl Exp $
 @end example
 (This is useful in all sources that use version control, not just manuals.)
 You may wish to include the @samp{$Id:} comment in the @code{@@copying}
@@ -21171,7 +21174,7 @@
 
 @verbatim
 \input texinfo   @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.395 2011/10/31 14:58:59 pertusus Exp $
address@hidden $Id: texinfo.txi,v 1.396 2011/11/06 16:59:17 karl Exp $
 @comment %**start of header
 @setfilename sample.info
 @include version.texi