[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 01/01: Fix to HEADING spacing. Added user settable space arg to
|
From: |
Peter Schaffter |
|
Subject: |
[groff] 01/01: Fix to HEADING spacing. Added user settable space arg to PARA_SPACE. |
|
Date: |
Wed, 26 Mar 2014 17:15:37 +0000 |
PTPi pushed a commit to branch master
in repository groff.
commit 76f6280b8701e5348ce6141c64a1504b4c5770bd
Author: Peter Schaffter <address@hidden>
Date: Wed Mar 26 13:10:10 2014 -0400
Fix to HEADING spacing. Added user settable space arg to PARA_SPACE.
---
contrib/mom/BUGS | 10 +++++-
contrib/mom/ChangeLog | 4 ++
contrib/mom/om.tmac | 83 +++++++++++++++++++++++++++++--------------------
3 files changed, 62 insertions(+), 35 deletions(-)
diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index 0f7ccbd..165c0d7 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -1,4 +1,5 @@
- Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
+ Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
+ 2013, 2014
Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
@@ -22,6 +23,13 @@ Also, please--no html email. That, too, gets nuked.
====================================================================
+Version 2.0-c
+=============
+
+Spacing not being restored (.ns/.rs) after a HEADING that falls at
+the top of the page.
+---Fixed---
+
Version 2.0-b
=============
diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index 04eec67..b4d8ca3 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -1,3 +1,7 @@
+* Wed Mar 26 2014
+
+o Added user settable space to PARA_SPACE.
+
* Tue Mar 11 2014
o Makefile.sub (MAN7): Do not install empty `mom.7' (tiny change).
diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index 81773df..af7f8dd 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -10274,8 +10274,10 @@ $DOC_COVER_TITLE_\\n+[#DOC_COVER_TITLE_NUM]
\\$\\n[#DOC_COVER_TITLE_NUM]
. if \\n[#QUOTE_4_HD] .rr #QUOTE_4_HD
. if address@hidden \{\
. ch address@hidden
-. wh \\n[nl]u+1u address@hidden
-. ns
+. rr @TOP
+. rs
+. nop \&
+. sp -1
. \}
. vpt
.END
@@ -10813,8 +10815,16 @@ $DOC_COVER_TITLE_\\n+[#DOC_COVER_TITLE_NUM]
\\$\\n[#DOC_COVER_TITLE_NUM]
\# PRINTSTYLE TYPEWRITE without SINGLESPACE.
\#
.MAC PARA_SPACE END
-. ie '\\$1'' .nr #PP_SPACE 1
-. el .rr #PP_SPACE
+. ie '\\$1'' \{\
+. nr #PP_SPACE 1
+. \}
+. el \{\
+. ie \B'\\$1' \{\
+. nr #PP_SPACE 1
+. ds $PP_SPACE_AMOUNT \\$1
+. \}
+. el .rr #PP_SPACE
+. \}
.END
\#
\# PARAGRAPH
@@ -10921,7 +10931,8 @@ $DOC_COVER_TITLE_\\n+[#DOC_COVER_TITLE_NUM]
\\$\\n[#DOC_COVER_TITLE_NUM]
. br
. if \\n[#PP_SPACE] \{\
. ie \\n[#END_QUOTE] \{\
-. ALD \\n[#DOC_LEAD]u
+. ie !'\\*[$PP_SPACE_AMOUNT]'' .ALD \\*[$PP_SPACE_AMOUNT]
+. el .sp
. rr #END_QUOTE
. nr #NO_SPACE 1
. nr #BASELINE_MARK \\n[nl]
@@ -10929,7 +10940,8 @@ $DOC_COVER_TITLE_\\n+[#DOC_COVER_TITLE_NUM]
\\$\\n[#DOC_COVER_TITLE_NUM]
. el \{\
. if \\n[#NO_SPACE]=1 .rr #NO_SPACE
. if !\\n[nl]=\\n[#BASELINE_MARK] \{\
-. ALD \\n[#DOC_LEAD]u
+. ie !'\\*[$PP_SPACE_AMOUNT]'' .ALD \\*[$PP_SPACE_AMOUNT]
+. el .sp
. rr #BASELINE_MARK
. \}
. \}
@@ -10976,7 +10988,10 @@ $DOC_COVER_TITLE_\\n+[#DOC_COVER_TITLE_NUM]
\\$\\n[#DOC_COVER_TITLE_NUM]
. \}
. el \{\
. ti \\n[#PP_INDENT]u/2u
-. if \\n[#PP_SPACE]=1 .ALD \\n[#DOC_LEAD]u
+. if \\n[#PP_SPACE]=1 \{\
+. ie !'\\*[$PP_SPACE_AMOUNT]'' .ALD \\*[$PP_SPACE_AMOUNT]
+. el .sp
+. \}
. \}
. if \\n[#CONDENSE] \{\
\E*[COND]\c
@@ -11493,7 +11508,10 @@ $DOC_COVER_TITLE_\\n+[#DOC_COVER_TITLE_NUM]
\\$\\n[#DOC_COVER_TITLE_NUM]
. ie \\n[#HEAD] .
. el \{\
. ie \\n[#START] .
-. el .ALD \\n[#DOC_LEAD]u/2u
+. el \{\
+. ie \\n[#FULLSPACE_QUOTES] .ALD \\n[#DOC_LEAD]u
+. el .ALD \\n[#DOC_LEAD]u/2u
+. \}
. \}
. \}
. el \{\
@@ -11566,38 +11584,35 @@ $DOC_COVER_TITLE_\\n+[#DOC_COVER_TITLE_NUM]
\\$\\n[#DOC_COVER_TITLE_NUM]
. \}
. \}
. el \{\
-. ie \\n[#PP_SPACE] .
+. ie \\n[#HEAD]=1 \{\
+. ALD \\n[#DOC_LEAD]u
+. SHIM
+. \}
. el \{\
-. ie \\n[#HEAD]=1 \{\
-. ALD \\n[#DOC_LEAD]u
-. SHIM
+. ie \\n[#FULLSPACE_QUOTES] \{\
+. ie \\n[#ENDNOTE] .ALD \\n[#EN_LEAD]u
+. el .ALD \\n[#DOC_LEAD]u
. \}
-. el \{\
-. ie \\n[#FULLSPACE_QUOTES] \{\
-. ie \\n[#ENDNOTE] .ALD \\n[#EN_LEAD]u
-. el .ALD \\n[#DOC_LEAD]u
+. el .ALD (\\n[#DOC_LEAD]/2)u
+. ie \\n[#Q_FITS] \{\
+. ie (\\n[#Q_TOP]=\\n[#PAGE_TOP]):(address@hidden) \{\
+. nr #Q_AT_TOP 1
+. nr #DELAY_SHIM 1
. \}
-. el .ALD (\\n[#DOC_LEAD]/2)u
-. ie \\n[#Q_FITS] \{\
-. ie (\\n[#Q_TOP]=\\n[#PAGE_TOP]):(address@hidden) \{\
-. nr #Q_AT_TOP 1
-. nr #DELAY_SHIM 1
-. \}
-. el \
-. if !\\n[.v]=\\n[#Q_LEAD_REAL] .SHIM
-. \}
-. el \{\
-. SHIM
+. el \
+. if !\\n[.v]=\\n[#Q_LEAD_REAL] .SHIM
+. \}
+. el \{\
+. SHIM
.\" Make sure that Q_LEAD_DIFF is not added to the first line of
.\" normal text at the top of any page following output of a quote
.\" whose last line falls on B_MARGIN of the previous page.
-. if \\n[#Q_LEAD_DIFF] \{\
-. if
\\n[nl]=(\\n[#T_MARGIN]-\\n[#DOC_LEAD]+\\n[#Q_LEAD_DIFF]) \{\
-. PRINT \&
-. br
-. sp -1v-\\n[#Q_LEAD_DIFF]u
-. nr #Q_LEAD_DIFF_CHECK 1
-. \}
+. if \\n[#Q_LEAD_DIFF] \{\
+. if
\\n[nl]=(\\n[#T_MARGIN]-\\n[#DOC_LEAD]+\\n[#Q_LEAD_DIFF]) \{\
+. PRINT \&
+. br
+. sp -1v-\\n[#Q_LEAD_DIFF]u
+. nr #Q_LEAD_DIFF_CHECK 1
. \}
. \}
. \}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 01/01: Fix to HEADING spacing. Added user settable space arg to PARA_SPACE.,
Peter Schaffter <=