summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2009-03-27 13:44:24 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2009-03-27 13:44:24 +0000
commit948477c0386fca9956999bb560a26efd8f203b92 (patch)
treee643b17e22cef85b18744388b3647c7bf1dedf1a
parent0e2222b5e44166e938751bd305066bdb088ba177 (diff)
downloadmandoc-948477c0386fca9956999bb560a26efd8f203b92.tar.gz
Fixes in going over all OpenBSD manuals.
-rw-r--r--Makefile20
-rw-r--r--ascii.in1
-rw-r--r--mdoc.72
-rw-r--r--mdoc_macro.c32
-rw-r--r--strings.c2
5 files changed, 37 insertions, 20 deletions
diff --git a/Makefile b/Makefile
index ef534bb5..fd53b646 100644
--- a/Makefile
+++ b/Makefile
@@ -18,14 +18,14 @@ LINTFLAGS += $(VFLAGS)
CFLAGS += $(VFLAGS)
MDOCLNS = mdoc_macro.ln mdoc.ln mdoc_hash.ln strings.ln xstd.ln \
- argv.ln mdoc_validate.ln mdoc_action.ln lib.ln att.ln \
- arch.ln vol.ln msec.ln st.ln
-MDOCOBJS = mdoc_macro.o mdoc.o mdoc_hash.o strings.o xstd.o argv.o \
- mdoc_validate.o mdoc_action.o lib.o att.o arch.o vol.o \
- msec.o st.o
-MDOCSRCS = mdoc_macro.c mdoc.c mdoc_hash.c strings.c xstd.c argv.c \
- mdoc_validate.c mdoc_action.c lib.c att.c arch.c vol.c \
- msec.c st.c
+ mdoc_argv.ln mdoc_validate.ln mdoc_action.ln lib.ln \
+ att.ln arch.ln vol.ln msec.ln st.ln
+MDOCOBJS = mdoc_macro.o mdoc.o mdoc_hash.o strings.o xstd.o \
+ mdoc_argv.o mdoc_validate.o mdoc_action.o lib.o att.o \
+ arch.o vol.o msec.o st.o
+MDOCSRCS = mdoc_macro.c mdoc.c mdoc_hash.c strings.c xstd.c \
+ mdoc_argv.c mdoc_validate.c mdoc_action.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
@@ -159,8 +159,8 @@ terminal.o: terminal.c term.h man.h mdoc.h
xstd.ln: xstd.c libmdoc.h
xstd.o: xstd.c libmdoc.h
-argv.ln: argv.c libmdoc.h
-argv.o: argv.c libmdoc.h
+mdoc_argv.ln: mdoc_argv.c libmdoc.h
+mdoc_argv.o: mdoc_argv.c libmdoc.h
man_validate.ln: man_validate.c libman.h
man_validate.o: man_validate.c libman.h
diff --git a/ascii.in b/ascii.in
index c17abf97..58df2047 100644
--- a/ascii.in
+++ b/ascii.in
@@ -32,6 +32,7 @@ LINE("`", 1, "`", 1)
LINE("%", 1, "%", 1)
LINE("-", 1, "-", 1)
LINE(" ", 1, " ", 1)
+LINE("0", 1, " ", 1)
LINE(".", 1, ".", 1)
LINE("&", 1, "", 0)
LINE("e", 1, "\\", 1)
diff --git a/mdoc.7 b/mdoc.7
index c8c4c39e..9b76e4d5 100644
--- a/mdoc.7
+++ b/mdoc.7
@@ -506,6 +506,8 @@ Monetary:
.Pp
Special symbols:
.Bl -tag -width 12n -offset "XXXX" -compact
+.It \e0
+.Pq white-space
.It \e(de
.Pq degree
.It \e(ps
diff --git a/mdoc_macro.c b/mdoc_macro.c
index 6693b132..be1a9d1b 100644
--- a/mdoc_macro.c
+++ b/mdoc_macro.c
@@ -800,7 +800,7 @@ blk_exp_close(MACRO_PROT_ARGS)
static int
in_line(MACRO_PROT_ARGS)
{
- int la, lastpunct, c, w;
+ int la, lastpunct, c, w, cnt, d, call;
struct mdoc_arg *arg;
char *p;
@@ -812,7 +812,6 @@ in_line(MACRO_PROT_ARGS)
*pos = la;
break;
}
-
if (ARGV_EOLN == c)
break;
if (ARGV_ARG == c)
@@ -822,11 +821,7 @@ in_line(MACRO_PROT_ARGS)
return(0);
}
- if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg))
- return(0);
- mdoc->next = MDOC_NEXT_CHILD;
-
- for (lastpunct = 0;; ) {
+ for (call = cnt = 0, lastpunct = 1;; ) {
la = *pos;
w = mdoc_args(mdoc, line, pos, buf, tok, &p);
@@ -847,6 +842,14 @@ in_line(MACRO_PROT_ARGS)
if (MDOC_MAX != c && -1 != c) {
if (0 == lastpunct && ! rew_elem(mdoc, tok))
return(0);
+ if (0 == cnt) {
+ if ( ! mdoc_elem_alloc(mdoc, line, ppos,
+ tok, arg))
+ return(0);
+ if ( ! rew_elem(mdoc, tok))
+ return(0);
+ mdoc->next = MDOC_NEXT_SIBLING;
+ }
c = mdoc_macro(mdoc, c, line, la, pos, buf);
if (0 == c)
return(0);
@@ -858,20 +861,22 @@ in_line(MACRO_PROT_ARGS)
/* Non-quote-enclosed punctuation. */
- if (ARGS_QWORD != w && mdoc_isdelim(p)) {
+ d = mdoc_isdelim(p);
+
+ if (ARGS_QWORD != w && d) {
if (0 == lastpunct && ! rew_elem(mdoc, tok))
return(0);
lastpunct = 1;
} else if (lastpunct) {
c = mdoc_elem_alloc(mdoc, line, ppos, tok, arg);
-
if (0 == c)
return(0);
-
mdoc->next = MDOC_NEXT_CHILD;
lastpunct = 0;
}
+ if ( ! d)
+ cnt++;
if ( ! mdoc_word_alloc(mdoc, line, la, p))
return(0);
mdoc->next = MDOC_NEXT_SIBLING;
@@ -879,6 +884,13 @@ in_line(MACRO_PROT_ARGS)
if (0 == lastpunct && ! rew_elem(mdoc, tok))
return(0);
+ if (0 == cnt) {
+ c = mdoc_elem_alloc(mdoc, line, ppos, tok, arg);
+ if (0 == c)
+ return(0);
+ if ( ! rew_elem(mdoc, tok))
+ return(0);
+ }
if (ppos > 1)
return(1);
return(append_delims(mdoc, line, pos, buf));
diff --git a/strings.c b/strings.c
index 763b50b6..ac7446c8 100644
--- a/strings.c
+++ b/strings.c
@@ -89,6 +89,8 @@ mdoc_isescape(const char *p)
/* FALLTHROUGH */
case ('%'):
/* FALLTHROUGH */
+ case ('0'):
+ /* FALLTHROUGH */
case (' '):
/* FALLTHROUGH */
case ('|'):