diff options
Diffstat (limited to 'tmac')
-rw-r--r-- | tmac/an-old.tmac | 36 | ||||
-rw-r--r-- | tmac/html.tmac | 7 | ||||
-rw-r--r-- | tmac/troffrc-end | 1 |
3 files changed, 14 insertions, 30 deletions
diff --git a/tmac/an-old.tmac b/tmac/an-old.tmac index dc886157..7100218c 100644 --- a/tmac/an-old.tmac +++ b/tmac/an-old.tmac @@ -95,7 +95,7 @@ .\" .TH title section extra1 extra2 extra3 .de1 TH . if \\n[an-html] \{\ -. HTML-TAG ".tl" +. HTML-TAG-NS ".tl" \\$1 . \} . @@ -208,6 +208,8 @@ .. . .de1 BT +. if r ps4html \ +. return . ie \\n[D] \{\ . if o .tl '\\*[an-extra2]'\\*[an-extra1]'\\*[an-page-string]' . if e .tl '\\*[an-page-string]'\\*[an-extra1]'\\*[an-extra2]' @@ -290,7 +292,7 @@ . fi . in \\n[an-margin]u . ti 0 -. HTML-TAG ".NH \\n[an-level]" +. HTML-TAG-NS ".NH \\n[an-level]" . it 1 an-trap . nr an-no-space-flag 1 . nr an-break-flag 1 @@ -368,10 +370,10 @@ .. . .de an-do-tag -. nr an-div? 0 . br -. ll . di +. nr an-div? 0 +. ll . ie (\\n[dl] + \\n[an-tag-sep] > \\n[an-prevailing-indent]) \{\ . in \\n[an-margin]u . ne (2v + 1u) @@ -387,26 +389,8 @@ . ti -\\n[an-prevailing-indent]u . chop an-div . ne (1v + 1u) -\\*[an-div]\\h'|\\n[an-prevailing-indent]u'\c -. \} -.. -. -.de an-do-tag-html -. nr an-div? 0 -. br -. ll -. di -. ie ((\\n[dl] + \\n[an-tag-sep]) > \\n[an-prevailing-indent]) \{\ -. in \\n[an-margin]u -. an-div -. in (\\n[an-margin]u + \\n[an-prevailing-indent]u + \\n[an-tag-sep]u) -. \} -. el \{\ -. in (\\n[an-margin]u + \\n[an-prevailing-indent]u + \\n[an-tag-sep]u) -. ti \\n[an-margin]u -. chop an-div . HTML-TAG-NS ".col 1" -\\*[an-div]\\h'|\\n[an-prevailing-indent]u'\\h'\\n[an-tag-sep]u'\c +\\*[an-div]\\h'|\\n[an-prevailing-indent]u'\c . HTML-TAG-NS ".col 2" . \} .. @@ -591,11 +575,7 @@ .ds lq \(lq .ds rq \(rq . -.ie \n[an-html] \{\ -. rm an-do-tag -. als an-do-tag an-do-tag-html -.\} -.el \{\ +.if !\n[an-html] \{\ . if !rHY .nr HY 14 . hy \n[HY] .\} diff --git a/tmac/html.tmac b/tmac/html.tmac index cd30c28d..0a3cf31b 100644 --- a/tmac/html.tmac +++ b/tmac/html.tmac @@ -708,6 +708,9 @@ .el \ . do mso cp1047.tmac . -.\" tell grohtml the page offset -.po +.\" tell grohtml some default parameter values +.po \n[.o]u +.ll \n[.l]u +.ta \n[.tabs] +. .\" end of file, make sure this is the last line diff --git a/tmac/troffrc-end b/tmac/troffrc-end index 928c923d..1dba113c 100644 --- a/tmac/troffrc-end +++ b/tmac/troffrc-end @@ -14,6 +14,7 @@ .do if !d HTML-IMAGE-LEFT .do ds HTML-IMAGE-LEFT .do if !d HTML-IMAGE-END .do ds HTML-IMAGE-END .do if !d HTML-TAG .do ds HTML-TAG +.do if !d HTML-TAG-NS .do ds HTML-TAG-NS .do if !d HTML-DO-IMAGE .do ds HTML-DO-IMAGE . .\" Don't let blank lines creep in here. |