texinfo update (Mon Jul 2 17:53:01 EDT 2007)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.721
retrieving revision 1.722
diff -u -r1.721 -r1.722
--- ChangeLog   2 Jul 2007 08:51:03 -0000       1.721
+++ ChangeLog   2 Jul 2007 21:40:31 -0000       1.722
@@ -1,6 +1,11 @@
 2007-07-02  Oleg Katsitadze  <address@hidden>
 
-       * texinfo.tex (\chapmacro):  avoid potential breakpoint at
+       * doc/pdfcolor.tex: removed (merged with doc/texinfo.tex).
+       * doc/texinfo.tex: merged doc/pdfcolor.tex, omitting unused colors.
+       * doc/Makefile.am, doc/README, doc/texinfo.txi, util/srclist.txt:
+       removed any mention of pdfcolor.tex.
+
+       * doc/texinfo.tex (\chapmacro):  avoid potential breakpoint at
        interline glue between \pdfdest and the heading.
        (\safewhatsit): typo.
 
@@ -40,19 +45,19 @@
 
 2007-06-27  Oleg Katsitadze  <address@hidden>
 
-       * texinfo.tex (\setnonasciicharscatcodenonglobal): new macro.
+       * doc/texinfo.tex (\setnonasciicharscatcodenonglobal): new macro.
        (\scanctxt):  in case of non-ASCII encodings, un-activate 8-bit
-       chars to avoid their expansion.  Report from John Mandereau on
-       bug-texinfo, Jun 22, 2007 at 05:26:09PM +0200.
+       chars to avoid their expansion.  Report from John Mandereau,
+       22 Jun 2007 17:26:09 +0200.
 
 2007-06-24  Karl Berry  <address@hidden>
 
-       * texinfo.tex (\internalpagesizes): must reset \pdfhorigin and
+       * doc/texinfo.tex (\internalpagesizes): must reset \pdfhorigin and
        \pdfvorigin after changing \pdfpageheight and \pdfpagewidth.
 
 2007-06-20  Karl Berry  <address@hidden>
 
-       * texinfo.tex (\documentlanguagetrywithoutunderscore): new macro,
+       * doc/texinfo.tex (\documentlanguagetrywithoutunderscore): new macro,
        to try txi-de.tex if @documentlanguage de_DE.
        (\documentlanguage): call it.
 
Index: doc/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/doc/Makefile.am,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- doc/Makefile.am     1 Jul 2007 17:59:13 -0000       1.33
+++ doc/Makefile.am     2 Jul 2007 21:40:32 -0000       1.34
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.33 2007/07/01 17:59:13 karl Exp $
+# $Id: Makefile.am,v 1.34 2007/07/02 21:40:32 olegkat Exp $
 # Makefile.am for texinfo/doc.
 # Run automake in .. to produce Makefile.in from this.
 #
@@ -30,7 +30,7 @@
            txi-ru.tex txi-sr.tex txi-tr.tex txi-uk.tex
 
 # Include our texinfo.tex, not Automake's.
-EXTRA_DIST = epsf.tex pdfcolor.tex texinfo.tex \
+EXTRA_DIST = epsf.tex texinfo.tex \
              fdl.texi \
             $(man_MANS) $(TXI_XLATE)
 
@@ -45,21 +45,18 @@
        @echo "         See doc/README for some considerations."
        @echo "         You can run make TEXMF=/your/texmf install-tex to do 
this."
        @echo
-       @echo "         You may also need to install epsf.tex and (if you"
-       @echo "         use pdftex) pdfcolor.tex in TEXMF/tex/generic/dvips"
-       @echo "         and TEXMF/pdftex/plain/misc/pdfcolor.tex respectively,"
-       @echo "         if your TeX installation did not include them."
+       @echo "         You may also need to install epsf.tex in"
+       @echo "         TEXMF/tex/generic/dvips, if your TeX"
+       @echo "         installation did not include it."
 endif
 
 texmf_texinfo = $(TEXMF)/tex/texinfo
 texmf_dvips = $(TEXMF)/tex/generic/epsf
-texmf_pdftex_misc = $(TEXMF)/pdftex/plain/pdfcolor
 install-tex:
        test -n "$(TEXMF)" || (echo "TEXMF must be set." >&2; exit 1)
-       $(mkinstalldirs) $(DESTDIR)$(texmf_texinfo) $(DESTDIR)$(texmf_dvips) 
$(DESTDIR)$(texmf_pdftex_misc)
+       $(mkinstalldirs) $(DESTDIR)$(texmf_texinfo) $(DESTDIR)$(texmf_dvips)
        $(INSTALL_DATA) $(srcdir)/texinfo.tex 
$(DESTDIR)$(texmf_texinfo)/texinfo.tex
        $(INSTALL_DATA) $(srcdir)/epsf.tex $(DESTDIR)$(texmf_dvips)/epsf.tex
-       $(INSTALL_DATA) $(srcdir)/pdfcolor.tex 
$(DESTDIR)$(texmf_pdftex_misc)/pdfcolor.tex
        for f in $(TXI_XLATE); do \
          $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(texmf_texinfo)/$$f; done
 
