head	1.19;
access;
symbols
	groff-1_17_2:1.7
	groff-1_17_1:1.7
	groff-1_17a:1.7
	groff-1_17:1.7
	groff-1_16_1b:1.5
	groff-1_16_1a:1.5
	groff-1_16_1:1.5
	groff-1_16:1.5
	groff-20000311:1.3
	groff-20000310-1:1.3
	groff-20000310:1.3
	pre-1_16:1.1.1.1
	start:1.1.1.1
	wlemb:1.1.1;
locks; strict;
comment	@# @;


1.19
date	2002.05.26.09.32.25;	author wlemb;	state dead;
branches;
next	1.18;

1.18
date	2002.03.29.16.41.34;	author wlemb;	state Exp;
branches;
next	1.17;

1.17
date	2002.02.17.17.05.52;	author wlemb;	state Exp;
branches;
next	1.16;

1.16
date	2002.02.10.01.22.09;	author wlemb;	state Exp;
branches;
next	1.15;

1.15
date	2002.02.09.14.37.02;	author wlemb;	state Exp;
branches;
next	1.14;

1.14
date	2002.02.04.18.57.20;	author wlemb;	state Exp;
branches;
next	1.13;

1.13
date	2002.01.01.12.40.16;	author wlemb;	state Exp;
branches;
next	1.12;

1.12
date	2001.12.30.14.48.03;	author wlemb;	state Exp;
branches;
next	1.11;

1.11
date	2001.09.11.21.40.36;	author wlemb;	state Exp;
branches;
next	1.10;

1.10
date	2001.07.25.12.43.18;	author wlemb;	state Exp;
branches;
next	1.9;

1.9
date	2001.07.20.17.49.58;	author wlemb;	state Exp;
branches;
next	1.8;

1.8
date	2001.07.19.07.35.08;	author wlemb;	state Exp;
branches;
next	1.7;

1.7
date	2001.01.17.14.17.18;	author wlemb;	state Exp;
branches;
next	1.6;

1.6
date	2000.10.23.06.19.12;	author wlemb;	state Exp;
branches;
next	1.5;

1.5
date	2000.05.22.20.46.20;	author wlemb;	state Exp;
branches;
next	1.4;

1.4
date	2000.04.08.05.36.27;	author wlemb;	state Exp;
branches;
next	1.3;

1.3
date	2000.03.08.11.02.08;	author wlemb;	state Exp;
branches;
next	1.2;

1.2
date	2000.03.06.16.15.37;	author wlemb;	state Exp;
branches;
next	1.1;

1.1
date	2000.02.06.09.39.05;	author wlemb;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2000.02.06.09.39.05;	author wlemb;	state Exp;
branches;
next	;


desc
@@


1.19
log
@
Including the doc subdir into groff's Makefile system.

* aclocal.m4 (GROFF_INSTALL_INFO): New function.
* configure.ac: Use it.
Generate `doc/Makefile'.
* configure: Regenerated.

* Makefile.in (infodir, INSTALL_INFO): New variables.
(MDEFINES, uninstall_dirs): Updated.
(OTHERDIRS): Add `doc'.
* Makefile.comm (CLEANDIRADD): New variable.
(mostlyclean): Use it.

* doc/Makefile.sub, doc/Makefile.in: New files.
* doc/Makefile: Removed.

* NEWS, INSTALL: Updated.

