===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.266
retrieving revision 1.314
diff -u -p -r1.266 -r1.314
--- mandoc/Makefile	2010/05/13 03:51:16	1.266
+++ mandoc/Makefile	2011/03/20 11:07:05	1.314
@@ -1,5 +1,12 @@
-.SUFFIXES:	.html .xml .sgml .1 .3 .7 .md5 .tar.gz .1.txt .3.txt .7.txt .1.sgml .3.sgml .7.sgml .h .h.html
+.SUFFIXES:	.html .xml .sgml .1 .3 .7 .md5 .tar.gz 
+.SUFFIXES:	.1.txt .3.txt .7.txt
+.SUFFIXES:	.1.xhtml .3.xhtml .7.xhtml
+.SUFFIXES:	.1.sgml .3.sgml .7.sgml 
+.SUFFIXES:	.h .h.html 
+.SUFFIXES:	.1.ps .3.ps .7.ps
+.SUFFIXES:	.1.pdf .3.pdf .7.pdf
 
+PREFIX		= /usr/local
 BINDIR		= $(PREFIX)/bin
 INCLUDEDIR	= $(PREFIX)/include
 LIBDIR		= $(PREFIX)/lib
@@ -11,8 +18,8 @@ INSTALL_DATA	= $(INSTALL) -m 0444
 INSTALL_LIB	= $(INSTALL) -m 0644
 INSTALL_MAN	= $(INSTALL_DATA)
 
-VERSION	   = 1.9.24
-VDATE	   = 09 May 2010
+VERSION	   = 1.10.10
+VDATE	   = 20 March 2011
 
 VFLAGS	   = -DVERSION="\"$(VERSION)\""
 WFLAGS     = -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
@@ -22,72 +29,124 @@ CFLAGS    += -g $(WFLAGS) $(VFLAGS) -DHAVE_CONFIG_H
 # in the lower-left hand corner of -mdoc manuals.
 # CFLAGS += -DOSNAME="\"OpenBSD 4.5\""
 
-# Unset this if you don't want Xo/Xc allowing split `It' lines, which
-# breaks symmetry.
-CFLAGS	  += -DUGLY
-
 LINTFLAGS += $(VFLAGS)
 
-MANDOCFLAGS = -Wall -fstrict
-MANDOCHTML = -Thtml -Ostyle=style.css,man=%N.%S.html,includes=%I.html
+ROFFLNS    = roff.ln tbl.ln tbl_opts.ln tbl_layout.ln tbl_data.ln eqn.ln
 
-MDOCLNS	   = mdoc_macro.ln mdoc.ln mdoc_hash.ln mdoc_strings.ln \
-	     mdoc_argv.ln mdoc_validate.ln mdoc_action.ln \
-	     lib.ln att.ln arch.ln vol.ln msec.ln st.ln \
-	     mandoc.ln
-MDOCOBJS   = mdoc_macro.o mdoc.o mdoc_hash.o mdoc_strings.o \
-	     mdoc_argv.o mdoc_validate.o mdoc_action.o lib.o att.o \
-	     arch.o vol.o msec.o st.o mandoc.o
-MDOCSRCS   = mdoc_macro.c mdoc.c mdoc_hash.c mdoc_strings.c \
-	     mdoc_argv.c mdoc_validate.c mdoc_action.c lib.c att.c \
-	     arch.c vol.c msec.c st.c mandoc.c
+ROFFSRCS   = roff.c tbl.c tbl_opts.c tbl_layout.c tbl_data.c eqn.c
 
+ROFFOBJS   = roff.o tbl.o tbl_opts.o tbl_layout.o tbl_data.o eqn.o
+
+MANDOCLNS  = mandoc.ln
+
+MANDOCSRCS = mandoc.c
+
+MANDOCOBJS = mandoc.o
+
+MDOCLNS	   = mdoc_macro.ln mdoc.ln mdoc_hash.ln \
+	     mdoc_argv.ln mdoc_validate.ln \
+	     lib.ln att.ln arch.ln vol.ln msec.ln st.ln
+
+MDOCOBJS   = mdoc_macro.o mdoc.o mdoc_hash.o \
+	     mdoc_argv.o mdoc_validate.o lib.o att.o \
+	     arch.o vol.o msec.o st.o
+
+MDOCSRCS   = mdoc_macro.c mdoc.c mdoc_hash.c \
+	     mdoc_argv.c mdoc_validate.c lib.c att.c \
+	     arch.c vol.c msec.c st.c
+
 MANLNS	   = man_macro.ln man.ln man_hash.ln man_validate.ln \
