[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Groff-commit] groff/contrib/mom BUGS ChangeLog om.tmac exampl...
|
From: |
Werner LEMBERG |
|
Subject: |
[Groff-commit] groff/contrib/mom BUGS ChangeLog om.tmac exampl... |
|
Date: |
Wed, 08 Dec 2004 03:26:30 -0500 |
CVSROOT: /cvsroot/groff
Module name: groff
Branch:
Changes by: Werner LEMBERG <address@hidden> 04/12/08 07:57:48
Modified files:
contrib/mom : BUGS ChangeLog om.tmac
contrib/mom/examples: elvis_syntax elvis_syntax.new
contrib/mom/momdoc: docprocessing.html
Log message:
o Small fixes to elvis_syntax.new (dealing with strings, \{\ and \}
o Changed
. ie \\n[#START] \{\
. if \\n[#DOC_HEADER]=0 \{ . \}
. \}
in HEAD to
. ie \\n[#START] \{\
. if \\n[#DOC_HEADER]=0 \{ .RLD 1v \}
. \}
so that HEADs at the start of docs with no docheaders falls on
the correct baseline.
o Removed spurious parens from if ( \\n[#TRAP_DISTANCE] <
\\n[#DOC_LEAD]*2 )
in SUBHEAD.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/mom/BUGS.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/mom/ChangeLog.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/mom/om.tmac.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/mom/examples/elvis_syntax.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/mom/examples/elvis_syntax.new.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/mom/momdoc/docprocessing.html.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
Patches:
Index: groff/contrib/mom/BUGS
diff -u groff/contrib/mom/BUGS:1.16 groff/contrib/mom/BUGS:1.17
--- groff/contrib/mom/BUGS:1.16 Fri Oct 15 06:10:24 2004
+++ groff/contrib/mom/BUGS Wed Dec 8 07:57:46 2004
@@ -18,8 +18,23 @@
Version 1.2-d
=============
+HEADER_FAMILY not changing header family.
+---Fixed---
+
+FAMILY, after COLLATE, not changing the family of all and every
+page element or tag.
+---Fixed---
+
+Heads and subheads at the start of docs are printing one line lower
+than they should.
+---Fixed---
+
+Gaps are appearing at the bottom of pages when there's a linebreak
+followed by a subhead.
+---Fixed---
+
When LS is invoked after a single text line at the top of a page
-containing a T_MARGIN (set with T_MARGIN or PAGE), mom performing
+containing a T_MARGIN (set with T_MARGIN or PAGE), mom is performing
spacing adjustments as if the first line doesn't exist.
---Fixed---
Index: groff/contrib/mom/ChangeLog
diff -u groff/contrib/mom/ChangeLog:1.28 groff/contrib/mom/ChangeLog:1.29
--- groff/contrib/mom/ChangeLog:1.28 Fri Oct 15 06:10:24 2004
+++ groff/contrib/mom/ChangeLog Wed Dec 8 07:57:46 2004
@@ -1,3 +1,23 @@
+*Dec 6 2004
+
+o Small fixes to elvis_syntax.new (dealing with strings, \{\ and \}
+
+o Changed
+ . ie \\n[#START] \{\
+ . if \\n[#DOC_HEADER]=0 \{ . \}
+ . \}
+ in HEAD to
+ . ie \\n[#START] \{\
+ . if \\n[#DOC_HEADER]=0 \{ .RLD 1v \}
+ . \}
+ so that HEADs at the start of docs with no docheaders falls on
+ the correct baseline.
+
+*Dec 3 2004
+
+o Removed spurious parens from if ( \\n[#TRAP_DISTANCE] < \\n[#DOC_LEAD]*2 )
+ in SUBHEAD.
+
*Oct 14 2004
o Reworked the LL macro so that the argument can take a prepended +
Index: groff/contrib/mom/examples/elvis_syntax
diff -u groff/contrib/mom/examples/elvis_syntax:1.8
groff/contrib/mom/examples/elvis_syntax:1.9
--- groff/contrib/mom/examples/elvis_syntax:1.8 Mon Jul 7 20:55:43 2003
+++ groff/contrib/mom/examples/elvis_syntax Wed Dec 8 07:57:47 2004
@@ -1,143 +1,89 @@
#Mom
language mom
-extension .mom
-startword .\
-inword _(
-keyword .ALD .ALIAS .ALWAYS_FULLSPACE_QUOTES .ATTRIBUTE_STRING
-keyword .AUTHOR .AUTHOR_FAMILY .AUTHOR_FONT .AUTHOR_SIZE .AUTOLEAD .BLANKPAGE
-keyword .BLOCKQUOTE .BLOCKQUOTE_FAMILY .BLOCKQUOTE_FONT .BLOCKQUOTE_QUAD
.BLOCKQUOTE_SIZE
-keyword .B_MARGIN .BR .BR_AT_LINE_KERN .BREAK_QUOTE
-keyword .CAPS .CENTER .CENTRE
-keyword .CHAPTER .CHAPTER_TITLE .CHAPTER_STRING .CITATION .CITE .CLOSING
-keyword .COLLATE .COL_BREAK .COL_BREAK .COL_NEXT .COLUMNS
-keyword .COMMENT .CONDENSE .COPYSTYLE
-keyword .DATE .DEFAULTS
-keyword .DOC_FAM .DOC_FAMILY .DOCHEADER
-keyword .DOCHEADER_ADVANCE .DOCHEADER_LEAD
-keyword .DOC_LEAD .DOC_LEAD_ADJUST .DOC_LEFT_MARGIN .DOC_LINE_LENGTH
-keyword .DOC_LLENGTH .DOC_L_LENGTH .DOC_L_MARGIN .DOC_LMARGIN
-keyword .DOC_LS .DOC_PS .DOC_PT_SIZE .DOC_QUAD
-keyword .DOC_RIGHT_MARGIN .DOC_R_MARGIN .DOC_RMARGIN
-keyword .DOCTYPE .DOCTYPE_FAMILY .DOCTYPE_FONT .DOCTYPE_SIZE .DOC_TITLE
-keyword .DRAFT .DRAFT_STRING .DRAFT_WITH_PAGENUMBER
-keyword .DROPCAP .DROPCAP_ADJUST .DROPCAP_FAMILY .DROPCAP_FONT .DROPCAP_GUTTER
.DROPCAP_OFF
-keyword .EL
-keyword .ENDNOTE .ENDNOTES
-keyword .ENDNOTE_FAMILY .ENDNOTE_FONT .ENDNOTE_PT_SIZE .ENDNOTE_LEAD
.ENDNOTE_QUAD
-keyword .ENDNOTE_STRING .ENDNOTE_STRING_FAMILY .ENDNOTE_STRING_FONT
.ENDNOTE_STRING_SIZE
-keyword .ENDNOTE_STRING_QUAD .ENDNOTE_STRING_UNDERSCORE
-keyword .ENDNOTE_TITLE .ENDNOTE_TITLE_FAMILY .ENDNOTE_TITLE_FONT
.ENDNOTE_TITLE_SIZE
-keyword .ENDNOTE_TITLE_QUAD .ENDNOTE_TITLE_UNDERSCORE
-keyword .ENDNOTE_NUMBER_FAMILY .ENDNOTE_NUMBER_FONT .ENDNOTE_NUMBER_SIZE
-keyword .ENDNOTE_NUMBERS_ALIGN_RIGHT .ENDNOTE_NUMBERS_ALIGN_LEFT
-keyword .ENDNOTE_PARA_INDENT .ENDNOTE_PARA_SPACE .ENDNOTES_FOOTER_CENTER
.ENDNOTES_HEADER_CENTER
-keyword .ENDNOTE_STRING_CAPS .ENDNOTES_NO_COLUMNS .ENDNOTES_NO_FIRST_PAGENUM
-keyword .ENDNOTES_ALLOWS_HEADERS .ENDNOTES_PAGENUM_STYLE
.ENDNOTES_FIRST_PAGENUMBER
-keyword .ENDNOTE_SINGLESPACE
-keyword .EPIGRAPH .EPIGRAPH_AUTOLEAD .EPIGRAPH_FAMILY .EPIGRAPH_FONT
-keyword .EPIGRAPH_INDENT .EPIGRAPH_QUAD .EPIGRAPH_SIZE
-keyword .EW .EXTEND
-keyword .FAM .FAMILY
-keyword .FINIS .FINIS_STRING
-keyword .FOOTER .FOOTER_CENTER .FOOTER_CENTER_CAPS .FOOTER_CENTER_FAM
.FOOTER_CENTER_FAMILY
-keyword .FOOTER_CENTER_FONT .FOOTER_CENTER_FT .FOOTER_CENTER_PS
.FOOTER_CENTER_SIZE
-keyword .FOOTER_CENTRE .FOOTER_CENTRE_CAPS .FOOTER_CENTRE_FAM
.FOOTER_CENTRE_FAMILY
-keyword .FOOTER_CENTRE_FT .FOOTER_CENTRE_PS .FOOTER_CENTRE_SIZE .FOOTER_FAM
-keyword .FOOTER_FAMILY .FOOTER_GAP .FOOTER_LEFT .FOOTER_LEFT_CAPS
.FOOTER_LEFT_FAM
-keyword .FOOTER_LEFT_FAMILY .FOOTER_LEFT_FONT .FOOTER_LEFT_FT .FOOTER_LEFT_PS
-keyword .FOOTER_LEFT_SIZE .FOOTER_MARGIN .FOOTER_ON_FIRST_PAGE .FOOTER_PLAIN
-keyword .FOOTER_RECTO .FOOTER_RIGHT .FOOTER_RIGHT_CAPS .FOOTER_RIGHT_FAM
.FOOTER_RIGHT_FAMILY
-keyword .FOOTER_RIGHT_FONT .FOOTER_RIGHT_FT .FOOTER_RIGHT_PS .FOOTER_RIGHT_SIZE
-keyword .FOOTER_RULE .FOOTER_RULE_GAP .FOOTERS .FOOTER_SIZE .FOOTER_VERSO
-keyword .FOOTNOTE .FOOTNOTE_AUTOLEAD .FOOTNOTE_FAMILY .FOOTNOTE_FONT
.FOOTNOTE_MARKERS
-keyword .FOOTNOTE_MARKER_STYLE .FOOTNOTE_QUAD .FOOTNOTE_RULE .FOOTNOTE_RULE_ADJ
-keyword .FOOTNOTE_RULE_LENGTH .FOOTNOTE_SIZE
-keyword .FROM .FT
-keyword .GREETING
-keyword .HDRFTR_CENTER .HDRFTR_CENTER .HDRFTR_CENTER_CAPS .HDRFTR_CENTER_FAMILY
-keyword .HDRFTR_CENTER_FONT .HDRFTR_CENTER_SIZE .HDRFTR_FAMILY .HDRFTR_GAP
.HDRFTR_CENTER_PAD
-keyword .HDRFTR_LEFT .HDRFTR_LEFT .HDRFTR_LEFT_CAPS .HDRFTR_LEFT_FAMILY
-keyword .HDRFTR_LEFT_FONT .HDRFTR_LEFT_SIZE .HDRFTR_MARGIN .HDRFTR_PLAIN
-keyword .HDRFTR_RIGHT .HDRFTR_RIGHT_CAPS .HDRFTR_RIGHT_FAMILY
.HDRFTR_RIGHT_FONT
-keyword .HDRFTR_RIGHT_SIZE .HDRFTR_RULE .HDRFTR_RULE_GAP .HDRFTR_RULE_INTERNAL
-keyword .HDRFTR_RULE_INTERNAL .HDRFTR_SIZE
-keyword .HEAD .HEAD_CAPS .HEADER .HEADER_CENTER .HEADER_CENTER_CAPS
-keyword .HEADER_CENTER_FAM .HEADER_CENTER_FAMILY .HEADER_CENTER_FONT
-keyword .HEADER_CENTER_FT .HEADER_CENTER_PS .HEADER_CENTER_SIZE .HEADER_CENTRE
-keyword .HEADER_CENTRE_CAPS .HEADER_CENTRE_FAM .HEADER_CENTRE_FAMILY
-keyword .HEADER_CENTRE_FONT .HEADER_CENTRE_FT .HEADER_CENTRE_PS
.HEADER_CENTRE_SIZE
-keyword .HEADER_FAM .HEADER_FAMILY .HEADER_GAP
-keyword .HEADER_LEFT .HEADER_LEFT_CAPS .HEADER_LEFT_FAM .HEADER_LEFT_FAMILY
-keyword .HEADER_LEFT_FONT .HEADER_LEFT_FT .HEADER_LEFT_PS .HEADER_LEFT_SIZE
-keyword .HEADER_MARGIN .HEADER_PLAIN
-keyword .HEADER_RECTO .HEADER_RIGHT .HEADER_RIGHT_CAPS .HEADER_RIGHT_FAM
.HEADER_RIGHT_FAMILY
-keyword .HEADER_RIGHT_FONT .HEADER_RIGHT_FT .HEADER_RIGHT_PS
.HEADER_RIGHT_SIZE .HEADER_VERSO
-keyword .HEADER_RULE .HEADER_RULE_GAP .HEADERS .HEADER_SIZE
-keyword .HEAD_FAMILY .HEAD_FONT .HEAD_QUAD .HEAD_SIZE .HEAD_SPACE
.HEAD_UNDERLINE
-keyword .HI .HY .HYPHENATE .HYPHENATION .HY_SET
-keyword .IB .IBX .IBQ .IH .IL .ILX .ILQ
-keyword .IQ .IR .IRX .IRQ .IT .IX
-keyword .INDENT_FIRST_PARAS .ITALIC_MEANS_ITALIC
-keyword .JUSTIFY
-keyword .KERN
-keyword .LEADER_CHARACTER .LEFT .LIG .LIGATURES .LINEBREAK .LL .LL .L_MARGIN
.LS
-keyword .MCO .MCR .MCX
-keyword .NEWPAGE .NEW_PAGE .NO_SUITE .NUMBER_HEADS .NUMBER_PARAHEADS
.NUMBER_SUBHEADS
-keyword .PAD .PADMARKER .PAD_STRING .PAGE .PAGE_LENGTH .PAGELENGTH .PAGEWIDTH
-keyword .PAGENUM .PAGENUM_FAMILY .PAGENUM_FONT .PAGENUM_HYPHENS
-keyword .PAGENUM_ON_FIRST_PAGE .PAGENUM_POS .PAGENUM_SIZE .PAGENUM_STYLE
.PAGENUMBER
-keyword .PAGINATE .PAGINATION .PAPER
-keyword .PARAHEAD .PARAHEAD_FAMILY .PARAHEAD_FONT .PARAHEAD_INDENT
.PARAHEAD_SIZE
-keyword .PARA_INDENT .PARA_SPACE
-keyword .PP .PP_FONT .PP_FT .PT_SIZE .PSPIC
-keyword .PRINTSTYLE
-keyword .QUAD
-keyword .QUOTE .QUOTE_FAMILY .QUOTE_FONT .QUOTE_INDENT .QUOTE_SIZE
-keyword .RECTO_VERSO
-keyword .RESET_FOOTNOTE_NUMBER .RESET_HEAD_NUMBER .RESET_PARAHEAD_NUMBER
-keyword .RESET_SUBHEAD_NUMBER
-keyword .REVISION .REVISION_STRING .RIGHT .RLD .R_MARGIN .RW
-keyword .SETBOLDER .SETSLANT .SHIM .SILENT .SLANT_MEANS_SLANT .SMARTQUOTES .SP
.SPACE
-keyword .SPREAD .SS .ST .START .STRING .SUBHEAD .SUBHEAD_FAMILY .SUBHEAD_FONT
.SUBHEAD_SIZE
-keyword .SUBTITLE .SUBTITLE_FAMILY .SUBTITLE_FONT .SUBTITLE_SIZE
-keyword .SWITCH_FOOTERS .SWITCH_HDRFTR .SWITCH_HEADERS
-keyword .SUSPEND_PAGINATION .RESTORE_PAGINATION
-keyword .TAB_SET .TAB .TABSET .TB .TI
-keyword .TITLE .TITLE_FAMILY .TITLE_FONT .TITLE_SIZE .T_MARGIN
-keyword .TN .TO .TOC
-keyword .TOC_FAMILY .TOC_PT_SIZE .TOC_LEAD .TOC_PAGENUM_STYLE
-keyword .TOC_HEADER_FAMILY .TOC_HEADER_FONT .TOC_HEADER_SIZE .TOC_HEADER_QUAD
.TOC_HEADER_STRING
-keyword .TOC_TITLE_FAMILY .TOC_TITLE_FONT .TOC_TITLE_SIZE .TOC_TITLE_INDENT
-keyword .TOC_HEAD_FAMILY .TOC_HEAD_FONT .TOC_HEAD_SIZE .TOC_HEAD_INDENT
-keyword .TOC_SUBHEAD_FAMILY .TOC_SUBHEAD_FONT .TOC_SUBHEAD_SIZE
.TOC_SUBHEAD_INDENT
-keyword .TOC_PARAHEAD_FAMILY .TOC_PARAHEAD_FONT .TOC_PARAHEAD_SIZE
.TOC_PARAHEAD_INDENT
-keyword .TOC_PN_FAMILY .TOC_PN_FONT .TOC_PN_SIZE
-keyword .TOC_APPENDS_AUTHOR .TOC_RV_SWITCH .TOC_PADDING .PAGINATE_TOC
-keyword .TQ .TRAP .TYPESIZE
-keyword .UNDERLINE .UNDERLINE_ITALIC .UNDERLINE_QUOTES .UNDERLINE_SLANT
-keyword .UNDERSCORE .UNDERSCORE_2 .UNDERSCORE2
-keyword .WS
-font fixed DEFAULT CHAPTER NAMED LETTER
-font fixed TYPESET TYPEWRITE
-font fixed FINAL DRAFT
-font fixed BLOCK QUAD
-font fixed LEFT RIGHT CENTER CENTRE JUSTIFY TOP BOTTOM
-font fixed OFF QUIT END EXIT DONE NO ALL
-font fixed PAGE NUMBER STAR
-font fixed COND EXT
-font fixed LETTER LEGAL EXECUTIVE LEDGER TABLOID QUARTO FOLIO
-font fixed 10x14 A3 A4 A5 B4 B5
-font fixed SINGLESPACE
-font fixed FACTOR
-font underlined \/ \/. \/? \/! \/, \/; \/:
-font underlined \, \,. \,? \,! \,, \,; \,:
-font underlined \\ \~ \% \0 \: \( \| \^ \& \%
-font underlined \b \c \C \d \D \e \f \f( \h \l \L \p \r \s \s+ \s- \S \u \v \w
-font fixed \(bu \(co \(ct \(de \(dg \(di \(em \(en \(mu \(pl \(rg \(sc \(sq
-font fixed \(14 \(12 \(34 \(+-
-font fixed # ' ^
-font italic "
-character \]
-comment \#
-comment \"
-comment \!
+extension .mom .tmac
+
+startword .
+color startword normal
+
+inword _.'
+color inword normal
+
+other initialpunct
+mostly normal
+
+backslash none
+
+color args like fixed
+color braces like char
+color brackets like underlined
+color chars like emphasized
+color decimals like number
+color ellipsis normal
+color escapes like keyword
+color math like cursor
+color misc like string
+color operators like string
+color parens like comment
+color reg_string like math
+color tmac_escapes like keyword
+color single_slash like char
+
+font args DA DE EN ES FR IT NL NO PT SV
+font args DEFAULT CHAPTER NAMED LETTER
+font args TYPESET TYPEWRITE
+font args FINAL DRAFT
+font args BLOCK QUAD
+font args LEFT RIGHT CENTER CENTRE JUSTIFY TOP BOTTOM L R C J
+font args OFF QUIT END EXIT DONE NO ALL
+font args PAGE NUMBER STAR
+font args LETTER LEGAL EXECUTIVE LEDGER TABLOID QUARTO FOLIO
+font args 10x14 A3 A4 A5 B4 B5
+font args SINGLESPACE
+font args FACTOR
+font args DASH BULLET ALPHA DIGIT USER
+font args RGB CYM CMYK GRAY GREY
+font args COND CONDX EXT EXTX SUP SUPX CONDSUP CONDSUPX EXTSUP EXTSUPX
+font args BOLDER BOLDERX SLANT SLANTX
+font args UP DOWN BCK FWD BU BP FU FP
+font args ROM IT BD BDI PREV
+font args ST
+
+prefix { \{ \{\
+font braces { \{ \{\
+prefix [ ]
+font brackets [ ]
+prefix \(bu \(co \(ct \(de \(dg \(di \(em \(en \(mu \(pl \(rg \(sc
\(sq \(lq \(rq
+font chars \(bu \(co \(ct \(de \(dg \(di \(em \(en \(mu \(pl \(rg \(sc
\(sq \(lq \(rq
+prefix \(14 \(12 \(34 \(+-
+font chars \(14 \(12 \(34 \(+-
+prefix \fR \fB \fI \fP \f0 \f1 \f2 \f3
+font chars \fR \fB \fI \fP \f0 \f1 \f2 \f3
+prefix .0 .1 .2 .3 .4 .5 .6 .7 .8 .9
+font decimals . .0 .1 .2 .3 .4 .5 .6 .7 .8 .9
+prefix \/ \/. \/? \/! \/, \/; \/:
+font escapes \/ \/. \/? \/! \/, \/; \/:
+prefix \, \,. \,? \,! \,, \,; \,:
+font escapes \, \,. \,? \,! \,, \,; \,:
+prefix \~ \0 \: \| \^ \& \% \!
+font escapes \~ \0 \: \| \^ \& \% \!
+prefix \b \c \C \d \D \e \f \f( \h \l \L \p \r \s \s+ \s- \S \u \v
\w
+font escapes \b \c \C \d \D \e \f \f( \h \l \L \p \r \s \s+ \s- \S \u \v
\w
+prefix ...
+font ellipsis ...
+prefix + - * / = == < > <= >= <? >? %
+font math + - * / = == < > <= >= <? >? %
+prefix |
+font misc |
+prefix ! : &
+font operators ! : &
+prefix ( )
+font parens ( )
+prefix # * $
+font reg_string # * $
+prefix \n \* \[
+font single_slash \n \* \[
+prefix \\n \\* \\$
+font tmac_escapes \\n \\* \\$
+
+comment \#
+comment \"
Index: groff/contrib/mom/examples/elvis_syntax.new
diff -u groff/contrib/mom/examples/elvis_syntax.new:1.6
groff/contrib/mom/examples/elvis_syntax.new:1.7
--- groff/contrib/mom/examples/elvis_syntax.new:1.6 Wed Sep 29 09:29:38 2004
+++ groff/contrib/mom/examples/elvis_syntax.new Wed Dec 8 07:57:47 2004
@@ -63,8 +63,8 @@
font args ROM IT BD BDI PREV
font args ST
-prefix { \{ \{\
-font braces { \{ \{\
+prefix { \{ \} \{\
+font braces { \{ \} \{\
prefix [ ]
font brackets [ ]
prefix \(bu \(co \(ct \(de \(dg \(di \(em \(en \(mu \(pl \(rg \(sc
\(sq \(lq \(rq
@@ -100,7 +100,6 @@
prefix \\n \\* \\$
font tmac_escapes \\n \\* \\$
-character \]
-string ''
+character \]'
comment \#
comment \"
Index: groff/contrib/mom/momdoc/docprocessing.html
diff -u groff/contrib/mom/momdoc/docprocessing.html:1.18
groff/contrib/mom/momdoc/docprocessing.html:1.19
--- groff/contrib/mom/momdoc/docprocessing.html:1.18 Mon Sep 13 15:57:39 2004
+++ groff/contrib/mom/momdoc/docprocessing.html Wed Dec 8 07:57:47 2004
@@ -871,6 +871,14 @@
macros, only the title will appear, both at the top of page one and in
subsequent page headers.
<p>
+The style of the chapter title can be altered by
+<a href="docelement.html#DOCELEMENT_CONTROL">control macros</a>,
+e.g. <strong>CHAPTER_TITLE_FAMILY</strong>,
+<strong>CHAPTER_TITLE_FONT</strong>, etc. The default family,
+font and point size are Times Roman, Bold Italic, 4 points larger
+than
+<a href="definitions.html#TERMS_RUNNING">running text</a>.
+<p>
<!---DRAFT--->
@@ -2359,13 +2367,11 @@
<li>the argument is the same as for
<a href="typesetting.html#FAMILY">FAMILY</a>
<li>globally changes the type family
- <li>if you wish the
- <a href="definitions.html#TERMS_HEADER">header</a>
- and/or page number families to remain at their old values,
- you must reset them with
- <a href="headfootpage.html#HEADER_FAMILY">HEADER_FAMILY</a>
- and
- <a href="headfootpage.html#PAGENUM_FAMILY">PAGENUM_FAMILY</a>
+ <li>any page elements (e.g.
+ <a href="definitions.html#TERMS_HEADER">headers</a>,
+ page numbers, footnotes) whose families you wish to remain
+ at their old values must be reset with the appropriate
+ <a href="docelement.html#DOCELEMENT_CONTROL">control macros</a>
</ul>
<br>
Index: groff/contrib/mom/om.tmac
diff -u groff/contrib/mom/om.tmac:1.23 groff/contrib/mom/om.tmac:1.24
--- groff/contrib/mom/om.tmac:1.23 Fri Oct 15 06:10:24 2004
+++ groff/contrib/mom/om.tmac Wed Dec 8 07:57:46 2004
@@ -23,7 +23,7 @@
.\"
.\"
.\"
-\# Version 1.2-d
+\# Version 1.2-e
\# -------------
\#
\# Antoine de St-Exupéry asserted that elegance in engineering is
@@ -449,6 +449,9 @@
. ft 0
. \}
. \}
+. if \\n[#COLLATE]=1 \{\
+. if !r#START \{ .DOC_FAM \\*[$FAMILY] \}
+. \}
.END
\#
\#
@@ -4158,7 +4161,12 @@
. if '\\$0'EPIGRAPH_FAMILY' .ds $EPI_FAM \\$1
. if '\\$0'FOOTNOTE_FAMILY' .ds $FN_FAM \\$1
. if '\\$0'HDRFTR_CENTER_FAMILY' .ds $HDRFTR_CENTER_FAM \\$1
-. if '\\$0'HDRFTR_FAMILY' .ds $HDRFTR_FAM \\$1
+. if '\\$0'HDRFTR_FAMILY' \{\
+. ds $HDRFTR_FAM \\$1
+. ds $HDRFTR_LEFT_FAM \\$1
+. ds $HDRFTR_CENTER_FAM \\$1
+. ds $HDRFTR_RIGHT_FAM \\$1
+. \}
. if '\\$0'HDRFTR_LEFT_FAMILY' .ds $HDRFTR_LEFT_FAM \\$1
. if '\\$0'HDRFTR_RIGHT_FAMILY' .ds $HDRFTR_RIGHT_FAM \\$1
. if '\\$0'HEAD_FAMILY' .ds $HEAD_FAM \\$1
@@ -6331,8 +6339,8 @@
\#
.MAC DOC_FAMILY END
. br
-. ds $DOC_FAM \\$1
-. FAMILY \\*[$DOC_FAM]
+. ds $DOC_FAM \\$1
+. ds $FAMILY \\*[$DOC_FAM]
. TITLE_FAMILY \\*[$DOC_FAM]
. SUBTITLE_FAMILY \\*[$DOC_FAM]
. AUTHOR_FAMILY \\*[$DOC_FAM]
@@ -6343,7 +6351,7 @@
. BLOCKQUOTE_FAMILY \\*[$DOC_FAM]
. EPIGRAPH_FAMILY \\*[$DOC_FAM]
. HDRFTR_FAMILY \\*[$DOC_FAM]
-. PAGENUM_FAMILY \\*[$DOC_FAM]
+. FOOTNOTE_FAMILY \\*[$DOC_FAM]
.END
\#
\#
@@ -8423,7 +8431,7 @@
. el \{ .ne 3 \}
. \}
. ie \\n[#START] \{\
-. if \\n[#DOC_HEADER]=0 \{ . \}
+. if \\n[#DOC_HEADER]=0 \{ .RLD 1v \}
. \}
. el \{\
. if \\n[#PRINT_STYLE]=1 \{\
@@ -8621,9 +8629,9 @@
. \}
. if \\n[#PRINT_STYLE]=1 \{ .nr #SH_LEAD_ADJUST \\n[#LEAD]/5 \}
. if \\n[#PRINT_STYLE]=2 \{ .nr #SH_LEAD_ADJUST \\n[#LEAD]/8 \}
-. ie \\n[#START] \{ . \}
+. ie \\n[#START] \{ .RLD 1v \}
. el \{\
-. ie ( \\n[#TRAP_DISTANCE] < (\\n[#DOC_LEAD]u*2u) ) \{\
+. ie ( \\n[#TRAP_DISTANCE] < \\n[#DOC_LEAD]*2 ) \{\
. ie \\n[#COLUMNS] \{ .COL_NEXT \}
. el \{ .bp \}
. \}
@@ -12660,311 +12668,311 @@
\#
.MAC FOOTER_CENTER_COLOR END
. HDRFTR_CENTER_COLOR \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_CENTER_COLOUR END
. HDRFTR_CENTER_COLOR \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_CENTER_FAM END
. HDRFTR_CENTER_FAMILY \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_CENTER_FAMILY END
. HDRFTR_CENTER_FAMILY \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_CENTER_FONT END
. HDRFTR_CENTER_FONT \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_CENTER_FT END
. HDRFTR_CENTER_FONT \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_CENTER_PS END
. HDRFTR_CENTER_SIZE \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_CENTER_SIZE END
. HDRFTR_CENTER_SIZE \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_CENTRE_CAPS END
. HDRFTR_CENTER_CAPS \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_CENTRE_COLOR END
. HDRFTR_CENTRE_COLOR \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_CENTRE_COLOUR END
. HDRFTR_CENTRE_COLOR \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_CENTRE_FAM END
. HDRFTR_CENTER_FAMILY \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_CENTRE_FAMILY END
. HDRFTR_CENTER_FAMILY \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_CENTRE_FONT END
. HDRFTR_CENTER_FONT \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_CENTRE_FT END
. HDRFTR_CENTER_FONT \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_CENTRE_PS END
. HDRFTR_CENTER_SIZE \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_CENTRE_SIZE END
. HDRFTR_CENTER_SIZE \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_COLOR END
. HDRFTR_COLOR \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_COLOUR END
. HDRFTR_COLOR \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_FAM END
. HDRFTR_FAMILY \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_FAMILY END
. HDRFTR_FAMILY \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_LEFT_COLOR END
. HDRFTR_LEFT_COLOR \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_LEFT_COLOUR END
. HDRFTR_LEFT_COLOR \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_LEFT_FAM END
. HDRFTR_LEFT_FAMILY \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_LEFT_FAMILY END
. HDRFTR_LEFT_FAMILY \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_LEFT_FONT END
. HDRFTR_LEFT_FONT \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_LEFT_FT END
. HDRFTR_LEFT_FONT \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_LEFT_PS END
. HDRFTR_LEFT_SIZE \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_LEFT_SIZE END
. HDRFTR_LEFT_SIZE \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_RIGHT_COLOR END
. HDRFTR_RIGHT_COLOR \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_RIGHT_COLOUR END
. HDRFTR_RIGHT_COLOR \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_RIGHT_FAM END
. HDRFTR_RIGHT_FAMILY \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_RIGHT_FAMILY END
. HDRFTR_RIGHT_FAMILY \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_RIGHT_FONT END
. HDRFTR_RIGHT_FONT \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_RIGHT_FT END
. HDRFTR_RIGHT_FONT \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_RIGHT_PS END
. HDRFTR_RIGHT_SIZE \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_RIGHT_SIZE END
. HDRFTR_RIGHT_SIZE \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_RULE_COLOR END
. HDRFTR_RULE_COLOR \\$1
-.END \\$1
+.END
\#
.MAC FOOTER_SIZE END
. HDRFTR_SIZE \\$1
-.END \\$1
+.END
\#
.MAC HEADER_CENTER_COLOR END
. HDRFTR_CENTER_COLOR \\$1
-.END \\$1
+.END
\#
.MAC HEADER_CENTER_COLOUR END
. HDRFTR_CENTER_COLOR \\$1
-.END \\$1
+.END
\#
.MAC HEADER_CENTER_FAM END
. HDRFTR_CENTER_FAMILY \\$1
-.END \\$1
+.END
\#
.MAC HEADER_CENTER_FAMILY END
. HDRFTR_CENTER_FAMILY \\$1
-.END \\$1
+.END
\#
.MAC HEADER_CENTER_FONT END
. HDRFTR_CENTER_FONT \\$1
-.END \\$1
+.END
\#
.MAC HEADER_CENTER_FT END
. HDRFTR_CENTER_FONT \\$1
-.END \\$1
+.END
\#
.MAC HEADER_CENTER_PS END
. HDRFTR_CENTER_SIZE \\$1
-.END \\$1
+.END
\#
.MAC HEADER_CENTER_SIZE END
. HDRFTR_CENTER_SIZE \\$1
-.END \\$1
+.END
\#
.MAC HEADER_CENTRE_COLOR END
. HDRFTR_CENTRE_COLOR \\$1
-.END \\$1
+.END
\#
.MAC HEADER_CENTRE_COLOUR END
. HDRFTR_CENTRE_COLOR \\$1
-.END \\$1
+.END
\#
.MAC HEADER_CENTRE_FAM END
. HDRFTR_CENTER_FAMILY \\$1
-.END \\$1
+.END
\#
.MAC HEADER_CENTRE_FAMILY END
. HDRFTR_CENTER_FAMILY \\$1
-.END \\$1
+.END
\#
.MAC HEADER_CENTRE_FONT END
. HDRFTR_CENTER_FONT \\$1
-.END \\$1
+.END
\#
.MAC HEADER_CENTRE_FT END
. HDRFTR_CENTER_FONT \\$1
-.END \\$1
+.END
\#
.MAC HEADER_CENTRE_PS END
. HDRFTR_CENTER_SIZE \\$1
-.END \\$1
+.END
\#
.MAC HEADER_CENTRE_SIZE END
. HDRFTR_CENTER_SIZE \\$1
-.END \\$1
+.END
\#
.MAC HEADER_COLOR END
. HDRFTR_COLOR \\$1
-.END \\$1
+.END
\#
.MAC HEADER_COLOUR END
. HDRFTR_COLOR \\$1
-.END \\$1
+.END
\#
.MAC HEADER_FAM END
. HDRFTR_FAMILY \\$1
-.END \\$1
+.END
\#
.MAC HEADER_FAMILY END
. HDRFTR_FAMILY \\$1
-.END \\$1
+.END
\#
.MAC HEADER_LEFT_COLOR END
. HDRFTR_LEFT_COLOR \\$1
-.END \\$1
+.END
\#
.MAC HEADER_LEFT_COLOUR END
. HDRFTR_LEFT_COLOR \\$1
-.END \\$1
+.END
\#
.MAC HEADER_LEFT_FAM END
. HDRFTR_LEFT_FAMILY \\$1
-.END \\$1
+.END
\#
.MAC HEADER_LEFT_FAMILY END
. HDRFTR_LEFT_FAMILY \\$1
-.END \\$1
+.END
\#
.MAC HEADER_LEFT_FONT END
. HDRFTR_LEFT_FONT \\$1
-.END \\$1
+.END
\#
.MAC HEADER_LEFT_FT END
. HDRFTR_LEFT_FONT \\$1
-.END \\$1
+.END
\#
.MAC HEADER_LEFT_PS END
. HDRFTR_LEFT_SIZE \\$1
-.END \\$1
+.END
\#
.MAC HEADER_LEFT_SIZE END
. HDRFTR_LEFT_SIZE \\$1
-.END \\$1
+.END
\#
.MAC HEADER_RIGHT_COLOR END
. HDRFTR_RIGHT_COLOR \\$1
-.END \\$1
+.END
\#
.MAC HEADER_RIGHT_COLOUR END
. HDRFTR_RIGHT_COLOR \\$1
-.END \\$1
+.END
\#
.MAC HEADER_RIGHT_FAM END
. HDRFTR_RIGHT_FAMILY \\$1
-.END \\$1
+.END
\#
.MAC HEADER_RIGHT_FAMILY END
. HDRFTR_RIGHT_FAMILY \\$1
-.END \\$1
+.END
\#
.MAC HEADER_RIGHT_FONT END
. HDRFTR_RIGHT_FONT \\$1
-.END \\$1
+.END
\#
.MAC HEADER_RIGHT_FT END
. HDRFTR_RIGHT_FONT \\$1
-.END \\$1
+.END
\#
.MAC HEADER_RIGHT_PS END
. HDRFTR_RIGHT_SIZE \\$1
-.END \\$1
+.END
\#
.MAC HEADER_RIGHT_SIZE END
. HDRFTR_RIGHT_SIZE \\$1
-.END \\$1
+.END
\#
.MAC HEADER_RULE_COLOR END
. HDRFTR_RULE_COLOR \\$1
-.END \\$1
+.END
\#
.MAC HEADER_SIZE END
. HDRFTR_SIZE \\$1
-.END \\$1
+.END
\#
\# HEADER and FOOTER aliases for HDRFTR macros.
\#
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Groff-commit] groff/contrib/mom BUGS ChangeLog om.tmac exampl...,
Werner LEMBERG <=