texinfo update (Tue Jul 3 17:23:01 EDT 2007)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.722
retrieving revision 1.723
diff -u -r1.722 -r1.723
--- ChangeLog   2 Jul 2007 21:40:31 -0000       1.722
+++ ChangeLog   3 Jul 2007 20:57:36 -0000       1.723
@@ -1,3 +1,10 @@
+2007-07-03  Oleg Katsitadze  <address@hidden>
+
+       * doc/texinfo.tex: use \setcolor for color changes instead of
+       \pdfsetcolor, to preserve color changes across page breaks.  Use a
+       darker red (which comes out almost black in b&w print) for links
+       and urls.
+
 2007-07-02  Oleg Katsitadze  <address@hidden>
 
        * doc/pdfcolor.tex: removed (merged with doc/texinfo.tex).
Index: doc/texinfo.tex
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- doc/texinfo.tex     2 Jul 2007 21:40:32 -0000       1.247
+++ doc/texinfo.tex     3 Jul 2007 20:57:36 -0000       1.248
@@ -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.23}
+\def\texinfoversion{2007-07-03.23}
 %
 % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, 2007,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -1262,12 +1262,9 @@
 \ifpdf
   %
   % Color manipulation macros from pdfcolor.tex.
-  \def\cmykBrickRed{0 0.89 0.94 0.28}
+  \def\cmykDarkRed{0.28 1 1 0.35}
   \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}}
   %
@@ -1353,9 +1350,9 @@
   %
   % by default, use a color that is dark enough to print on paper as
   % nearly black, but still distinguishable for online viewing.
-  \let\urlcolor = \BrickRed
-  \let\linkcolor = \BrickRed
-  \def\endlink{\Black\pdfendlink}
+  \def\urlcolor{\cmykDarkRed}
+  \def\linkcolor{\cmykDarkRed}
+  \def\endlink{\setcolor{\maincolor}\pdfendlink}
   %
   % Adding outlines to PDF; macros for calculating structure of outlines
   % come from Petr Olsak
@@ -1488,7 +1485,7 @@
       address@hidden@}%
       \let\/=\empty
       \makevalueexpandable
-      \leavevmode\urlcolor
+      \leavevmode\setcolor{\urlcolor}%
       \startlink attr{/Border [0 0 0]}%
         user{/Subtype /Link /A << /S /URI /URI (#1) >>}%
     \endgroup}
@@ -1515,13 +1512,14 @@
     {\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0}
   \def\pdflink#1{%
     \startlink attr{/Border [0 0 0]} goto name{\pdfmkpgn{#1}}
-    \linkcolor #1\endlink}
+    \setcolor{\linkcolor}#1\endlink}
   \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
 \else
   \let\pdfmkdest = \gobble
   \let\pdfurl = \gobble
   \let\endlink = \relax
-  \let\linkcolor = \relax
+  \let\setcolor = \gobble
+  \let\pdfsetcolor = \gobble
   \let\pdfmakeoutlines = \relax
 \fi  % \ifx\pdfoutput
 
@@ -6718,7 +6716,7 @@
          goto name{\pdfmkpgn{\pdfxrefdest}}%
      \fi
     }%
-    \linkcolor
+    \setcolor{\linkcolor}%
   \fi
   %
   % Float references are printed completely differently: "Figure 1.2"
P ChangeLog
P doc/texinfo.tex