Merge from gnulib.
This incorporates: 2014-01-07 update from texinfo 2014-01-06 md5, sha1, sha256, sha512: support older autoconf
This commit is contained in:
Paul Eggert
parent
6b81c31d81
commit
bada50fc50
4 changed files with 62 additions and 44 deletions
|
|
@ -1,3 +1,9 @@
|
|||
2014-01-11 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Merge from gnulib, incorporating:
|
||||
2014-01-07 update from texinfo
|
||||
2014-01-06 md5, sha1, sha256, sha512: support older autoconf
|
||||
|
||||
2014-01-09 Eric S. Raymond <esr@thyrsus.com>
|
||||
|
||||
* INSTALL, configure.ac, etc/CONTRIBUTE, nt/INSTALL: Remove
|
||||
|
|
|
|||
|
|
@ -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{2013-09-11.11}
|
||||
\def\texinfoversion{2014-01-06.16}
|
||||
%
|
||||
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
|
||||
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
|
||||
|
|
@ -1138,10 +1138,12 @@
|
|||
|
||||
\ifpdf
|
||||
%
|
||||
% Color manipulation macros based on pdfcolor.tex,
|
||||
% Color manipulation macros using ideas from pdfcolor.tex,
|
||||
% except using rgb instead of cmyk; the latter is said to render as a
|
||||
% very dark gray on-screen and a very dark halftone in print, instead
|
||||
% of actual black.
|
||||
% of actual black. The dark red here is dark enough to print on paper as
|
||||
% nearly black, but still distinguishable for online viewing. We use
|
||||
% black by default, though.
|
||||
\def\rgbDarkRed{0.50 0.09 0.12}
|
||||
\def\rgbBlack{0 0 0}
|
||||
%
|
||||
|
|
@ -1251,10 +1253,9 @@
|
|||
% used to mark target names; must be expandable.
|
||||
\def\pdfmkpgn#1{#1}
|
||||
%
|
||||
% by default, use a color that is dark enough to print on paper as
|
||||
% nearly black, but still distinguishable for online viewing.
|
||||
\def\urlcolor{\rgbDarkRed}
|
||||
\def\linkcolor{\rgbDarkRed}
|
||||
% by default, use black for everything.
|
||||
\def\urlcolor{\rgbBlack}
|
||||
\def\linkcolor{\rgbBlack}
|
||||
\def\endlink{\setcolor{\maincolor}\pdfendlink}
|
||||
%
|
||||
% Adding outlines to PDF; macros for calculating structure of outlines
|
||||
|
|
@ -2574,37 +2575,21 @@
|
|||
\let\file=\code
|
||||
\let\option=\code
|
||||
|
||||
% @uref (abbreviation for `urlref') takes an optional (comma-separated)
|
||||
% second argument specifying the text to display and an optional third
|
||||
% arg as text to display instead of (rather than in addition to) the url
|
||||
% itself. First (mandatory) arg is the url.
|
||||
% (This \urefnobreak definition isn't used now, leaving it for a while
|
||||
% for comparison.)
|
||||
\def\urefnobreak#1{\dourefnobreak #1,,,\finish}
|
||||
\def\dourefnobreak#1,#2,#3,#4\finish{\begingroup
|
||||
\unsepspaces
|
||||
\pdfurl{#1}%
|
||||
\setbox0 = \hbox{\ignorespaces #3}%
|
||||
\ifdim\wd0 > 0pt
|
||||
\unhbox0 % third arg given, show only that
|
||||
\else
|
||||
\setbox0 = \hbox{\ignorespaces #2}%
|
||||
\ifdim\wd0 > 0pt
|
||||
\ifpdf
|
||||
\unhbox0 % PDF: 2nd arg given, show only it
|
||||
\else
|
||||
\unhbox0\ (\code{#1})% DVI: 2nd arg given, show both it and url
|
||||
\fi
|
||||
\else
|
||||
\code{#1}% only url given, so show it
|
||||
\fi
|
||||
\fi
|
||||
\endlink
|
||||
\endgroup}
|
||||
% @uref (abbreviation for `urlref') aka @url takes an optional
|
||||
% (comma-separated) second argument specifying the text to display and
|
||||
% an optional third arg as text to display instead of (rather than in
|
||||
% addition to) the url itself. First (mandatory) arg is the url.
|
||||
|
||||
% This \urefbreak definition is the active one.
|
||||
% TeX-only option to allow changing PDF output to show only the second
|
||||
% arg (if given), and not the url (which is then just the link target).
|
||||
\newif\ifurefurlonlylink
|
||||
|
||||
% The main macro is \urefbreak, which allows breaking at expected
|
||||
% places within the url. (There used to be another version, which
|
||||
% didn't support automatic breaking.)
|
||||
\def\urefbreak{\begingroup \urefcatcodes \dourefbreak}
|
||||
\let\uref=\urefbreak
|
||||
%
|
||||
\def\dourefbreak#1{\urefbreakfinish #1,,,\finish}
|
||||
\def\urefbreakfinish#1,#2,#3,#4\finish{% doesn't work in @example
|
||||
\unsepspaces
|
||||
|
|
@ -2613,12 +2598,19 @@
|
|||
\ifdim\wd0 > 0pt
|
||||
\unhbox0 % third arg given, show only that
|
||||
\else
|
||||
\setbox0 = \hbox{\ignorespaces #2}%
|
||||
\setbox0 = \hbox{\ignorespaces #2}% look for second arg
|
||||
\ifdim\wd0 > 0pt
|
||||
\ifpdf
|
||||
\unhbox0 % PDF: 2nd arg given, show only it
|
||||
\ifurefurlonlylink
|
||||
% PDF plus option to not display url, show just arg
|
||||
\unhbox0
|
||||
\else
|
||||
% PDF, normally display both arg and url for consistency,
|
||||
% visibility, if the pdf is eventually used to print, etc.
|
||||
\unhbox0\ (\urefcode{#1})%
|
||||
\fi
|
||||
\else
|
||||
\unhbox0\ (\urefcode{#1})% DVI: 2nd arg given, show both it and url
|
||||
\unhbox0\ (\urefcode{#1})% DVI, always show arg and url
|
||||
\fi
|
||||
\else
|
||||
\urefcode{#1}% only url given, so show it
|
||||
|
|
@ -3691,7 +3683,7 @@
|
|||
\parskip=\smallskipamount
|
||||
\ifdim\parskip=0pt \parskip=2pt \fi
|
||||
%
|
||||
% Try typesetting the item mark that if the document erroneously says
|
||||
% Try typesetting the item mark so that if the document erroneously says
|
||||
% something like @itemize @samp (intending @table), there's an error
|
||||
% right away at the @itemize. It's not the best error message in the
|
||||
% world, but it's better than leaving it to the @item. This means if
|
||||
|
|
@ -8342,8 +8334,8 @@
|
|||
%
|
||||
% Auto-number footnotes. Otherwise like plain.
|
||||
\gdef\footnote{%
|
||||
\let\indent=\ptexindent
|
||||
\let\noindent=\ptexnoindent
|
||||
%\let\indent=\ptexindent
|
||||
%\let\noindent=\ptexnoindent
|
||||
\global\advance\footnoteno by \@ne
|
||||
\edef\thisfootno{$^{\the\footnoteno}$}%
|
||||
%
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# 00gnulib.m4 serial 2
|
||||
# 00gnulib.m4 serial 3
|
||||
dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
|
||||
dnl This file is free software; the Free Software Foundation
|
||||
dnl gives unlimited permission to copy and/or distribute it,
|
||||
|
|
@ -6,7 +6,23 @@ dnl with or without modifications, as long as this notice is preserved.
|
|||
|
||||
dnl This file must be named something that sorts before all other
|
||||
dnl gnulib-provided .m4 files. It is needed until such time as we can
|
||||
dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE semantics.
|
||||
dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE and
|
||||
dnl m4_divert semantics.
|
||||
|
||||
# Until autoconf 2.63, handling of the diversion stack required m4_init
|
||||
# to be called first; but this does not happen with aclocal. Wrapping
|
||||
# the entire execution in another layer of the diversion stack fixes this.
|
||||
# Worse, prior to autoconf 2.62, m4_wrap depended on the underlying m4
|
||||
# for whether it was FIFO or LIFO; in order to properly balance with
|
||||
# m4_init, we need to undo our push just before anything wrapped within
|
||||
# the m4_init body. The way to ensure this is to wrap both sides of
|
||||
# m4_init with a one-shot macro that does the pop at the right time.
|
||||
m4_ifndef([_m4_divert_diversion],
|
||||
[m4_divert_push([KILL])
|
||||
m4_define([gl_divert_fixup], [m4_divert_pop()m4_define([$0])])
|
||||
m4_define([m4_init],
|
||||
[gl_divert_fixup()]m4_defn([m4_init])[gl_divert_fixup()])])
|
||||
|
||||
|
||||
# AC_DEFUN_ONCE([NAME], VALUE)
|
||||
# ----------------------------
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# gnulib-common.m4 serial 33
|
||||
# gnulib-common.m4 serial 34
|
||||
dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
|
||||
dnl This file is free software; the Free Software Foundation
|
||||
dnl gives unlimited permission to copy and/or distribute it,
|
||||
|
|
@ -375,3 +375,7 @@ AC_DEFUN([gl_CACHE_VAL_SILENT],
|
|||
AC_CACHE_VAL([$1], [$2])
|
||||
as_echo_n="$saved_as_echo_n"
|
||||
])
|
||||
|
||||
# AS_VAR_COPY was added in autoconf 2.63b
|
||||
m4_define_default([AS_VAR_COPY],
|
||||
[AS_LITERAL_IF([$1[]$2], [$1=$$2], [eval $1=\$$2])])
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue