[groff] 01/01: Simplify and fix bibliography spacing.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit bf34df2416304aad6fe108cd7278f07f2e43479a
Author: Peter Schaffter <address@hidden>
AuthorDate: Tue Apr 14 15:30:37 2020 -0400

    Simplify and fix bibliography spacing.
    
    Update BUGS file.
---
 contrib/mom/BUGS    |  5 +++++
 contrib/mom/om.tmac | 19 ++++---------------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index 559ddde..9d72dd3 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -21,6 +21,11 @@ the Subject line or you risk my spam filters nuking your 
message.
 
 ====================================================================
 
+Version 2.4-4_a
+===============
+BIBLIOGRAPHY_SPACING not being respected.
+---Fixed---
+
 Version 2.4-4
 =============
 Default PAPER settings overwriting user-entered PAGEWIDTH,
diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index 493f1ea..c8e6a69 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -20,7 +20,7 @@ for more details.
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-Version 2.4-4_a
+Version 2.4-4_b
 ---------------
 Antoine de St-Exupéry asserted that elegance in engineering is
 achieved not when there is nothing left to add, but when there is
@@ -54,7 +54,7 @@ extensions, and float management).
 .if (\n[.x]\n[.y] < 118) \
 .   ab [mom]: You need GNU troff version 1.18 or higher to run this version of 
mom.
 \# Mom version
-.ds version 2.4-4_a
+.ds version 2.4-4_b
 .if dVERSION \{\
 .   ab [mom]: Version \*[version]
 .\}
@@ -15265,23 +15265,12 @@ E\\R'#CAP_HEIGHT \\n[.cht]'
 \# *Argument:
 \#   <amount of space>
 \# *Function:
-\#   Gets value for #BIB_SPACE in units.
+\#   Gets value for $BIB_SPACE.
 \# *Notes:
 \#   Requires a unit of measure.
 \#
 .MAC BIBLIOGRAPHY_SPACING END
 .    ds $BIB_SPACE \\$1
-.    if \\n[#BIB_LEAD]=0 \{\
-.       nr #DEFER_BIB_SPACING 1
-.       return
-.    \}
-.    ds $EVAL_BIB_SPACE \\*[$BIB_SPACE]
-.    substring $EVAL_BIB_SPACE -1
-.    ie '\\*[$EVAL_BIB_SPACE]'v' \{\
-.       substring $BIB_SPACE 0 0
-.       nr #BIB_SPACE \\n[#BIB_LEAD]*\\*[$BIB_SPACE]
-.    \}
-.    el .nr #BIB_SPACE (\\$1)
 .END
 \#
 \# Bibliography (user space macro)
@@ -21959,7 +21948,7 @@ does not fit on page \\n[pgnum]\\*[col-num].
 .\" Part of workaround for refer spitting out a blank page if the
 .\" last ref falls on the bottom line.
 \\*[ref*string]\R'ref*num*first-pass +1'\?\R'ref*num +1'\?
-.sp \\n[#BIB_SPACE]u
+.sp \\*[$BIB_SPACE]
 .ie \\n[#BIB_LIST]=0 .in
 .el .IL -\\n[#REF_BIB_INDENT]u
 .nn 0