-	     man_action.ln mandoc.ln man_argv.ln
+	     man_argv.ln
+
 MANOBJS	   = man_macro.o man.o man_hash.o man_validate.o \
-	     man_action.o mandoc.o man_argv.o
+	     man_argv.o
 MANSRCS	   = man_macro.c man.c man_hash.c man_validate.c \
-	     man_action.c mandoc.c man_argv.c
+	     man_argv.c
 
 MAINLNS	   = main.ln mdoc_term.ln chars.ln term.ln tree.ln \
 	     compat.ln man_term.ln html.ln mdoc_html.ln \
-	     man_html.ln out.ln
+	     man_html.ln out.ln term_ps.ln term_ascii.ln \
+	     tbl_term.ln tbl_html.ln
+
 MAINOBJS   = main.o mdoc_term.o chars.o term.o tree.o compat.o \
-	     man_term.o html.o mdoc_html.o man_html.o out.o
+	     man_term.o html.o mdoc_html.o man_html.o out.o \
+	     term_ps.o term_ascii.o tbl_term.o tbl_html.o
+
 MAINSRCS   = main.c mdoc_term.c chars.c term.c tree.c compat.c \
-	     man_term.c html.c mdoc_html.c man_html.c out.c
+	     man_term.c html.c mdoc_html.c man_html.c out.c \
+	     term_ps.c term_ascii.c tbl_term.c tbl_html.c
 
-LLNS	   = llib-llibmdoc.ln llib-llibman.ln llib-lmandoc.ln
-LNS	   = $(MAINLNS) $(MDOCLNS) $(MANLNS)
-LIBS	   = libmdoc.a libman.a
-OBJS	   = $(MDOCOBJS) $(MAINOBJS) $(MANOBJS)
-SRCS	   = $(MDOCSRCS) $(MAINSRCS) $(MANSRCS)
+LLNS	   = llib-llibmdoc.ln llib-llibman.ln llib-lmandoc.ln \
+	     llib-llibmandoc.ln llib-llibroff.ln
+
+LNS	   = $(MAINLNS) $(MDOCLNS) $(MANLNS) \
+	     $(MANDOCLNS) $(ROFFLNS)
+
+LIBS	   = libmdoc.a libman.a libmandoc.a libroff.a
+
+OBJS	   = $(MDOCOBJS) $(MAINOBJS) $(MANOBJS) \
+	     $(MANDOCOBJS) $(ROFFOBJS)
+
+SRCS	   = $(MDOCSRCS) $(MAINSRCS) $(MANSRCS) \
+	     $(MANDOCSRCS) $(ROFFSRCS)
+
 DATAS	   = arch.in att.in lib.in msec.in st.in \
 	     vol.in chars.in
+
 HEADS	   = mdoc.h libmdoc.h man.h libman.h term.h \
-	     libmandoc.h html.h chars.h out.h main.h
-GSGMLS	   = mandoc.1.sgml mdoc.3.sgml mdoc.7.sgml manuals.7.sgml \
-	     mandoc_char.7.sgml man.7.sgml man.3.sgml
+	     libmandoc.h html.h chars.h out.h main.h roff.h \
+	     mandoc.h libroff.h
+
+GSGMLS	   = mandoc.1.sgml mdoc.3.sgml mdoc.7.sgml \
+	     mandoc_char.7.sgml man.7.sgml man.3.sgml roff.7.sgml \
+	     roff.3.sgml tbl.7.sgml eqn.7.sgml
+
 SGMLS	   = index.sgml
-HTMLS	   = ChangeLog.html index.html man.h.html mdoc.h.html
+
+XHTMLS	   = mandoc.1.xhtml mdoc.3.xhtml \
+	     man.3.xhtml mdoc.7.xhtml man.7.xhtml mandoc_char.7.xhtml \
+	     roff.7.xhtml roff.3.xhtml tbl.7.xhtml eqn.7.xhtml
+
+HTMLS	   = ChangeLog.html index.html man.h.html mdoc.h.html \
+	     mandoc.h.html roff.h.html mandoc.1.html mdoc.3.html \
+	     man.3.html mdoc.7.html man.7.html mandoc_char.7.html \
+	     roff.7.html roff.3.html tbl.7.html eqn.7.html
+
+PSS	   = mandoc.1.ps mdoc.3.ps man.3.ps mdoc.7.ps man.7.ps \
+	     mandoc_char.7.ps roff.7.ps roff.3.ps tbl.7.ps eqn.7.ps
+
+PDFS	   = mandoc.1.pdf mdoc.3.pdf man.3.pdf mdoc.7.pdf man.7.pdf \
+	     mandoc_char.7.pdf roff.7.pdf roff.3.pdf tbl.7.pdf eqn.7.pdf
+
 XSLS	   = ChangeLog.xsl
