groff-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[groff] 05/07: man pages: Convert .nf/fi/nh/hy nonense to .EX/EE.


From: G. Branden Robinson
Subject: [groff] 05/07: man pages: Convert .nf/fi/nh/hy nonense to .EX/EE.
Date: Wed, 4 Nov 2020 07:32:50 -0500 (EST)

gbranden pushed a commit to branch master
in repository groff.

commit dfa7b3108f24c30a1fe7b723d2c7fee7ebbd9671
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Wed Nov 4 21:41:11 2020 +1100

    man pages: Convert .nf/fi/nh/hy nonense to .EX/EE.
    
    Prompted by John Gardner on the groff mailing list.  I hadn't realized
    how close we were to killing the last of these off.
    
    Several examples render in roman (Courier roman on typesetters) now
    instead of bold, or in bold only for portions of mixed I/O that are user
    input, just as groff_man_style(7) recommends.
    
    No textual changes (well, not to _words_) despite severe temptation.
    
    * contrib/chem/chem.1.man:
    * contrib/hdtbl/groff_hdtbl.7.man:
    * contrib/mm/groff_mm.7.man:
    * man/groff_out.5.man:
    * src/devices/grops/grops.1.man:
    * src/preproc/pic/pic.1.man:
    * tmac/groff_ms.7.man:
    * tmac/groff_www.7.man: Replace nf/(nh)/(ft)/.../(ft)/(hy)/fi sequences
      with .EX/EE.  That is what the macros are there for: to turn off
      filling and hyphenation, and select a font family that will stand out
      (Courier) so that all three styles are available, and unlike bold,
      allows character-cell alignment since it is monospaced.  As part of
      groff's unwritten man page style guide, examples are always indented
      as well, which mitigates the absense of a font family change.
    
    * contrib/hdtbl/groff_hdtbl.7.man: Also use .ne requests in troff mode
      consistently for table examples (two examples already did).  I'm
      conflicted about this; it's against our current portability advice but
      keeps are a pretty basic typographical thing to want/have.  Maybe we
      should bring ms(7)'s .KS/.KE into man(7)--muahahahahaha.  (Less
      radically, we could make .EX and .EE use diversions.)
    
    * src/preproc/pic/pic.1.man: Also fix bizarre use of matched,
      directional, single-quote special character escapes in a code example.
      Use the _correct_ special character escape, \[aq], instead.
      e375837773f99ea0de14ebebe5fb69e22b39fb28 (18 September 2014) is a
      perversely fascinating commit, not least for its misleading summary.
---
 contrib/chem/chem.1.man         |  34 ++---
 contrib/hdtbl/groff_hdtbl.7.man | 297 +++++++++++++++++++---------------------
 contrib/mm/groff_mm.7.man       |   4 +-
 man/groff_out.5.man             |  49 +++----
 src/devices/grops/grops.1.man   |  41 +++---
 src/preproc/pic/pic.1.man       |  67 +++++----
 tmac/groff_ms.7.man             |  40 ++++--
 tmac/groff_www.7.man            |  79 ++++++-----
 8 files changed, 304 insertions(+), 307 deletions(-)

diff --git a/contrib/chem/chem.1.man b/contrib/chem/chem.1.man
index db5dde7..5755a12 100644
--- a/contrib/chem/chem.1.man
+++ b/contrib/chem/chem.1.man
@@ -136,13 +136,11 @@ lines looks like this
 .
 .
 .IP
-.nf
-.ft B
+.EX
 \&.cstart
-\fIchem data\fP
+.I chem data
 \&.cend
-.ft
-.fi
+.EE
 .
 .
 .P
@@ -178,15 +176,13 @@ commands to draw the diagram.
 As an example,
 .
 .IP
-.nf
-.ft B
+.EX
 \&.cstart
 CH3
 bond
 CH3
 \&.cend
-.ft
-.fi
+.EE
 .
 .
 .P
@@ -401,12 +397,10 @@ vertex\~1.
 This is expressed as
 .
 .IP
-.ft B
-.nf
+.EX
 R1: ring pointing up
 R2: ring pointing right
-.fi
-.ft
+.EE
 .
 .
 .P
@@ -440,12 +434,12 @@ These vertex names are used for connecting bonds or other 
rings.  For
 example,
 .
 .IP
-.ft B
-.nf
+.EX
 R1: benzene pointing right
 R2: benzene pointing right with .V6 at R1.V2
-.fi
-.ft
+.EE
+.
+.
 .P
 creates two benzene rings connected along a side.
 .
@@ -649,12 +643,10 @@ The specific construction
 .P
 is equivalent to
 .IP
-.ft B
-.nf
+.EX
 bond
 moiety
-.fi
-.ft
+.EE
 .
 .
 .P
diff --git a/contrib/hdtbl/groff_hdtbl.7.man b/contrib/hdtbl/groff_hdtbl.7.man
index 729ea34..e88416e 100644
--- a/contrib/hdtbl/groff_hdtbl.7.man
+++ b/contrib/hdtbl/groff_hdtbl.7.man
@@ -216,15 +216,15 @@ there are two possibilities to do so:
 .
 Either add the line
 .
+.
 .PP
-.nf
-.nh
 .RS
-.CR .mso hdtbl.tmac
-.fi
-.hy
+.EX
+\&.mso hdtbl.tmac
+.EE
 .RE
 .
+.
 .PP
 to your
 .I roff
@@ -233,14 +233,13 @@ file before using any macros of the
 package, or add the option
 .
 .PP
-.nf
-.nh
 .RS
-.CR \-m hdtbl
-.fi
-.hy
+.EX
+\-m hdtbl
+.EE
 .RE
 .
+.
 .PP
 to the command line of groff (before the document file which contains
 .B hdtbl
@@ -268,17 +267,16 @@ four base table macros in the right order.
 .
 Here we construct a table with only one cell.
 .
+.
 .PP
 .RS
-.nf
-.nh
-.CR .TBL
-.CR .TR
-.CR .TD
-.CI contents of the table cell
-.CR .ETB
-.fi
-.hy
+.EX
+\&.TBL
+\&.TR
+\&.TD
+.I contents of the table cell
+\&.ETB
+.EE
 .RE
 .
 .
@@ -287,30 +285,28 @@ A
 .I tty
 representation is
 .
+.
 .PP
-.nf
-.nh
-.ft CR
+.if t .ne 3v
 .RS
+.EX
 +------------------------------------------------------+
-| contents-of-the-table-cell                           |
+.\" That's 27 spaces below.
+.RI "| " contents-of-the-table-cell "                           |"
 +------------------------------------------------------+
+.EE
 .RE
-.ft
-.hy
-.fi
 .
 .
 .PP
 Equivalent to the above is the following notation.
 .
+.
 .PP
 .RS
-.nh
-.nf
-.CRI ".TBL .TR .TD \[dq]" "contents of the table cell" "\[dq] .ETB"
-.fi
-.hy
+.EX
+.RI ".TBL .TR .TD \[dq]" "contents of the table cell" "\[dq] .ETB"
+.EE
 .RE
 .
 .
@@ -333,14 +329,12 @@ can be written as
 .
 .PP
 .RS
-.nf
-.nh
-.CR ".TBL cols=2"
-.CR ".  TR .TD 1*1 .TD 1*2"
-.CR ".  TR .TD 2*1 .TD 2*2"
-.CR ".ETB"
-.fi
-.hy
+.EX
+\&.TBL cols=2
+\&.  TR .TD 1*1 .TD 1*2
+\&.  TR .TD 2*1 .TD 2*2
+\&.ETB
+.EE
 .RE
 .
 .
@@ -351,19 +345,16 @@ representation is
 .
 .
 .PP
-.nf
-.nh
-.ft CR
+.if t .ne 5v
 .RS
+.EX
 +--------------------------+---------------------------+
 | 1*1                      | 1*2                       |
 +--------------------------+---------------------------+
 | 2*1                      | 2*2                       |
 +--------------------------+---------------------------+
+.EE
 .RE
-.ft
-.hy
-.fi
 .
 .
 .PP
@@ -390,49 +381,49 @@ and
 .
 Note, however, that this table
 .
+.
 .PP
 .RS
-.nf
-.nh
-.CR ".TBL"
-.CR ".  TR"
-.CR ".    TD"
-.CR ".      nop 1*1 1*2"
-.CR ".  TR"
-.CR ".    TD"
-.CR ".      TBL cols=2 border="
-.CR ".        TR"
-.CR ".          TD"
-.CR ".            nop 2*1"
-.CR ".          TD"
-.CR ".            nop 2*2"
-.CR ".      ETB"
-.CR ".ETB"
-.fi
-.hy
+.EX
+\&.TBL
+\&.  TR
+\&.    TD
+\&.      nop 1*1 1*2
+\&.  TR
+\&.    TD
+\&.      TBL cols=2 border=
+\&.        TR
+\&.          TD
+\&.            nop 2*1
+\&.          TD
+\&.            nop 2*2
+\&.      ETB
+\&.ETB
+.EE
 .RE
 .
+.
 .PP
 and this table
 .
+.
 .PP
 .RS
-.nf
-.nh
-.CR ".TBL cols=2"
-.CR ".  TR"
-.CR ".    TD colspan=2"
-.CR ".      nop 1*1 1*2"
-.CR ".  TR"
-.CR ".    TD"
-.CR ".      nop 2*1"
-.CR ".    TD"
-.CR ".      nop 2*2"
-.CR ".ETB"
-.fi
-.hy
+.EX
+\&.TBL cols=2
+\&.  TR
+\&.    TD colspan=2
+\&.      nop 1*1 1*2
+\&.  TR
+\&.    TD
+\&.      nop 2*1
+\&.    TD
+\&.      nop 2*2
+\&.ETB
+.EE
 .RE
 .
+.
 .PP
 are similar but not identical (the use of
 .CR .nop
@@ -443,10 +434,9 @@ is purely cosmetic to get proper indentation).
 The first table looks like
 .
 .PP
-.nf
-.nh
-.ft CR
+.if t .ne 7v
 .RS
+.EX
 +------------------------------------------------------+
 | 1*1 1*2                                              |
 +------------------------------------------------------+
@@ -454,40 +444,36 @@ The first table looks like
 | 2*1                         2*2                      |
 |                                                      |
 +------------------------------------------------------+
+.EE
 .RE
-.ft
-.hy
-.fi
+.
 .
 .PP
 and the second one like
 .
+.
 .PP
-.nf
-.nh
-.ft CR
+.if t .ne 5v
 .RS
+.EX
 +------------------------------------------------------+
 | 1*1 1*2                                              |
 +---------------------------+--------------------------+
 | 2*1                       | 2*2                      |
 +---------------------------+--------------------------+
+.EE
 .RE
-.ft
-.hy
-.fi
+.
 .
 .PP
 Here the latter table in a more compact form.
 .
 .PP
 .RS
-.nf
-.nh
-.CR ".TBL cols=2 .TR \[dq].TD colspan=2\[dq] 1*1 1*2"
-.CR ".            TR .TD 2*1 .TD 2*2 .ETB"
-.fi
-.hy
+.EX
+\&.TBL cols=2 .TR \[dq].TD colspan=2\[dq] 1*1 1*2
+\&.            TR .TD 2*1 .TD 2*2 .ETB
+.EE
 .RE
 .
 .
@@ -805,45 +791,42 @@ as in the following table fragment
 (the overlapping happens in the second cell in the second row),
 is invalid and causes incorrect results.
 .
+.
 .RS
 .IP
-.nh
-.nf
-.CR ".TR .TD 1*1 \[dq].TD 1*2 rowspan=2\[dq] .TD 1*3"
-.CR ".TR \[dq].TD 2*1 colspan=2\[dq]         .TD 2*3"
-.fi
-.hy
+.EX
+\&.TR .TD 1*1 \[dq].TD 1*2 rowspan=2\[dq] .TD 1*3
+\&.TR \[dq].TD 2*1 colspan=2\[dq]         .TD 2*3
+.EE
 .RE
 .
+.
 .PP
 A working example for headers and cells with
 .B colspan
 is
 .
+.
 .PP
 .RS
-.nf
-.nh
-.CR .TBL cols=3
-.CR ".  TR" \[dq].TH colspan=2\[dq] header1+2 .TH header3
-.CR ".  TR" .TD 1*1 .TD 1*2 .TD 1*3
-.CR ".  TR" .TD 2*1 \[dq].TD colspan=2\[dq] 2*2+3
-.CR .ETB
-.fi
-.hy
+.EX
+\&.TBL cols=3
+\&.  TR \[dq].TH colspan=2\[dq] header1+2 .TH header3
+\&.  TR .TD 1*1 .TD 1*2 .TD 1*3
+\&.  TR .TD 2*1 \[dq].TD colspan=2\[dq] 2*2+3
+\&.ETB
+.EE
 .RE
 .
+.
 .PP
 This looks like
 .
+.
 .PP
-.ft CR
-.if t \{\
-.  ne 7v
-.\}
+.if t .ne 7v
 .RS
-.nf
-.nh
+.EX
 +------------------------------+---------------+
 |          header1+2           |    header3    |
 +--------------+---------------+---------------+
@@ -851,57 +834,54 @@ This looks like
 +--------------+---------------+---------------+
 | 2*1          | 2*2+3                         |
 +--------------+-------------------------------+
+.EE
 .RE
-.ft
-.hy
-.fi
+.
 .
 .PP
 A working example with
 .B rowspan
 is
 .
+.
 .PP
 .RS
-.nf
-.nh
-.CR .TBL cols=3
-.CR ".  TR"
-.CR ".  TD" 1*1
-.CR ".  TD" rowspan=2 1+2*2
-.CR ".  TD" 1*3
-.CR .
-.CR ".  TR"
-.CR ".  TD" 2*1
-.CR ".  TD" 2*3
-.CR .ETB
-.fi
-.hy
+.EX
+\&.TBL cols=3
+\&.  TR
+\&.  TD 1*1
+\&.  TD rowspan=2 1+2*2
+\&.  TD 1*3
+\&.
+\&.  TR
+\&.  TD 2*1
+\&.  TD 2*3
+\&.ETB
+.EE
 .RE
 .
+.
 .PP
 which looks like
 .
+.
 .PP
-.ft CR
+.if t .ne 5v
 .RS
-.nf
-.nh
+.EX
 +--------------+---------------+---------------+
 | 1*1          | 1+2*2         | 1*3           |
 +--------------+               +---------------+
 | 2*1          |               | 2*3           |
 +--------------+---------------+---------------+
-.hy
-.fi
+.EE
 .RE
-.ft CR
-.
 .RE
 .RE
 .
 .\"==================================================================
 .
+.
 .TP
 .CB ".ETB \[lB]hold\[rB]"
 End of the table.
@@ -1185,12 +1165,12 @@ to minimize the markup needed in each table.
 The following example sets up defaults suitable for typical papers:
 .PP
 .RS
-.nf
-.CR ".ds t*bgc white\e\[dq] background color
-.CR ".ds t*fgc black\e\[dq] foreground color
-.CR ".ds t*bc black\e\[dq]  border color
-.CR ".nr t*cpd 0.1n\e\[dq]  cell padding
-.fi
+.EX
+\&.ds t*bgc white\[rs]\[dq] background color
+\&.ds t*fgc black\[rs]\[dq] foreground color
+\&.ds t*bc black\[rs]\[dq]  border color
+\&.nr t*cpd 0.1n\[rs]\[dq]  cell padding
+.EE
 .RE
 .
 .
@@ -1210,13 +1190,14 @@ to the page header macro of your document's main macro 
package.
 .
 For example, say
 .
+.
 .PP
 .RS
-.nf
-.CR ".am pg@top"
-.CR ".  t*hm"
-.CR ".."
-.fi
+.EX
+\&.am pg@top
+\&.  t*hm
+\&..
+.EE
 .RE
 .
 .
@@ -1239,17 +1220,17 @@ to the \[lq]end\[rq] macro of your document's main 
macro package.
 .
 For example:
 .
+.
 .PP
 .RS
-.nf
-.nh
-.CR ".am pg@end-text"
-.CR ".  t*EM"
-.CR ".."
-.fi
-.hy
+.EX
+\&.am pg@end-text
+\&.  t*EM
+\&..
+.EE
 .RE
 .
+.
 .PP
 If you use the
 .B ms
diff --git a/contrib/mm/groff_mm.7.man b/contrib/mm/groff_mm.7.man
index 156632f..280d875 100644
--- a/contrib/mm/groff_mm.7.man
+++ b/contrib/mm/groff_mm.7.man
@@ -572,7 +572,7 @@ Always use this order of the cover macros:
 .
 .RS
 .IP
-.nf
+.EX
 \&.COVER
 \&.TL
 \&.AF
@@ -581,7 +581,7 @@ Always use this order of the cover macros:
 \&.AS
 \&.AE
 \&.COVEND
-.fi
+.EE
 .RE
 .
 .IP
diff --git a/man/groff_out.5.man b/man/groff_out.5.man
index 9df6b2d..8327687 100644
--- a/man/groff_out.5.man
+++ b/man/groff_out.5.man
@@ -1526,13 +1526,12 @@ High-resolution device
 .RS
 .P
 .EX
-\fBshell>\fP echo "hell world" | groff \-Z \-T ps
+.RB "shell>\~" "echo \[dq]hell world\[dq] | groff \-Z \-T ps"
 .EE
 .
 .
 .P
-.nf
-.ft CB
+.EX
 x T ps
 x res 72000 1 1
 x init
@@ -1551,8 +1550,7 @@ n12000 0
 x trailer
 V792000
 x stop
-.ft P
-.fi
+.EE
 .RE
 .
 .
@@ -1587,43 +1585,33 @@ formatter.
 .
 .
 .P
-.nf
-.I "# prologue"
-.ft CB
+.EX
+.I # prologue
 x T latin1
 x res 240 24 40
 x init
-.I "# begin a new page"
-.ft CB
+.I # begin a new page
 p1
-.I "# font setup"
-.ft CB
+.I # font setup
 x font 1 R
 f1
 s10
-.I "# initial positioning on the page"
-.ft CB
+.I # initial positioning on the page
 V40
 H0
-.I "# write text \[oq]hell\[cq]"
-.ft CB
+.I # write text \[oq]hell\[cq]
 thell
-.I "# inform about a space, and do it by a horizontal jump"
-.ft CB
+.I # inform about a space, and do it by a horizontal jump
 wh24
-.I "# write text \[oq]world\[cq]"
-.ft CB
+.I # write text \[oq]world\[cq]
 tworld
-.I "# announce line break, but do nothing because ..."
-.ft CB
+.I # announce line break, but do nothing because ...
 n40 0
-.I "# ... the end of the document has been reached"
-.ft CB
+.I # ... the end of the document has been reached
 x trailer
 V2640
 x stop
-.ft P
-.fi
+.EE
 .RE
 .
 .
@@ -1653,8 +1641,7 @@ displacements.
 .
 .
 .P
-.nf
-.ft CB
+.EX
 x T X100
 x res 100 1 1
 x init
@@ -1664,15 +1651,13 @@ f5
 s10
 V16
 H100
-.I "# write text with old-style jump-and-write command"
-.ft CB
+.I # write text with old-style jump-and-write command
 ch07e07l03lw06w11o07r05l03dh7
 n16 0
 x trailer
 V1100
 x stop
-.ft P
-.fi
+.EE
 .RE
 .
 .
diff --git a/src/devices/grops/grops.1.man b/src/devices/grops/grops.1.man
index 958d049..f89ba51 100644
--- a/src/devices/grops/grops.1.man
+++ b/src/devices/grops/grops.1.man
@@ -879,10 +879,10 @@ can extend over multiple lines.
 .
 For example,
 .
+.
 .RS
 .IP
-.nf
-.ft B
+.EX
 \&.nr x 1i
 \&.de y
 \&ps: exec
@@ -890,8 +890,8 @@ For example,
 \&stroke
 \&..
 \&\[rs]Yy
-.ft R
-.fi
+.EE
+.
 .
 .LP
 is another way to draw a horizontal line one inch long.
@@ -1069,15 +1069,14 @@ character because the standard X11 fonts do not provide 
it;
 this problem can be overcome by executing the following
 request
 .
+.
 .IP
-.ft B
-.nf
+.EX
 \&.char \[rs][em] \[rs]X\[aq]ps: invis\[aq]\[rs]
 \[rs]Z\[aq]\[rs]v\[aq]-.25m\[aq]\[rs]h\[aq].05m\[aq]\c
 \[rs]D\[aq]l .9m 0\[aq]\[rs]h\[aq].05m\[aq]\[aq]\[rs]
 \[rs]X\[aq]ps: endinvis\[aq]\[rs][em]
-.ft
-.fi
+.EE
 .
 .
 .LP
@@ -1112,10 +1111,11 @@ anything is drawn or written by groff).
 .
 For example, to underlay the page contents with the word
 \[oq]DRAFT\[cq] in light gray, you might use
