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 mdocml-1.9.23:
details: https://anonhg.NetBSD.org/src/rev/1215759452c9
branches: trunk
changeset: 754111:1215759452c9
user: joerg <joerg%NetBSD.org@localhost>
date: Tue Apr 20 18:05:55 2010 +0000
description:
mdocml-1.9.23:
- Smaller bug fixes
- Relax some constraints that don't deal well with the real world usage
diffstat:
external/bsd/mdocml/dist/Makefile | 14 +-
external/bsd/mdocml/dist/html.c | 8 +-
external/bsd/mdocml/dist/html.h | 25 +-
external/bsd/mdocml/dist/libmdoc.h | 6 +-
external/bsd/mdocml/dist/man.7 | 5 +-
external/bsd/mdocml/dist/man_validate.c | 17 ++-
external/bsd/mdocml/dist/mandoc.c | 10 +-
external/bsd/mdocml/dist/mandoc_char.7 | 6 +-
external/bsd/mdocml/dist/mdoc.7 | 206 ++++++++++--------------------
external/bsd/mdocml/dist/mdoc.c | 91 +++++++++++--
external/bsd/mdocml/dist/mdoc_argv.c | 37 +++--
external/bsd/mdocml/dist/mdoc_html.c | 89 +++++++-----
external/bsd/mdocml/dist/mdoc_macro.c | 29 ++-
external/bsd/mdocml/dist/mdoc_strings.c | 12 +-
external/bsd/mdocml/dist/mdoc_term.c | 27 +++-
external/bsd/mdocml/dist/mdoc_validate.c | 61 +++++---
external/bsd/mdocml/dist/out.c | 149 ++++++++++++++-------
external/bsd/mdocml/dist/out.h | 4 +-
external/bsd/mdocml/dist/style.css | 25 ++-
external/bsd/mdocml/dist/term.c | 75 +++++++---
20 files changed, 520 insertions(+), 376 deletions(-)
diffs (truncated from 1999 to 300 lines):
diff -r c22b632ec6e1 -r 1215759452c9 external/bsd/mdocml/dist/Makefile
--- a/external/bsd/mdocml/dist/Makefile Tue Apr 20 17:48:16 2010 +0000
+++ b/external/bsd/mdocml/dist/Makefile Tue Apr 20 18:05:55 2010 +0000
@@ -1,4 +1,4 @@
-.SUFFIXES: .html .xml .sgml .1 .3 .7 .md5 .tar.gz .1.txt .3.txt .7.txt .1.sgml .3.sgml .7.sgml
+.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
BINDIR = $(PREFIX)/bin
INCLUDEDIR = $(PREFIX)/include
@@ -10,8 +10,8 @@
INSTALL_LIB = install -m 0644
INSTALL_MAN = $(INSTALL_DATA)
-VERSION = 1.9.22
-VDATE = 31 March 2010
+VERSION = 1.9.23
+VDATE = 07 April 2010
VFLAGS = -DVERSION="\"$(VERSION)\""
WFLAGS = -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
@@ -68,7 +68,7 @@
GSGMLS = mandoc.1.sgml mdoc.3.sgml mdoc.7.sgml manuals.7.sgml \
mandoc_char.7.sgml man.7.sgml man.3.sgml
SGMLS = index.sgml
-HTMLS = ChangeLog.html index.html
+HTMLS = ChangeLog.html index.html man.h.html mdoc.h.html
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
@@ -123,7 +123,7 @@
mkdir -p $(MANDIR)/man7
$(INSTALL_PROGRAM) mandoc $(BINDIR)
$(INSTALL_MAN) mandoc.1 $(MANDIR)/man1
- $(INSTALL_MAN) man.7 mdoc.7 $(MANDIR)/man7
+ $(INSTALL_MAN) man.7 mdoc.7 mandoc_char.7 $(MANDIR)/man7
$(INSTALL_DATA) example.style.css $(EXAMPLEDIR)
uninstall:
@@ -131,6 +131,7 @@
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
$(OBJS): config.h
@@ -241,6 +242,9 @@
.tar.gz.md5:
md5 $< > $@
+.h.h.html:
+ highlight -I $< >$@
+
config.h: config.h.pre config.h.post
rm -f config.log
( cat config.h.pre; \
diff -r c22b632ec6e1 -r 1215759452c9 external/bsd/mdocml/dist/html.c
--- a/external/bsd/mdocml/dist/html.c Tue Apr 20 17:48:16 2010 +0000
+++ b/external/bsd/mdocml/dist/html.c Tue Apr 20 18:05:55 2010 +0000
@@ -1,4 +1,4 @@
-/* $Vendor-Id: html.c,v 1.96 2010/02/17 19:48:33 kristaps Exp $ */
+/* $Vendor-Id: html.c,v 1.97 2010/04/03 12:46:35 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps%kth.se@localhost>
*
@@ -507,8 +507,6 @@
case(')'):
/* FALLTHROUGH */
case(']'):
- /* FALLTHROUGH */
- case('}'):
if ( ! (HTML_IGNDELIM & h->flags))
h->flags |= HTML_NOSPACE;
break;
@@ -525,11 +523,11 @@
if (*p && 0 == *(p + 1))
switch (*p) {
+ case('|'):
+ /* FALLTHROUGH */
case('('):
/* FALLTHROUGH */
case('['):
- /* FALLTHROUGH */
- case('{'):
h->flags |= HTML_NOSPACE;
break;
default:
diff -r c22b632ec6e1 -r 1215759452c9 external/bsd/mdocml/dist/html.h
--- a/external/bsd/mdocml/dist/html.h Tue Apr 20 17:48:16 2010 +0000
+++ b/external/bsd/mdocml/dist/html.h Tue Apr 20 18:05:55 2010 +0000
@@ -1,4 +1,4 @@
-/* $Vendor-Id: html.h,v 1.22 2010/01/29 14:39:38 kristaps Exp $ */
+/* $Vendor-Id: html.h,v 1.23 2010/04/05 08:51:56 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps%kth.se@localhost>
*
@@ -90,18 +90,17 @@
const char *val;
};
-#define PAIR_CLASS_INIT(p, v) \
- do { (p)->key = ATTR_CLASS; \
- (p)->val = (v); } while (/* CONSTCOND */ 0)
-#define PAIR_HREF_INIT(p, v) \
- do { (p)->key = ATTR_HREF; \
- (p)->val = (v); } while (/* CONSTCOND */ 0)
-#define PAIR_STYLE_INIT(p, h) \
- do { (p)->key = ATTR_STYLE; \
- (p)->val = (h)->buf; } while (/* CONSTCOND */ 0)
-#define PAIR_SUMMARY_INIT(p, v) \
- do { (p)->key = ATTR_SUMMARY; \
- (p)->val = (v); } while (/* CONSTCOND */ 0)
+#define PAIR_INIT(p, t, v) \
+ do { \
+ (p)->key = (t); \
+ (p)->val = (v); \
+ } while (/* CONSTCOND */ 0)
+
+#define PAIR_ID_INIT(p, v) PAIR_INIT(p, ATTR_ID, v)
+#define PAIR_CLASS_INIT(p, v) PAIR_INIT(p, ATTR_CLASS, v)
+#define PAIR_HREF_INIT(p, v) PAIR_INIT(p, ATTR_HREF, v)
+#define PAIR_STYLE_INIT(p, h) PAIR_INIT(p, ATTR_STYLE, (h)->buf)
+#define PAIR_SUMMARY_INIT(p, v) PAIR_INIT(p, ATTR_SUMMARY, v)
enum htmltype {
HTML_HTML_4_01_STRICT,
diff -r c22b632ec6e1 -r 1215759452c9 external/bsd/mdocml/dist/libmdoc.h
--- a/external/bsd/mdocml/dist/libmdoc.h Tue Apr 20 17:48:16 2010 +0000
+++ b/external/bsd/mdocml/dist/libmdoc.h Tue Apr 20 18:05:55 2010 +0000
@@ -1,4 +1,4 @@
-/* $Vendor-Id: libmdoc.h,v 1.31 2010/03/31 07:13:53 kristaps Exp $ */
+/* $Vendor-Id: libmdoc.h,v 1.33 2010/04/06 11:33:00 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps%kth.se@localhost>
*
@@ -137,8 +137,7 @@
int mdoc_head_alloc(struct mdoc *, int, int, enum mdoct);
int mdoc_tail_alloc(struct mdoc *, int, int, enum mdoct);
int mdoc_body_alloc(struct mdoc *, int, int, enum mdoct);
-void mdoc_node_free(struct mdoc_node *);
-void mdoc_node_freelist(struct mdoc_node *);
+void mdoc_node_delete(struct mdoc *, struct mdoc_node *);
void mdoc_hash_init(void);
enum mdoct mdoc_hash_find(const char *);
int mdoc_iscdelim(char);
@@ -167,6 +166,7 @@
#define ARGV_ARG (1)
#define ARGV_WORD (2)
void mdoc_argv_free(struct mdoc_arg *);
+void mdoc_argn_free(struct mdoc_arg *, int);
int mdoc_args(struct mdoc *, int,
int *, char *, enum mdoct, char **);
int mdoc_zargs(struct mdoc *, int,
diff -r c22b632ec6e1 -r 1215759452c9 external/bsd/mdocml/dist/man.7
--- a/external/bsd/mdocml/dist/man.7 Tue Apr 20 17:48:16 2010 +0000
+++ b/external/bsd/mdocml/dist/man.7 Tue Apr 20 18:05:55 2010 +0000
@@ -1,4 +1,4 @@
-.\" $Vendor-Id: man.7,v 1.60 2010/03/27 10:22:28 kristaps Exp $
+.\" $Vendor-Id: man.7,v 1.61 2010/04/05 07:25:23 kristaps Exp $
.\"
.\" Copyright (c) 2009 Kristaps Dzonsons <kristaps%kth.se@localhost>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: March 27 2010 $
+.Dd $Mdocdate: April 5 2010 $
.Dt MAN 7
.Os
.
@@ -440,7 +440,6 @@
raised (unless in the case of
.Sx \&br ,
.Sx \&sp ,
-.Sx \&Sp ,
or
.Sx \&na ) .
.Pp
diff -r c22b632ec6e1 -r 1215759452c9 external/bsd/mdocml/dist/man_validate.c
--- a/external/bsd/mdocml/dist/man_validate.c Tue Apr 20 17:48:16 2010 +0000
+++ b/external/bsd/mdocml/dist/man_validate.c Tue Apr 20 18:05:55 2010 +0000
@@ -1,4 +1,4 @@
-/* $Vendor-Id: man_validate.c,v 1.33 2010/03/29 10:10:35 kristaps Exp $ */
+/* $Vendor-Id: man_validate.c,v 1.34 2010/04/03 14:12:48 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps%kth.se@localhost>
*
@@ -167,8 +167,19 @@
if (NULL == m->first->child)
return(man_nerr(m, n, WNODATA));
- if (NULL == m->meta.title)
- return(man_nerr(m, n, WNOTITLE));
+ if (NULL == m->meta.title) {
+ if ( ! man_nwarn(m, n, WNOTITLE))
+ return(0);
+ /*
+ * If a title hasn't been set, do so now (by
+ * implication, date and section also aren't set).
+ *
+ * FIXME: this should be in man_action.c.
+ */
+ m->meta.title = mandoc_strdup("unknown");
+ m->meta.date = time(NULL);
+ m->meta.msec = 1;
+ }
return(1);
}
diff -r c22b632ec6e1 -r 1215759452c9 external/bsd/mdocml/dist/mandoc.c
--- a/external/bsd/mdocml/dist/mandoc.c Tue Apr 20 17:48:16 2010 +0000
+++ b/external/bsd/mdocml/dist/mandoc.c Tue Apr 20 18:05:55 2010 +0000
@@ -1,4 +1,4 @@
-/* $Vendor-Id: mandoc.c,v 1.10 2010/01/05 19:51:10 kristaps Exp $ */
+/* $Vendor-Id: mandoc.c,v 1.11 2010/04/07 11:25:38 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps%kth.se@localhost>
*
@@ -73,10 +73,6 @@
return(2);
case ('e'):
return(2);
- case ('f'):
- if ('\0' == *++p || ! isgraph((u_char)*p))
- return(0);
- return(3);
case ('s'):
if ('\0' == *++p)
return(2);
@@ -152,6 +148,10 @@
}
return(c);
+ case ('f'):
+ /* FALLTHROUGH */
+ case ('F'):
+ /* FALLTHROUGH */
case ('*'):
if (0 == *++p || ! isgraph((u_char)*p))
return(0);
diff -r c22b632ec6e1 -r 1215759452c9 external/bsd/mdocml/dist/mandoc_char.7
--- a/external/bsd/mdocml/dist/mandoc_char.7 Tue Apr 20 17:48:16 2010 +0000
+++ b/external/bsd/mdocml/dist/mandoc_char.7 Tue Apr 20 18:05:55 2010 +0000
@@ -1,4 +1,4 @@
-.\" $Vendor-Id: mandoc_char.7,v 1.34 2010/03/30 19:20:33 kristaps Exp $
+.\" $Vendor-Id: mandoc_char.7,v 1.35 2010/04/05 10:33:20 kristaps Exp $
.\"
.\" Copyright (c) 2009 Kristaps Dzonsons <kristaps%kth.se@localhost>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: March 30 2010 $
+.Dd $Mdocdate: April 5 2010 $
.Dt MANDOC_CHAR 7
.Os
.
@@ -244,7 +244,7 @@
.
.Pp
Mathematical:
-.Bl -column -compact -offset indent "Input" "Rendered" "Description"
+.Bl -column -compact -offset indent "\[coproduct]X" "Rendered" "Description"
.It Em Input Ta Em Rendered Ta Em Description
.It \e(pl Ta \(pl Ta plus
.It \e(mi Ta \(mi Ta minus
diff -r c22b632ec6e1 -r 1215759452c9 external/bsd/mdocml/dist/mdoc.7
--- a/external/bsd/mdocml/dist/mdoc.7 Tue Apr 20 17:48:16 2010 +0000
+++ b/external/bsd/mdocml/dist/mdoc.7 Tue Apr 20 18:05:55 2010 +0000
@@ -1,4 +1,4 @@
-.\" $Vendor-Id: mdoc.7,v 1.87 2010/03/31 07:13:53 kristaps Exp $
+.\" $Vendor-Id: mdoc.7,v 1.91 2010/04/07 08:17:16 kristaps Exp $
.\"
.\" Copyright (c) 2009 Kristaps Dzonsons <kristaps%kth.se@localhost>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: March 31 2010 $
+.Dd $Mdocdate: April 7 2010 $
.Dt MDOC 7
.Os
.
@@ -860,7 +860,7 @@
.It Sx \&Ot Ta \&No Ta \&No Ta n
.It Sx \&Ox Ta Yes Ta Yes Ta n
.It Sx \&Pa Ta Yes Ta Yes Ta n
-.It Sx \&Pf Ta \&No Ta Yes Ta 1
+.It Sx \&Pf Ta Yes Ta Yes Ta 1
.It Sx \&Pp Ta \&No Ta \&No Ta 0
.It Sx \&Rv Ta \&No Ta \&No Ta n
.It Sx \&Sm Ta \&No Ta \&No Ta 1
@@ -974,10 +974,8 @@
memory, not a physical (post) address.
.Pp
Examples:
Home |
Main Index |
Thread Index |
Old Index