[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Groff-commit] groff/contrib/mom BUGS ChangeLog om.tmac momdoc...
|
From: |
Werner LEMBERG |
|
Subject: |
[Groff-commit] groff/contrib/mom BUGS ChangeLog om.tmac momdoc... |
|
Date: |
Sat, 25 Feb 2006 06:28:53 +0000 |
CVSROOT: /cvsroot/groff
Module name: groff
Branch:
Changes by: Werner LEMBERG <address@hidden> 06/02/25 06:28:53
Modified files:
contrib/mom : BUGS ChangeLog om.tmac
contrib/mom/momdoc: docelement.html docprocessing.html
reserved.html toc.html
Log message:
o Removed superfluous "if" from FONT, line 492
o Removed #ADD_BREAK register from FOOTNOTE and ENDNOTE, along with
the routines it invoked
o Added an optional argument, BREAK, to FOOTNOTE OFF and ENDNOTE
OFF, for correct and flexible handling of punctuation and
continued lines when FOOTNOTE or ENDNOTE are called while nofill
mode is active.
o Created an alias for .so, INCLUDE.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/groff/contrib/mom/BUGS.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/contrib/mom/ChangeLog.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/contrib/mom/om.tmac.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/contrib/mom/momdoc/docelement.html.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/contrib/mom/momdoc/docprocessing.html.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/contrib/mom/momdoc/reserved.html.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/contrib/mom/momdoc/toc.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.22 groff/contrib/mom/BUGS:1.23
--- groff/contrib/mom/BUGS:1.22 Sat Jan 14 08:22:41 2006
+++ groff/contrib/mom/BUGS Sat Feb 25 06:28:53 2006
@@ -19,6 +19,16 @@
========================================================================
+Version 1.3-c
+=============
+Owing to a superfluous "if" in the FONT macro, the "missing font"
+routine is being silently ignored.
+---Fixed---
+
+FOOTNOTE, used in nofill mode, adds a linebreak between the
+marker and the text of the footnote.
+---Fixed---
+
Version 1.3-b
=============
Index: groff/contrib/mom/ChangeLog
diff -u groff/contrib/mom/ChangeLog:1.39 groff/contrib/mom/ChangeLog:1.40
--- groff/contrib/mom/ChangeLog:1.39 Fri Feb 24 08:08:42 2006
+++ groff/contrib/mom/ChangeLog Sat Feb 25 06:28:53 2006
@@ -1,4 +1,18 @@
-*Thu Feb 2 2006
+*Fri Feb 24 2006
+
+o Removed superfluous "if" from FONT, line 492
+
+o Removed #ADD_BREAK register from FOOTNOTE and ENDNOTE, along with
+ the routines it invoked
+
+o Added an optional argument, BREAK, to FOOTNOTE OFF and ENDNOTE
+ OFF, for correct and flexible handling of punctuation and
+ continued lines when FOOTNOTE or ENDNOTE are called while nofill
+ mode is active.
+
+o Created an alias for .so, INCLUDE.
+
+*Thu Feb 2 2006
o Small fix to handling of underlining of italic text spanning
pages in PRINTSTYLE TYPEWRITE.
Index: groff/contrib/mom/momdoc/docelement.html
diff -u groff/contrib/mom/momdoc/docelement.html:1.18
groff/contrib/mom/momdoc/docelement.html:1.19
--- groff/contrib/mom/momdoc/docelement.html:1.18 Fri Feb 24 08:08:42 2006
+++ groff/contrib/mom/momdoc/docelement.html Sat Feb 25 06:28:53 2006
@@ -2580,38 +2580,16 @@
<a href="#FOOTNOTE_MARKERS">.FOOTNOTE_MARKERS</a>
<strong>OFF</strong>.)
<p>
-<strong>***Version 1.3 change***</strong>
+<strong>***Version 1.3-d change***</strong>
<p>
-As of version 1.3, the manner of entering the line
+As of version 1.3-d, the manner of entering the line
<em>after</em> <strong>.FOOTNOTE OFF</strong> has changed
to accommodate users' differing wishes with respect to
-the order of punctuation and footnote markers. The
-correct way to enter the line after <strong>.FOOTNOTE
-OFF</strong>--<strong><em><u>ONLY</u></em></strong> if your
-<a href="#FOOTNOTE_MARKER_STYLE">FOOTNOTE_MARKER_STYLE</a> is
-<strong>STAR</strong> or <strong>NUMBER</strong>--is to input
-it as if it's literally a continuation of the line before
-<strong>.FOOTNOTE</strong>, and therefore begins with either a space
-or a punctuation mark, as in the two following examples.
+the order of punctuation and footnote markers. Please see
+<a href="#FN_AND_PUNCT">Footnote markers and punctuation in the running
text</a>
+for more information.
<p>
-<pre>
- Example 1 Example 2
- --------- ---------
-
- A line of text,\c A line of text\c
- .FOOTNOTE .FOOTNOTE
- A footnote line. A footnote line.
- .FOOTNOTE OFF .FOOTNOTE OFF
- broken up with a comma. , broken up with a comma.
-
- (last line begins with (last line begins with
- a literal space) the comma and a space)
-</pre>
-
-If your <strong>FOOTNOTE_MARKER_STYLE</strong> is line, none of
-this is a concern.
-<p>
-<strong>***End of version 1.3 change***</strong>
+<strong>***End of version 1.3-d change***</strong>
<p>
After you invoke <strong>FOOTNOTE</strong>, <strong>mom</strong>
takes care of everything: putting footnote markers in the body of
@@ -2720,32 +2698,49 @@
<h3><u><a name="FN_AND_PUNCT">Footnote markers and punctuation in the running
text</a></u></h3>
<p>
-As of version 1.3, the manner of entering the line <em>after</em>
-<strong>.FOOTNOTE OFF</strong> has changed. The correct way to
-enter the line after <strong>.FOOTNOTE OFF</strong> now is to
-input it as if it's literally a continuation of the line before
-<strong>.FOOTNOTE</strong>, and therefore begins with either a space
-or a punctuation mark, as in the two following examples.
-<p>
-<pre>
- Example 1 Example 2
- --------- ---------
-
- A line of text,\c A line of text\c
- .FOOTNOTE .FOOTNOTE
- A footnote line. A footnote line.
- .FOOTNOTE OFF .FOOTNOTE OFF
- broken up with a comma. , broken up with a comma.
+As of version 1.3-d, the manner of entering the line <em>after</em>
+<strong>.FOOTNOTE OFF</strong> has changed.
+<br>
+
+<a name="FN_AND_PUNCT_FILL"><h4>"Fill" modes -- JUSTIFY, or QUAD LEFT | CENTER
| RIGHT</h4></a>
+
+In fill modes, the correct way to enter the line after
+<strong>.FOOTNOTE OFF</strong> is to input it as if it's literally a
+continuation of the input line you were entering before you invoked
+<strong>.FOOTNOTE</strong>. Therefore, if necessary, the input line
+may have to begin with space(s) or a punctuation mark, as in the two
+following examples.
+<pre>
+ Example 1
+ ---------
+ A line of text,\c
+ .FOOTNOTE
+ A footnote line.
+ .FOOTNOTE OFF
+ broken up with a comma.
+ ^
+ (last line begins with a literal space)
+
+ Example 2
+ ---------
+ A line of text\c
+ .FOOTNOTE
+ A footnote line.
+ .FOOTNOTE OFF
+ , broken up with a comma.
+ ^
+ (last line begins with a comma and a space)
+</pre>
- (last line begins with (last line begins with
- a literal space) the comma and a space)
+Both produce, on output
+<pre>
+ A line of text*, broken up with a comma.
</pre>
Care must be taken, though, if the punctuation mark that begins the
line after <strong>FOOTNOTE OFF</strong> is a period (dot). You
<strong><em><u>must</u></em></strong> begin such lines with
<strong>\&.</strong>, like this:
-<p>
<pre>
end of a sentence\c
.FOOTNOTE
@@ -2755,15 +2750,100 @@
</pre>
If you omit the <strong>\&.</strong>, the line will vanish!
+
<p>
+<strong>NOTE:</strong> The document element tag,
+<strong>BLOCKQUOTE</strong>, implies a "fill" mode, therefore these
+instructions also apply when you're inputting blockquote text.
+<br>
+
+<a name="FN_AND_PUNCT_NOFILL"><h4>"No-fill" modes -- LEFT, CENTER,
RIGHT</h4></a>
+In no-fill modes, you must decide a) whether text on the
+<em>input</em> line after <strong>FOOTNOTE OFF</strong> is
+to be joined to the <em>output</em> line before
+<strong>FOOTNOTE</strong> was invoked, or b) whether you want the
+<em>output</em> text to begin on a new line.
+<p>
+In the first instance, simply follow the instructions,
+<a href="#FN_AND_PUNCT_FILL">above</a>,
+for fill modes.
+<p>
+In the second instance, you must explicitly tell <strong>mom</strong>
+that you want input text after <strong>FOOTNOTE OFF</strong> to
+begin on a new output line. This is accomplished by passing
+<strong>.FOOTNOTE OFF</strong> (or <strong>QUIT, END, X,</strong>
+etc) an additional argument: <strong>BREAK</strong> or
+<strong>BR</strong>.
+
+<p>
+Study the two examples below to understand the difference.
+<pre>
+ Example 1 -- No-fill mode, FOOTNOTE OFF with no BREAK
+ -----------------------------------------------------
+ .LEFT
+ A line of text\c
+ .FOOTNOTE
+ A footnote line
+ .FOOTNOTE OFF
+ that carries on after the footnote.
+</pre>
+
+produces, on output
+<pre>
+ A line of text* that carries on after the footnote.
+</pre>
+
+whereas
+<pre>
+ Example 2 -- No-fill mode, FOOTNOTE OFF with BREAK
+ --------------------------------------------------
+ .LEFT
+ A line of text\c
+ .FOOTNOTE
+ A footnote line
+ .FOOTNOTE OFF BREAK
+ that doesn't carry on after the footnote.
+</pre>
+
+produces the following on output:
+<pre>
+ A line of text*
+ that doesn't carry on after the footnote.
+</pre>
+
+<p>
+The distinction becomes particularly important if you like to see
+punctuation marks come <em>after</em> footnote markers. In no-fill
+modes, that's accomplished like this:
+<pre>
+ .LEFT
+ A line of text\c
+ .FOOTNOTE
+ A footnote line
+ .FOOTNOTE OFF
+ ,
+ broken up with a comma.
+</pre>
+
+The output of the above looks like this:
+<pre>
+ A line of text*,
+ broken up with a comma.
+</pre>
+
+<p>
+<strong>NOTE:</strong> The document element tag,
+<strong>QUOTE</strong>, implies a "no-fill" mode, therefore these
+instructions also apply when you're inputting quote text.
+<p>
<!---FOOTNOTE--->
<hr width="66%" align="left">
<p>
<a name="FOOTNOTE">
- <nobr>Tag: <strong>FOOTNOTE</strong> <toggle> | INDENT LEFT |
RIGHT | BOTH <indent value></nobr>
+ <nobr>Tag: <strong>FOOTNOTE</strong> <toggle> [ BREAK | BR ] |
INDENT LEFT | RIGHT | BOTH <indent value></nobr>
<br>
<em>*See <a href="#FOOTNOTE_NOTE">HYPER-IMPORTANT NOTE</a>!!!</em>
<br>
@@ -2812,17 +2892,27 @@
<a href="#FOOTNOTE_EXAMPLE">footnote example</a>
above.
<p>
-Additionally, the line <em>after</em> a <strong>FOOTNOTE
-OFF</strong> should be entered as if there were no interruption in
-the input text, i.e. the line should begin with a literal space or
-punctuation mark. See
-<a href="#FN_AND_PUNCT">above</a>.
+Additionally, in "fill" modes (<strong>JUSTIFY</strong>
+or <strong>QUAD LEFT | CENTER | RIGHT</strong>), the line
+<em>after</em> a <strong>FOOTNOTE OFF</strong> should be entered
+as if there were no interruption in the input text, i.e. the line
+should begin with a literal space or punctuation mark (see explanation
+and examples
+<a href="#FN_AND_PUNCT">here</a>).
+<p>
+In "no-fill" modes, the optional argument <strong>BREAK</strong> or
+<strong>BR</strong> may be used after the <strong>OFF</strong> (or
+<strong>QUIT, END, X,</strong> etc.) argument to instruct
+<strong>mom</strong> NOT to join the next input line to the
+previous output. See
+<a href="#FN_AND_PUNCT_NOFILL">here</a>
+for a more complete explanation, with examples.
<p>
Do NOT use the <strong>\c</strong> inline escape if your
<strong>FOOTNOTE_MARKER_STYLE</strong> is <strong>LINE</strong>, or
if you have disabled footnote markers with
<a href="#FOOTNOTE_MARKERS">.FOOTNOTE_MARKERS</a>
-<strong>OFF</strong>. As well, the line after
+<strong>OFF</strong>. In these instances, the line after
<strong>FOOTNOTE OFF</strong> should be entered normally.
<p>
@@ -3111,37 +3201,21 @@
with superscript numbers). When the marker style is
<strong>LINE</strong>, you must <em>not</em> use the
<strong>\c</strong> escape.
+
<p>
-<strong>***Version 1.3 change***</strong>
+<strong>***Version 1.3-d change***</strong>
<p>
-As of version 1.3, the manner of entering the line <em>after</em>
+As of version 1.3-d, the manner of entering the line <em>after</em>
<strong>.ENDNOTE OFF</strong> has changed to accommodate users'
differing wishes with respect to the order of punctuation and
-endnote markers. The correct way to enter the line after
-<strong>.ENDNOTE OFF</strong>--but <strong><em><u>NOT</u></em></strong>
-if your
-<a href="#ENDNOTE_MARKER_STYLE">ENDNOTE_MARKER_STYLE</a>
-is <strong>LINE</strong>--is to input it as if it's literally
-a continuation of the line before <strong>.ENDNOTE</strong>, and
-therefore begins with either a space or a punctuation mark, as in
-the two following examples.
-<p>
-<a name="EN_PUNCT"></a>
-<pre>
- Example 1 Example 2
- --------- ---------
-
- A line of text,\c A line of text\c
- .ENDNOTE .ENDNOTE
- A footnote line. A footnote line.
- .ENDNOTE OFF .ENDNOTE OFF
- broken up with a comma. , broken up with a comma.
-
- (last line begins with (last line begins with
- a literal space) the comma and a space)
-</pre>
-
+endnote markers. <strong>Mom</strong> handles endnotes and
+footnotes identically in this regard, so please read the footnote
+section,
+<a href="#FN_AND_PUNCT">Footnote markers and punctuation in the running
text</a>,
+for an explanation.
+<p>
<strong>***End version 1.3 change***</strong>
+
<p>
Endnotes differ from footnotes in two ways (other than the fact that
endnotes come at the end of a document whereas footnotes appear in the
@@ -3253,7 +3327,7 @@
<p>
<a name="ENDNOTE">
- <nobr>Macro: <strong>ENDNOTE</strong> <toggle></nobr>
+ <nobr>Macro: <strong>ENDNOTE</strong> <toggle> [ BREAK | BR
]</nobr>
<br>
<em>*See <a href="#ENDNOTE_NOTE">HYPER-IMPORTANT NOTE</a>!!!</em>
</a>
@@ -3283,12 +3357,21 @@
<a href="#ENDNOTE_EXAMPLE">endnote example</a>
above.
<p>
-Additionally, the line <em>after</em>
-<strong>.ENDNOTE OFF</strong> should be entered as if there
-were no interruption in the input text, i.e. the line should begin
-with a literal space or punctuation mark. See the two
-<a href="#EN_PUNCT">examples</a>,
-above.
+Additionally, in "fill" modes (<strong>JUSTIFY</strong>
+or <strong>QUAD LEFT | CENTER | RIGHT</strong>), the line
+<em>after</em> a <strong>ENDNOTE OFF</strong> should be entered
+as if there were no interruption in the input text, i.e. the line
+should begin with a literal space or punctuation mark (see explanation
+and examples
+<a href="#FN_AND_PUNCT">here</a>).
+<p>
+In "no-fill" modes, the optional argument <strong>BREAK</strong> or
+<strong>BR</strong> may be used after the <strong>OFF</strong> (or
+<strong>QUIT, END, X,</strong> etc.) argument to instruct
+<strong>mom</strong> NOT to join the next input line to the
+previous output. See
+<a href="#FN_AND_PUNCT_NOFILL">here</a>
+for a more complete explanation, with examples.
<p>
If your <strong>ENDNOTE_MARKER_STYLE</strong> is
<strong>LINE</strong>, do NOT use the <strong>\c</strong> escape,
Index: groff/contrib/mom/momdoc/docprocessing.html
diff -u groff/contrib/mom/momdoc/docprocessing.html:1.23
groff/contrib/mom/momdoc/docprocessing.html:1.24
--- groff/contrib/mom/momdoc/docprocessing.html:1.23 Fri Feb 24 08:08:42 2006
+++ groff/contrib/mom/momdoc/docprocessing.html Sat Feb 25 06:28:53 2006
@@ -1621,8 +1621,83 @@
every invocation of the tag.
<p>
+<!---INCLUDE--->
+<a name="INCLUDE"><h2><u>Including (sourcing) style sheets and
files</u></h2></a>
+<br>
+If you routinely make the same changes to <strong>mom</strong>'s
+defaults in order to create similar documents in a similar
+style--in other words, you need a template--, you can create
+style-sheet files and include, or "source", them into your
+<strong>mom</strong> documents with the macro,
+<strong>INCLUDE</strong>. The right place for such style sheets is
+after
+<a href="#PRINTSTYLE">PRINTSTYLE</a>
+and before
+<a href="#START">START</a>
+<p>
+Say, for example, in a particular kind of document, you
+always want main heads set in Helvetica Bold Italic, flush
+left, with no underscore. You'd create a file, let's call
+it <kbd>head_template</kbd>, in which you'd place the pertinent
+HEAD control macros.
+
+<pre>
+ .HEAD_FAMILY H
+ .HEAD_FONT BI
+ .HEAD_QUAD L
+ .HEAD_UNDERLINE OFF
+</pre>
+
+Then, in the preliminary document set-up section of your main file,
+you'd include the style sheet, or template, like this:
+
+<pre>
+ .TITLE "Sample Document
+ .AUTHOR "Joe Blow
+ .PRINTSTYLE TYPESET
+ \#
+ .INCLUDE head_template
+ \#
+ .START
+</pre>
+
+The blank comment lines (<strong>\#</strong>) aren't required, but
+they do make your file(s) easier to read.
+
+<p>
+If the file to be included is in the same directory as the file
+you're working, you simply enter the filename after
+<kbd>.INCLUDE</kbd>. If the file's in another directory, you must
+provide a full path name to it. For example, if you're working in
+a directory called <kbd>/home/joe/stories</kbd> and your
+style-sheet is in <kbd>/home/joe/style_sheets</kbd>, the above
+example would have to look like this:
+
+<pre>
+ .TITLE "Sample Document
+ .AUTHOR "Joe Blow
+ .PRINTSTYLE TYPESET
+ \#
+ .INCLUDE /home/joe/style_sheets/head_template
+ \#
+ .START
+</pre>
+
+<strong>INCLUDE</strong> is not restricted to style sheets
+or templates. You can include any file at any point into a
+document, provided the file contains only text and valid groff or
+<strong>mom</strong> formatting commands. Neither is
+<strong>INCLUDE</strong> restricted to use with
+<strong>mom</strong>'s document processing macros. You can use it
+in plain typeset documents as well.
+<p>
+<strong>EXPERTS: INCLUDE</strong> is an alias for the groff
+request, <kbd>.so</kbd>. Mix 'n' match <strong>.INCLUDE</strong>
+and <strong>.so</strong> with impunity.
+<p>
+
<!---COLOR--->
-<a name="COLOR"><h2><u>Colour</u></h2></a>
+<a name="COLOR"><h2><u>Using colours</u></h2></a>
<br>
Although it doesn't really matter where you define/initialize
colours for use in document processing (see
Index: groff/contrib/mom/momdoc/reserved.html
diff -u groff/contrib/mom/momdoc/reserved.html:1.20
groff/contrib/mom/momdoc/reserved.html:1.21
--- groff/contrib/mom/momdoc/reserved.html:1.20 Fri Feb 24 08:08:42 2006
+++ groff/contrib/mom/momdoc/reserved.html Sat Feb 25 06:28:53 2006
@@ -388,6 +388,7 @@
FT FONT
HYPHENATE HY
HYPHENATION HY
+INCLUDE so
LIG LIGATURES
LL LINE_LENGTH
MAC de
@@ -946,9 +947,6 @@
doesn't fall below what should be the
correct last printed line of running
text
-#ADD_BREAK Instructs FOOTNOTEs and ENDNOTEs to add
- a break afer processing a footnote if
- we're not in fill mode
#ADJ_BIB_LEAD Adjust BIB_LEAD? (toggle)
#ADJ_DOC_LEAD Adjust DOC_LEAD? (toggle)
#ADJ_TOC_LEAD Adjust TOC_LEAD? (toggle)
@@ -1293,7 +1291,7 @@
#L_MARGIN_DIFF Difference between DOC_L_MARGIN and
L_MARGIN
#LEFT_CAP_HEIGHT Cap height of left string in headers/footers
-#LEGAL_BASELINE Calculates vert. position of next valid
+#VALID_BASELINE Calculates vert. position of next valid
baseline in SHIM
#LETTER_STYLE 1=BUSINESS 2=PERSONAL
#LINEBREAK Did we have a linebreak? (toggle)
Index: groff/contrib/mom/momdoc/toc.html
diff -u groff/contrib/mom/momdoc/toc.html:1.18
groff/contrib/mom/momdoc/toc.html:1.19
--- groff/contrib/mom/momdoc/toc.html:1.18 Thu Sep 15 11:41:32 2005
+++ groff/contrib/mom/momdoc/toc.html Sat Feb 25 06:28:53 2006
@@ -2,13 +2,13 @@
<html>
<head>
<meta http-equiv="content-type" content="text/html;charset=iso-8859-1">
-<title>Mom, version 1.3-b -- Table of Contents</title>
+<title>Mom, version 1.3-d -- Table of Contents</title>
</head>
<body bgcolor="#dfdfdf">
<!====================================================================>
-<h1 align="center"><u>Table of Contents for mom, version 1.3-b</u></h1>
+<h1 align="center"><u>Table of Contents for mom, version 1.3-d</u></h1>
The table of contents has grown quite large. If you've been using
<strong>mom</strong> for a while, you might prefer the
@@ -220,10 +220,11 @@
<ul>
<li><a
href="docprocessing.html#TYPE_BEFORE_START">5.3.4.1 Typesetting macros before
START</a> -- usage
<ul>
- <li><a
href="docprocessing.html#COLOR">Colour</a>
+ <li><a
href="docprocessing.html#INCLUDE">Including (sourcing) style sheets and
files</a>
+ <li><a
href="docprocessing.html#COLOR">Using colours</a>
</ul>
<li><a
href="docprocessing.html#DOC_LEAD_ADJUST">5.3.4.2 DOC_LEAD_ADJUST</a> --
adjusting the document
- <a
href="definitions.html#TERMS_LEADING">leading</a> (line spacing) to fill pages
+ <a
href="definitions.html#TERMS_LEADING">leading</a> (line spacing) to fill pages
<li><a
href="docprocessing.html#DOCHEADER">5.3.4.3 DOCHEADER</a> -- managing the
<a href="definitions.html#TERMS_DOCHEADER">document
header</a>
Index: groff/contrib/mom/om.tmac
diff -u groff/contrib/mom/om.tmac:1.32 groff/contrib/mom/om.tmac:1.33
--- groff/contrib/mom/om.tmac:1.32 Fri Feb 24 08:08:42 2006
+++ groff/contrib/mom/om.tmac Sat Feb 25 06:28:53 2006
@@ -21,8 +21,8 @@
with groff; see the file COPYING. If not, write to the Free Software
Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-Version 1.3-c_1
----------------
+Version 1.3-d
+-------------
Antoine de St-Exupéry asserted that elegance in engineering is
achieved not when there is nothing left to add, but when there is
nothing left to take away.
@@ -108,6 +108,7 @@
.ALIAS SPREAD brp
.ALIAS ESC_CHAR ec
.ALIAS STRING ds
+.ALIAS INCLUDE so
\#
\# ALIASES FOR NUMBER REGISTERS
\# ----------------------------
@@ -488,7 +489,7 @@
. ds $FONT \\$1
. ft 0
. ft \\*[$FONT]
-. if if (\\n[.x]\\n[.y]\\n[.Y] >= 1192) \{\
+. if (\\n[.x]\\n[.y]\\n[.Y] >= 1192) \{\
. if '\\n[.sty]'' \{\
. if !F\\n[.fn] \{\
. if !S\\*[$FONT] \{\
@@ -6538,23 +6539,23 @@
\# First, a little convenience macro
\#
.MAC PROCESS_SHIM END
-. while \\n+[#LEGAL_BASELINE]<\\n[#CURRENT_V_POS] \{\
+. while \\n+[#VALID_BASELINE]<\\n[#CURRENT_V_POS] \{\
.
.\}
-. nr #SHIM \\n[#LEGAL_BASELINE]-\\n[#CURRENT_V_POS]
+. nr #SHIM \\n[#VALID_BASELINE]-\\n[#CURRENT_V_POS]
.END
\#
\#
.MAC SHIM END
-. nr #LEGAL_BASELINE \\n[#T_MARGIN]-1v \\n[#DOC_LEAD]
+. nr #VALID_BASELINE \\n[#T_MARGIN]-1v \\n[#DOC_LEAD]
. if !r#CURRENT_V_POS \{ .nr #CURRENT_V_POS \\n(.d \}
. ie r#ADVANCE_FROM_TOP \{\
. ie \\n[#CURRENT_V_POS]<(\\n[#T_MARGIN]-1v) \{\
-. while \\n-[#LEGAL_BASELINE]>\\n[#CURRENT_V_POS] \{\
+. while \\n-[#VALID_BASELINE]>\\n[#CURRENT_V_POS] \{\
.
.\}
-. nr #LEGAL_BASELINE +\\n[#DOC_LEAD]
-. nr #SHIM \\n[#LEGAL_BASELINE]-\\n[#CURRENT_V_POS]
+. nr #VALID_BASELINE +\\n[#DOC_LEAD]
+. nr #SHIM \\n[#VALID_BASELINE]-\\n[#CURRENT_V_POS]
. \}
. el \{\
. PROCESS_SHIM
@@ -10556,7 +10557,6 @@
\# for each footnote the user wants indented.
\#
.MAC FOOTNOTE END
-. if !\\n(.u \{ .nr #ADD_BREAK 1 \}
. ie '\\$1'' \{\
. if \\n[#FN_MARKER_STYLE]=3 \{\
. if !\\n[#LINENUMBERS] \{\
@@ -11235,9 +11235,9 @@
. \}
. nr #NO_FN_MARKER 0
. \}
-. if \\n[#ADD_BREAK] \{\
-. br
-. rr #ADD_BREAK
+. if \\n[#NUM_ARGS]=2 \{\
+. if '\\$2'BREAK' \{ .BR \}
+. if '\\$2'BR' \{ .BR \}
. \}
.END
\#
@@ -12046,7 +12046,6 @@
\# when ENDNOTE_MARKER_STYLE is NUMBER.
\#
.MAC ENDNOTE END
-. if !\\n(.u \{ .nr #ADD_BREAK 1 \}
. ie '\\$1'' \{\
. nr #ENDNOTE 1
. if \\n[#EN_MARKER_STYLE]=1 \{\
@@ -12063,7 +12062,9 @@
. \}
. PRINT
"\s-2\v'-\\n[#DOC_LEAD]u/5u'\\n+[#EN_NUMBER]\v'+\\n[#DOC_LEAD]u/5u'\s+2\c"
. \}
-. if \\n[#PRINT_STYLE]=2 \{ .PRINT
"\*[SUP]\\n+[#EN_NUMBER]\*[SUPX]\c" \}
+. if \\n[#PRINT_STYLE]=2 \{\
+. PRINT \*[SUP]\\n+[#EN_NUMBER]\*[SUPX]\c
+. \}
. \}
. if \\n[#EN_MARKER_STYLE]=2 \{\
. if !\\n[#LINENUMBERS] \{\
@@ -12250,9 +12251,9 @@
\*[SLANT]\c
. \}
. \}
-. if \\n[#ADD_BREAK] \{\
-. br
-. rr #ADD_BREAK
+. if \\n[#NUM_ARGS]=2 \{\
+. if '\\$2'BREAK' \{ .BR \}
+. if '\\$2'BR' \{ .BR \}
. \}
.END
\#
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Groff-commit] groff/contrib/mom BUGS ChangeLog om.tmac momdoc...,
Werner LEMBERG <=