[groff] 02/05: [ms]: Diagnose, recover from nested diversions.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 78421dbbfd30c0451de93e4719b2c7ae2ac202fd
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Sat May 1 02:01:45 2021 +1000

    [ms]: Diagnose, recover from nested diversions.
    
    * tmac/s.tmac (DS): Issue diagnostic and attempt recovery if document
      attempts to start a display within another display.
    
    Fixes <https://savannah.gnu.org/bugs/?55136>.
---
 ChangeLog   | 7 +++++++
 tmac/s.tmac | 1 +
 2 files changed, 8 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index faedb16..bd5a4ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2021-05-01  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * tmac/s.tmac (DS): Issue diagnostic and attempt recovery if
+       document attempts to start a display within another display.
+
+       Fixes <https://savannah.gnu.org/bugs/?55136>.
+
 2021-04-30  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * tmac/s.tmac: Implement alternative rendering for automatic
diff --git a/tmac/s.tmac b/tmac/s.tmac
index 01f92e6..7bb919a 100644
--- a/tmac/s.tmac
+++ b/tmac/s.tmac
@@ -1013,6 +1013,7 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 .el .@error-recover mismatched .DE
 ..
 .de DS
+.if '\\n(.z'ds*div' .@error-recover cannot begin display within display
 .br
 .di ds*div
 .ie '\\$1'B' \{\