"sys/param.h is for kernel interface programs.

[mandoc.git] / mdoc_strings.c

diff --git a/mdoc_strings.c b/mdoc_strings.c
index ff8eba1ff6a25c2d782610af094142baa09cd0c3..e7ced1fe1b37e496ab3627e46e85e77cffb0cb6d 100644 (file)
--- a/mdoc_strings.c
+++ b/mdoc_strings.c
@@ -1,6 +1,6 @@
-/*     $Id: mdoc_strings.c,v 1.19 2010/05/12 08:41:17 kristaps Exp $ */
+/*     $Id: mdoc_strings.c,v 1.24 2010/07/31 23:52:58 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -26,6 +26,7 @@
 #include <string.h>
 #include <time.h>
 
 #include <string.h>
 #include <time.h>
 

+#include "mandoc.h"

 #include "libmdoc.h"
 
 static const char * const secnames[SEC__MAX] = {
 #include "libmdoc.h"
 
 static const char * const secnames[SEC__MAX] = {


@@ -57,17 +58,17 @@ static      const char * const secnames[SEC__MAX] = {
  * FIXME: this is repeated in print_text() (html.c) and term_word()
  * (term.c).
  */
  * FIXME: this is repeated in print_text() (html.c) and term_word()
  * (term.c).
  */

-int
+enum mdelim

 mdoc_iscdelim(char p)
 {
 
        switch (p) {
 mdoc_iscdelim(char p)
 {
 
        switch (p) {

-       case('|'):
-               /* FALLTHROUGH */

        case('('):
                /* FALLTHROUGH */
        case('['):
        case('('):
                /* FALLTHROUGH */
        case('['):

-               return(1);
+               return(DELIM_OPEN);
+       case('|'):
+               return(DELIM_MIDDLE);

        case('.'):
                /* FALLTHROUGH */
        case(','):
        case('.'):
                /* FALLTHROUGH */
        case(','):


@@ -83,21 +84,21 @@ mdoc_iscdelim(char p)
        case(')'):
                /* FALLTHROUGH */
        case(']'):
        case(')'):
                /* FALLTHROUGH */
        case(']'):

-               return(2);
+               return(DELIM_CLOSE);

        default:
                break;
        }
 
        default:
                break;
        }
 

-       return(0);
+       return(DELIM_NONE);

 }
 
 
 }
 
 

-int
+enum mdelim

 mdoc_isdelim(const char *p)
 {
 
        if ('\0' == p[0])
 mdoc_isdelim(const char *p)
 {
 
        if ('\0' == p[0])

-               return(0);
+               return(DELIM_NONE);

        if ('\0' == p[1])
                return(mdoc_iscdelim(p[0]));
 
        if ('\0' == p[1])
                return(mdoc_iscdelim(p[0]));
 


@@ -106,7 +107,7 @@ mdoc_isdelim(const char *p)
         * is treated in exactly the same way as the vertical bar.  This
         * is the only function that checks for this.
         */
         * is treated in exactly the same way as the vertical bar.  This
         * is the only function that checks for this.
         */

-       return(0 == strcmp(p, "\\*(Ba"));
+       return(strcmp(p, "\\*(Ba") ? DELIM_NONE : DELIM_MIDDLE);

 }
 
 
 }