Moved output definitions into main.h.

[mandoc.git] / man_action.c

diff --git a/man_action.c b/man_action.c
index e90065adfdfdea1991443059d5b18ce0ac18a3b0..6ca7f9e2b8f20a3a0cecf1011664dc35d1491117 100644 (file)
--- a/man_action.c
+++ b/man_action.c
@@ -1,4 +1,4 @@
-/*     $Id: man_action.c,v 1.17 2009/08/20 11:51:07 kristaps Exp $ */
+/*     $Id: man_action.c,v 1.19 2009/08/22 09:10:38 kristaps Exp $ */

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


@@ -23,17 +23,13 @@
 
 #include "libman.h"
 
 
 #include "libman.h"
 

-#ifdef __linux__
-extern char            *strptime(const char *, const char *, struct tm *);
-#endif
-

 struct actions {
        int     (*post)(struct man *);
 };
 
 struct actions {
        int     (*post)(struct man *);
 };
 

-

 static int       post_TH(struct man *);
 static int       post_TH(struct man *);

-static time_t    man_atotime(const char *);
+static int       post_fi(struct man *);
+static int       post_nf(struct man *);

 
 const  struct actions man_actions[MAN_MAX] = {
        { NULL }, /* br */
 
 const  struct actions man_actions[MAN_MAX] = {
        { NULL }, /* br */


@@ -60,14 +56,20 @@ const       struct actions man_actions[MAN_MAX] = {
        { NULL }, /* na */
        { NULL }, /* i */
        { NULL }, /* sp */
        { NULL }, /* na */
        { NULL }, /* i */
        { NULL }, /* sp */

-       { NULL }, /* nf */
-       { NULL }, /* fi */
+       { post_nf }, /* nf */
+       { post_fi }, /* fi */

        { NULL }, /* r */
        { NULL }, /* RE */
        { NULL }, /* RS */
        { NULL }, /* DT */
        { NULL }, /* r */
        { NULL }, /* RE */
        { NULL }, /* RS */
        { NULL }, /* DT */

+       { NULL }, /* UC */

 };
 
 };
 

+static time_t    man_atotime(const char *);
+#ifdef __linux__
+extern char     *strptime(const char *, const char *, struct tm *);
+#endif
+

 
 int
 man_action_post(struct man *m)
 
 int
 man_action_post(struct man *m)


@@ -79,14 +81,39 @@ man_action_post(struct man *m)
 
        switch (m->last->type) {
        case (MAN_TEXT):
 
        switch (m->last->type) {
        case (MAN_TEXT):

-               break;
+               /* FALLTHROUGH */

        case (MAN_ROOT):
        case (MAN_ROOT):

-               break;
+               return(1);

        default:
        default:

-               if (NULL == man_actions[m->last->tok].post)
-                       break;
-               return((*man_actions[m->last->tok].post)(m));
+               break;

        }
        }

+
+       if (NULL == man_actions[m->last->tok].post)
+               return(1);
+       return((*man_actions[m->last->tok].post)(m));
+}
+
+
+static int
+post_fi(struct man *m)
+{
+
+       if ( ! (MAN_LITERAL & m->flags))
+               if ( ! man_nwarn(m, m->last, WNLITERAL))
+                       return(0);
+       m->flags &= ~MAN_LITERAL;
+       return(1);
+}
+
+
+static int
+post_nf(struct man *m)
+{
+
+       if (MAN_LITERAL & m->flags)
+               if ( ! man_nwarn(m, m->last, WOLITERAL))
+                       return(0);
+       m->flags |= MAN_LITERAL;

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