mirror/groff
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/groff.git synced 2026-01-26 15:39:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

* arch/misc/Makefile.sub (shdeps.sed): Use $(srcdir).

Browse Source 
Fix problems with `friend name injections'.

* src/preproc/eqn/box.h (make_mark_box, make_lineup_box,
make_script_box), src/roff/troff/div.h (end_diversions),
src/roff/troff/env.h (title), input.cpp (process_input_stack): Undo
change 2004-04-08.


* src/preproc/pic/pic.man, doc/pic.ms: Add example for `command'.


* src/libs/libgroff/cset.cpp, src/libs/libgroff/lf.cpp,
src/libs/libgroff/color.cpp: Include lib.h.
This commit is contained in:
Werner LEMBERG 2004-05-28 21:43:38 +00:00
parent 0000c1aaba
commit f22440b6eb
11 changed files with 100 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ChangeLog
View File

@ -1,3 +1,25 @@
2004-05-27 Werner LEMBERG <wl@gnu.org>
* arch/misc/Makefile.sub (shdeps.sed): Use $(srcdir).
2004-05-26 Niklas Edmundsson <nikke@acc.umu.se>
Fix problems with `friend name injections'.
* src/preproc/eqn/box.h (make_mark_box, make_lineup_box,
make_script_box), src/roff/troff/div.h (end_diversions),
src/roff/troff/env.h (title), input.cpp (process_input_stack): Undo
change 2004-04-08.
2004-05-25 Bernd Warken <bwarken@mayn.de>
* src/preproc/pic/pic.man, doc/pic.ms: Add example for `command'.
2004-05-25 Werner LEMBERG <wl@gnu.org>
* src/libs/libgroff/cset.cpp, src/libs/libgroff/lf.cpp,
src/libs/libgroff/color.cpp: Include lib.h.
2004-05-25 Paul Eggert <eggert@cs.ucla.edu>
* PROBLEMS: Update documentation for problems with Sun C++ 5.0

4
arch/misc/Makefile.sub
View File

@ -21,7 +21,7 @@ CLEANADD=shdeps.sed
all: shdeps.sed
shdeps.sed: shdeps.sh
$(SHELL) shdeps.sh "$(RT_SEP)" "$(SH_SEP)" "$(bindir)" > $@
shdeps.sed: $(srcdir)/shdeps.sh
$(SHELL) $(srcdir)/shdeps.sh "$(RT_SEP)" "$(SH_SEP)" "$(bindir)" > $@
# eof

25
doc/pic.ms
View File

@ -1731,7 +1731,7 @@ Accordingly, the command
.RS
.KS
.IP
.ft CW
.CW
.nf
\&.PS
copy thru % circle at ($1,$2) % until "END"
@ -1750,7 +1750,7 @@ is equivalent to
.RS
.KS
.IP
.ft CW
.CW
.nf
\&.PS
circle at (1,2)
@ -1787,6 +1787,27 @@ This has a similar effect to a line beginning with
or
\fB\e\fR\|,
but allows the values of variables to be passed through.
.LP
For example,
.KS
.DS
.CW
.nf
\&.PS
x = 14
command ".ds string x is " x "."
\&.PE
\e*[string]
.DE
.R
.KE
.LP
prints
.DS
.CW
x is 14.
.R
.DE
.
.NH 2
Executing Shell Commands

3
src/libs/libgroff/color.cpp
View File