Index: doc/README
===================================================================
RCS file: /sources/texinfo/texinfo/doc/README,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- doc/README  11 Apr 2004 17:56:45 -0000      1.4
+++ doc/README  2 Jul 2007 21:40:32 -0000       1.5
@@ -1,4 +1,4 @@
-$Id: README,v 1.4 2004/04/11 17:56:45 karl Exp $
+$Id: README,v 1.5 2007/07/02 21:40:32 olegkat Exp $
 texinfo/doc/README
 
   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -17,11 +17,11 @@
 sense of security.  So, you should simply cp *.tex to the appropriate
 place.  If your installation follows the TeX Directory Structure
 standard (http://tug.org/tds/), this will be the directory
-TEXMF/tex/texinfo/ for texinfo.tex, TEXMF/tex/generic/dvips/ for epsf.tex,
-and TEXMF/pdftex/plain/misc for pdfcolor.tex.  If you use the default
-installation paths, TEXMF will be /usr/local/share/texmf.  On systems
-with TeX preinstalled, as most GNU/Linux distributions offer, TEXMF
-will often be something like /usr/share/texmf.
+TEXMF/tex/texinfo/ for texinfo.tex, and TEXMF/tex/generic/dvips/ for
+epsf.tex.  If you use the default installation paths, TEXMF will be
+/usr/local/share/texmf.  On systems with TeX preinstalled, as most
+GNU/Linux distributions offer, TEXMF will often be something like
+/usr/share/texmf.
 
 It is also possible to put these .tex files in a `local' place instead
 of overwriting existing ones, but this is more complicated.  See your TeX
cvs diff: Tag HEAD refers to a dead (removed) revision in file 
`doc/pdfcolor.tex'.
cvs diff: No comparison available.  Pass `-N' to `cvs diff'?
Index: doc/texinfo.tex
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -r1.246 -r1.247
--- doc/texinfo.tex     2 Jul 2007 08:50:27 -0000       1.246
+++ doc/texinfo.tex     2 Jul 2007 21:40:32 -0000       1.247
@@ -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{2007-07-02.11}
+\def\texinfoversion{2007-07-02.23}
 %
 % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, 2007,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -1260,7 +1260,33 @@
 output) for that.)}
 
 \ifpdf
-  \input pdfcolor
+  %
+  % Color manipulation macros from pdfcolor.tex.
+  \def\cmykBrickRed{0 0.89 0.94 0.28}
+  \def\cmykBlack{0 0 0 1}
+  %
+  \def\BrickRed{\pdfsetcolor{\cmykBrickRed}}
+  \def\Black{\pdfsetcolor{\cmykBlack}}
+  %
+  \def\pdfsetcolor#1{\pdfliteral{#1 k}}
+  \def\setcolor#1{\mark{#1}\pdfsetcolor{#1}}
+  %
+  \def\maincolor{\cmykBlack}
+  \pdfsetcolor{\maincolor}
+  %
+  \def\makefootline{
+      \baselineskip24pt
+      \line{\pdfsetcolor{\maincolor}\the\footline}}
+  %
+  \def\makeheadline{%
+      \edef\M{\topmark}
+      \ifx\M\empty\let\M=\maincolor\fi
+      \vbox to 0pt{\vskip-22.5pt
+          \line{\vbox to8.5pt{}%
+          \pdfsetcolor{\maincolor}\the\headline\pdfsetcolor{\M}}\vss}%
+      \nointerlineskip}
+  %
+  %
   \pdfcatalog{/PageMode /UseOutlines}
   %
   % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto).
@@ -1327,7 +1353,6 @@
   %
   % by default, use a color that is dark enough to print on paper as
   % nearly black, but still distinguishable for online viewing.
-  % (Defined in pdfcolor.tex.)
   \let\urlcolor = \BrickRed
   \let\linkcolor = \BrickRed
   \def\endlink{\Black\pdfendlink}
Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- doc/texinfo.txi     20 Jun 2007 20:27:41 -0000      1.195
+++ doc/texinfo.txi     2 Jul 2007 21:40:32 -0000       1.196
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.195 2007/06/20 20:27:41 karl Exp $
address@hidden $Id: texinfo.txi,v 1.196 2007/07/02 21:40:32 olegkat 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.
 
@@ -14683,10 +14683,6 @@
 from another distribution.  More details are at the end of the description
 of the @code{@@image} command (@pxref{Images}).
 
address@hidden address@hidden, installing}
-Likewise for @file{pdfcolor.tex}, if it is not already installed and you
-use pdftex.
-
 @pindex texinfo.cnf @r{installation}
 @cindex Customizing of @TeX{} for Texinfo
 @cindex Site-wide Texinfo configuration file
@@ -18744,7 +18740,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.195 2007/06/20 20:27:41 karl Exp $
+$Id: texinfo.txi,v 1.196 2007/07/02 21:40:32 olegkat 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}
@@ -18810,7 +18806,7 @@
 
 @verbatim
 \input texinfo   @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.195 2007/06/20 20:27:41 karl Exp $
address@hidden $Id: texinfo.txi,v 1.196 2007/07/02 21:40:32 olegkat Exp $
 @comment %**start of header
 @setfilename sample.info
 @include version.texi
Index: util/srclist.txt
===================================================================
RCS file: /sources/texinfo/texinfo/util/srclist.txt,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- util/srclist.txt    29 May 2006 13:50:00 -0000      1.23
+++ util/srclist.txt    2 Jul 2007 21:40:32 -0000       1.24
@@ -1,4 +1,4 @@
-# $Id: srclist.txt,v 1.23 2006/05/29 13:50:00 karl Exp $
+# $Id: srclist.txt,v 1.24 2007/07/02 21:40:32 olegkat Exp $
 # Files which we keep in sync from other places.
 # This is input for the script config/srclist-update in the gnulib
 # project on savannah.
@@ -13,7 +13,6 @@
 
 $EMACSSRC/man/info.texi                        doc
 #$TEXMFROOT/tex/generic/dvips/epsf.tex doc
-$TEXMFROOT/tex/plain/misc/pdfcolor.tex doc
 
 
 $GETTEXT/gettext-runtime/ABOUT-NLS             .
P ChangeLog
P doc/Makefile.am
P doc/README
cvs update: `doc/pdfcolor.tex' is no longer in the repository
P doc/texinfo.tex
P doc/texinfo.txi
P util/srclist.txt