summaryrefslogtreecommitdiff
path: root/texinfo.tex
diff options
context:
space:
mode:
authorKarl Berry <karl@gnu.org>1997-06-05 22:04:25 +0000
committerKarl Berry <karl@gnu.org>1997-06-05 22:04:25 +0000
commitdd63648825eb0bd3624e981802ea5dd4bd0b883b (patch)
treecf05574da5e08444acb778c8c2afb73dc21b7156 /texinfo.tex
parent229ba33d0ea1e8a0cd5d294eb67ed6a856d942d2 (diff)
downloadgunmake-dd63648825eb0bd3624e981802ea5dd4bd0b883b.tar.gz
(\uref): Write real definition, taking one mandatory argument and one
optional one.
Diffstat (limited to 'texinfo.tex')
-rw-r--r--texinfo.tex18
1 files changed, 15 insertions, 3 deletions
diff --git a/texinfo.tex b/texinfo.tex
index 9235c4f..ca676b5 100644
--- a/texinfo.tex
+++ b/texinfo.tex
@@ -1338,13 +1338,25 @@ where each line of input produces a line of output.}
\else{\tclose{\ttsl\look}}\fi
\else{\tclose{\ttsl\look}}\fi}
-% @url, @uref, @email. Quotes do not seem necessary.
+% @url, @email. Quotes do not seem necessary.
\let\url=\code % perhaps include a hypertex \special eventually
-\let\uref=\code
% rms does not like the angle brackets --karl, 17may97.
%\def\email#1{$\langle${\tt #1}$\rangle$}
\let\email=\code
+% @uref (abbreviation for `urlref') takes an optional second argument
+% specifying the text to display. First (mandatory) arg is the url.
+%
+\def\uref#1{\urefxxx #1,,\finish}
+\def\urefxxx#1,#2,#3\finish{%
+ \setbox0 = \hbox{\ignorespaces #2}%
+ \ifdim\wd0 > 0pt
+ \unhbox0\ (\code{#1})%
+ \else
+ \code{#1}%
+ \fi
+}
+
% Check if we are currently using a typewriter font. Since all the
% Computer Modern typewriter fonts have zero interword stretch (and
% shrink), and it is reasonable to expect all typewriter fonts to have
@@ -2089,7 +2101,7 @@ July\or August\or September\or October\or November\or December\fi
\global\colcount=0\relax}}
}
-\def\setmultitablespacing{% test to see if user has set \multitablelinespace.
+\def\setultitablespacing{% test to see if user has set \multitablelinespace.
% If so, do nothing. If not, give it an appropriate dimension based on
% current baselineskip.
\ifdim\multitablelinespace=0pt