[groff] 01/01: Fix for issue of some part-by-part formatting changes to headers not being recognized when global header options have been invoked.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit aa24e0e974244a027922dee54ad56752250399fd
Author: Peter Schaffter <address@hidden>
Date:   Sun Jul 26 20:52:38 2015 -0400

    Fix for issue of some part-by-part formatting changes to headers not
    being recognized when global header options have been invoked.
---
 contrib/mom/BUGS      |    8 ++++++++
 contrib/mom/ChangeLog |    4 ++++
 contrib/mom/om.tmac-u |   43 +++++++++++++++++++++++++++++++++++--------
 3 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index 197d728..7bb753a 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -22,8 +22,16 @@ Also, please--no html email.  That, too, gets nuked.
 
 ====================================================================
 
+Version 2.1-a
+=============
+
+Some part-by-part formatting changes to headers not being recognized
+when global header options have been invoked.
+---Fixed---
+
 Version 2.1
 ===========
+
 UNDERSCORE adding an extra space after underlined text.
 ---Fixed---
 
diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index 56085a3..8b87800 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -1,3 +1,7 @@
+* Sun Jul 26 2015
+
+       o Fix to header part-by-part changes.
+
 * Mon Apr 27 2015
 
        o version 2.1-a release (see NEWS)
diff --git a/contrib/mom/om.tmac-u b/contrib/mom/om.tmac-u
index 70172e9..d0c1089 100644
--- a/contrib/mom/om.tmac-u
+++ b/contrib/mom/om.tmac-u
@@ -5170,15 +5170,16 @@ y\R'#DESCENDER \\n[.cdp]'
 .\" See if ELEMENT is of the form HDRFTR_<pos>_<param>
 .       substring hdrftr-pos-element 0 7
 .       substring hdrftr-pos-element -1
-.       if '\\*[hdrftr-pos-element]'L' .nr hdrftr-pos-element 1
-.       if '\\*[hdrftr-pos-element]'C' .nr hdrftr-pos-element 1
-.       if '\\*[hdrftr-pos-element]'R' .nr hdrftr-pos-element 1
+.       if !'\\*[ELEMENT]'HDRFTR_COLOR' \{\
+.          if '\\*[hdrftr-pos-element]'L' .nr hdrftr-pos-element 1
+.          if '\\*[hdrftr-pos-element]'C' .nr hdrftr-pos-element 1
+.          if '\\*[hdrftr-pos-element]'R' .nr hdrftr-pos-element 1
+.       \}
 .    \}
 .    if !\\n[hdrftr-pos-element] \{\
 .       ds c1-c5 \\*[ELEMENT]
 .       substring c1-c5 0 4  \" Grab first five letters of the alias
 .    \}
-.    rr hdrftr-pos-element
 .\"  If none of the following, convert the substring of the
 .\"  calling alias, ie \*[ELEMENT], into the parameter string, eg
 .\"  $TITLE_FAM, assign arg, and set register.
@@ -5208,6 +5209,15 @@ y\R'#DESCENDER \\n[.cdp]'
 .       if '\\*[c1-c5]'LINEN' .ASSIGN_PARAM LN_       \\$1
 .       if '\\*[c1-c5]'PAGEN' .ASSIGN_PARAM PAGE_NUM_ \\$1
 .    \}
+.    if \\n[hdrftr-pos-element] \{\
+.       if '\\*[hdrftr-pos-element]'L' .ds hdrftr-pos-element LEFT
+.       if '\\*[hdrftr-pos-element]'C' .ds hdrftr-pos-element CENTER
+.       if '\\*[hdrftr-pos-element]'R' .ds hdrftr-pos-element RIGHT
+.       if '\\*[ELEMENT]'HDRFTR_\\*[hdrftr-pos-element]_FAM' \
+.          ds $HDRFTR_\\*[hdrftr-pos-element]_FAM \\$1
+.    \}
+.    rr hdrftr-pos-element
+.    rm hdrftr-pos-element
 .END
 \#
 .MAC ASSIGN_PARAM END
@@ -5234,17 +5244,34 @@ y\R'#DESCENDER \\n[.cdp]'
 .    if '\\$1'EPI_' .rm ELEMENT
 .    if '\\$1'FN_'  .rm ELEMENT
 .    if '\\$1'HDRFTR_' \{\
-.       ie '\\*[ELEMENT]'HDRFTR_FAM' \{\
+.       if '\\*[ELEMENT]'HDRFTR_FAM' \{\
 .          nr #HDRFTR 1
 .          ds $HDRFTR_FAM        \\$2
 .          ds $HDRFTR_LEFT_FAM   \\$2
 .          ds $HDRFTR_CENTER_FAM \\$2
 .          ds $HDRFTR_RIGHT_FAM  \\$2
 .       \}
-.       el \{\
+.       if '\\*[ELEMENT]'HDRFTR_COLOR' \{\
+.          nr #HDRFTR 1
+.          nr #HDRFTR_COLOR 1
+.          ds $HDRFTR_COLOR \\$2
+.       \}
+.       if '\\*[ELEMENT]'HDRFTR_SIZE_CHANGE' \{\
+.          nr #HDRFTR 1
+.          ds $HDRFTR_SIZE_CHANGE \\$2
+.       \}
+.       if '\\*[PARAM]'SIZE_CHANGE' \{\
+.          nr #HDRFTR 1
+.          if '\\*[hdrftr-pos-element]'L' \
+.             ds $HDRFTR_LEFT_SIZE_CHANGE \\$2
+.          if '\\*[hdrftr-pos-element]'C' \
+.             ds $HDRFTR_CENTER_SIZE_CHANGE \\$2
+.          if '\\*[hdrftr-pos-element]'R' \
+.             ds $HDRFTR_RIGHT_SIZE_CHANGE \\$2
+.       \}
+.       if !r #HDRFTR \{\
 .          substring ELEMENT 7 \\n[substr-index]
-.          if '\\*[ELEMENT]'_LEFT' \
-.             ds ELEMENT _STRING_
+.          if '\\*[ELEMENT]'_LEFT' .ds ELEMENT _STRING_
 .       \}
 .    \}
 .    if '\\$1'LN_'       .rm ELEMENT