+.
+.
 .RS
 .LP
-.nf
-.ft B
+.EX
 \&.de XX
 ps: def
 /BPhook
@@ -1127,27 +1127,30 @@ ps: def
 def
 \&..
 \&.devicem XX
-.ft R
-.fi
+.EE
 .RE
+.
+.
 .LP
 Or, to cause lines and polygons to be drawn with square linecaps
 and mitered linejoins instead of the round linecaps and linejoins
 normally used by
 .BR grops ,
 use
+.
+.
 .RS
 .LP
-.nf
-.ft B
+.EX
 \&.de XX
 ps: def
 /BPhook { 2 setlinecap 0 setlinejoin } def
 \&..
 \&.devicem XX
-.ft R
-.fi
+.EE
 .RE
+.
+.
 .LP
 (square linecaps, as opposed to butt linecaps (0 setlinecap),
 give true corners in boxed tables even though the lines are
@@ -1168,16 +1171,14 @@ produces an encapsulated PS file.
 .
 .RS
 .LP
-.nf
-.ft B
+.EX
 #! /bin/sh
 groff \-P\-b16 $1 > $1.ps
 gs \-dNOPAUSE \-sDEVICE=bbox \-\- $1.ps 2> $1.bbox
 sed \-e "/\[ha]%%Orientation/r $1.bbox" \[rs]
     \-e "/\[ha]%!PS-Adobe-3.0/s/$/ EPSF-3.0/" $1.ps > $1.eps
 rm $1.ps $1.bbox
-.ft R
-.fi
+.EE
 .RE
 .
 .
diff --git a/src/preproc/pic/pic.1.man b/src/preproc/pic/pic.1.man
index 7b97804..3f7b2da 100644
--- a/src/preproc/pic/pic.1.man
+++ b/src/preproc/pic/pic.1.man
@@ -456,25 +456,32 @@ or
 but allows the values of variables to be passed through.
 .
 For example,
+.
+.
 .RS
 .IP
-.ft B
-.nf
+.EX
 \&.PS
 x = 14
 command ".ds string x is " x "."
 \&.PE
 \e*[string]
-.ft
-.fi
+.EE
 .RE
+.
+.
 .IP
 prints
+.
+.
 .RS
 .IP
-.B x is 14.
+.EX
+x is 14.
+.EE
 .RE
 .
+.
 .TP
 \fBsh\fR \fIX\fR \fIcommand\fR \fIX\fR
 Pass
@@ -540,10 +547,11 @@ can be any character not occurring in
 .IR body .
 .
 For example,
+.
+.
 .RS
 .IP
-.ft B
-.nf
+.EX
 \&.PS
 copy thru % circle at ($1,$2) % until "END"
 1 2
@@ -552,25 +560,27 @@ copy thru % circle at ($1,$2) % until "END"
 END
 box
 \&.PE
-.ft
-.fi
+.EE
 .RE
+.
+.
 .IP
 is equivalent to
+.
+.
 .RS
 .IP
-.ft B
-.nf
+.EX
 \&.PS
 circle at (1,2)
 circle at (3,4)
 circle at (5,6)
 box
 \&.PE
-.ft
-.fi
+.EE
 .RE
 .
+.
 .IP
 The commands to be performed for each line can also be taken
 from a macro defined earlier by giving the name of the macro
@@ -638,10 +648,11 @@ defines the variable in the current block if it is not 
already defined
 there, and then changes the value in the current block only.)
 .
 For example, the following:
