Implement centering and adjustment to the right margin directly in

[mandoc.git] / mandocd.c

diff --git a/mandocd.c b/mandocd.c
index 3f055a503efaad492f0cee1049669bc84b5cd2eb..77fd3d0d07ccdcde4cf4cfe5ec1ca1e993e2c1cb 100644 (file)
--- a/mandocd.c
+++ b/mandocd.c
@@ -1,4 +1,4 @@
-/*     $Id: mandocd.c,v 1.7 2018/12/13 11:55:46 schwarze Exp $ */
+/*     $Id: mandocd.c,v 1.9 2018/12/30 00:49:55 schwarze Exp $ */
 /*
  * Copyright (c) 2017 Michael Stapelberg <stapelberg@debian.org>
  * Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -172,7 +172,7 @@ main(int argc, char *argv[])
 
        mchars_alloc();
        parser = mparse_alloc(MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1,
-           MANDOCERR_MAX, NULL, MANDOC_OS_OTHER, defos);
+           MANDOC_OS_OTHER, defos);
 
        memset(&options, 0, sizeof(options));
        switch (outtype) {
@@ -244,35 +244,29 @@ main(int argc, char *argv[])
 static void
 process(struct mparse *parser, enum outt outtype, void *formatter)
 {
-       struct roff_man  *man;
+       struct roff_meta *meta;
 
        mparse_readfd(parser, STDIN_FILENO, "<unixfd>");
-       mparse_result(parser, &man, NULL);
-
-       if (man == NULL)
-               return;
-
-       if (man->macroset == MACROSET_MDOC) {
-               mdoc_validate(man);
+       meta = mparse_result(parser);
+       if (meta->macroset == MACROSET_MDOC) {
                switch (outtype) {
                case OUTT_ASCII:
                case OUTT_UTF8:
-                       terminal_mdoc(formatter, man);
+                       terminal_mdoc(formatter, meta);
                        break;
                case OUTT_HTML:
-                       html_mdoc(formatter, man);
+                       html_mdoc(formatter, meta);
                        break;
                }
        }
-       if (man->macroset == MACROSET_MAN) {
-               man_validate(man);
+       if (meta->macroset == MACROSET_MAN) {
                switch (outtype) {
                case OUTT_ASCII:
                case OUTT_UTF8:
-                       terminal_man(formatter, man);
+                       terminal_man(formatter, meta);
                        break;
                case OUTT_HTML:
-                       html_man(formatter, man);
+                       html_man(formatter, meta);
                        break;
                }
        }