From 32fcaf4233ad61b6d5744360997db5f63c30f877 Mon Sep 17 00:00:00 2001 From: wlemb Date: Sun, 17 Feb 2002 17:05:51 +0000 Subject: * doc/Makefile (clean): Add *.eps. (MEMACROS): Removed. (TFLAG): New variable. (TROFF): Use it. Add -ww. (GROFF): Use TFLAG, FFLAG, -U, -p, -e, -t, and -ww. (.me.dit): Fixed. (.ms.html, .ms.ascii, .ms.ps, homepage.html): Simplify. * tmac/www.tmac: Use dummy diversion while resetting and disabling `.tl'. * tmac/e.tmac: Inserted some more `\"' to remove warnings if used unstripped. * src/roff/troff/troff.man: Fix order of parameter description. * NEWS: Updated. Simplify image handling for grohtml. Fix

bug. * src/devices/grohtml/html-text.cc (DEBUGGING): Don't undefine but comment out. (html_text::dump_stack): Don't emit newline while debugging. (html_text::do_push) [DEBUGGING]: Print more info. (html_text::check_emit_text): Fix handling of

. * src/devices/grohtml/html.h: Updated. * src/devices/grohtml/output.cc (FPUTC, FPUTS, PUTC): New macros, replacing `fputc', `fputs', `putc'. If DEBUGGING is defined, they send its data to stderr also. Update all callers. (simple_output::space_or_newline) [DEBUGGING]: Removed. * src/devices/grohtml/post-html.cc (html_printer::do_links, html_printer::html_printer): Remove `DEBUGGING' conditionals. * src/include/html-strings.h (HTML_IMAGE_{CENTERED,LEFT,RIGHT,END}): Removed. * src/libs/libgroff/htmlhint.cc (is_in_graphic_start, is_inline_image): Removed. (html_begin_suppress, html_end_suppress): Don't take a parameter. (graphic_start, graphic_end): Removed. * src/include/htmlindicate.h: Updated. * src/preproc/html/pre-html.cc (DEBUG_HTML): Removed. (macroset_template): New global variable. (makeFileName): Use `macroset_template'. (write_end_image): Don't take a parameter. Don't emit newline. (write_start_image: Don't emit newline. (char_buffer::write_upto_newline): Updated. (char_buffer::skip_to_newline): Renamed to ... (char_buffer::skip_until_newline): This. Fix code. (char_buffer::write_file_troff, char_buffer::write_file_html): Simplified. (createAllPages, createImage) [DEBUGGING]: Handle `debug' flag. (removeAllPages): Remove `DEBUGGING' conditionals. (addRegDef, dump_args): New functions. (char_buffer::do_html, char_buffer::do_image): Handle `www-image-template' command line variable. Add more debugging code. (addps4html): Removed. (removeTempFiles) [DEBUGGING]: Handle `debug' flag. * src/preproc/eqn/main.cc: Include `ctype.h'. (suppress_html): Removed. (do_file): Updated. (inline_equation): Use `html_begin_suppress' and `html_end_suppress'. * src/preproc/pic/troff.cc: Don't include `htmlindicate.h'. (troff_output::start_picture, troff_output::finish_picture): Updated. * src/preproc/tbl/main.cc: Don't include `htmlindicate.h'. (process_input_file): Updated. * src/roff/troff/div.cc (page_number): Set page number only if the `ps4html' register isn't defined. * src/roff/troff/input.cc (image_no): New external variable. (do_suppress): Use it. * src/roff/troff/node.h (suppress_node::image_id): New member. * src/roff/troff/node.cc (image_no): Remove `static' keyword. (suppress_node::suppress_node): Initialize `image_id' member. (suppress_node::same): Handle `image_id' also. (suppress_node::copy): Updated. (last_image_id): New global variable. (suppress_node::tprint): Use it. * tmac/an-old.tmac (TS, TE, EQ, EN): Use HTML-IMAGE and HTML-IMAGE-END. * tmac/pspic.mac (PSPIC): Fix html support. * tmac/s.tmac (@EQ, @EN, @TS, TE, PS, PE): Ditto. * tmac/www.tmac (www-image-template): Set up. (HTMLINDEX): Renamed to... (HX): This. (BODYCOLOR): Renamed to... (BCL): This. (BACKGROUND): Renamed to... (BGIMG): This. (URL): Change order of parameters for consistency. (MAILTO): Renamed to... (MTO): This. (IMAGE, PNG-IMAGE, MARGIN-PNG-IMAGE): Renamed to... (IMG, PIMG, MPIMG): This. (HTML-H-BEGIN, HTML-H-END): Renamed to... (HnS, HnE): This. (LINKS): Renamed to... (LK): This. (LINE): Renamed to... (HR): This. (NO-AUTO-RULE): Renamed to... (NHR): This. (HTML-TL): Renamed to... (HTL): This. (UL-BEGIN, UL-END): Renamed to... (ULS, ULE): This. (DROPCAP): Renamed to... (DC): This. (TS, TE, EQ, EN): Provide default definitions. (www-make-unique-name): Updated. (HTML-IMAGE-INLINE): Fix typo. * tmac/groff_www.man: Updated. * doc/Makefile (homepage.html): Add option -r to grohtml. Use shortened image name. * doc/groff.texinfo: Updated info on grohtml strings and macros. * doc/homepage.ms: Updated and extended. --- tmac/e.tmac | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'tmac/e.tmac') diff --git a/tmac/e.tmac b/tmac/e.tmac index 28349ef5..b8dd9f32 100644 --- a/tmac/e.tmac +++ b/tmac/e.tmac @@ -184,7 +184,7 @@ .rs .if \\n(hm>0 \ . sp |\\n(hmu \" move to header position -.@t $h \" output header title +.@t $h\" \" output header title .if \\n(tm<=0 \ . nr tm \n(.Vu .sp |\\n(tmu \" move to top of text @@ -200,7 +200,7 @@ ' @b .\} .el \ -. @n \" begin the column +. @n\" \" begin the column .if \n@>2 .tm << @h .. .de @n \" --- new column or page @@ -222,7 +222,7 @@ .nr ?f 0 \" reset footnote flag .if \\n(?o \ \{\ -. (f _ \" reprocess footnotes which run off page +. (f _\" \" reprocess footnotes which run off page . nf . |o . fi @@ -234,7 +234,7 @@ \{\ . nr _i \\n(.i . in 0 -. |h \" output the table header +. |h\" \" output the table header . in \\n(_iu . rr _i . mk #T \" for tbl commands @@ -249,7 +249,7 @@ . nr ?w 0 .\} .os -.$H \" special column header macro +.$H\" \" special column header macro .ns .. .de @f \" --- footer @@ -260,7 +260,7 @@ .if \\n(?T \ \{\ . nr T. 1 \" for tbl commands (to output bottom line) -. T# 1 \" output the sides and bottom lines +. T# 1\" \" output the sides and bottom lines . br .\} .ev 2 @@ -271,11 +271,11 @@ . @k |b\" \" output bottom of page tables .\} .if \\n(?f \ -. @o \" output footnote if present +. @o\" \" output footnote if present .ie \\n($c<\\n($m \ -. @c \" handle new column +. @c\" \" handle new column .el \ -. @e \" new page +. @e\" \" new page .ev .if \n@>2 .tm << @f .. @@ -315,14 +315,14 @@ .@O \\n(_ou .rs .sp |\\n(.pu-\\n(fmu-((\\n(tpp*\\n($vu)/100u) \" move to footer position -.@t $f \" output footer title +.@t $f\" \" output footer title .nr ?h 0 .bp .. .de @t \" --- output header or footer title .if !\\n(?h \ \{\ -. sz \\n(tp \" set header/footer type fonts, etc. +. sz \\n(tp\" \" set header/footer type fonts, etc. . @F \\n(tf . lt \\n(_Lu \" make title span entire page . nf @@ -375,7 +375,7 @@ . if \\n(.$>0 \ . pn \\$1 . if \\n(?I \ -. @h \" 'spring' the header trap +. @h\" \" 'spring' the header trap .\} .br .wh 0 @h \" reset header @@ -678,7 +678,7 @@ .de 2c \" *** double columned output .br .if \\n($m>1 \ -. 1c \" revert to 1c if already 2c +. 1c\" \" revert to 1c if already 2c .nr $c 1 .nr $m 2 .if \\n(.$>1 \ @@ -905,7 +905,7 @@ . nr ?e 0 . di . if \\n(dn \ -. @q \" actual equation output +. @q\" \" actual equation output . rm |e . ev .\} @@ -916,7 +916,7 @@ .sp \\n(esu \" output rest of preceeding text .if !"\\n(.z"" \!.ne \\n(_Qu .ne \\n(_Qu+\n(.Vu \" keep it on one page -.@C 2 \" .ev 2 may be jumbled from header +.@C 2\" \" .ev 2 may be jumbled from header .if \\n(_d=1 \ . in (\\n(.lu+\\n($iu-\\n(dlu)/2u .if \\n(_d=2 \ @@ -967,7 +967,7 @@ .nr ?T \\n(_T .nr _i \\n(.i .in 0 -.|h \" put in the initial header +.|h\" \" put in the initial header .in \\n(_iu .rr _i .mk #T @@ -1403,7 +1403,7 @@ in \\f2\\*([B\\f1, \c .rm |x .. .de +c \" *** begin chapter -.ep \" force out footnotes +.ep\" \" force out footnotes .if \\n(?o:\\n(?a \ \{\ . bp \" force out a table or more footnote @@ -1452,7 +1452,7 @@ in \\f2\\*([B\\f1, \c . pn 1 \" must do before .ep .if !\\n(_0=\\n(_M .if \\n(_M=3 \ . pn 1 \" must do before .ep -.ep \" end page for correct page number types +.ep\" \" end page for correct page number types .if \\n(_0=1 \ \{\ . af ch 1 -- cgit v1.2.1