+.
+.
 .RS
 .IP
-.ft B
-.nf
+.EX
 \&.PS
 x = 3
 y = 3
@@ -651,14 +662,19 @@ y = 3
 ]
 print x " " y
 \&.PE
-.ft
-.fi
+.EE
 .RE
+.
+.
 .IP
 prints
+.
+.
 .RS
 .IP
+.EX
 .B 5 3
+.EE
 .RE
 .
 .
@@ -1146,15 +1162,14 @@ is a single token: no space is allowed between the
 and the
 .BR th .
 .
+.
 For example,
 .IP
-.ft B
-.nf
+.EX
 for i = 1 to 4 do {
-   line from \[oq]i\[cq]th box.nw to \[oq]i+1\[cq]th box.se
+   line from \[aq]i\[aq]th box.nw to \[aq]i+1\[aq]th box.se
 }
-.ft
-.fi
+.EE
 .
 .
 .\" ====================================================================
@@ -1193,16 +1208,16 @@ At the moment, calling standard
 without any macro package works.
 .
 Alternatively, you can define your own requests, e.g., to do nothing:
+.
+.
 .LP
 .RS
-.nf
-.ft B
+.EX
 \&.de PS
 \&..
 \&.de PE
 \&..
-.ft
-.fi
+.EE
 .RE
 .
 .
