Added `brp' request: This is p as a request.

* src/roff/troff/env.cc (environment::do_break): Add parameter
`spread'.
(do_break_request): New function (was `break_request').
(break_request): Calls `do_break_request'.
(break_spread_request): New; calls `do_break_request'.
(init_env_requests): Updated.
* src/roff/troff/env.h: Updated.
* NEWS, src/roff/troff/troff.man, man/groff.man: Document it.

* VERSION: Increased to 1.17.1.


* tmac/an-old.tmac: Fix minor compatibility mode issue.
* tmac/troffrc-end: Make it really work in compatibility mode.

9 files changed, 79 insertions, 28 deletions

diff --git a/ChangeLog b/ChangeLog
index 5fa244e6..188b8ca0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2001-05-02  Werner LEMBERG  <wl@gnu.org>
+
+	Added `brp' request: This is \p as a request.
+
+	* src/roff/troff/env.cc (environment::do_break): Add parameter
+	`spread'.
+	(do_break_request): New function (was `break_request').
+	(break_request): Calls `do_break_request'.
+	(break_spread_request): New; calls `do_break_request'.
+	(init_env_requests): Updated.
+	* src/roff/troff/env.h: Updated.
+	* NEWS, src/roff/troff/troff.man, man/groff.man: Document it.
+
+	* VERSION: Increased to 1.17.1.
+
+2001-05-01  Werner LEMBERG  <wl@gnu.org>
+
+	* tmac/an-old.tmac: Fix minor compatibility mode issue.
+	* tmac/troffrc-end: Make it really work in compatibility mode.
+
 2001-04-27  Werner LEMBERG  <wl@gnu.org>
 
 	* src/utils/lkbib/lkbib.cc: Switch inclusion order of stdio.h and
diff --git a/NEWS b/NEWS
index 77c614f5..3592b2c2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+This file describes recent user-visible changes in groff.  Bug fixes are not
+described.  There are more details in the man pages.
+
+
+VERSION 1.17.1
+==============
+
+This is a bug-fixing release.
+
+Troff
+-----
+
+o Added request `brp'.  This is the same as `\p'.
+
 Nroff
 -----
 
@@ -9,9 +23,6 @@ o The environment variable GROFF_BIN_PATH will now be checked before PATH
 VERSION 1.17
 ============
 
-This file describes recent user-visible changes in groff.  Bug fixes
-are not described.  There are more details in the man pages.
-
 Groff
 -----
 
diff --git a/VERSION b/VERSION
index b48f3226..511a76e6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.17
+1.17.1
diff --git a/man/groff.man b/man/groff.man
index d69330d0..6c3daad1 100644
--- a/man/groff.man
+++ b/man/groff.man
@@ -892,6 +892,10 @@ Embolden Special Font
 when current font is
 .argument font .
 .
+.REQ .blm macro
+Set the blank line macro to
+.argument macro .
+.
 .REQ .box
 End current diversion.
 .
@@ -907,6 +911,7 @@ End current diversion.
 Divert and append to
 .argument macro ,
 omitting a partially filled line.
+.
 .REQ .bp
 Eject current page and begin new page.
 .
@@ -914,13 +919,12 @@ Eject current page and begin new page.
 Eject current page; next page number
 .argument \(+-N .
 .
-.REQ .blm macro
-Set the blank line macro to
-.argument macro .
-.
 .REQ .br
 Line break.
 .
+.REQ .brp
+Break and spread output line.
+.
 .REQ .break
 Break out of a while loop.
 .
diff --git a/src/roff/troff/env.cc b/src/roff/troff/env.cc
index 56f357c9..ca4881c2 100644
--- a/src/roff/troff/env.cc
+++ b/src/roff/troff/env.cc
@@ -2135,7 +2135,7 @@ void environment::add_html_tag_tabs()
   }
 }
 
