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.10.9 and additional...
details: https://anonhg.NetBSD.org/src/rev/97acf42593cf
branches: trunk
changeset: 760769:97acf42593cf
user: joerg <joerg%NetBSD.org@localhost>
date: Wed Jan 12 22:57:08 2011 +0000
description:
Import mdocml-1.10.9 and additional post-release bugfixes
(tbl_data.c 1.15, tbl_layout.c 1.13, tbl_opts.c 1.8).
This features many small improvements and the initial integration of
tbl(1) support on all output devices.
diffstat:
external/bsd/mdocml/dist/Makefile | 77 +-
external/bsd/mdocml/dist/arch.in | 3 +-
external/bsd/mdocml/dist/chars.c | 32 +-
external/bsd/mdocml/dist/chars.h | 4 +-
external/bsd/mdocml/dist/chars.in | 33 +-
external/bsd/mdocml/dist/example.style.css | 146 ++
external/bsd/mdocml/dist/html.c | 130 +-
external/bsd/mdocml/dist/html.h | 50 +-
external/bsd/mdocml/dist/libman.h | 5 +-
external/bsd/mdocml/dist/libmandoc.h | 3 +-
external/bsd/mdocml/dist/libmdoc.h | 6 +-
external/bsd/mdocml/dist/libroff.h | 62 +
external/bsd/mdocml/dist/main.c | 960 ++++++++------
external/bsd/mdocml/dist/main.h | 4 +-
external/bsd/mdocml/dist/man.3 | 127 +-
external/bsd/mdocml/dist/man.7 | 153 +-
external/bsd/mdocml/dist/man.c | 206 +-
external/bsd/mdocml/dist/man.h | 76 +-
external/bsd/mdocml/dist/man_argv.c | 78 +-
external/bsd/mdocml/dist/man_hash.c | 4 +-
external/bsd/mdocml/dist/man_html.c | 406 ++----
external/bsd/mdocml/dist/man_macro.c | 18 +-
external/bsd/mdocml/dist/man_validate.c | 323 ++++-
external/bsd/mdocml/dist/mandoc.1 | 278 ++-
external/bsd/mdocml/dist/mandoc.c | 154 ++-
external/bsd/mdocml/dist/mandoc.h | 292 +++-
external/bsd/mdocml/dist/mandoc_char.7 | 7 +-
external/bsd/mdocml/dist/mdoc.3 | 84 +-
external/bsd/mdocml/dist/mdoc.7 | 591 +++++----
external/bsd/mdocml/dist/mdoc.c | 232 ++-
external/bsd/mdocml/dist/mdoc.h | 168 +-
external/bsd/mdocml/dist/mdoc_argv.c | 9 +-
external/bsd/mdocml/dist/mdoc_html.c | 1387 +++++++++------------
external/bsd/mdocml/dist/mdoc_macro.c | 77 +-
external/bsd/mdocml/dist/mdoc_strings.c | 4 +-
external/bsd/mdocml/dist/mdoc_validate.c | 1754 ++++++++++++++++++++-------
external/bsd/mdocml/dist/out.c | 262 ++++-
external/bsd/mdocml/dist/out.h | 41 +-
external/bsd/mdocml/dist/roff.3 | 25 +-
external/bsd/mdocml/dist/roff.7 | 567 ++++++--
external/bsd/mdocml/dist/roff.c | 576 ++++++--
external/bsd/mdocml/dist/roff.h | 11 +-
external/bsd/mdocml/dist/st.in | 4 +-
external/bsd/mdocml/dist/tbl.7 | 322 +++++
external/bsd/mdocml/dist/tbl.c | 159 ++
external/bsd/mdocml/dist/tbl_data.c | 218 +++
external/bsd/mdocml/dist/tbl_html.c | 126 ++
external/bsd/mdocml/dist/tbl_layout.c | 408 ++++++
external/bsd/mdocml/dist/tbl_opts.c | 260 ++++
external/bsd/mdocml/dist/tbl_term.c | 425 ++++++
external/bsd/mdocml/dist/term.c | 121 +-
external/bsd/mdocml/dist/term.h | 11 +-
external/bsd/mdocml/dist/term_ascii.c | 4 +-
external/bsd/mdocml/dist/term_ps.c | 47 +-
external/bsd/mdocml/dist/tree.c | 111 +-
55 files changed, 7899 insertions(+), 3742 deletions(-)
diffs (truncated from 17574 to 300 lines):
diff -r efaa0e310c28 -r 97acf42593cf external/bsd/mdocml/dist/Makefile
--- a/external/bsd/mdocml/dist/Makefile Wed Jan 12 22:53:16 2011 +0000
+++ b/external/bsd/mdocml/dist/Makefile Wed Jan 12 22:57:08 2011 +0000
@@ -1,4 +1,10 @@
-.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 .1.ps .3.ps .7.ps .1.pdf .3.pdf .7.pdf
+.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
@@ -12,8 +18,8 @@
INSTALL_LIB = $(INSTALL) -m 0644
INSTALL_MAN = $(INSTALL_DATA)
-VERSION = 1.10.5
-VDATE = 27 July 2010
+VERSION = 1.10.9
+VDATE = 07 January 2010
VFLAGS = -DVERSION="\"$(VERSION)\""
WFLAGS = -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
@@ -25,11 +31,11 @@
LINTFLAGS += $(VFLAGS)
-ROFFLNS = roff.ln
+ROFFLNS = roff.ln tbl.ln tbl_opts.ln tbl_layout.ln tbl_data.ln
-ROFFSRCS = roff.c
+ROFFSRCS = roff.c tbl.c tbl_opts.c tbl_layout.c tbl_data.c
-ROFFOBJS = roff.o
+ROFFOBJS = roff.o tbl.o tbl_opts.o tbl_layout.o tbl_data.o
MANDOCLNS = mandoc.ln
@@ -38,36 +44,37 @@
MANDOCOBJS = mandoc.o
MDOCLNS = mdoc_macro.ln mdoc.ln mdoc_hash.ln mdoc_strings.ln \
- mdoc_argv.ln mdoc_validate.ln mdoc_action.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_strings.o \
- mdoc_argv.o mdoc_validate.o mdoc_action.o lib.o att.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 mdoc_action.c lib.c att.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 man_argv.ln
+ man_argv.ln
MANOBJS = man_macro.o man.o man_hash.o man_validate.o \
- man_action.o man_argv.o
+ man_argv.o
MANSRCS = man_macro.c man.c man_hash.c man_validate.c \
- man_action.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 term_ps.ln term_ascii.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
+ 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 \
- term_ps.c term_ascii.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
@@ -88,30 +95,34 @@
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
+ 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
+ roff.3.sgml tbl.7.sgml
SGMLS = index.sgml
+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
+
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
+ roff.7.html roff.3.html tbl.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
+ 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
+ mandoc_char.7.pdf roff.7.pdf roff.3.pdf tbl.7.pdf
XSLS = ChangeLog.xsl
TEXTS = mandoc.1.txt mdoc.3.txt man.3.txt mdoc.7.txt man.7.txt \
mandoc_char.7.txt ChangeLog.txt \
- roff.7.txt roff.3.txt
+ roff.7.txt roff.3.txt tbl.7.txt
EXAMPLES = example.style.css
@@ -124,7 +135,7 @@
TARGZS = mdocml-$(VERSION).tar.gz
MANS = mandoc.1 mdoc.3 mdoc.7 mandoc_char.7 man.7 \
- man.3 roff.7 roff.3
+ man.3 roff.7 roff.3 tbl.7
BINS = mandoc
@@ -134,7 +145,7 @@
DOCLEAN = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) \
$(TARGZS) tags $(MD5S) $(XMLS) $(TEXTS) $(GSGMLS) \
- config.h config.log $(PSS) $(PDFS)
+ config.h config.log $(PSS) $(PDFS) $(XHTMLS)
DOINSTALL = $(SRCS) $(HEADS) Makefile $(MANS) $(SGMLS) $(STATICS) \
$(DATAS) $(XSLS) $(EXAMPLES) $(TESTS) $(CONFIGS)
@@ -148,14 +159,14 @@
dist: mdocml-$(VERSION).tar.gz
-www: all $(GSGMLS) $(HTMLS) $(TEXTS) $(MD5S) $(TARGZS) $(PSS) $(PDFS)
+www: all $(GSGMLS) $(HTMLS) $(XHTMLS) $(TEXTS) $(MD5S) $(TARGZS) $(PSS) $(PDFS)
ps: $(PSS)
pdf: $(PDFS)
installwww: www
- $(INSTALL_DATA) $(HTMLS) $(PSS) $(PDFS) $(TEXTS) $(STATICS) $(DESTDIR)$(PREFIX)/
+ $(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
@@ -168,7 +179,7 @@
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 mandoc_char.7 $(DESTDIR)$(MANDIR)/man7
+ $(INSTALL_MAN) man.7 mdoc.7 roff.7 tbl.7 mandoc_char.7 $(DESTDIR)$(MANDIR)/man7
$(INSTALL_DATA) example.style.css $(DESTDIR)$(EXAMPLEDIR)
uninstall:
@@ -176,6 +187,7 @@
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/tbl.7
rm -f $(DESTDIR)$(MANDIR)/man7/man.7
rm -f $(DESTDIR)$(MANDIR)/man7/mandoc_char.7
rm -f $(DESTDIR)$(EXAMPLEDIR)/example.style.css
@@ -244,8 +256,6 @@
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:
@@ -298,16 +308,19 @@
sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< > $@
.1.1.txt .3.3.txt .7.7.txt:
- ./mandoc -Tascii -Wall,error -fstrict $< | col -b > $@
+ ./mandoc -Tascii -Wall,stop $< | col -b > $@
.1.1.sgml .3.3.sgml .7.7.sgml:
- ./mandoc -Thtml -Wall,error -fstrict -Ostyle=style.css,man=%N.%S.html,includes=%I.html $< > $@
+ ./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,error -fstrict $< > $@
+ ./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,error -fstrict $< > $@
+ ./mandoc -Tpdf -Wall,stop $< > $@
.tar.gz.md5:
md5 $< > $@
diff -r efaa0e310c28 -r 97acf42593cf external/bsd/mdocml/dist/arch.in
--- a/external/bsd/mdocml/dist/arch.in Wed Jan 12 22:53:16 2011 +0000
+++ b/external/bsd/mdocml/dist/arch.in Wed Jan 12 22:57:08 2011 +0000
@@ -1,4 +1,4 @@
-/* $Vendor-Id: arch.in,v 1.9 2010/07/19 15:43:10 kristaps Exp $ */
+/* $Vendor-Id: arch.in,v 1.10 2010/09/27 06:56:44 kristaps Exp $ */
/*
* Copyright (c) 2009 Kristaps Dzonsons <kristaps%bsd.lv@localhost>
*
@@ -42,6 +42,7 @@
LINE("luna88k", "Luna88k")
LINE("mac68k", "Mac68k")
LINE("macppc", "MacPPC")
+LINE("mips64", "MIPS64")
LINE("mvme68k", "MVME68k")
LINE("mvme88k", "MVME88k")
LINE("mvmeppc", "MVMEPPC")
diff -r efaa0e310c28 -r 97acf42593cf external/bsd/mdocml/dist/chars.c
--- a/external/bsd/mdocml/dist/chars.c Wed Jan 12 22:53:16 2011 +0000
+++ b/external/bsd/mdocml/dist/chars.c Wed Jan 12 22:57:08 2011 +0000
@@ -1,6 +1,6 @@
-/* $Vendor-Id: chars.c,v 1.24 2010/07/26 13:59:00 kristaps Exp $ */
+/* $Vendor-Id: chars.c,v 1.31 2011/01/02 10:10:57 kristaps Exp $ */
/*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps%bsd.lv@localhost>
+ * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps%bsd.lv@localhost>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -40,7 +40,7 @@
#define CHARS_BOTH (CHARS_CHAR | CHARS_STRING)
};
-#define LINES_MAX 370
+#define LINES_MAX 351
#define CHAR(in, ch, code) \
{ NULL, (in), (ch), (code), CHARS_CHAR },
@@ -54,22 +54,22 @@
#include "chars.in"
-struct tbl {
+struct ctab {
enum chars type;
struct ln **htab;
};
static inline int match(const struct ln *,
const char *, size_t, int);
-static const struct ln *find(struct tbl *, const char *, size_t, int);
+static const struct ln *find(struct ctab *, const char *, size_t, int);
void
chars_free(void *arg)
{
- struct tbl *tab;
+ struct ctab *tab;
- tab = (struct tbl *)arg;
+ tab = (struct ctab *)arg;
free(tab->htab);
free(tab);
@@ -79,7 +79,7 @@
void *
chars_init(enum chars type)
{
- struct tbl *tab;
+ struct ctab *tab;
struct ln **htab;
struct ln *pp;
int i, hash;
@@ -91,16 +91,16 @@
* (they're in-line re-ordered during lookup).
*/
- tab = malloc(sizeof(struct tbl));
+ tab = malloc(sizeof(struct ctab));
if (NULL == tab) {
perror(NULL);
- exit(EXIT_FAILURE);
+ exit((int)MANDOCLEVEL_SYSERR);
}
Home |
Main Index |
Thread Index |
Old Index