diff --git a/tmac/groff_ms.7.man b/tmac/groff_ms.7.man
index 8b9967e..294d149 100644
--- a/tmac/groff_ms.7.man
+++ b/tmac/groff_ms.7.man
@@ -534,9 +534,9 @@ For example,
 the sequence:
 .
 .RS
-.ne 12
-.nf
 .IP
+.ne 12v
+.EX
 \&.nr PS 10
 \&.nr GROWPS 3
 \&.nr PSINCR 1.5p
@@ -549,7 +549,7 @@ Second Level Heading
 \&.
 \&.NH 3
 Third Level Heading
-.fi
+.EE
 .RE
 .
 .IP
@@ -600,24 +600,32 @@ accordingly.
 By default,
 .B SN\-STYLE
 is initialised by defining the alias
+.
+.
 .RS
-.nf
 .IP
+.EX
 \&.als SN\-STYLE SN\-DOT
-.fi
+.EE
 .RE
+.
+.
 .IP
 it may be changed to the
 .B SN\-NO\-DOT
 style,
 if preferred,
 by defining the alternative alias
+.
+.
 .RS
-.nf
 .IP
+.EX
 \&.als SN\-STYLE SN\-NO\-DOT
-.fi
+.EE
 .RE
+.
+.
 .IP
 Any such change becomes effective with the first use of
 .BR .NH ,
