summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwlemb <wlemb>2001-05-18 06:04:15 +0000
committerwlemb <wlemb>2001-05-18 06:04:15 +0000
commit1b34c45ee635719d735ad55bfcd5b8b3d8dcc9dd (patch)
treede734f87cbd9f6a837b5736ad0473bb6665cc441
parent4e1662b43006a43f0dd0dc619a3151607d95277e (diff)
downloadgroff-1b34c45ee635719d735ad55bfcd5b8b3d8dcc9dd.tar.gz
* src/roff/troff/env.c, src/roff/troff/env.h,
src/roff/troff/input.cc, src/roff/troff/troff.man: Undo `ss' change from 2000-12-21.
-rw-r--r--ChangeLog6
-rw-r--r--src/roff/troff/env.cc2
-rw-r--r--src/roff/troff/env.h1
-rw-r--r--src/roff/troff/input.cc2
-rw-r--r--src/roff/troff/troff.man3
5 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 07cf9ca2..ae7a2212 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-05-18 Werner LEMBERG <wl@gnu.org>
+
+ * src/roff/troff/env.c, src/roff/troff/env.h,
+ src/roff/troff/input.cc, src/roff/troff/troff.man: Undo `ss' change
+ from 2000-12-21.
+
2001-05-17 Jeffrey Friedl <jfriedl@yahoo-inc.com>
* src/roff/troff/input.cc (read_size): Fix special case `\s0'.
diff --git a/src/roff/troff/env.cc b/src/roff/troff/env.cc
index ca4881c2..c0743441 100644
--- a/src/roff/troff/env.cc
+++ b/src/roff/troff/env.cc
@@ -1117,7 +1117,7 @@ void point_size()
void space_size()
{
int n;
- if (get_integer(&n) && !compatible_flag) {
+ if (get_integer(&n)) {
curenv->space_size = n;
if (has_arg() && get_integer(&n))
curenv->sentence_space_size = n;
diff --git a/src/roff/troff/env.h b/src/roff/troff/env.h
index 89ff0416..851a9a0a 100644
--- a/src/roff/troff/env.h
+++ b/src/roff/troff/env.h
@@ -345,6 +345,5 @@ void init_environments();
void read_hyphen_file(const char *name);
extern int break_flag;
-extern int compatible_flag;
extern symbol default_family;
extern int translate_space_to_dummy;
diff --git a/src/roff/troff/input.cc b/src/roff/troff/input.cc
index d0f86328..459a41ce 100644
--- a/src/roff/troff/input.cc
+++ b/src/roff/troff/input.cc
@@ -108,7 +108,7 @@ static void disable_warning(const char *);
static int escape_char = '\\';
static symbol end_macro_name;
static symbol blank_line_macro_name;
-int compatible_flag = 0;
+static int compatible_flag = 0;
int ascii_output_flag = 0;
int suppress_output_flag = 0;
int is_html = 0;
diff --git a/src/roff/troff/troff.man b/src/roff/troff/troff.man
index a37d623f..4336f56c 100644
--- a/src/roff/troff/troff.man
+++ b/src/roff/troff/troff.man
@@ -1725,8 +1725,7 @@ one twelfth of the spacewidth parameter for the current font.
Initially both the word space size and the sentence
space size are 12.
Contrary to UNIX troff, GNU troff handles this request in nroff mode
-also (if not in compatibility mode); a given value is then rounded down
-to the nearest multiple of\~12.
+also; a given value is then rounded down to the nearest multiple of\~12.
The sentence space size is used in two circumstances:
if the end of a sentence occurs at the end of a line in fill mode, then
both an inter-word space and a sentence space will be added;