-void environment::do_break()
+void environment::do_break(int spread)
 {
   if (curdiv == topdiv && topdiv->before_first_page) {
     topdiv->begin_page();
@@ -2146,7 +2146,7 @@ void environment::do_break()
   if (line) {
     line = new space_node(H0, line); // this is so that hyphenation works
     space_total++;
-    possibly_break_line();
+    possibly_break_line(0, spread);
   }
   while (line != 0 && line->discardable()) {
     width_total -= line->width();
@@ -2185,17 +2185,27 @@ int environment::is_empty()
   return !current_tab && line == 0 && pending_lines == 0;
 }
 
-void break_request()
+void do_break_request(int spread)
 {
   while (!tok.newline() && !tok.eof())
     tok.next();
   if (break_flag) {
-    curenv->do_break();
+    curenv->do_break(spread);
     curenv->add_html_tag(".br");
   }
   tok.next();
 }
 
+void break_request()
+{
+  do_break_request(0);
+}
+
+void break_spread_request()
+{
+  do_break_request(1);
+}
+
 void title()
 {
   if (curdiv == topdiv && topdiv->before_first_page) {
@@ -3014,6 +3024,7 @@ void init_env_requests()
   init_request("cc", control_char);
   init_request("c2", no_break_control_char);
   init_request("br", break_request);
+  init_request("brp", break_spread_request);
   init_request("tl", title);
   init_request("ta", set_tabs);
   init_request("linetabs", line_tabs_request);
diff --git a/src/roff/troff/env.h b/src/roff/troff/env.h
index 256db512..89ff0416 100644
--- a/src/roff/troff/env.h
+++ b/src/roff/troff/env.h
@@ -275,7 +275,7 @@ public:
   void interrupt();
   void spread() { spread_flag = 1; }
   void possibly_break_line(int start_here = 0, int forced = 0);
-  void do_break();			// .br
+  void do_break(int spread = 0);	// .br
   void final_break();
   void add_html_tag_eol();
   void add_html_tag(const char *);
diff --git a/src/roff/troff/troff.man b/src/roff/troff/troff.man
index 7fe052b4..86d5ba40 100644
--- a/src/roff/troff/troff.man
+++ b/src/roff/troff/troff.man
@@ -810,6 +810,10 @@ Be sure not to confuse this with the
 .B br
 request.
 .TP
+.B .brp
+This is the same as
+.BR \ep .
+.TP
 .BI .cflags\  n\ c1\ c2\|.\|.\|.
 Characters
 .IR c1 ,
diff --git a/tmac/an-old.tmac b/tmac/an-old.tmac
index 9ef041f9..caa1fa4e 100644
--- a/tmac/an-old.tmac
+++ b/tmac/an-old.tmac
@@ -35,7 +35,7 @@
 .
 .if !\n(.g .ab These man macros work only with groff.
 .
-.nr _C \n[.C]
+.nr _C \n(.C
 .cp 0
 .
 .if !r D .nr D 0
@@ -53,7 +53,7 @@
 .\}
 .
 .nr an-html 0
-.if '\*(.T'html' .nr an-html 1
+.if '\*[.T]'html' .nr an-html 1
 .if \n[an-html] .nr C 1
 .if r ps4html .nr C 1
 .
@@ -63,11 +63,12 @@
 .
 .\" .TH title section extra1 extra2 extra3
 .de TH
+.  cp 0
+.
 .  if \\n[an-html] \{\
 .     HTML-TAG ".tl"
 \\$1
 .  \}
-.  cp 0
 .
 .  de an-init \" We have to do it like this to get multiple man pages right.
 .    ds an-title "\\$1
@@ -465,8 +466,8 @@
 .el        .ds R (Reg.)
 .ie c\[tm] .ds Tm \[tm]
 .el        .ds Tm (TM)
-.ds lq \(lq
-.ds rq \(rq
+.ds lq \[lq]
+.ds rq \[rq]
 .
 .if !\n[an-html] .hy 14
 .
diff --git a/tmac/troffrc-end b/tmac/troffrc-end
index 631f6b00..f786059d 100644
--- a/tmac/troffrc-end
+++ b/tmac/troffrc-end
@@ -2,18 +2,18 @@
 .\" final startup file for troff
 .\" this file is parsed after all macro sets have been read
 .\"
-.do if '\*(.T'html' .mso html.tmac
-.\" if we are running the postscript device for html images then load -mwww
+.do if '\*[.T]'html' .do mso html.tmac
+.\" if we are running the postscript device for html images then load www.tmac
 .\"
-.do if r ps4html    .mso www.tmac
+.do if r ps4html     .do mso www.tmac
 .\"
 .\" for all other devices blank out these macros
 .\"
-.do if !d HTML-IMAGE-INLINE   .ds HTML-IMAGE-INLINE
-.do if !d HTML-IMAGE          .ds HTML-IMAGE
-.do if !d HTML-IMAGE-RIGHT    .ds HTML-IMAGE-RIGHT
-.do if !d HTML-IMAGE-LEFT     .ds HTML-IMAGE-LEFT
-.do if !d HTML-IMAGE-END      .ds HTML-IMAGE-END
-.do if !d HTML-TAG            .ds HTML-TAG
-.do if !d HTML-DO-IMAGE       .ds HTML-DO-IMAGE
+.do if !d HTML-IMAGE-INLINE .do ds HTML-IMAGE-INLINE
+.do if !d HTML-IMAGE        .do ds HTML-IMAGE
+.do if !d HTML-IMAGE-RIGHT  .do ds HTML-IMAGE-RIGHT
+.do if !d HTML-IMAGE-LEFT   .do ds HTML-IMAGE-LEFT
+.do if !d HTML-IMAGE-END    .do ds HTML-IMAGE-END
+.do if !d HTML-TAG          .do ds HTML-TAG
+.do if !d HTML-DO-IMAGE     .do ds HTML-DO-IMAGE
 .\" Don't let blank lines creep in here.