From 28e28e82c4ee479b264fea54f16b450fb423c567 Mon Sep 17 00:00:00 2001
From: wl <wl>
Date: Sun, 14 Aug 2011 05:41:41 +0000
Subject: Fix indents in nested static displays.

* m.tmac (DS, ds@end): Save indent with a stack.
See http://lists.gnu.org/archive/html/groff/2011-07/msg00068.html
for an example.
---
 contrib/mm/ChangeLog |  8 ++++++++
 contrib/mm/m.tmac    | 10 ++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/contrib/mm/ChangeLog b/contrib/mm/ChangeLog
index 5ad2887a..b3808e28 100644
--- a/contrib/mm/ChangeLog
+++ b/contrib/mm/ChangeLog
@@ -1,3 +1,11 @@
+Sun Aug 14 07:36:29 2011  Anton Shepelev  <anton.txt@gmail.com>
+
+	Fix indents in nested static displays.
+
+	* m.tmac (DS, ds@end): Save indent with a stack.
+	See http://lists.gnu.org/archive/html/groff/2011-07/msg00068.html
+	for an example.
+
 Sun Mar 27 09:25:01 2011  Anton Shepelev  <anton.txt@gmail.com>
 
 	* m.tmac (misc@tag): Fix last patch.
diff --git a/contrib/mm/m.tmac b/contrib/mm/m.tmac
index e5e163d9..d86c7f95 100644
--- a/contrib/mm/m.tmac
+++ b/contrib/mm/m.tmac
@@ -3,8 +3,8 @@
 .ds RE \\$2
 ..
 .\"
-.\" $Id: m.tmac,v 2.51 2011/03/27 08:11:38 wl Exp $
-.@revision $Revision: 2.51 $
+.\" $Id: m.tmac,v 2.52 2011/08/14 05:41:42 wl Exp $
+.@revision $Revision: 2.52 $
 .ig
 
 Copyright (C) 1991-2006, 2009-2011
@@ -2072,7 +2072,8 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%]
 .\"
 .nr ds*old-ll \\n[.l]
 .nr ds*old-in \\n[.i]
-.misc@push ds-ll \\n[.l]
+.misc@push ds-in \\n[ds*old-in] \" Saving indent and line length of
+.misc@push ds-ll \\n[ds*old-ll] \" the text outside the display.
 .misc@push ds-form \\n[ds*format]
 .nr ds*i \\n[.i]
 .nr ds*ftmp \\n[.f]
@@ -2095,7 +2096,8 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%]
 .\" **********
 .nr ds*width \\n[dl]
 .nr ds*height \\n[dn]
-.misc@pop-nr ds-ll ds*old-ll
+.misc@pop-nr ds-ll ds*old-ll \" Restore indent and
+.misc@pop-nr ds-in ds*old-in \" line length
 .misc@pop-nr ds-form ds*format
 .\"
 .\" **********
-- 
cgit v1.2.1