consistency

git-svn-id: svn://tug.org/texlive/trunk@25948 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 91 insertions, 48 deletions

diff --git a/Build/source/texk/tests/TeXLive/TLUtils.pm b/Build/source/texk/tests/TeXLive/TLUtils.pm
index e868c455e2c..d204192d636 100644
--- a/Build/source/texk/tests/TeXLive/TLUtils.pm
+++ b/Build/source/texk/tests/TeXLive/TLUtils.pm
@@ -5,7 +5,7 @@
 
 package TeXLive::TLUtils;
 
-my $svnrev = '$Revision: 25027 $';
+my $svnrev = '$Revision: 25907 $';
 my $_modulerevision;
 if ($svnrev =~ m/: ([0-9]+) /) {
   $_modulerevision = $1;
@@ -265,10 +265,11 @@ sub platform_name {
   my $CPU; # CPU type as reported by config.guess.
   my $OS;  # O/S type as reported by config.guess.
   ($CPU = $guessed_platform) =~ s/(.*?)-.*/$1/;
-  $CPU =~ s/^alpha(.*)/alpha/;   # alphaev56 or whatever
-  $CPU =~ s/armv7l/armel/;       # arm
-  $CPU =~ s/powerpc64/powerpc/;  # we don't distinguish ppc64
-  $CPU =~ s/mips64el/mipsel/;    # we don't distinguish mips64 and 32 el
+  $CPU =~ s/^alpha(.*)/alpha/;   # alphaev whatever
+  $CPU =~ s/armv7l/armel/;       # arm whatever
+  $CPU =~ s/powerpc64/powerpc/;  # don't distinguish ppc64
+  $CPU =~ s/sparc64/sparc/;      # don't distinguish sparc64
+  $CPU =~ s/mips64el/mipsel/;    # don't distinguish mips64 and 32 el
 
   my @OSs = qw(aix cygwin darwin freebsd hpux irix
                kfreebsd linux netbsd openbsd solaris);
@@ -2497,13 +2498,16 @@ sub make_var_skeleton {
 
 =item C<make_local_skeleton($prefix)>
 
-Generate a skeleton of empty directories in the C<TEXMFLOCAL> tree.
+Generate a skeleton of empty directories in the C<TEXMFLOCAL> tree 
+if C<TEXMFLOCAL> doesn't already exist.
 
 =cut
 
 sub make_local_skeleton {
   my $prefix=shift;
 
+  return if (-d $prefix);
+
   mkdirhier "$prefix/tex/latex/local";
   mkdirhier "$prefix/tex/plain/local";
   mkdirhier "$prefix/dvips/local";
@@ -2514,6 +2518,7 @@ sub make_local_skeleton {
   mkdirhier "$prefix/fonts/source/local";
   mkdirhier "$prefix/fonts/type1/local";
   mkdirhier "$prefix/metapost/local";
+  mkdirhier "$prefix/doc/local";
   mkdirhier "$prefix/web2c";
 }
 
diff --git a/Build/source/utils/biber/TeXLive/TLUtils.pm b/Build/source/utils/biber/TeXLive/TLUtils.pm
index e868c455e2c..d204192d636 100644
--- a/Build/source/utils/biber/TeXLive/TLUtils.pm
+++ b/Build/source/utils/biber/TeXLive/TLUtils.pm
@@ -5,7 +5,7 @@
 
 package TeXLive::TLUtils;
 
-my $svnrev = '$Revision: 25027 $';
+my $svnrev = '$Revision: 25907 $';
 my $_modulerevision;
 if ($svnrev =~ m/: ([0-9]+) /) {
   $_modulerevision = $1;
@@ -265,10 +265,11 @@ sub platform_name {
   my $CPU; # CPU type as reported by config.guess.
   my $OS;  # O/S type as reported by config.guess.
   ($CPU = $guessed_platform) =~ s/(.*?)-.*/$1/;
-  $CPU =~ s/^alpha(.*)/alpha/;   # alphaev56 or whatever
-  $CPU =~ s/armv7l/armel/;       # arm
-  $CPU =~ s/powerpc64/powerpc/;  # we don't distinguish ppc64
-  $CPU =~ s/mips64el/mipsel/;    # we don't distinguish mips64 and 32 el
+  $CPU =~ s/^alpha(.*)/alpha/;   # alphaev whatever
+  $CPU =~ s/armv7l/armel/;       # arm whatever
+  $CPU =~ s/powerpc64/powerpc/;  # don't distinguish ppc64
+  $CPU =~ s/sparc64/sparc/;      # don't distinguish sparc64
+  $CPU =~ s/mips64el/mipsel/;    # don't distinguish mips64 and 32 el
 
   my @OSs = qw(aix cygwin darwin freebsd hpux irix
                kfreebsd linux netbsd openbsd solaris);
@@ -2497,13 +2498,16 @@ sub make_var_skeleton {
 
 =item C<make_local_skeleton($prefix)>
 
-Generate a skeleton of empty directories in the C<TEXMFLOCAL> tree.
+Generate a skeleton of empty directories in the C<TEXMFLOCAL> tree 
+if C<TEXMFLOCAL> doesn't already exist.
 
 =cut
 
 sub make_local_skeleton {
   my $prefix=shift;
 
+  return if (-d $prefix);
+
   mkdirhier "$prefix/tex/latex/local";
   mkdirhier "$prefix/tex/plain/local";
   mkdirhier "$prefix/dvips/local";
@@ -2514,6 +2518,7 @@ sub make_local_skeleton {
   mkdirhier "$prefix/fonts/source/local";
   mkdirhier "$prefix/fonts/type1/local";
   mkdirhier "$prefix/metapost/local";
+  mkdirhier "$prefix/doc/local";
   mkdirhier "$prefix/web2c";
 }
 
diff --git a/Build/source/utils/chktex/getopt.h b/Build/source/utils/chktex/getopt.h
index c899189bebc..a2530b8bf8f 100644
--- a/Build/source/utils/chktex/getopt.h
+++ b/Build/source/utils/chktex/getopt.h
@@ -120,8 +120,12 @@ struct option
 #if defined(__GNU_LIBRARY__) || defined (WIN32) || defined (__CYGWIN__)
 /* Many other libraries have conflicting prototypes for getopt, with
    differences in the consts, in stdlib.h.  To avoid compilation
-   errors, only prototype getopt for the GNU C library.  */
+   errors, only prototype getopt for the GNU C library.  And not when
+   compiling with C++; g++ 4.7.0 has introduced a conflicting
+   declaration.  */
+#if !defined (__cplusplus)
 extern KPSEDLL int getopt (int argc, char *const *argv, const char *shortopts);
+#endif
 #if defined (__MINGW32__) || defined (__CYGWIN__)
 #define __GETOPT_H__ /* Avoid that <unistd.h> redeclares the getopt API.  */
 #endif
diff --git a/Master/texmf-dist/bibtex/bib/beebe/texbook2.bib b/Master/texmf-dist/bibtex/bib/beebe/texbook2.bib
index c4c3ca99969..edde56436c9 100644
--- a/Master/texmf-dist/bibtex/bib/beebe/texbook2.bib
+++ b/Master/texmf-dist/bibtex/bib/beebe/texbook2.bib
@@ -5,9 +5,9 @@
 %%% ====================================================================
 %%% BibTeX-file{
 %%%     author          = "Nelson H. F. Beebe",
-%%%     version         = "2.04",
-%%%     date            = "29 September 2011",
-%%%     time            = "06:58:08 MDT",
+%%%     version         = "2.05",
+%%%     date            = "11 April 2012",
+%%%     time            = "10:31:59 MDT",
 %%%     filename        = "texbook2.bib",
 %%%     address         = "University of Utah
 %%%                        Department of Mathematics, 110 LCB
@@ -16,7 +16,7 @@
 %%%                        USA",
 %%%     telephone       = "+1 801 581 5254",
 %%%     FAX             = "+1 801 581 4148",
-%%%     checksum        = "02076 9077 34062 311774",
+%%%     checksum        = "14273 9079 34074 311904",
 %%%     email           = "beebe at math.utah.edu, beebe at acm.org,
 %%%                        beebe at computer.org (Internet)",
 %%%     codetable       = "ISO/ASCII",
@@ -32,7 +32,7 @@
 %%%                        printed if the is-alpha.bst or is-plain.bst
 %%%                        style files are used.
 %%%
-%%%                        At version 2.04, the year coverage looked
+%%%                        At version 2.05, the year coverage looked
 %%%                        like this:
 %%%
 %%%                             1979 (   1)    1990 (  99)    2001 (   2)
@@ -1760,7 +1760,9 @@
 @Book{Bien:KSI91,
   author =       "Janusz S. Bie{\'n}",
   title =        "Koncepcja s{\l}ownikowej informacji morfologicznej i
-                 jej komputerowej weryfikacji.",
+                 jej komputerowej weryfikacji. ({Polish}) [{The} concept
+                 of predictive information and its morphological
+                 verification of computer]",
   volume =       "383",
   publisher =    "Wydawnictwa Uniwersytetu Warszawskiego",
   address =      "Warszawa, Polska",
diff --git a/Master/texmf-dist/tex/texinfo/texinfo.tex b/Master/texmf-dist/tex/texinfo/texinfo.tex
index 4555c9aee72..e4dca02c6c6 100644
--- a/Master/texmf-dist/tex/texinfo/texinfo.tex
+++ b/Master/texmf-dist/tex/texinfo/texinfo.tex
@@ -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{2012-03-30.11}
+\def\texinfoversion{2012-04-06.11}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -4530,6 +4530,7 @@ end
   \definedummyword\file
   \definedummyword\image
   \definedummyword\indicateurl
+  \definedummyword\inforef
   \definedummyword\kbd
   \definedummyword\key
   \definedummyword\math
@@ -7814,7 +7815,7 @@ end
   \fi\fi
 }
 
-
+% 
 % @xref, @pxref, and @ref generate cross-references.  For \xrefX, #1 is
 % the node name, #2 the name of the Info cross-reference, #3 the printed
 % node name, #4 the name of the Info file, #5 the name of the printed
@@ -7824,16 +7825,21 @@ end
 \def\xref#1{\putwordSee{} \xrefX[#1,,,,,,,]}
 \def\ref#1{\xrefX[#1,,,,,,,]}
 %
-\newbox\topbox
+\newbox\toprefbox
 \newbox\printedrefnamebox
+\newbox\infofilenamebox
 \newbox\printedmanualbox
 %
 \def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup
   \unsepspaces
   %
+  % Get args without leading/trailing spaces.
   \def\printedrefname{\ignorespaces #3}%
   \setbox\printedrefnamebox = \hbox{\printedrefname\unskip}%
   %
+  \def\infofilename{\ignorespaces #4}%
+  \setbox\infofilenamebox = \hbox{\infofilename\unskip}%
+  %
   \def\printedmanual{\ignorespaces #5}%
   \setbox\printedmanualbox  = \hbox{\printedmanual\unskip}%
   %
@@ -7868,11 +7874,18 @@ end
      \turnoffactive
      \makevalueexpandable
      % This expands tokens, so do it after making catcode changes, so _
-     % etc. don't get their TeX definitions.
+     % etc. don't get their TeX definitions.  This ignores all spaces in
+     % #4, including (wrongly) those in the middle of the filename.
      \getfilename{#4}%
      %
+     % This (wrongly) does not take account of leading or trailing
+     % spaces in #1, which should be ignored.
      \edef\pdfxrefdest{#1}%
-     \txiescapepdf\pdfxrefdest
+     \ifx\pdfxrefdest\empty
+       \def\pdfxrefdest{Top}% no empty targets
+     \else
+       \txiescapepdf\pdfxrefdest  % escape PDF special chars
+     \fi
      %
      \leavevmode
      \startlink attr{/Border [0 0 0]}%
@@ -7905,7 +7918,7 @@ end
       \printedrefname
     \fi
     %
-    % if the user also gave the printed manual name (fifth arg), append
+    % If the user also gave the printed manual name (fifth arg), append
     % "in MANUALNAME".
     \ifdim \wd\printedmanualbox > 0pt
       \space \putwordin{} \cite{\printedmanual}%
@@ -7920,32 +7933,20 @@ end
     % this is a loss.  Therefore, we give the text of the node name
     % again, so it is as if TeX is seeing it for the first time.
     % 
-    % Cross-manual reference.  Only include the "Section ``foo'' in" if
-    % the foo is neither missing or Top.  Thus, @xref{,,,foo,The Foo Manual}
-    % outputs simply "see The Foo Manual".
     \ifdim \wd\printedmanualbox > 0pt
-      % What is the 7sp about?  The idea is that we also want to omit
-      % the Section part if we would be printing "Top", since they are
-      % clearly trying to refer to the whole manual.  But, this being
-      % TeX, we can't easily compare strings while ignoring the possible
-      % spaces before and after in the input.  By adding the arbitrary
-      % 7sp, we make it much less likely that a real node name would
-      % happen to have the same width as "Top" (e.g., in a monospaced font).
-      % I hope it will never happen in practice.
+      % Cross-manual reference with a printed manual name.
       % 
-      % For the same basic reason, we retypeset the "Top" at every
-      % reference, since the current font is indeterminate.
+      \crossmanualxref{\cite{\printedmanual\unskip}}%
+    %
+    \else\ifdim \wd\infofilenamebox > 0pt
+      % Cross-manual reference with only an info filename (arg 4), no
+      % printed manual name (arg 5).  This is essentially the same as
+      % the case above; we output the filename, since we have nothing else.
       % 
-      \setbox\topbox = \hbox{Top\kern7sp}%
-      \setbox2 = \hbox{\ignorespaces \printedrefname \unskip \kern7sp}%
-      \ifdim \wd2 > 7sp
-        \ifdim \wd2 = \wd\topbox \else
-          \putwordSection{} ``\printedrefname'' \putwordin{}\space
-        \fi
-      \fi
-      \cite{\printedmanual}%
+      \crossmanualxref{\code{\infofilename\unskip}}%
+    %
     \else
-      % Reference in this manual.
+      % Reference within this manual.
       %
       % _ (for example) has to be the character _ for the purposes of the
       % control sequence corresponding to the node, but it has to expand
@@ -7966,11 +7967,37 @@ end
       %
       % output the `page 3'.
       \turnoffactive \putwordpage\tie\refx{#1-pg}{}%
-    \fi
+    \fi\fi
   \fi
   \endlink
 \endgroup}
 
+% Output a cross-manual xref to #1.  Used just above (twice).
+% 
+% Only include the text "Section ``foo'' in" if the foo is neither
+% missing or Top.  Thus, @xref{,,,foo,The Foo Manual} outputs simply
+% "see The Foo Manual", the idea being to refer to the whole manual.
+% 
+% But, this being TeX, we can't easily compare our node name against the
+% string "Top" while ignoring the possible spaces before and after in
+% the input.  By adding the arbitrary 7sp below, we make it much less
+% likely that a real node name would have the same width as "Top" (e.g.,
+% in a monospaced font).  Hopefully it will never happen in practice.
+% 
+% For the same basic reason, we retypeset the "Top" at every
+% reference, since the current font is indeterminate.
+% 
+\def\crossmanualxref#1{%
+  \setbox\toprefbox = \hbox{Top\kern7sp}%
+  \setbox2 = \hbox{\ignorespaces \printedrefname \unskip \kern7sp}%
+  \ifdim \wd2 > 7sp  % nonempty?
+    \ifdim \wd2 = \wd\toprefbox \else  % same as Top?
+      \putwordSection{} ``\printedrefname'' \putwordin{}\space
+    \fi
+  \fi
+  #1%
+}
+
 % This macro is called from \xrefX for the `[nodename]' part of xref
 % output.  It's a separate macro only so it can be changed more easily,
 % since square brackets don't work well in some documents.  Particularly