o Added string $PRE_CODE_FAM to CODE; fixes bug that kept

  CODE OFF from restoring the previous family_font combo

o Added a test for existence of register #DEPTH to .ITEM; if it
  doesn't exist, ignore ITEM

o BUGS and ChangeLog updated

3 files changed, 24 insertions, 5 deletions

diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index df9ead7c..44c38390 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -18,6 +18,14 @@ Also, please--no html email.  That, too, gets nuked.
 --Peter Schaffter
 
 ========================================================================
+Version 1.4
+===========
+.CODE OFF not always restoring previous family and font.
+---Fixed---
+
+.ITEM, when not in a list, should do nothing.
+---Fixed---
+
 Version 1.3-e_3
 ===============
 ENDNOTES is not, by default, printing headers on endnotes pages.
diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index 913f4da0..7ca172ac 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -1,3 +1,12 @@
+* Sat May 20 2006
+
+o Added string $PRE_CODE_FAM to CODE; fixes bug that kept
+  CODE OFF from restoring the previous family_font combo
+
+o Added a test for existence of register #DEPTH to .ITEM; if it
+  doesn't exist, ignore ITEM
+
+------------------------------------------------------------------------
 *Fri May 19 2006
 
 o Updated docs
@@ -48,8 +57,6 @@ o In macro, PRINT_HDRFTR, removed .EOL from clause .if \\n[#HDRFTR_COLOR]=1
 
 o Fixed broken link to DOCTITLE in docs.
 
-------------------------------------------------------------------------
-
 *Wed Apr 26 2006
 
 o Corrected doc entry that stated TOC control macros can be entered
diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index 29f6050b..f6dd5c3b 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -9882,8 +9882,10 @@ Default is OFF.
 \#
 .MAC CODE END
 .    ie '\\$1'' \{\
-.        ds $PRE_CODE_FT \\n[.fam]\\n[.sty]
-.        ft CR
+.        ds $PRE_CODE_FAM \\n[.fam]
+.        ds $PRE_CODE_FT \\n[.sty]
+.        fam C
+.        ft  R
 .        if \\n[#UNDERLINE_QUOTES]=1 \{\
 .            nr #RESTORE_UNDERLINE 1
 .            UNDERLINE_QUOTES OFF
@@ -9898,7 +9900,8 @@ Default is OFF.
 .       \}
 .    \}
 .    el \{\
-.       ft \\*[$PRE_CODE_FT]
+.       fam \\*[$PRE_CODE_FAM]
+.       ft  \\*[$PRE_CODE_FT]
 .       rr $RESTORE_FT
 .       if \\n[#RESTORE_UNDERLINE]=1 \{\
 .          rr #RESTORE_UNDERLINE
@@ -13893,6 +13896,7 @@ Arguments, Function and Notes.
 \#   receive the text of an item.
 \#
 .MAC ITEM END
+.    if !r#DEPTH \{ .return \}
 .    if \\n[#LINENUMBERS]=1 \{\
 .       NUMBER_LINES OFF
 .       nr #LINENUMBERS 2