diff options
| -rw-r--r-- | doc/texinfo.tex | 57 | ||||
| -rw-r--r-- | lib/getopt.c | 4 | ||||
| -rw-r--r-- | lib/getopt.h | 12 | ||||
| -rw-r--r-- | lib/getopt1.c | 4 | ||||
| -rw-r--r-- | old/sh-utils/ChangeLog | 5 | ||||
| -rw-r--r-- | src/test.c | 4 |
6 files changed, 53 insertions, 33 deletions
diff --git a/doc/texinfo.tex b/doc/texinfo.tex index d9feb29b1..c7dcd3615 100644 --- a/doc/texinfo.tex +++ b/doc/texinfo.tex @@ -24,7 +24,7 @@ % This automatically updates the version number based on RCS. \def\deftexinfoversion$#1: #2 ${\def\texinfoversion{#2}} -\deftexinfoversion$Revision: 1.6 $ +\deftexinfoversion$Revision: 1.7 $ \message{Loading texinfo package [Version \texinfoversion]:} % Print the version number if in a .fmt file. @@ -168,9 +168,14 @@ % Do @cropmarks to get crop marks \def\cropmarks{\let\onepageout=\croppageout } +\newinsert\margin \dimen\margin=\maxdimen + \def\pagebody#1{\vbox to\pageheight{\boxmaxdepth=\maxdepth #1}} {\catcode`\@ =11 \gdef\pagecontents#1{\ifvoid\topins\else\unvbox\topins\fi +% marginal hacks, juha@viisa.uucp (Juha Takala) +\ifvoid\margin\else % marginal info is present + \rlap{\kern\hsize\vbox to\z@{\kern1pt\box\margin \vss}}\fi \dimen@=\dp#1 \unvbox#1 \ifvoid\footins\else\vskip\skip\footins\footnoterule \unvbox\footins\fi \ifr@ggedbottom \kern-\dimen@ \vfil \fi} @@ -901,12 +906,14 @@ where each line of input produces a line of output.} % Set the font macro #1 to the font named #2, adding on the % specified font prefix (normally `cm'). -\def\fontprefix{cm} \def\setfont#1#2{\font#1=\fontprefix#2} -% Enter `@setfontprefix dc' to use the dc fonts instead of the cm fonts. -\def\setfontprefix{\parsearg\\setfontprefixzzz} -\def\setfontprefixzzz#1{\gdef\fontprefix{#1}} +% Use cm as the default font prefix. +% To specify the font prefix, you must define \fontprefix +% before you read in texinfo.tex. +\ifx\fontprefix\undefined +\def\fontprefix{cm} +\fi \ifx\bigger\relax \let\mainmagstep=\magstep1 @@ -924,11 +931,11 @@ where each line of input produces a line of output.} \setfont\textsl{sl10 scaled \mainmagstep} \setfont\textsf{ss10 scaled \mainmagstep} \setfont\textsc{csc10 scaled \mainmagstep} -\setfont\texti{mi10 scaled \mainmagstep} -\setfont\textsy{sy10 scaled \mainmagstep} +\font\texti=cmmi10 scaled \mainmagstep +\font\textsy=cmsy10 scaled \mainmagstep % A few fonts for @defun, etc. -\setfont\defbf{bx10 scaled \magstep1 %was 1314} +\setfont\defbf{bx10 scaled \magstep1} %was 1314 \setfont\deftt{tt10 scaled \magstep1} \def\df{\let\tentt=\deftt \let\tenbf = \defbf \bf} @@ -945,8 +952,8 @@ where each line of input produces a line of output.} \let\indsf=\indrm \let\indbf=\indrm \let\indsc=\indrm -\setfont\indi{mi9} -\setfont\indsy{sy9} +\font\indi=cmmi9 +\font\indsy=cmsy9 % Fonts for headings \setfont\chaprm{bx12 scaled \magstep2} @@ -956,8 +963,8 @@ where each line of input produces a line of output.} \setfont\chapsf{ss12 scaled \magstep2} \let\chapbf=\chaprm \setfont\chapsc{csc10 scaled\magstep3} -\setfont\chapi{mi12 scaled \magstep2} -\setfont\chapsy{sy10 scaled \magstep3} +\font\chapi=cmmi12 scaled \magstep2 +\font\chapsy=cmsy10 scaled \magstep3 \setfont\secrm{bx12 scaled \magstep1} \setfont\secit{ti12 scaled \magstep1} @@ -966,8 +973,8 @@ where each line of input produces a line of output.} \setfont\secsf{ss12 scaled \magstep1} \setfont\secbf{bx12 scaled \magstep1} \setfont\secsc{csc10 scaled\magstep2} -\setfont\seci{mi12 scaled \magstep1} -\setfont\secsy{sy10 scaled \magstep2} +\font\seci=cmmi12 scaled \magstep1 +\font\secsy=cmsy10 scaled \magstep2 % \setfont\ssecrm{bx10 scaled \magstep1} % This size an font looked bad. % \setfont\ssecit{cmti10 scaled \magstep1} % The letters were too crowded. @@ -990,13 +997,13 @@ where each line of input produces a line of output.} \setfont\ssecsf{ss12 scaled \magstephalf} \setfont\ssecbf{bx12 scaled \magstephalf} \setfont\ssecsc{csc10 scaled \magstep1} -\setfont\sseci{mi12 scaled \magstephalf} -\setfont\ssecsy{sy10 scaled \magstep1} +\font\sseci=cmmi12 scaled \magstephalf +\font\ssecsy=cmsy10 scaled \magstep1 % The smallcaps and symbol fonts should actually be scaled \magstep1.5, % but that is not a standard magnification. % Fonts for title page: -\setfont\titlerm ={bx12 scaled \magstep3} +\setfont\titlerm{bx12 scaled \magstep3} \let\authorrm = \secrm % In order for the font changes to affect most math symbols and letters, @@ -2031,7 +2038,13 @@ July\or August\or September\or October\or November\or December\fi \let\indexbackslash=0 %overridden during \printindex. +% workhorse for all \fooindexes +% #1 is name of index, #2 is stuff to put there \def\doind #1#2{% +% Put the index entry in the margin if desired. +\ifx\SETmarginindex\relax\else% +\insert\margin{\hbox{\vrule height8pt depth3pt width0pt #2}}% +\fi% {\count10=\lastpenalty % {\indexdummies % Must do this here, since \bf, etc expand at this stage \escapechar=`\\% @@ -2467,7 +2480,7 @@ July\or August\or September\or October\or November\or December\fi \def\chapteryyy #1{\numhead0{#1}} % normally numhead0 calls chapterzzz \def\chapterzzz #1{\seccheck{chapter}% \secno=0 \subsecno=0 \subsubsecno=0 -\global\advance \chapno by 1 \message{Chapter \the\chapno}% +\global\advance \chapno by 1 \message{\putwordChapter \the\chapno}% \chapmacro {#1}{\the\chapno}% \gdef\thissection{#1}% \gdef\thischaptername{#1}% @@ -3848,7 +3861,7 @@ July\or August\or September\or October\or November\or December\fi % Use \turnoffactive so that punctuation chars such as underscore % work in node names. -\def\dosetq #1#2{{\let\folio=0 \turnoffactive% +\def\dosetq #1#2{{\let\folio=0 \turnoffactive \auxhat% \edef\next{\write\auxfile{\internalsetq {#1}{#2}}}% \next}} @@ -3987,6 +4000,7 @@ July\or August\or September\or October\or November\or December\fi \catcode `\{=1 \catcode `\}=2 \catcode `\%=\other \catcode `\'=0 +\catcode`\^=7 % to make ^^e4 etc usable in xref tags \catcode `\\=\other \openin 1 \jobname.aux \ifeof 1 \else \closein 1 \input \jobname.aux \global\havexrefstrue @@ -4208,8 +4222,8 @@ July\or August\or September\or October\or November\or December\fi % textwidth; \voffset; \hoffset (!); binding offset. All require a dimension; % header is additional; added length extends the bottom of the page. -\def\changepagesizes#1#2#3#4#5 -{\global\vsize= #1 +\def\changepagesizes#1#2#3#4#5{ + \global\vsize= #1 \advance\vsize by \topskip \global\voffset= #3 \global\hsize= #2 @@ -4267,6 +4281,7 @@ July\or August\or September\or October\or November\or December\fi \def~{{\tt \char '176}} \chardef\hat=`\^ \catcode`\^=\active +\def\auxhat{\def^{'hat}} \def^{{\tt \hat}} \catcode`\_=\active diff --git a/lib/getopt.c b/lib/getopt.c index ac0d6f3f7..4bab2b1b9 100644 --- a/lib/getopt.c +++ b/lib/getopt.c @@ -30,7 +30,7 @@ #include <config.h> #endif -#ifndef __STDC__ +#if !defined (__STDC__) || !__STDC__ /* This is a separate conditional since some stdc systems reject `defined (const)'. */ #ifndef const @@ -188,7 +188,7 @@ my_index (str, chr) #ifdef __GNUC__ /* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h. That was relevant to code that was here before. */ -#ifndef __STDC__ +#if !defined (__STDC__) || !__STDC__ /* gcc with -traditional declares the built-in strlen to return int, and has done so at least since version 2.4.5. -- rms. */ extern int strlen (const char *); diff --git a/lib/getopt.h b/lib/getopt.h index 45541f5ac..4ac33b718 100644 --- a/lib/getopt.h +++ b/lib/getopt.h @@ -1,5 +1,5 @@ /* Declarations for getopt. - Copyright (C) 1989, 1990, 1991, 1992, 1993 Free Software Foundation, Inc. + Copyright (C) 1989, 90, 91, 92, 93, 94 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -76,7 +76,7 @@ extern int optopt; struct option { -#if __STDC__ +#if defined (__STDC__) && __STDC__ const char *name; #else char *name; @@ -94,15 +94,15 @@ struct option #define required_argument 1 #define optional_argument 2 -#if __STDC__ -#if defined(__GNU_LIBRARY__) +#if defined (__STDC__) && __STDC__ +#ifdef __GNU_LIBRARY__ /* 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. */ extern int getopt (int argc, char *const *argv, const char *shortopts); #else /* not __GNU_LIBRARY__ */ extern int getopt (); -#endif /* not __GNU_LIBRARY__ */ +#endif /* __GNU_LIBRARY__ */ extern int getopt_long (int argc, char *const *argv, const char *shortopts, const struct option *longopts, int *longind); extern int getopt_long_only (int argc, char *const *argv, @@ -120,7 +120,7 @@ extern int getopt_long (); extern int getopt_long_only (); extern int _getopt_internal (); -#endif /* not __STDC__ */ +#endif /* __STDC__ */ #ifdef __cplusplus } diff --git a/lib/getopt1.c b/lib/getopt1.c index 725c653bb..4580211cf 100644 --- a/lib/getopt1.c +++ b/lib/getopt1.c @@ -1,5 +1,5 @@ /* getopt_long and getopt_long_only entry points for GNU getopt. - Copyright (C) 1987, 88, 89, 90, 91, 92, 1993 + Copyright (C) 1987, 88, 89, 90, 91, 92, 1993, 1994 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it @@ -22,7 +22,7 @@ #include "getopt.h" -#ifndef __STDC__ +#if !defined (__STDC__) || !__STDC__ /* This is a separate conditional since some stdc systems reject `defined (const)'. */ #ifndef const diff --git a/old/sh-utils/ChangeLog b/old/sh-utils/ChangeLog index b14ee46f0..9eecbe29e 100644 --- a/old/sh-utils/ChangeLog +++ b/old/sh-utils/ChangeLog @@ -1,3 +1,8 @@ +Wed Nov 02 18:52:20 1994 Jim Meyering (meyering@comco.com) + + * doc/Makefile.in (install): Remove test for existence of info + file. Simply change to $(srcdir) instead. + Wed Oct 26 23:40:07 1994 Jim Meyering (meyering@comco.com) * safe-xstat.hin [EINTR]: Always define safe_l?stat. diff --git a/src/test.c b/src/test.c index 1e3c79212..9c4d30a13 100644 --- a/src/test.c +++ b/src/test.c @@ -157,8 +157,8 @@ test_stat (path, finfo) } /* Do the same thing access(2) does, but use the effective uid and gid, - and don't make the mistake of telling root that any file is - executable. */ + and don't make the mistake of telling root that any file is executable. + But this loses when the containing filesystem is mounted e.g. read-only. */ static int eaccess (path, mode) char *path; |