diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | ascii.in | 3 | ||||
| -rw-r--r-- | mdoc.7 | 4 | ||||
| -rw-r--r-- | strings.c | 8 | ||||
| -rw-r--r-- | term.c | 6 | ||||
| -rw-r--r-- | validate.c | 4 |
6 files changed, 15 insertions, 12 deletions
@@ -9,7 +9,7 @@ INSTALL_DATA = install -m 0444 INSTALL_LIB = install -m 0644 INSTALL_MAN = $(INSTALL_DATA) -VERSION = 1.6.7 +VERSION = 1.6.8 VDATE = 21 March 2009 VFLAGS = -DVERSION=\"$(VERSION)\" @@ -1,4 +1,4 @@ -/* $Id: ascii.in,v 1.4 2009/03/19 20:43:13 kristaps Exp $ */ +/* $Id: ascii.in,v 1.5 2009/03/21 13:47:02 kristaps Exp $ */ /* * Copyright (c) 2009 Kristaps Dzonsons <kristaps@openbsd.org> * @@ -29,6 +29,7 @@ LINE("\\", 1, "\\", 1) LINE("\'", 1, "\'", 1) LINE("`", 1, "`", 1) +LINE("%", 1, "%", 1) LINE("-", 1, "-", 1) LINE(" ", 1, " ", 1) LINE(".", 1, ".", 1) @@ -1,4 +1,4 @@ -.\" $Id: mdoc.7,v 1.11 2009/03/21 13:37:31 kristaps Exp $ +.\" $Id: mdoc.7,v 1.12 2009/03/21 13:47:02 kristaps Exp $ .\" .\" Copyright (c) 2009 Kristaps Dzonsons <kristaps@openbsd.org> .\" @@ -786,7 +786,7 @@ then the macro accepts an arbitrary number of arguments. .It \&.Er Ta Yes Ta Yes Ta >0 .It \&.Ev Ta Yes Ta Yes Ta n .It \&.Ex Ta \&No Ta \&No Ta 0 -.It \&.Fa Ta Yes Ta Yes Ta >0 +.It \&.Fa Ta Yes Ta Yes Ta n .It \&.Fd Ta \&No Ta \&No Ta >0 .It \&.Fl Ta Yes Ta Yes Ta n .It \&.Fn Ta Yes Ta Yes Ta >0 @@ -1,4 +1,4 @@ -/* $Id: strings.c,v 1.30 2009/03/20 19:56:25 kristaps Exp $ */ +/* $Id: strings.c,v 1.31 2009/03/21 13:47:02 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se> * @@ -87,6 +87,8 @@ mdoc_isescape(const char *p) /* FALLTHROUGH */ case ('-'): /* FALLTHROUGH */ + case ('%'): + /* FALLTHROUGH */ case (' '): /* FALLTHROUGH */ case ('|'): @@ -208,9 +210,9 @@ mdoc_atotime(const char *p) (void)memset(&tm, 0, sizeof(struct tm)); - if (xstrcmp(p, "$Mdocdate: March 20 2009 $")) + if (xstrcmp(p, "$Mdocdate: March 21 2009 $")) return(time(NULL)); - if ((pp = strptime(p, "$Mdocdate: March 20 2009 $", &tm)) && 0 == *pp) + if ((pp = strptime(p, "$Mdocdate: March 21 2009 $", &tm)) && 0 == *pp) return(mktime(&tm)); /* XXX - this matches "June 1999", which is wrong. */ if ((pp = strptime(p, "%b %d %Y", &tm)) && 0 == *pp) @@ -1,4 +1,4 @@ -/* $Id: term.c,v 1.66 2009/03/21 13:26:30 kristaps Exp $ */ +/* $Id: term.c,v 1.67 2009/03/21 13:47:02 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org> * @@ -1171,9 +1171,9 @@ termp_fn_pre(DECL_ARGS) term_word(p, node->child->string); p->flags &= ~ttypes[TTYPE_FUNC_NAME]; + p->flags |= TERMP_NOSPACE; term_word(p, "("); - p->flags |= TERMP_NOSPACE; for (n = node->child->next; n; n = n->next) { p->flags |= ttypes[TTYPE_FUNC_ARG]; term_word(p, n->string); @@ -1231,7 +1231,7 @@ termp_fa_pre(DECL_ARGS) term_word(p, ","); } - if (node->next && node->next->tok == MDOC_Fa) + if (node->child && node->next && node->next->tok == MDOC_Fa) term_word(p, ","); return(0); @@ -1,4 +1,4 @@ -/* $Id: validate.c,v 1.90 2009/03/21 13:37:31 kristaps Exp $ */ +/* $Id: validate.c,v 1.91 2009/03/21 13:47:02 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org> * @@ -220,7 +220,7 @@ const struct valids mdoc_valids[MDOC_MAX] = { { pres_er, posts_text }, /* Er */ { NULL, NULL }, /* Ev */ { pres_ex, posts_ex }, /* Ex */ - { NULL, posts_text }, /* Fa */ + { NULL, NULL }, /* Fa */ { pres_fd, posts_wtext }, /* Fd */ { NULL, NULL }, /* Fl */ { NULL, posts_text }, /* Fn */ |