-GHTMLS	   = mandoc.1.html mdoc.3.html man.3.html mdoc.7.html \
-	     man.7.html mandoc_char.7.html manuals.7.html
+
 TEXTS	   = mandoc.1.txt mdoc.3.txt man.3.txt mdoc.7.txt man.7.txt \
-	     mandoc_char.7.txt manuals.7.txt ChangeLog.txt
+	     mandoc_char.7.txt ChangeLog.txt \
+	     roff.7.txt roff.3.txt tbl.7.txt eqn.7.txt
+
 EXAMPLES   = example.style.css
+
 XMLS	   = ChangeLog.xml
+
 STATICS	   = index.css style.css external.png
+
 MD5S	   = mdocml-$(VERSION).md5 
+
 TARGZS	   = mdocml-$(VERSION).tar.gz
-MANS	   = mandoc.1 mdoc.3 mdoc.7 manuals.7 mandoc_char.7 \
-	     man.7 man.3
+
+MANS	   = mandoc.1 mdoc.3 mdoc.7 mandoc_char.7 man.7 \
+	     man.3 roff.7 roff.3 tbl.7 eqn.7
+
 BINS	   = mandoc
+
 TESTS	   = test-strlcat.c test-strlcpy.c
+
 CONFIGS	   = config.h.pre config.h.post
+
 DOCLEAN	   = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) \
 	     $(TARGZS) tags $(MD5S) $(XMLS) $(TEXTS) $(GSGMLS) \
-	     $(GHTMLS) config.h config.log
+	     config.h config.log $(PSS) $(PDFS) $(XHTMLS)
+
 DOINSTALL  = $(SRCS) $(HEADS) Makefile $(MANS) $(SGMLS) $(STATICS) \
 	     $(DATAS) $(XSLS) $(EXAMPLES) $(TESTS) $(CONFIGS)
 
@@ -98,42 +157,41 @@ lint:	$(LLNS)
 clean:
 	rm -f $(DOCLEAN)
 
-cleanlint:
-	rm -f $(LNS) $(LLNS)
-
-cleanhtml:
-	rm -f $(HTMLS) $(GSGMLS) $(GHTMLS)
-
 dist:	mdocml-$(VERSION).tar.gz
 
-www:	all $(GSGMLS) $(GHTMLS) $(HTMLS) $(TEXTS) $(MD5S) $(TARGZS)
+www:	all $(GSGMLS) $(HTMLS) $(XHTMLS) $(TEXTS) $(MD5S) $(TARGZS) $(PSS) $(PDFS)
 
-htmls:	all $(GSGMLS) $(GHTMLS)
+ps:	$(PSS)
 
+pdf:	$(PDFS)
+
 installwww: www
-	$(INSTALL_DATA) $(GHTMLS) $(HTMLS) $(TEXTS) $(STATICS) $(PREFIX)/
-	$(INSTALL_DATA) mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/
-	$(INSTALL_DATA) mdocml-$(VERSION).md5 $(PREFIX)/snapshots/
-	$(INSTALL_DATA) mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/mdocml.tar.gz
-	$(INSTALL_DATA) mdocml-$(VERSION).md5 $(PREFIX)/snapshots/mdocml.md5
+	$(INSTALL_DATA) $(HTMLS) $(XHTMLS) $(PSS) $(PDFS) $(TEXTS) $(STATICS) $(DESTDIR)$(PREFIX)/
+	$(INSTALL_DATA) mdocml-$(VERSION).tar.gz $(DESTDIR)$(PREFIX)/snapshots/
+	$(INSTALL_DATA) mdocml-$(VERSION).md5 $(DESTDIR)$(PREFIX)/snapshots/
+	$(INSTALL_DATA) mdocml-$(VERSION).tar.gz $(DESTDIR)$(PREFIX)/snapshots/mdocml.tar.gz
+	$(INSTALL_DATA) mdocml-$(VERSION).md5 $(DESTDIR)$(PREFIX)/snapshots/mdocml.md5
 
 install:
