summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rw-r--r--mdoctree.c16
-rw-r--r--term.c2
3 files changed, 13 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index c10d60a3..b9928f58 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
.SUFFIXES: .html .sgml
-VERSION = 1.3.19
-VDATE = 05 March 2009
+VERSION = 1.4.1
+VDATE = 8 March 2009
BINDIR = $(PREFIX)/bin
INCLUDEDIR = $(PREFIX)/include
diff --git a/mdoctree.c b/mdoctree.c
index ff685eb5..18e975da 100644
--- a/mdoctree.c
+++ b/mdoctree.c
@@ -57,7 +57,7 @@ doprint(const struct mdoc_node *n, int indent)
int i, j;
size_t argc, sz;
char **params;
- struct mdoc_arg *argv;
+ struct mdoc_argv *argv;
argv = NULL;
argc = sz = 0;
@@ -92,7 +92,7 @@ doprint(const struct mdoc_node *n, int indent)
switch (n->type) {
case (MDOC_TEXT):
- p = n->data.text.string;
+ p = n->string;
break;
case (MDOC_BODY):
p = mdoc_macronames[n->tok];
@@ -105,13 +105,17 @@ doprint(const struct mdoc_node *n, int indent)
break;
case (MDOC_ELEM):
p = mdoc_macronames[n->tok];
- argv = n->data.elem.argv;
- argc = n->data.elem.argc;
+ if (n->args) {
+ argv = n->args->argv;
+ argc = n->args->argc;
+ }
break;
case (MDOC_BLOCK):
p = mdoc_macronames[n->tok];
- argv = n->data.block.argv;
- argc = n->data.block.argc;
+ if (n->args) {
+ argv = n->args->argv;
+ argc = n->args->argc;
+ }
break;
case (MDOC_ROOT):
p = "root";
diff --git a/term.c b/term.c
index daf0010c..195db212 100644
--- a/term.c
+++ b/term.c
@@ -316,7 +316,7 @@ arg_listtype(const struct mdoc_node *n)
assert(MDOC_BLOCK == n->type);
- len = n->args ? n->args->argc : 0;
+ len = (int)(n->args ? n->args->argc : 0);
for (i = 0; i < len; i++)
switch (n->args->argv[i].arg) {