diff --git a/tmac/s.tmac b/tmac/s.tmac index f72a8d698..258431e14 100644 --- a/tmac/s.tmac +++ b/tmac/s.tmac @@ -519,11 +519,7 @@ along with this program. If not, see . .. .nr pg*P1 0 .de P1 -.ie r bell_localisms \{\ -. DS L -. ft CW -.\} -.el .nr pg*P1 1 +.nr pg*P1 1 .. .wh -\n[FM]u pg@bottom .wh -\n[FM]u/2u pg*footer @@ -541,8 +537,8 @@ along with this program. If not, see . . \} .\} .ie !\\n(.$ \{\ -. nr pg@colw \\n[LL]*7/15 -. nr pg*gutw \\n[LL]-(2*\\n[pg@colw]) +. nr pg*gutw \\n[MINGW] +. nr pg@colw \\n[LL]-\\n[pg*gutw]/2u . nr pg@ncols 2 .\} .el \{\ @@ -555,10 +551,10 @@ along with this program. If not, see . . el .nr pg*gutw 0 .\} .DEVTAG ".mc \\n[pg@ncols] \\n[pg@colw] \\n[pg*gutw]" -.ns .nr pg*col-num 0 .nr pg@fn-colw \\n[pg@colw]*\\*[FR] .par@reset +.ns .mk pg*col-top .. .de 2C @@ -976,6 +972,7 @@ along with this program. If not, see . .de DE .ds*end!\\n[\\n[.ev]:ds-type] .nr \\n[.ev]:ds-type 0 +.ns .. .de ds@auto-end .if \\n[\\n[.ev]:ds-type] \{\ @@ -1884,6 +1881,7 @@ along with this program. If not, see . . if !'\\*[eqn*num]'' .nr eqn*have-num 1 . ie \\n[dl]:\\n[eqn*have-num] \{\ . sp \\n[DD]u +. ns . par@reset . ds eqn*tabs \\n[.tabs] . nf @@ -1912,6 +1910,7 @@ along with this program. If not, see . . \} .\". if !'\*(.T'html' .sp \\n[DD]u . sp \\n[DD]u +. ns . ta \\*[eqn*tabs] . \} . el \{\ @@ -2130,41 +2129,6 @@ along with this program. If not, see . .\} .. .par@load-init -.\" **************************** -.\" ******** module bell ******** -.\" **************************** -.\" Emulate Bell Labs localisms. Note, (a) they're not documented, and -.\" (b) the .P1 and .UC macros collide with different ones in Berkeley -.\" ms. -.\" -.\" [Correction 2022-04-17: 10th Edition AT&T ms also collides with -.\" Berkeley's (undocumented) FP macro.] -.\" -.\" We hack around this by conditionalizing the behavior of P1; UC was -.\" not defined by groff and will be a no-op if called Berkeley style -.\" with no arguments, so there is no problem with hijacking it here. -.\" -.\" What's done here is sufficient to give back the Guide to EQN (1976) -.\" its section headings and restore some text that had gone missing as -.\" macro arguments; no warranty express or implied is given as to how -.\" well the typographic details these produce match the original Bell -.\" Labs macros. -.\" -.\" P1 is now defined in module pg. -.de SC -.nr bell_localisms 1 -.NH -\\$* -.. -.de UC -.if r bell_localisms \f(CR\\$*\fP -.. -.de P2 -.if r bell_localisms \{\ -. ft -. DE -.\} -.. .\" Local Variables: .\" mode: nroff .\" fill-column: 72