[groff] 05/05: [ms]: Reset IP indentation after an SH call.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 021ba0e71bade16f3a4aa133b5fe56ae58795e90
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Sat May 1 18:37:40 2021 +1000

    [ms]: Reset IP indentation after an SH call.
    
    * tmac/s.tmac (par@finish): Set "ai" register for the current
      environment to the paragraph indent (PI) setting for the current
      environment.
    
    * doc/groff.texi (Highlighting in ms) <IP>:
    * doc/ms.ms (Highlighting) <IP>:
    * tmac/groff_ms.7.man (Usage/Highlighting) <IP>: Update documentation.
    
    Fixes <https://savannah.gnu.org/bugs/?60222>.
---
 ChangeLog           | 17 ++++++++++++++---
 doc/groff.texi      |  4 +---
 doc/ms.ms           |  5 ++---
 tmac/groff_ms.7.man |  5 ++---
 tmac/s.tmac         |  1 +
 5 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6e80f27..5ea6cfe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,20 @@
 2021-05-01  G. Branden Robinson <g.branden.robinson@gmail.com>
 
-       Add regression test for Savannah #60222.
+       Restore default IP paragraph indentation after an SH call.
 
-       * tmac/tests/s_SH_resets_IP_indentation_amount: Do it.
-       * tmac/tmac.am (tmac_TESTS): Run it.
+       * tmac/s.tmac (par@finish): Set "ai" register for the current
+       environment to the paragraph indent (PI) setting for the current
+       environment.
+
+       * doc/groff.texi (Highlighting in ms) <IP>:
+       * doc/ms.ms (Highlighting) <IP>:
+       * tmac/groff_ms.7.man (Usage/Highlighting) <IP>: Update
+       documentation.
+
+       * tmac/tests/s_SH_resets_IP_indentation_amount: Test it.
+       * tmac/tmac.am (tmac_TESTS): Run test.
+
+       Fixes <https://savannah.gnu.org/bugs/?60222>.
 
 2021-05-01  G. Branden Robinson <g.branden.robinson@gmail.com>
 
diff --git a/doc/groff.texi b/doc/groff.texi
index e827634..aa0134c 100644
--- a/doc/groff.texi
+++ b/doc/groff.texi
@@ -2998,9 +2998,7 @@ not indented and is empty by default.  It has several 
applications;
 see @ref{Lists in ms}.  @var{width} overrides the default indentation
 amount stored in the @code{PI} register; its default unit is @samp{n}.
 Once specified, @var{width} applies to further @code{IP} calls until
-specified again or a different paragraphing
-@c or heading (Savannah #60222)
-macro is called.
+specified again or a heading or different paragraphing macro is called.
 @endDefmac
 
 @Defmac {QP, , ms}
diff --git a/doc/ms.ms b/doc/ms.ms
index 875cdce..a211670 100644
--- a/doc/ms.ms
+++ b/doc/ms.ms
@@ -695,9 +695,8 @@ Once specified,
 .I width
 applies to further
 .CW .IP
-calls until specified again or a different paragraphing
-.\" or heading (Savannah #60222)
-macro is called.
+calls until specified again or a heading or different paragraphing macro
+is called.
 T}
 _
 \&.QP  T{
diff --git a/tmac/groff_ms.7.man b/tmac/groff_ms.7.man
index 7aab8e2..7e30c62 100644
--- a/tmac/groff_ms.7.man
+++ b/tmac/groff_ms.7.man
@@ -513,9 +513,8 @@ Once specified,
 .I width
 applies to further
 .B .IP
-calls until specified again or a different paragraphing
-.\" or heading (Savannah #60222)
-macro is called.
+calls until specified again or a heading or different paragraphing macro
+is called.
 .
 .
 .TP
diff --git a/tmac/s.tmac b/tmac/s.tmac
index 7bb919a..95ac843 100644
--- a/tmac/s.tmac
+++ b/tmac/s.tmac
@@ -1260,6 +1260,7 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 .ne \\n[PORPHANS]v+\\n(.Vu
 ..
 .de par@finish
+.nr \\n[.ev]:ai \\n[\\n[.ev]:PI]
 .nr \\n[.ev]:pli 0
 .nr \\n[.ev]:pri 0
 .par@reset