diff options
author | wlemb <wlemb> | 2004-05-28 21:43:35 +0000 |
---|---|---|
committer | wlemb <wlemb> | 2004-05-28 21:43:35 +0000 |
commit | 6c29c26bfb148776f1dcd15f7c797bf428757c07 (patch) | |
tree | 6468094b4e19b1a0ae4b19b25d467058925ed247 | |
parent | f2901a5093e9226ca375c81a0215bcfcc2e30450 (diff) | |
download | groff-6c29c26bfb148776f1dcd15f7c797bf428757c07.tar.gz |
* arch/misc/Makefile.sub (shdeps.sed): Use $(srcdir).
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.
-rw-r--r-- | ChangeLog | 22 | ||||
-rw-r--r-- | arch/misc/Makefile.sub | 4 | ||||
-rw-r--r-- | doc/pic.ms | 27 | ||||
-rw-r--r-- | src/libs/libgroff/color.cpp | 3 | ||||
-rw-r--r-- | src/libs/libgroff/cset.cpp | 4 | ||||
-rw-r--r-- | src/libs/libgroff/lf.cpp | 5 | ||||
-rw-r--r-- | src/preproc/eqn/box.h | 4 | ||||
-rw-r--r-- | src/preproc/pic/pic.man | 40 | ||||
-rw-r--r-- | src/roff/troff/div.h | 2 | ||||
-rw-r--r-- | src/roff/troff/env.h | 2 | ||||
-rw-r--r-- | src/roff/troff/input.cpp | 2 |
11 files changed, 101 insertions, 14 deletions
@@ -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 diff --git a/arch/misc/Makefile.sub b/arch/misc/Makefile.sub index d49ab76e..b5f66e1d 100644 --- a/arch/misc/Makefile.sub +++ b/arch/misc/Makefile.sub @@ -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 @@ -10,7 +10,7 @@ .\" This document was written for free use and redistribution by .\" Eric S. Raymond <esr@thyrsus.com> in August 1995. .\" -.\" $Id: pic.ms,v 1.25 2003/07/12 06:08:49 wlemb Exp $ +.\" $Id: pic.ms,v 1.26 2004/05/28 21:43:36 wlemb Exp $ .\" .\" Set a proper TeX and LaTeX .ie t \{\ @@ -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 diff --git a/src/libs/libgroff/color.cpp b/src/libs/libgroff/color.cpp index 2a01ae5e..e14bd9ef 100644 --- a/src/libs/libgroff/color.cpp +++ b/src/libs/libgroff/color.cpp @@ -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 diff --git a/src/libs/libgroff/cset.cpp b/src/libs/libgroff/cset.cpp index e4845c11..3057a489 100644 --- a/src/libs/libgroff/cset.cpp +++ b/src/libs/libgroff/cset.cpp @@ -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); diff --git a/src/libs/libgroff/lf.cpp b/src/libs/libgroff/lf.cpp index 34272c7d..92750410 100644 --- a/src/libs/libgroff/lf.cpp +++ b/src/libs/libgroff/lf.cpp @@ -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" diff --git a/src/preproc/eqn/box.h b/src/preproc/eqn/box.h index 0b385f8b..89b9ac61 100644 --- a/src/preproc/eqn/box.h +++ b/src/preproc/eqn/box.h @@ -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; diff --git a/src/preproc/pic/pic.man b/src/preproc/pic/pic.man index 45bc2d62..d46f3b32 100644 --- a/src/preproc/pic/pic.man +++ b/src/preproc/pic/pic.man @@ -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. diff --git a/src/roff/troff/div.h b/src/roff/troff/div.h index af524606..87aeb1a3 100644 --- a/src/roff/troff/div.h +++ b/src/roff/troff/div.h @@ -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(); diff --git a/src/roff/troff/env.h b/src/roff/troff/env.h index 27f54c9c..ab71222f 100644 --- a/src/roff/troff/env.h +++ b/src/roff/troff/env.h @@ -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 }; diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp index 6dbaad20..62be5844 100644 --- a/src/roff/troff/input.cpp +++ b/src/roff/troff/input.cpp @@ -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() { |