@@ -646,13 +654,15 @@ the user may redefine it as an alias for
 'ne 10
 by including the initialisation:
 .
+.
 .RS
-.nf
 .IP
+.EX
 \&.als SN SN\-NO\-DOT
-.fi
+.EE
 .RE
 .
+.
 .IP
 at any time;
 the change becomes effective with the next use of
@@ -686,13 +696,14 @@ as used in the preceding
 example,
 the sequence:
 .
+.
 .RS
-.ne
-.nf
 .IP
+.ne 2v
+.EX
 \&.SH 2
 An Unnumbered Subheading
-.fi
+.EE
 .RE
 .
 .IP
@@ -1380,7 +1391,7 @@ For example:
 .
 .PP
 .ne 8
-.nf
+.EX
 \&.XS 1
 Introduction
 \&.XA 2
@@ -1389,9 +1400,10 @@ A Brief History of the Universe
 Details of Galactic Formation
 \&.\|.\|.
 \&.XE
-.fi
+.EE
 .RE
 .
+.
 .LP
 Use the
 .B PX
diff --git a/tmac/groff_www.7.man b/tmac/groff_www.7.man
index f920aee..6ebe764 100644
--- a/tmac/groff_www.7.man
+++ b/tmac/groff_www.7.man
@@ -166,12 +166,16 @@ but not for
 .BR .NH\ 3 .
 .
 Whereas