@ -2,7 +2,7 @@
/* <groff_src_dir>/src/libs/libgroff/color.cpp
Last update: 07 Jan 2004
Last update: 26 May 2004
Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
Written by Gaius Mulley <gaius@glam.ac.uk>
@ -23,6 +23,7 @@ You should have received a copy of the GNU General Public License along
with groff; see the file COPYING. If not, write to the Free Software
Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "lib.h"
#include "color.h"
#include "cset.h"
#ifdef HAVE_UNISTD_H

4
src/libs/libgroff/cset.cpp
View File

@ -1,5 +1,5 @@
// -*- C++ -*-
/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
/* Copyright (C) 1989, 1990, 1991, 1992, 2004 Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
This file is part of groff.
@ -19,6 +19,8 @@ with groff; see the file COPYING. If not, write to the Free Software
Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include <ctype.h>
#include "lib.h"
#include "cset.h"
cset csalpha(CSET_BUILTIN);

5
src/libs/libgroff/lf.cpp
View File

@ -1,5 +1,5 @@
// -*- C++ -*-
/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
/* Copyright (C) 1989, 1990, 1991, 1992, 2004 Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
This file is part of groff.
@ -18,8 +18,9 @@ You should have received a copy of the GNU General Public License along
with groff; see the file COPYING. If not, write to the Free Software
Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include <string.h>
#include <ctype.h>
#include "lib.h"
#include "cset.h"
#include "stringclass.h"

4
src/preproc/eqn/box.h
View File

@ -62,6 +62,10 @@ public:
friend class list_box;
};
box *make_script_box(box *, box *, box *);
box *make_mark_box(box *);
box *make_lineup_box(box *);
class list_box : public box {
int is_script;
box_list list;

40
src/preproc/pic/pic.man
View File

@ -1,5 +1,5 @@
.ig
Copyright (C) 1989-2000, 2001, 2002, 2003 Free Software Foundation, Inc.
Copyright (C) 1989-2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
Permission is granted to make and distribute verbatim copies of
this manual provided the copyright notice and this permission notice
@ -362,6 +362,25 @@ This has a similar effect to a line beginning with
or
.BR \e ,
but allows the values of variables to be passed through.
For example,
.RS
.IP
.ft B
.nf
\&.PS
x = 14
command ".ds string x is " x "."
\&.PE
\e*[string]
.ft
.fi
.RE
.IP
prints
.RS
.IP
.B x is 14.
.RE
.
.TP
\fBsh\fR \fIX\fR \fIcommand\fR \fIX\fR
@ -522,7 +541,10 @@ print x " " y
.RE
.IP
prints
.BR 5\ 3 .
.RS
.IP
.B 5 3
.RE
.
.LP
Arguments of the form
@ -625,8 +647,10 @@ where
.I dir
is the current direction.
For example
.IP
.LP
.RS
.B line 2i
.RE
.LP
means draw a line 2\ inches long in the current direction.
The `i' (or `I') character is ignored; to use another measurement unit,
@ -645,6 +669,7 @@ Initially these have values 8.5 and 11.
Scientific notation is allowed for numbers.
For example
.RS
.LP
.B
x = 5e\-2
.RE
@ -653,21 +678,25 @@ x = 5e\-2
Text attributes can be compounded.
For example,
.RS
.LP
.B
"foo" above ljust
.RE
is legal.
.LP
is valid.
.
.LP
There is no limit to the depth to which blocks can be examined.
For example,
.RS
.LP
.B
[A: [B: [C: box ]]] with .A.B.C.sw at 1,2
.br
.B
circle at last [\^].A.B.C
.RE
.LP
is acceptable.
.
.LP
@ -974,6 +1003,7 @@ has built-in graphics conversion devices that are called with the option
.RE
.LP
Call
.LP
.RS
.B gs --help
.RE
@ -1052,7 +1082,7 @@ W. Richard Stevens - Examples of picMacros
.
Input characters that are invalid for
.B groff
(ie those with
(i.e., those with
.SM ASCII
code 0, or 013 octal, or between 015 and 037 octal, or between 0200 and 0237
octal) are rejected even in \*(tx mode.

2
src/roff/troff/div.h
View File

@ -19,6 +19,8 @@ You should have received a copy of the GNU General Public License along
with groff; see the file COPYING. If not, write to the Free Software
Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
void end_diversions();
class diversion {
friend void do_divert(int append, int boxing);
friend void end_diversions();

2
src/roff/troff/env.h
View File

@ -71,6 +71,8 @@ hunits env_sentence_space_width(environment *);
hunits env_narrow_space_width(environment *);
hunits env_half_narrow_space_width(environment *);
void title();
struct tab;
enum tab_type { TAB_NONE, TAB_LEFT, TAB_CENTER, TAB_RIGHT };

2
src/roff/troff/input.cpp
View File

@ -154,6 +154,8 @@ class input_iterator;
input_iterator *make_temp_iterator(const char *);
const char *input_char_description(int);
void process_input_stack();
void set_escape_char()
{