Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/mdocml/dist Import mdocml-1.11.1 with a few add...
details: https://anonhg.NetBSD.org/src/rev/704b82af4ee8
branches: trunk
changeset: 764295:704b82af4ee8
user: joerg <joerg%NetBSD.org@localhost>
date: Fri Apr 15 13:45:25 2011 +0000
description:
Import mdocml-1.11.1 with a few additional fixes from CVS:
Merge the libraries into a single frontend, libmandoc.
Iinitial support for eqn(1) functionality.
Additional changes:
Portability fixes (tbl_opts.c 1.11, tbl_layout.c 1.18, tbl.c 1.25)
HTML space fixe (mdocml_html.c 1.163)
ROFF conditional nesting bug (roff.c 1.131)
diffstat:
external/bsd/mdocml/dist/Makefile | 626 +++++++++++----------
external/bsd/mdocml/dist/arch.c | 3 +-
external/bsd/mdocml/dist/att.c | 3 +-
external/bsd/mdocml/dist/chars.c | 39 +-
external/bsd/mdocml/dist/chars.in | 4 +-
external/bsd/mdocml/dist/eqn.7 | 92 +++
external/bsd/mdocml/dist/eqn.c | 81 ++
external/bsd/mdocml/dist/example.style.css | 6 +-
external/bsd/mdocml/dist/html.c | 85 +-
external/bsd/mdocml/dist/html.h | 10 +-
external/bsd/mdocml/dist/lib.c | 3 +-
external/bsd/mdocml/dist/libman.h | 22 +-
external/bsd/mdocml/dist/libmandoc.h | 96 ++-
external/bsd/mdocml/dist/libmdoc.h | 37 +-
external/bsd/mdocml/dist/libroff.h | 22 +-
external/bsd/mdocml/dist/main.c | 823 ++--------------------------
external/bsd/mdocml/dist/man.7 | 60 +-
external/bsd/mdocml/dist/man.c | 187 +++---
external/bsd/mdocml/dist/man.h | 39 +-
external/bsd/mdocml/dist/man_hash.c | 3 +-
external/bsd/mdocml/dist/man_html.c | 81 +-
external/bsd/mdocml/dist/man_macro.c | 86 +-
external/bsd/mdocml/dist/man_validate.c | 172 ++---
external/bsd/mdocml/dist/mandoc-db.1 | 132 ++++
external/bsd/mdocml/dist/mandoc-db.c | 669 +++++++++++++++++++++++
external/bsd/mdocml/dist/mandoc.1 | 5 +-
external/bsd/mdocml/dist/mandoc.3 | 333 +++++++++++
external/bsd/mdocml/dist/mandoc.c | 122 ++-
external/bsd/mdocml/dist/mandoc.h | 102 +-
external/bsd/mdocml/dist/mandoc_char.7 | 73 +-
external/bsd/mdocml/dist/mdoc.7 | 148 ++--
external/bsd/mdocml/dist/mdoc.c | 204 ++++---
external/bsd/mdocml/dist/mdoc.h | 210 ++----
external/bsd/mdocml/dist/mdoc_argv.c | 311 +++++-----
external/bsd/mdocml/dist/mdoc_hash.c | 3 +-
external/bsd/mdocml/dist/mdoc_html.c | 340 ++++++++---
external/bsd/mdocml/dist/mdoc_macro.c | 113 ++-
external/bsd/mdocml/dist/mdoc_validate.c | 290 +++++++--
external/bsd/mdocml/dist/msec.c | 3 +-
external/bsd/mdocml/dist/out.c | 85 ++-
external/bsd/mdocml/dist/out.h | 82 +-
external/bsd/mdocml/dist/read.c | 765 ++++++++++++++++++++++++++
external/bsd/mdocml/dist/roff.7 | 86 ++-
external/bsd/mdocml/dist/roff.c | 307 ++++++----
external/bsd/mdocml/dist/st.c | 3 +-
external/bsd/mdocml/dist/tbl.7 | 52 +-
external/bsd/mdocml/dist/tbl_data.c | 122 +++-
external/bsd/mdocml/dist/tbl_html.c | 103 ++-
external/bsd/mdocml/dist/tbl_term.c | 82 +-
external/bsd/mdocml/dist/term.c | 77 +--
external/bsd/mdocml/dist/term_ascii.c | 5 +-
external/bsd/mdocml/dist/term_ps.c | 14 +-
external/bsd/mdocml/dist/tree.c | 33 +-
external/bsd/mdocml/dist/vol.c | 3 +-
54 files changed, 4822 insertions(+), 2635 deletions(-)
diffs (truncated from 11601 to 300 lines):
diff -r 6a3705f8d630 -r 704b82af4ee8 external/bsd/mdocml/dist/Makefile
--- a/external/bsd/mdocml/dist/Makefile Fri Apr 15 13:42:22 2011 +0000
+++ b/external/bsd/mdocml/dist/Makefile Fri Apr 15 13:45:25 2011 +0000
@@ -1,345 +1,379 @@
-.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
-MANDIR = $(PREFIX)/man
-EXAMPLEDIR = $(PREFIX)/share/examples/mandoc
-INSTALL = install
-INSTALL_PROGRAM = $(INSTALL) -m 0755
-INSTALL_DATA = $(INSTALL) -m 0444
-INSTALL_LIB = $(INSTALL) -m 0644
-INSTALL_MAN = $(INSTALL_DATA)
-
-VERSION = 1.10.9
-VDATE = 07 January 2010
-
-VFLAGS = -DVERSION="\"$(VERSION)\""
-WFLAGS = -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
-CFLAGS += -g $(WFLAGS) $(VFLAGS) -DHAVE_CONFIG_H
+.PHONY: clean install installwww
+.SUFFIXES: .sgml .html .md5 .h .h.html
+.SUFFIXES: .1 .3 .7
+.SUFFIXES: .1.txt .3.txt .7.txt
+.SUFFIXES: .1.pdf .3.pdf .7.pdf
+.SUFFIXES: .1.ps .3.ps .7.ps
+.SUFFIXES: .1.html .3.html .7.html
+.SUFFIXES: .1.xhtml .3.xhtml .7.xhtml
# Specify this if you want to hard-code the operating system to appear
# in the lower-left hand corner of -mdoc manuals.
-# CFLAGS += -DOSNAME="\"OpenBSD 4.5\""
-
-LINTFLAGS += $(VFLAGS)
-
-ROFFLNS = roff.ln tbl.ln tbl_opts.ln tbl_layout.ln tbl_data.ln
-
-ROFFSRCS = roff.c tbl.c tbl_opts.c tbl_layout.c tbl_data.c
-
-ROFFOBJS = roff.o tbl.o tbl_opts.o tbl_layout.o tbl_data.o
-
-MANDOCLNS = mandoc.ln
-
-MANDOCSRCS = mandoc.c
+# CFLAGS += -DOSNAME="\"OpenBSD 4.5\""
-MANDOCOBJS = mandoc.o
-
-MDOCLNS = mdoc_macro.ln mdoc.ln mdoc_hash.ln mdoc_strings.ln \
- mdoc_argv.ln mdoc_validate.ln \
- lib.ln att.ln arch.ln vol.ln msec.ln st.ln
+VERSION = 1.11.1
+VDATE = 04 April 2011
+CFLAGS += -g -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\""
+CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
+PREFIX = /usr/local
+BINDIR = $(PREFIX)/bin
+INCLUDEDIR = $(PREFIX)/include/mandoc
+LIBDIR = $(PREFIX)/lib/mandoc
+MANDIR = $(PREFIX)/man
+EXAMPLEDIR = $(PREFIX)/share/examples/mandoc
+INSTALL = install
+INSTALL_PROGRAM = $(INSTALL) -m 0755
+INSTALL_DATA = $(INSTALL) -m 0444
+INSTALL_LIB = $(INSTALL) -m 0644
+INSTALL_MAN = $(INSTALL_DATA)
-MDOCOBJS = mdoc_macro.o mdoc.o mdoc_hash.o mdoc_strings.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_strings.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_argv.ln
+all: mandoc
-MANOBJS = man_macro.o man.o man_hash.o man_validate.o \
- man_argv.o
-MANSRCS = man_macro.c man.c man_hash.c man_validate.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 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 \
- term_ps.o term_ascii.o tbl_term.o tbl_html.o
+SRCS = Makefile \
+ arch.c \
+ arch.in \
+ att.c \
+ att.in \
+ chars.c \
+ chars.in \
+ compat.c \
+ config.h.post \
+ config.h.pre \
+ eqn.7 \
+ eqn.c \
+ example.style.css \
+ external.png \
+ html.c \
+ html.h \
+ index.css \
+ index.sgml \
+ lib.c \
+ lib.in \
+ libman.h \
+ libmandoc.h \
+ libmdoc.h \
+ libroff.h \
+ main.c \
+ main.h \
+ man.h \
+ man.7 \
+ man.c \
+ man_hash.c \
+ man_html.c \
+ man_macro.c \
+ man_term.c \
+ man_validate.c \
+ mandoc.1 \
+ mandoc.3 \
+ mandoc.c \
+ mandoc.h \
+ mandoc-db.1 \
+ mandoc-db.c \
+ mandoc_char.7 \
+ mdoc.h \
+ mdoc.7 \
+ mdoc.c \
+ mdoc_argv.c \
+ mdoc_hash.c \
+ mdoc_html.c \
+ mdoc_macro.c \
+ mdoc_term.c \
+ mdoc_validate.c \
+ msec.c \
+ msec.in \
+ out.c \
+ out.h \
+ read.c \
+ roff.7 \
+ roff.c \
+ st.c \
+ st.in \
+ style.css \
+ tbl.7 \
+ tbl.c \
+ tbl_data.c \
+ tbl_html.c \
+ tbl_layout.c \
+ tbl_opts.c \
+ tbl_term.c \
+ term.c \
+ term.h \
+ term_ascii.c \
+ term_ps.c \
+ test-strlcat.c \
+ test-strlcpy.c \
+ tree.c \
+ vol.c \
+ vol.in
-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 \
- term_ps.c term_ascii.c tbl_term.c tbl_html.c
-
-LLNS = llib-llibmdoc.ln llib-llibman.ln llib-lmandoc.ln \
- llib-llibmandoc.ln llib-llibroff.ln
+LIBMAN_OBJS = man.o \
+ man_hash.o \
+ man_macro.o \
+ man_validate.o
+LIBMAN_LNS = man.ln \
+ man_hash.ln \
+ man_macro.ln \
+ man_validate.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)
+LIBMDOC_OBJS = arch.o \
+ att.o \
+ lib.o \
+ mdoc.o \
+ mdoc_argv.o \
+ mdoc_hash.o \
+ mdoc_macro.o \
+ mdoc_validate.o \
+ msec.o \
+ st.o \
+ vol.o
+LIBMDOC_LNS = arch.ln \
+ att.ln \
+ lib.ln \
+ mdoc.ln \
+ mdoc_argv.ln \
+ mdoc_hash.ln \
+ mdoc_macro.ln \
+ mdoc_validate.ln \
+ msec.ln \
+ st.ln \
+ vol.ln
-DATAS = arch.in att.in lib.in msec.in st.in \
- vol.in chars.in
+LIBROFF_OBJS = eqn.o \
+ roff.o \
+ tbl.o \
+ tbl_data.o \
+ tbl_layout.o \
+ tbl_opts.o
+LIBROFF_LNS = eqn.ln \
+ roff.ln \
+ tbl.ln \
+ tbl_data.ln \
+ tbl_layout.ln \
+ tbl_opts.ln
-HEADS = mdoc.h libmdoc.h man.h libman.h term.h \
- 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
-
-SGMLS = index.sgml
+LIBMANDOC_OBJS = $(LIBMAN_OBJS) \
+ $(LIBMDOC_OBJS) \
+ $(LIBROFF_OBJS) \
+ mandoc.o \
+ read.o
+LIBMANDOC_LNS = $(LIBMAN_LNS) \
+ $(LIBMDOC_LNS) \
+ $(LIBROFF_LNS) \
+ mandoc.ln \
+ read.ln
-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
+arch.o arch.ln: arch.in
+att.o att.ln: att.in
+lib.o lib.ln: lib.in
+msec.o msec.ln: msec.in
+st.o st.ln: st.in
+vol.o vol.ln: vol.in
+
+$(LIBMAN_OBJS) $(LIBMAN_LNS): libman.h
+$(LIBMDOC_OBJS) $(LIBMDOC_LNS): libmdoc.h
+$(LIBROFF_OBJS) $(LIBROFF_LNS): libroff.h
+$(LIBMANDOC_OBJS) $(LIBMANDOC_LNS): mandoc.h mdoc.h man.h libmandoc.h config.h
-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
+MANDOC_HTML_OBJS = html.o \
+ man_html.o \
+ mdoc_html.o \
+ tbl_html.o
+MANDOC_HTML_LNS = html.ln \
+ man_html.ln \
+ mdoc_html.ln \
+ tbl_html.ln
-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
-
-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
-
-XSLS = ChangeLog.xsl
+MANDOC_TERM_OBJS = man_term.o \
+ mdoc_term.o \
+ term.o \
Home |
Main Index |
Thread Index |
Old Index