Accent marks sync'd with current groff.

[mandoc.git] / main.c

diff --git a/main.c b/main.c
index a7b5c4d408ceac01676f707aed7e5890d443cef3..523be5129ae6c5d37ad3216ff896348951e50bd7 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/*     $Id: main.c,v 1.39 2009/07/24 14:00:59 kristaps Exp $ */
+/*     $Id: main.c,v 1.44 2009/09/21 13:06:13 kristaps Exp $ */

 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -40,8 +40,8 @@ extern        int               getsubopt(char **, char * const *, char **);
 # endif
 #endif
 
 # endif
 #endif
 

-typedef        int             (*out_mdoc)(void *, const struct mdoc *);
-typedef        int             (*out_man)(void *, const struct man *);
+typedef        void            (*out_mdoc)(void *, const struct mdoc *);
+typedef        void            (*out_man)(void *, const struct man *);

 typedef        void            (*out_free)(void *);
 
 struct buf {
 typedef        void            (*out_free)(void *);
 
 struct buf {


@@ -58,6 +58,7 @@ enum  intt {
 enum   outt {
        OUTT_ASCII = 0,
        OUTT_TREE,
 enum   outt {
        OUTT_ASCII = 0,
        OUTT_TREE,

+       OUTT_HTML,

        OUTT_LINT
 };
 
        OUTT_LINT
 };
 


@@ -83,13 +84,18 @@ struct      curparse {
        out_man           outman;
        out_free          outfree;
        void             *outdata;
        out_man           outman;
        out_free          outfree;
        void             *outdata;

+       char             *outopts;

 };
 
 };
 

+extern void             *html_alloc(char *);
+extern void              html_mdoc(void *, const struct mdoc *);
+extern void              html_man(void *, const struct man *);
+extern void              html_free(void *);

 extern void             *ascii_alloc(void);
 extern void             *ascii_alloc(void);

-extern int               tree_mdoc(void *, const struct mdoc *);
-extern int               tree_man(void *, const struct man *);
-extern int               terminal_mdoc(void *, const struct mdoc *);
-extern int               terminal_man(void *, const struct man *);
+extern void              tree_mdoc(void *, const struct mdoc *);
+extern void              tree_man(void *, const struct man *);
+extern void              terminal_mdoc(void *, const struct mdoc *);
+extern void              terminal_man(void *, const struct man *);

 extern void              terminal_free(void *);
 
 static int               foptions(int *, char *);
 extern void              terminal_free(void *);
 
 static int               foptions(int *, char *);


@@ -125,7 +131,7 @@ main(int argc, char *argv[])
        curp.outtype = OUTT_ASCII;
 
        /* LINTED */
        curp.outtype = OUTT_ASCII;
 
        /* LINTED */

-       while (-1 != (c = getopt(argc, argv, "f:m:VW:T:")))
+       while (-1 != (c = getopt(argc, argv, "f:m:o:T:VW:")))

                switch (c) {
                case ('f'):
                        if ( ! foptions(&curp.fflags, optarg))
                switch (c) {
                case ('f'):
                        if ( ! foptions(&curp.fflags, optarg))


@@ -135,6 +141,9 @@ main(int argc, char *argv[])
                        if ( ! moptions(&curp.inttype, optarg))
                                return(EXIT_FAILURE);
                        break;
                        if ( ! moptions(&curp.inttype, optarg))
                                return(EXIT_FAILURE);
                        break;

+               case ('o'):
+                       curp.outopts = optarg;
+                       break;

                case ('T'):
                        if ( ! toptions(&curp.outtype, optarg))
                                return(EXIT_FAILURE);
                case ('T'):
                        if ( ! toptions(&curp.outtype, optarg))
                                return(EXIT_FAILURE);


@@ -418,7 +427,8 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse *curp)
        /* NOTE a parser may not have been assigned, yet. */
 
        if ( ! (man || mdoc)) {
        /* NOTE a parser may not have been assigned, yet. */
 
        if ( ! (man || mdoc)) {

-               warnx("%s: not a manual", curp->file);
+               (void)fprintf(stderr, "%s: not a manual\n", 
+                               curp->file);

                return(0);
        }
 
                return(0);
        }
 


@@ -431,6 +441,12 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse *curp)
 
        if ( ! (curp->outman && curp->outmdoc)) {
                switch (curp->outtype) {
 
        if ( ! (curp->outman && curp->outmdoc)) {
                switch (curp->outtype) {

+               case (OUTT_HTML):
+                       curp->outdata = html_alloc(curp->outopts);
+                       curp->outman = html_man;
+                       curp->outmdoc = html_mdoc;
+                       curp->outfree = html_free;
+                       break;

                case (OUTT_TREE):
                        curp->outman = tree_man;
                        curp->outmdoc = tree_mdoc;
                case (OUTT_TREE):
                        curp->outman = tree_man;
                        curp->outmdoc = tree_mdoc;


@@ -449,11 +465,9 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse *curp)
        /* Execute the out device, if it exists. */
 
        if (man && curp->outman)
        /* Execute the out device, if it exists. */
 
        if (man && curp->outman)

-               if ( ! (*curp->outman)(curp->outdata, man))
-                       return(-1);
+               (*curp->outman)(curp->outdata, man);

        if (mdoc && curp->outmdoc)
        if (mdoc && curp->outmdoc)

-               if ( ! (*curp->outmdoc)(curp->outdata, mdoc))
-                       return(-1);
+               (*curp->outmdoc)(curp->outdata, mdoc);

 
        return(1);
 }
 
        return(1);
 }


@@ -547,6 +561,8 @@ toptions(enum outt *tflags, char *arg)
                *tflags = OUTT_LINT;
        else if (0 == strcmp(arg, "tree"))
                *tflags = OUTT_TREE;
                *tflags = OUTT_LINT;
        else if (0 == strcmp(arg, "tree"))
                *tflags = OUTT_TREE;

+       else if (0 == strcmp(arg, "html"))
+               *tflags = OUTT_HTML;

        else {
                warnx("bad argument: -T%s", arg);
                return(0);
        else {
                warnx("bad argument: -T%s", arg);
                return(0);


@@ -639,8 +655,8 @@ merr(void *arg, int line, int col, const char *msg)
 
        curp = (struct curparse *)arg;
 
 
        curp = (struct curparse *)arg;
 

-       warnx("%s:%d: error: %s (column %d)", 
-                       curp->file, line, msg, col);
+       (void)fprintf(stderr, "%s:%d:%d: error: %s\n", 
+                       curp->file, line, col + 1, msg);

 
        return(0);
 }
 
        return(0);
 }


@@ -656,13 +672,12 @@ mwarn(void *arg, int line, int col, const char *msg)
        if ( ! (curp->wflags & WARN_WALL))
                return(1);
 
        if ( ! (curp->wflags & WARN_WALL))
                return(1);
 

-       warnx("%s:%d: warning: %s (column %d)", 
-                       curp->file, line, msg, col);
+       (void)fprintf(stderr, "%s:%d:%d: warning: %s\n", 
+                       curp->file, line, col + 1, msg);

 
        if ( ! (curp->wflags & WARN_WERR))
                return(1);
        
 
        if ( ! (curp->wflags & WARN_WERR))
                return(1);
        

-       warnx("considering warnings as errors");

        return(0);
 }
 
        return(0);
 }