diff options
author | wlemb <wlemb> | 2003-03-31 14:31:16 +0000 |
---|---|---|
committer | wlemb <wlemb> | 2003-03-31 14:31:16 +0000 |
commit | eddc04d73ab0dd063925712f1448826403d2afb4 (patch) | |
tree | f0ba6a350b4d946b753dbc066d7e9077f3d3dae9 /tmac/an-old.tmac | |
parent | 948bc8624f9f9b0a32f696df77ec91f92a5db1b8 (diff) | |
download | groff-eddc04d73ab0dd063925712f1448826403d2afb4.tar.gz |
* src/roff/troff/env.cc (point_size): Fix emission of html tag.
Otherwise, the following code
.di xxx
.ps 10
a
.br
.di
x\*[xxx]
produces `x a' instead of `xa'. This is a temporary fix, disabling
font changes in diversions for -Thtml.
* tmac/an-old.tmac (TH, SH): Use `HTML-TAG-NS' instead of
`HTML-TAG'.
(an-do-tag-html): Merge with ...
(an-do-tag): This macro.
Change code slightly to circumvent grohtml bug.
* tmac/troffrc-end: Define dummy for HTML-TAG-NS.
* src/devices/grohtml/html-table.cc (html_table::emit_col,
html_table::is_gap): Round `width' properly.
* tmac/html.tmac: Provide some default layout parameters for
grohtml.
* font/devhtml/DESC.proto: Don't use discrete values for `sizes'
command.
src/devices/grops/ps.cc (ps_printer::do_import): Fix error message.
* tmac/an-old.tmac (BT): Don't call .tl if register `ps4html' is
defined.
Diffstat (limited to 'tmac/an-old.tmac')
-rw-r--r-- | tmac/an-old.tmac | 36 |
1 files changed, 8 insertions, 28 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] .\} |