[groff] 28/31: [ms]: Support pic(1) "flyback" feature.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 33c2f8cf681ff93804ea8a389f31f29764349d4e
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Mon Aug 15 01:04:08 2022 -0500

    [ms]: Support pic(1) "flyback" feature.
    
    * tmac/s.tmac (PF): Add macro; it does what `PE` formerly did, minus
      vertical spacing.
    
      (PE): Call `PF` and vertically space as before.
    
    * doc/groff.texi (ms Insertions):
    * doc/ms.ms (Tables, figures, equations, and references):
    * tmac/groff_ms.7.man (Tables, figures, equations, and references):
      Document it.
    
    * NEWS: Add item.
    
    Fixes <https://savannah.gnu.org/bugs/?60558>.
    
    Also bump doc/ms.ms document date.
---
 ChangeLog           | 17 +++++++++++++++++
 NEWS                |  3 +++
 doc/groff.texi      | 10 ++++++----
 doc/ms.ms           | 19 ++++++++++++++-----
 tmac/groff_ms.7.man | 13 +++++++++++--
 tmac/s.tmac         |  5 ++++-
 6 files changed, 55 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 87900afd4..8615277ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2022-08-15  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       [ms]: Support pic(1) "flyback" feature.
+
+       * tmac/s.tmac (PF): Add macro; it does what `PE` formerly did,
+       minus vertical spacing.
+       (PE): Call `PF` and vertically space as before.
+
+       * doc/groff.texi (ms Insertions):
+       * doc/ms.ms (Tables, figures, equations, and references):
+       * tmac/groff_ms.7.man (Tables, figures, equations, and
+       references): Document it.
+
+       * NEWS: Add item.
+
+       Fixes <https://savannah.gnu.org/bugs/?60558>.
+
 2022-08-15  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * tmac/s.tmac (@PS): Validate better; check for 2 arguments
diff --git a/NEWS b/NEWS
index c3b710950..306be4bab 100644
--- a/NEWS
+++ b/NEWS
@@ -387,6 +387,9 @@ o The s (ms) macro package's `RP` macro recognizes a new 
optional
   the latter will continue to be supported for backward compatibility.
   Optional arguments to `RP` can be given in any order.
 
+o The s (ms) package now offers a `PF` macro, supporting the pic(1)
+  preprocessor's "flyback" feature.
+
 o The "a4.tmac" file has been dropped from the distribution.  Its
   successor, "papersize.tmac", has been present and documented for
   nearly 20 years.  See subsection "Paper size" of groff(1).
diff --git a/doc/groff.texi b/doc/groff.texi
index 85adaf9e3..904bad805 100644
--- a/doc/groff.texi
+++ b/doc/groff.texi
@@ -3968,10 +3968,12 @@ use.
 @endDefmac
 
 @DefmacList {PS, , ms}
-@DefmacListEndx {PE, , ms}
-Demarcate a diagram to be processed by the @code{pic} preprocessor.  You
-can create @code{pic} input manually or by using a program such as
-@code{xfig}.
+@DefmacItemx {PE, , ms}
+@DefmacListEndx {PF, , ms}
+@code{PS} begins a picture to be processed by the @command{gpic}
+preprocessor; either of @code{PE} or @code{PF} ends it, the latter with
+``flyback'' to the vertical position at its top.  You can create
+@code{pic} input manually or with a program such as @code{xfig}.
 @endDefmac
 
 @DefmacList {EQ, [@Var{align} [@Var{label}]], ms}
diff --git a/doc/ms.ms b/doc/ms.ms
index c2eec839e..b19c4fe21 100644
--- a/doc/ms.ms
+++ b/doc/ms.ms
@@ -22,8 +22,8 @@
 .nr TC-MARGIN \w'00' \" expect 2-digit page numbers at most
 .ie t .nr PI 3.5n
 .el   .nr PI 4n
-.ND July 2022
-.EH '%''July 2022'
+.ND August 2022
+.EH '%''August 2022'
 .EF ''''
 .OH 'Using \f[I]groff\f[] with the \f[I]ms\f[] macros''%'
 .OF ''''
@@ -2396,14 +2396,23 @@ T{
 \&.PS
 .br
 \&.PE
+.br
+\&.PF
 T}     T{
-Demarcate a diagram to be processed by the
+.CW .PS
+begins a picture to be processed by the
 .I pic
-preprocessor.
+preprocessor;
+either of
+.CW .PE
+or
+.CW .PF
+ends it,
+the latter with \[lq]flyback\[rq] to the vertical position at its top.
 .
 You can create
 .I pic
-input manually or by using a program such as
+input manually or with a program such as
 .I xfig (1).
 T}
 _
diff --git a/tmac/groff_ms.7.man b/tmac/groff_ms.7.man
index eb9af571b..e64c9b464 100644
--- a/tmac/groff_ms.7.man
+++ b/tmac/groff_ms.7.man
@@ -1481,9 +1481,18 @@ examples of its use.
 .B .PS
 .TQ
 .B .PE
-Demarcate a diagram to be processed by the
+.TQ
+.B .PF
+.B .PS
+begins a picture to be processed by the
 .I pic
-preprocessor.
+preprocessor;
+either of
+.B .PE
+or
+.B .PF
+ends it,
+the latter with \[lq]flyback\[rq] to the vertical position at its top.
 .
 .
 .TP
diff --git a/tmac/s.tmac b/tmac/s.tmac
index ec9602489..bdc5fd0bf 100644
--- a/tmac/s.tmac
+++ b/tmac/s.tmac
@@ -2070,9 +2070,12 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 .\}
 .HTML-IMAGE
 ..
-.de PE
+.de PF
 .HTML-IMAGE-END
 .par@reset
+..
+.de PE
+.PF
 .sp \\n[DD]u+.5m
 ..
 .\" ****************************