* doc/homepage.ms: Renamed to ...
* doc/webpage.ms: This.
Use `.NHR'.
* contrib/mom/Makefile.sub (momdocdir): Removed.
(HTMLDOCFILES): Prepend `momdoc/'.
(EXTRAEXAMPLEFILES): Removed.  Added entries to...
(EXAMPLEFILES): This.
(.SUFFIXES, .mom.ps): New.
(prepare_make_examples): Updated.
(examples/*.ps): Removed; .mom.ps will handle this.
(install_data): Updated.
@
text
@# Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002
#   Free Software Foundation, Inc.
#      Written by James Clark (jjc@@jclark.com)
# 
# This file is part of groff.
# 
# groff is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free
# Software Foundation; either version 2, or (at your option) any later
# version.
# 
# groff is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
# for more details.
# 
# You should have received a copy of the GNU General Public License along
# with groff; see the file COPYING.  If not, write to the Free Software
# Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

FFLAG=-F../font
TFLAG=-M../tmac
TROFF=../src/roff/troff/troff $(TFLAG) $(FFLAG) -ww
GROFF=../src/roff/groff/groff $(TFLAG) $(FFLAG) -U -p -e -t -ww
GROPS=../src/devices/grops/grops $(FFLAG)
DOCS=meref.ps meintro.ps pic.ps pic.html homepage.ps homepage.html
SOELIM=../src/preproc/soelim/soelim

groff_bin_dirs=\
  ../src/roff/groff \
  ../src/roff/troff \
  ../src/preproc/pic \
  ../src/preproc/eqn \
  ../src/preproc/tbl \
  ../src/preproc/grn \
  ../src/preproc/refer \
  ../src/preproc/soelim \
  ../src/preproc/html \
  ../src/devices/grops \
  ../src/devices/grodvi \
  ../src/devices/grotty \
  ../src/devices/grolj4 \
  ../src/devices/grolbp \
  ../src/devices/grohtml
groff_bin_path=`echo $(groff_bin_dirs) | sed -e 's| \+|:|g'`

version=`cat ../VERSION`
# No additional number if revision is zero
revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' ../REVISION`

all: $(DOCS)

.SUFFIXES: .tr .me .ms .ps .dit .html .ascii .texinfo .dvi .pdf

.dit.ps:
	$(GROPS) $< >$@@

.me.dit:
	$(SOELIM) $< \
	| sed -e "s;@@VERSION@@;$(version)$(revision);" \
	| $(TROFF) -Tps -me >$@@
.tr.dit:
	$(TROFF) -Tps $< >$@@

.ms.html:
	GROFF_BIN_PATH=$(groff_bin_path); \
	export GROFF_BIN_PATH; \
	sed -e "s;@@VERSION@@;$(version)$(revision);" $< \
	| $(GROFF) -P-b -P-I`echo $< | sed -e 's|.ms$$||'` \
		   -P-Dimg -Thtml -ms >$@@
.ms.ascii:
	GROFF_BIN_PATH=$(groff_bin_path); \
	export GROFF_BIN_PATH; \
	sed -e "s;@@VERSION@@;$(version)$(revision);" $< \
	| $(GROFF) -Tascii -ms -mwww >$@@
.ms.ps:
	GROFF_BIN_PATH=$(groff_bin_path); \
	export GROFF_BIN_PATH; \
	sed -e "s;@@VERSION@@;$(version)$(revision);" $< \
	| $(GROFF) -Tps -ms -mwww >$@@

.texinfo.dvi:
	texi2dvi -e $<
.texinfo.pdf:
	texi2dvi -e --pdf $<
.texinfo.html:
	makeinfo --html --no-split $<

groff: groff.texinfo
	makeinfo groff.texinfo

gnu.eps: gnu.xpm
	xpmtoppm gnu.xpm | pnmdepth 15 | pnmtops -noturn > gnu.eps
gnu.png: gnu.xpm
	xpmtoppm gnu.xpm | pnmdepth 15 | pnmtopng > gnu.png

homepage.html: homepage.ms gnu.eps
	GROFF_BIN_PATH=$(groff_bin_path); \
	export GROFF_BIN_PATH; \
	sed -e "s;@@VERSION@@;$(version)$(revision);" $< \
	| $(GROFF) -P-Ihome -P-r -P-b -P-Dimg -Thtml -ms >$@@

homepage.ps: gnu.eps

install:

clean:
	-rm -f *.ps *.html *.ascii *.png *.eps *.gif *.dit core
	-rm -f *.aux *.dvi *.pdf *.log *.toc texput.log
	-rm -f *.cp *.cps *.cv *.cn *.es *.ess *.fn *.fns *.ky *.kys \
               *.ma *.mas *.op *.ops *.pg *.pgs *.rq *.rqs *.st *.sts \
               *.tp *.tps *.tr *.vr *.vrs
	-rm -rf img

distclean: clean

realclean: distclean

extraclean: clean
	-rm -f core *~ \#* junk temp grot
@


1.18
log
@
* doc/gnu.xpm: New image contributed by Emily Mulley.
* doc/Makefile (gnu.eps, gnu.png): Use pnmdepth.
(homepage.html): Be dependent on gnu.eps.
* doc/homepage.ms: Updated to new image.

* src/devices/grohtml/post-html.cc (html_printer): New member
`sbuf_prev_hpos'.
(html_printer::flush_sbuf, html_printer::set_char): Set it.
(html_printer::sbuf_continuation): Use it.
@
text
@@


1.17
log
@
* 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 <p> 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 <p>.
* 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.
@
text
@d93 1
a93 1
	xpmtoppm gnu.xpm | pnmtops -noturn > gnu.eps
d95 1
a95 1
	xpmtoppm gnu.xpm | pnmtopng > gnu.png
d97 1
a97 1
homepage.html: homepage.ms gnu.png
@


1.16
log
@
Illegal -> Invalid.

* src/libs/libgroff/illegal.cc: Renamed to ...
* src/libs/libgroff/invalid.cc: This.
(illegal_char_table): Renamed to ...
(invalid_char_table): This.
* src/libs/libgroff/Makefile.sub: Updated.
* win32-diffs: Updated.

* doc/groff.texinfo, src/devices/grops/psrm.cc (ps_get_line),
src/libs/libdriver/input.cc (fatal_command, parse_color_command,
parse_x_command), src/libs/libgroff/font.cc (text_file::next,
font::load), src/preproc/eqn/main.cc (read_line, main),
src/preproc/eqn/lex.cc (file_input::read_line),
src/preproc/pic/lex.cc (file_input::read_line,
simple_file_input::get, simple_file_input::peek),
src/preproc/pic/main.cc (top_input::get, top_input::peek),
src/preproc/pic/pic.man, src/preproc/refer/main.cc
(input_stack::push_file), src/preproc/refer/refer.cc (do_file,
do_bib), src/preproc/tbl/main.cc (table_input::get),
src/preproc/grn/grn.man, src/preproc/grn/main.cc (interpret),
src/roff/troff/input.cc (file_iterator::fill, file_iterator::peek,
do_zero_width, read_request, encode_char, ps_get_line,
transparent_file, get_char_for_escape_name, transparent_translate,
asciify, input_char_description, read_string, set_string),
src/roff/troff/env.cc (environment::add_html_tag),
src/roff/troff/troff.man, tmac/e.tmac (`@@(', `(f'): Do it.

* src/include/lib.h: Updated.

* src/preproc/eqn/eqn.cc: Removed.

* doc/gnu.xpm: New image.
* doc/Makefile (DOCS): Add homepage.ps
Add rules for converting xpm->png and xpm->eps.
Use `gnu.{xpm,eps}' as image names.
* doc/homepage.ms: Updated.
@
text
@d22 3
a24 2
TROFF=../src/roff/troff/troff -M../tmac $(FFLAG)
GROFF=../src/roff/groff/groff -p -e -t
a26 1
MEMACROS=../tmac/tmac.e
d61 1
a61 1
	| $(TROFF) -Tps $(FFLAG) -me >$@@
a65 2
	GROFF_TMAC_PATH=../tmac; \
	export GROFF_TMAC_PATH; \
d70 1
a70 1
		   -P-D -Pimg -Thtml $(FFLAG) -U -ms >$@@
a71 2
	GROFF_TMAC_PATH=../tmac; \
	export GROFF_TMAC_PATH; \
d75 1
a75 1
	| $(GROFF) -Tascii $(FFLAG) -U -ms -mwww >$@@
a76 2
	GROFF_TMAC_PATH=../tmac; \
	export GROFF_TMAC_PATH; \
d80 1
a80 1
	| $(GROFF) -Tps $(FFLAG) -U -ms -mwww >$@@
d97 6
a102 1
homepage.html: gnu.png
d108 1
a108 1
	-rm -f *.ps *.html *.ascii *.png *.gif *.dit core
@


1.15
log
@
* tmac/www.tmac (www-error): New macro, replacing calls to `@@error'.
(IMAGE): Change image position parameters to `-L', `-R', and `-C'.
Remove calls to `B1' and `B2'
(PNG-IMAGE): New macro for inclusion of images in PNG format.
(www-left-ll-trap, www-left-po-trap, www-right-ll-trap): New
auxiliary variables for MARGIN-PNG-IMAGE.
(www-finish-left-po, www-finish-right-ll, www-finish-left-ll): New
auxiliary macros for MARGIN-PNG-IMAGE.
(MARGIN-PNG-IMAGE): New macro to put an image in PNG format into
the margin.
(www-heading-no): New auxiliary variable for HTML-H-{BEGIN,END}.
(HTML-H-BEGIN, HTML-H-END): New macros to begin and end a heading.
(DROPCAP): New macro to produce dropcap characters.
(www-do-image): Renamed back to...
(HTML-DO-IMAGE): This.
Updated all callers.

* doc/Makefile (gnubw.eps): Updated.
* doc/homepage.ms: Updated.

* doc/pic.ms: Fixed typos (\(*tx -> \*(tx).
Added `linethick' to table in section `Style Variables'.

* src/libs/libdriver/input.cc (get_extended_arg): Fix conditional.
@
text
@d25 1
a25 1
DOCS=meref.ps meintro.ps pic.ps pic.html homepage.html
a61 1

a72 1

a79 1

a89 1

a91 1

d98 4
a101 2
gnubw.eps: gnupng
	pngtopnm gnupng | pnmtops -noturn > gnubw.eps
d103 2
a104 1
homepage.html: gnubw.eps
@


1.14
log
@
* doc/Makefile (.SUFFIXES, .texinfo.pdf, clean): Add support for
texinfo->pdf.
(.texinfo.html): Add support for texinfo->html.
* doc/groff.texinfo: More fixes.
@
text
@d104 1
a104 1
	pngtopnm gnupng | pnmscale 0.1 | pnmtops -noturn > gnubw.eps
@


1.13
log
@
* src/roff/groff/groff.man: Completely rewritten.
@
text
@d1 2
a2 1
# Copyright (C) 1989, 1990, 1991, 1992, 2001 Free Software Foundation, Inc.
d53 1
a53 1
.SUFFIXES: .tr .me .ms .ps .dit .html .ascii .texinfo .dvi
d94 6
d112 1
a112 1
	-rm -f *.aux *.dvi *.log *.toc texput.log
@


1.12
log
@
* tmac/www.tmac: Replace\\n[www-html] with \n[www-html] since the
device is already known at start-up.
Make all names of internal macros/registers/strings lowercase, and
prepend `www-'.
Other minor changes.

* src/roff/troff/troff.man: Add preprocessor string at BOF.

Implement option `-b' in grohtml to set the HTML background colour.

* src/devices/grohtml/post-html.cc (default_background): New global
variable.
(html_printer::html_printer): Initialize `background' to
`default_background'.
(main): Implement option `-b'.
(usage): Updated.
* src/preproc/html/pre-html.cc (scanArguments): Add dummy handling
of `-b' option.
* src/devices/grohtml/grohtml.man: Updated.
* doc/Makefile (.ms.html): Use `-b'.
* tmac/html.tmac: Don't set background color.

Add new grohtml tag `.html-tl'.

* src/devices/grohtml/post-html.cc (title_desc): Add `with_h1'
member variable.
(title_desc::title_desc): Updated.
(html_printer::troff_tag): Handle `.html-tl'.
(html_printer::write_title): Use `with_h1'.
* tmac/www.tmac (www-end-nowhere): New auxiliary macro.
(HTML-TL): New macro.

Add support for unordered lists in HTML.

* tmac/www.tmac (www-level): New auxiliary register.
(www-level1, www-level2, www-level3): New auxiliary strings.
(www-push-level, www-pop-level): New auxiliary macros
(UL-BEGIN, UL-END, LI): User macros for unordered lists.

Miscellaneous.

* src/preproc/html/pre-html.cc (DEFAULT_IMAGE_RES): Increase to 100.
(DEFAULT_VERTICAL_OFFSET): Removed.
(IMAGE_BOARDER_PIXELS): Set to 0.
(A4_LENGTH, A4_OFFSET, LETTER_LENGTH, LETTER_OFFSET): New macros.
(vertical_offset): Initialize with 0.
(gsPaper): New global variable.
(get_resolution): Scan for and return unsigned int.
(get_papersize): New function to get paper length from devps/DESC.
(determine_vertical_offset): New function.
(createAllPages): Produce gray-level images and use proper page
length.
(createImage): Use `-quiet' option of pnmcrop.
(addZ): Fix passing of `-Z'.
(scanArguments): Fix handling of `-o'.
(main): Call `determine_vertical_offset'.
* src/devices/grohtml/post-html.cc (html_printer::draw): Comment out
code for `l'.

* src/libs/libgroff/tmpfile.cc (add_tmp_file): Fix buffer length.
* src/roff/troff/node.cc (troff_output_file::check_charinfo): Handle
glyph descenders properly.

* doc/homepage.ms: Include `gnubw.eps'.
* doc/Makefile (gnubw.eps): New rule.
(homepage.html): Depend on `gnubw.eps'.
@
text
@d96 2
a97 2
gnubw.eps: gnubw-master-image
	pngtopnm gnubw-master-image | pnmscale 0.1 | pnmtops -noturn > gnubw.eps
@


1.11
log
@

* configure: Regenerated with autoconf 2.52.

* doc/groff.texinfo: Complete revision of indices.

* doc/Makefile (clean): Updated to delete all indices.
@
text
@d71 1
a71 1
	| $(GROFF) -P-I`echo $< | sed -e 's|.ms$$||'` \
d95 5
@


1.10
log
@* src/preproc/pic/pic.cc: Removed.
* src/preproc/pic/pic_tab.h: Removed.
* src/preproc/refer/label.cc: Removed.

* doc/Makefile (.ms.html): Don't use a file name extension in
argument to grohtml's -I option.
* Makefile.in (dist): Remove CVS directories.
Call `distfiles' target.


* doc/groff.texinfo: Minor fixes.
@
text
@d101 3
a103 2
	-rm -f *.cp *.cps *.cv *.cn *.fn *.fns *.gl *.gls *.ky *.kys \
               *.ma *.mas *.op *.ops *.pg *.pgs *.tp *.tps *.tr *.vr *.vrs
@


1.9
log
@

* doc/Makefile (.ms.html): Put image files into a subdirectory.
(clean): Updated.
@
text
@d71 2
a72 1
	| $(GROFF) -P-I$< -P-D -Pimg -Thtml $(FFLAG) -U -ms >$@@
@


1.8
log
@

* doc/Makefile: Added GROFF_BIN_PATH to make it work with uninstalled
groff also.
@
text
@d71 1
a71 1
	| $(GROFF) -Thtml $(FFLAG) -U -ms >$@@
d102 1
@


1.7
log
@First cut of the new html device driver.  Changes to pre-html and
the new grohtml are too numerous to be documented here.

Stuff related to `html' has been renamed to `html-old' and `html2'
stuff has been renamed to `html' (including directories).  The new
html device driver is therefore invoked as `-Thtml'.

Added new `O' escape to suppress output (needed by html driver).

Added functions and code to pass info about input-level commands
(`.in', `.fl', etc.) to html driver.

Three new functions (.html-begin, .html-end, and .html-image) for
better html handling: `html-begin' will execute the remaining line
if at the outermost nesting level, increasing an internal counter.
`html-end' does the same but decreases the internal counter.
`html_image' puts its arguments into a special node (suppress_node)
to define an image region.

The `output' request has been removed.

* tmac/html-tags.tmac: Removed.
* tmac/arkup.tmac: Updated and renamed to ...
* tmac/www.tmac: New file.
* tmac/markup.tmac Updated and renamed to ...
* tmac/mwww.tmac: New file.
* tmac/Makefile.sub: Updated.
* tmac/an-old.tmac: Updated.
* tmac/eqnrc: Updated.
* tmac/groff_man.man
* tmac/groff_markup.man: Updated and renamed to ...
* tmac/groff_mwww.man: New file.
* tmac/groff_tmac.man: Updated.
* tmac/html-old.tmac: Updated and Renamed from html.tmac.
* tmac/html.tmac: Updated and renamed from html2.tmac.
* tmac/pspic.tmac: Updated html support.
* tmac/s.tmac: Added html output support.
* tmac/troffrc, tmac/troffrc-end: Updated.

* Makefile.in, doc/Makefile: Updated.
* doc/groff.texinfo: Added info about new `O' escape.
* doc/homepage.ms: Use `MAILTO' macro.

* font/devhtml/DESC.proto: Add `C' font.
* font/devhtml/Makefile.sub: Updated.
* font/devhtml/R.proto: Minor fixes.
* font/devhtml-old/Makefile.sub: Updated.

* src/devices/grohtml-old/Makefile.sub: Updated.

* src/libs/libdriver/printer.cc (printer::get_font_from_index): New
method.
* src/libs/libgroff/htmlindicate.cc (html_begin_suppress,
graphic_start): Add `inline' parameter.  Update.
(html_end_suppress, graphic_end): Update.

* src/include/html-strings.h: New file.
* src/include/htmlindicate.h: Comments updated.
* src/include/printer.h: Updated.

* src/preproc/eqn/main.cc (do_file, main): Updated.
* src/preproc/pic/troff.cc (troff_output::start_picture,
troff_output::finish_picture): Updated.
* src/preproc/tbl/main.cc (process_input_file): Updated.

* src/roff/groff/groff.cc (main): Updated.
Pass device arguments to predrivers also.
Use `ps' device for `eqn' preprocessor if `-Thtml' is given.
* src/roff/troff/env.h (environment): Updated.
New elements `need_eol' and `ignore_next_eol' (for html output).
* src/roff/troff/env.cc (environment::environment): Add initializers
for `need_eol' and `ignore_next_eol'.
(environment::add_html_tag_eol, environment::add_html_tag_tabs): New
functions.
(point_size, fill, no_fill, center, right_justify, line_length,
indent, temporary_indent, break_request, handle_tab): Use
`add_html_tag()'.
(set_tabs): Use `add_html_tag_tabs()'.
(environment::add_html_tag): Updated.
(environment::do_break): Updated.
* src/roff/troff/div.cc (space_request, flush_output): Use
`environment::add_html_tag()'.
* src/roff/troff/input.cc: Updated.
New variable `html_level' to indicate nested `html-begin' requests.
(file_iterator::fill): Use `environment::add_html_tag_eol()'.
(non_interpreted_char_node, token_node, non_interpreted_node): Add
`force_tprint()' method.
(token::next): Handle `O'.
(do_suppress): Implement it.
(html_begin, html_end, html_image): New functions.
(init_output_requests): Renamed to ...
(init_html_requests): this.
(main): Use it.
(macro::append_str, macro::append_unsigned, macro::append_int): New
methods.
New variable `output_low_mark_miny' to limit minimal value of y.
(reset_output_registers): Use it.
(output_request): Removed.
(get_output_registers): New function.
* src/roff/troff/node.h (node): Make `force_tprint()' virtual.
(*_node): Added `force_tprint()' if necessary.
(special_node): New elements `tf' and `get_tfont()'.
(suppress_node): New class.
* src/roff/troff/node.cc:
New global variables `image_no' and `suppress_start_page'.
(real_output_file): New method `is_on()'.
(troff_output_file): New method `start_special(tfont)'.
(troff_output_file::really_print_line): Use `tprint' conditionally.
(real_output_file::print_line): Updated.
(real_output_file::on): Updated.
(*_node): Added `force_tprint()'.
(special_node::special_node): Initializer updated.
(special_node::same, special_node::copy, special_node::tprint_start):
Updated.
(get_reg_int, get_reg_str): New functions.
(suppress_node::*): New methods.
New global variables last_position, last_image_filename;
(min): New inline function.
* src/roff/troff/reg.h, src/roff/troff/request.h,
src/roff/troff/troff.h: Updated.
@
text
@d1 1
a1 1
# Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
d28 18
d68 2
d76 2
d84 2
@


1.6
log
@Move hyphen.us to tmac directory.

* src/roff/troff/hyphen.us: Removed.
* src/tmac/hyphen.us: Added.
* src/roff/troff/Makefile.sub, tmac/Makefile.sub: Updated.

Change installation structure for data files from .../groff/... to
.../groff/<version><revision>/... to be conform with other GNU
programs.

* Makefile.in, Makefile.comm, src/utils/indxbib/Makefile.sub,
doc/Makefile, src/xditview/Imakefile.in: Implement it.
* NEWS: Document it.

* NEWS, src/roff/nroff/nroff.man, src/roff/groff/groff.man,
@
text
@d57 1
a57 1
	| $(GROFF) -Tascii $(FFLAG) -U -ms -markup >$@@
d63 1
a63 1
	| $(GROFF) -Tps $(FFLAG) -U -ms -markup >$@@
@


1.5
log
@* doc/Makefile: Added rule for creating info files.

* font/devdvi/*: Added kernings for `cq' glyph.  Updated to latest
AMS font metrics.
* font/devdvi/generate/Makefile: Fixed dependencies.

* font/devps/*: Regenerated.  Heavy changes for Bookman and
NewCentury Schoolbook!
* font/devps/generate/afmname: Will now run with GNU awk.
* font/devps/generate/textmap: Added forgotten `cq' glyph name.
* font/devps/generate/Makefile: Cosmetic changes only.
@
text
@d29 1
a29 1
# No additional number for the groff archive if revision is zero
@


1.4
log
@* doc/Makefile (clean): Include more index files.
Add rule texinfo->dvi.


* doc/groff.texinfo: Added new index `op' for operators.  More
info on end of sentence characters.  More use of @@Deffn.


* */*.man: Adding a note that a whitespace can be inserted between
a command line option and its parameter -- we are using GNU getopt.

* src/roff/groff/groff.man: Add example of `-m mandoc'.


Correct anachronism of calling the man macro file with `-man'
instead of `-m man' etc.

* tmac/tmac.man, tmac/tmac.mandoc, tmac/tmac.markup, tmac/tmac.mdoc,
tmac/tmac.me, tmac/tmac.ms: New files tmac.m<package> which simply
load tmac.<package>.

* tmac/Makefile.sub: Updated.  Take care of $(tmac_an_prefix) etc.

* NEWS: Updated.

* doc/groff.texinfo: Updated.

* tmac/groff_man.man: Copyright added.

(I've basically taken groff_man.man).  Introducing new indices `ma'
@
text
@d68 3
@


1.3
log
@* doc/Makefile: Added texput.log to the `clean' target.
* doc/groff.texinfo: Added info about delimiters for escapes.
@
text
@d34 1
a34 1
.SUFFIXES: .tr .me .ms .ps .dit .html .ascii
d65 3
d72 3
a74 3
	-rm -f *.aux *.cp *.cps *.cv *.cn *.dvi *.fn *.fns *.ky *.kys \
               *.log *.op *.pg *.pgs *.ps *.toc *.tp *.tps *.tr *.vr *.vrs \
               texput.log
@


1.2
log
@* doc/Makefile: Bug fixes -- this is still provisional, though...
@
text
@d70 2
a71 1
               *.log *.op *.pg *.pgs *.ps *.toc *.tp *.tps *.tr *.vr *.vrs
@


1.1
log
@Initial revision
@
text
@d22 1
a22 1
GROFF=../src/rof/groff/groff -p -e -t
d34 1
a34 1
.SUFFIXES: .tr .me .ms .ps .dit
d42 1
a42 1
	| $(TROFF) -Tps $(FFLAG) -me  >$@@
d47 3
a49 2
%.html: %.ms
	export GROFF_TMAC_PATH=../tmac ; \
d53 3
a55 2
%.ascii: %.ms
	export GROFF_TMAC_PATH=../tmac ; \
d59 3
a61 2
%.ps: %.ms
	export GROFF_TMAC_PATH=../tmac ; \
a63 9

meref.ps: meref.dit
meintro.ps: meintro.dit

# This production must use -p -e -t so pic/eqn processing is done
pic.ps: pic.ms
	export GROFF_TMAC_PATH=../tmac ; \
	sed -e "s;@@VERSION@@;$(version)$(revision);" $< \
	| $(GROFF) -Tps $(FFLAG) -ms  >$@@
@


1.1.1.1
log
@groff pre-1.16 with new directory structure
@
text
@@
