Bumped minor-number.

All sources converted to new schema.

diff --git a/Makefile b/Makefile
index c10d60a379886a15033290c1afc23107c1540d1b..b9928f58e5e1df0f8be6c0187b70d452fed4da6d 100644 (file)
--- 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 acc0a03b46fbc0be39fb6b9f710f86eb01484219..6507034816f3fcd74470d1da79216d97b8b9b33c 100644 (file)
--- a/mdoctree.c
+++ b/mdoctree.c
@@ -1,4 +1,4 @@
-       /* $Id: mdoctree.c,v 1.5 2009/03/06 14:13:47 kristaps Exp $ */
+       /* $Id: mdoctree.c,v 1.6 2009/03/08 14:01:46 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -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 d99fbd29ffca3b0114787de72d0ff8f565c6320b..0aeaecfbf55b41c467e82c8a7b626b1d2fb6af3f 100644 (file)
--- a/term.c
+++ b/term.c
@@ -1,4 +1,4 @@
-/* $Id: term.c,v 1.45 2009/03/08 13:57:07 kristaps Exp $ */
+/* $Id: term.c,v 1.46 2009/03/08 14:01:46 kristaps Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -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) {