+.
+.
 .RS
 .IP
-.nf
-.B .HX 0
-.fi
+.EX
+\&.HX 0
+.EE
 .RE
+.
+.
 .IP
 tells
 .I \%grohtml
@@ -333,20 +337,21 @@ since it is a local reference.
 .
 This link was achieved via placing a TAG in the URL description above;
 the source looks like this:
+.
+.
 .RS
 .IP
-.nf
-.ft B
+.EX
 \&.TP
 \&.B URL
 generates
 \&.TAG URL
 a URL using either two or three arguments.
 \&.\|.\|.
-.fi
-.ft P
+.EE
 .RE
 .
+.
 .TP
 .B .IMG [\-R|\-L|\-C] filename [width] [height]
 Include a picture into the document.
@@ -430,15 +435,16 @@ If the width is absent it defaults to 1\~inch.
 If the height is absent it defaults to the width.
 .
 Example:
+.
+.
 .RS
 .IP
-.nf
-.ft B
+.EX
 \&.MPIMG \-L \-G 2c foo.png 3c 1.5c
-.ft P
-.fi
+.EE
 .RE
 .
+.
 .IP
 The height and width may also be given as percentages.
 .
@@ -449,15 +455,16 @@ register and the height from the
 register.
 .
 For example:
+.
+.
 .RS
 .IP
-.nf
-.ft B
+.EX
 \&.MPIMG \-L \-G 2c foo.png 15%
-.ft P
-.fi
+.EE
 .RE
 .
+.
 .TP
 .B .HnS n
 Begin heading.
@@ -469,10 +476,11 @@ is specified by the first parameter.
 Use this macro if your headings contain URL, FTP or MTO macros.
 .
 Example:
+.
+.
 .RS
 .IP
-.nf
-.ft B
+.EX
 \&.HnS 1
 \&.HR
 GNU Troff
@@ -482,10 +490,10 @@ GNU Troff
 \&project.
 \&.HR
 \&.HnE
-.ft P
-.fi
+.EE
 .RE
 .
+.
 .IP
 In this case you might wish to disable automatic links to headings.
 .
@@ -555,17 +563,19 @@ or
 .BR \-Txhtml .
 .
 Example:
+.
+.
 .RS
 .IP
-.nf
-.B ".HEAD" "\[dq]<link \[rs]"
-.B "  rel=\[dq]\[dq]icon\[dq]\[dq] \[rs]"
-.B "  type=\[dq]\[dq]image/png\[dq]\[dq] \[rs]"
-.B "  href=\[dq]\[dq]http://foo.org//bar.png\[dq]\[dq]/>\[dq]"
-.fi
-.ft P
+.EX
+\&.HEAD \[dq]<link \[rs]
+  rel=\[dq]\[dq]icon\[dq]\[dq] \[rs]
+  type=\[dq]\[dq]image/png\[dq]\[dq] \[rs]
+  href=\[dq]\[dq]http://foo.org//bar.png\[dq]\[dq]/>\[dq]
+.EE
 .RE
 .
+.
 .TP
 .B .HTML
 All text after this macro is treated as raw HTML.
@@ -583,15 +593,15 @@ higher-level macros.
 For example, the
 .B BGIMG
 macro is defined as
+.
+.
 .RS
 .IP
-.nf
-.ft B
+.EX
 \&.de BGIMG
 \&.   HTML <body background=\[rs]\[rs]$1>
 \&..
-.ft P
-.fi
+.EE
 .RE
 .
 .
@@ -657,15 +667,16 @@ Initialize default URL attributes to be used if this 
macro set is not
 used with the HTML device.
 .
 The macro set initializes itself with the following call
+.
+.
 .RS
 .IP
-.nf
-.ft B
+.EX
 \&.LINKSTYLE blue CR \e[la] \e[ra]
-.ft P
-.fi
+.EE
 .RE
 .
+.
 .IP
 but these values will be superseded by a user call to LINKSTYLE.
 .



reply via email to

[Prev in Thread] Current Thread [Next in Thread]