-	mkdir -p $(BINDIR)
-	mkdir -p $(EXAMPLEDIR)
-	mkdir -p $(MANDIR)/man1
-	mkdir -p $(MANDIR)/man7
-	$(INSTALL_PROGRAM) mandoc $(BINDIR)
-	$(INSTALL_MAN) mandoc.1 $(MANDIR)/man1
-	$(INSTALL_MAN) man.7 mdoc.7 mandoc_char.7 $(MANDIR)/man7
-	$(INSTALL_DATA) example.style.css $(EXAMPLEDIR)
+	mkdir -p $(DESTDIR)$(BINDIR)
+	mkdir -p $(DESTDIR)$(EXAMPLEDIR)
+	mkdir -p $(DESTDIR)$(MANDIR)/man1
+	mkdir -p $(DESTDIR)$(MANDIR)/man7
+	$(INSTALL_PROGRAM) mandoc $(DESTDIR)$(BINDIR)
+	$(INSTALL_MAN) mandoc.1 $(DESTDIR)$(MANDIR)/man1
+	$(INSTALL_MAN) man.7 mdoc.7 roff.7 eqn.7 tbl.7 mandoc_char.7 $(DESTDIR)$(MANDIR)/man7
+	$(INSTALL_DATA) example.style.css $(DESTDIR)$(EXAMPLEDIR)
 
 uninstall:
-	rm -f $(BINDIR)/mandoc
-	rm -f $(MANDIR)/man1/mandoc.1
-	rm -f $(MANDIR)/man7/mdoc.7
-	rm -f $(MANDIR)/man7/man.7
-	rm -f $(MANDIR)/man7/mandoc_char.7
-	rm -f $(EXAMPLEDIR)/example.style.css
+	rm -f $(DESTDIR)$(BINDIR)/mandoc
+	rm -f $(DESTDIR)$(MANDIR)/man1/mandoc.1
+	rm -f $(DESTDIR)$(MANDIR)/man7/mdoc.7
+	rm -f $(DESTDIR)$(MANDIR)/man7/roff.7
+	rm -f $(DESTDIR)$(MANDIR)/man7/eqn.7
+	rm -f $(DESTDIR)$(MANDIR)/man7/tbl.7
+	rm -f $(DESTDIR)$(MANDIR)/man7/man.7
+	rm -f $(DESTDIR)$(MANDIR)/man7/mandoc_char.7
+	rm -f $(DESTDIR)$(EXAMPLEDIR)/example.style.css
 
 $(OBJS): config.h
 
@@ -159,8 +217,6 @@ mdoc_macro.ln mdoc_macro.o: mdoc_macro.c libmdoc.h
 
 mdoc_term.ln mdoc_term.o: mdoc_term.c term.h mdoc.h
 
-mdoc_strings.ln mdoc_strings.o: mdoc_strings.c libmdoc.h
-
 man_hash.ln man_hash.o: man_hash.c libman.h
 
 mdoc_hash.ln mdoc_hash.o: mdoc_hash.c libmdoc.h
@@ -169,12 +225,16 @@ mdoc.ln mdoc.o: mdoc.c libmdoc.h
 
 man.ln man.o: man.c libman.h
 
-main.ln main.o: main.c mdoc.h
+main.ln main.o: main.c mdoc.h man.h roff.h
 
 compat.ln compat.o: compat.c 
 
 term.ln term.o: term.c term.h man.h mdoc.h chars.h
 
+term_ps.ln term_ps.o: term_ps.c term.h main.h
+
+term_ascii.ln term_ascii.o: term_ascii.c term.h main.h
+
 html.ln html.o: html.c html.h chars.h
 
 mdoc_html.ln mdoc_html.o: mdoc_html.c html.h mdoc.h
@@ -183,6 +243,8 @@ man_html.ln man_html.o: man_html.c html.h man.h out.h
 
 out.ln out.o: out.c out.h
 
+mandoc.ln mandoc.o: mandoc.c libmandoc.h
+
 tree.ln tree.o: tree.c man.h mdoc.h
 
 mdoc_argv.ln mdoc_argv.o: mdoc_argv.c libmdoc.h
@@ -193,8 +255,6 @@ man_validate.ln man_validate.o: man_validate.c libman.
 
 mdoc_validate.ln mdoc_validate.o: mdoc_validate.c libmdoc.h
 
-mdoc_action.ln mdoc_action.o: mdoc_action.c libmdoc.h
-
 libmdoc.h: mdoc.h
 
 ChangeLog.xml:
@@ -218,28 +278,49 @@ llib-llibmdoc.ln: $(MDOCLNS)
 llib-llibman.ln: $(MANLNS)
 	$(LINT) -Clibman $(MANLNS)
 
-llib-lmandoc.ln: $(MAINLNS) llib-llibmdoc.ln
-	$(LINT) -Cmandoc $(MAINLNS) llib-llibmdoc.ln
+llib-llibmandoc.ln: $(MANDOCLNS)
+	$(LINT) -Clibmandoc $(MANDOCLNS)
 
+llib-llibroff.ln: $(ROFFLNS)
+	$(LINT) -Clibroff $(ROFFLNS)
+
+llib-lmandoc.ln: $(MAINLNS) llib-llibmdoc.ln llib-llibman.ln llib-llibmandoc.ln llib-llibroff.ln
+	$(LINT) -Cmandoc $(MAINLNS) llib-llibmdoc.ln llib-llibman.ln llib-llibmandoc.ln llib-llibroff.ln
+
 libmdoc.a: $(MDOCOBJS)
 	$(AR) rs $@ $(MDOCOBJS)
 
 libman.a: $(MANOBJS)
 	$(AR) rs $@ $(MANOBJS)
 
-mandoc: $(MAINOBJS) libmdoc.a libman.a
-	$(CC) $(CFLAGS) -o $@ $(MAINOBJS) libmdoc.a libman.a
+libmandoc.a: $(MANDOCOBJS)
+	$(AR) rs $@ $(MANDOCOBJS)
 
+libroff.a: $(ROFFOBJS)
+	$(AR) rs $@ $(ROFFOBJS)
+
+mandoc: $(MAINOBJS) libroff.a libmdoc.a libman.a libmandoc.a
+	$(CC) $(CFLAGS) -o $@ $(MAINOBJS) libroff.a libmdoc.a libman.a libmandoc.a
+
 .sgml.html:
 	validate --warn $<
 	sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< > $@
 
 .1.1.txt .3.3.txt .7.7.txt:
-	./mandoc $(MANDOCFLAGS) $< | col -b > $@
+	./mandoc -Tascii -Wall,stop $< | col -b > $@
 
 .1.1.sgml .3.3.sgml .7.7.sgml:
-	./mandoc $(MANDOCFLAGS) $(MANDOCHTML) $< > $@
+	./mandoc -Thtml -Wall,stop -Ostyle=style.css,man=%N.%S.html,includes=%I.html $< > $@
 
+.1.1.ps .3.3.ps .7.7.ps:
+	./mandoc -Tps -Wall,stop $< > $@
+
+.1.1.xhtml .3.3.xhtml .7.7.xhtml:
+	./mandoc -Txhtml -Wall,stop -Ostyle=style.css,man=%N.%S.xhtml,includes=%I.html $< > $@
+
+.1.1.pdf .3.3.pdf .7.7.pdf:
+	./mandoc -Tpdf -Wall,stop $< > $@
+
 .tar.gz.md5:
 	md5 $< > $@
 
@@ -250,13 +331,13 @@ config.h: config.h.pre config.h.post
 	rm -f config.log
 	( cat config.h.pre; \
 	echo; \
-	if $(CC) $(CFLAGS) -Werror -c test-strlcat.c >> config.log 2>&1; then \
+	if $(CC) $(CFLAGS) -Werror -o test-strlcat test-strlcat.c >> config.log 2>&1; then \
 		echo '#define HAVE_STRLCAT'; \
-		rm test-strlcat.o; \
+		rm test-strlcat; \
 	fi; \
-	if $(CC) $(CFLAGS) -Werror -c test-strlcpy.c >> config.log 2>&1; then \
+	if $(CC) $(CFLAGS) -Werror -o test-strlcpy test-strlcpy.c >> config.log 2>&1; then \
 		echo '#define HAVE_STRLCPY'; \
-		rm test-strlcpy.o; \
+		rm test-strlcpy; \
 	fi; \
 	echo; \
 	cat config.h.post \