Fully skip first and last line for the purpose of cmp.

[mandoc.git] / mdoc_strings.c

diff --git a/mdoc_strings.c b/mdoc_strings.c
index 33f5da15f207b641954fb1457e6ffaa99c82351e..c80308f5361a020970b07318c6db89b15692f095 100644 (file)
--- a/mdoc_strings.c
+++ b/mdoc_strings.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_strings.c,v 1.18 2010/05/09 21:06:50 kristaps Exp $ */
+/*     $Id: mdoc_strings.c,v 1.21 2010/05/15 17:26:34 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -28,54 +28,46 @@
 
 #include "libmdoc.h"
 
-/* FIXME: this file is poorly named. */
-
-struct mdoc_secname {
-       const char      *name;  /* Name of section. */
-       enum mdoc_sec    sec;   /* Corresponding section. */
-};
-
-#define        SECNAME_MAX     (20)
-
-static const struct mdoc_secname secnames[SECNAME_MAX] = {
-       { "NAME", SEC_NAME },
-       { "LIBRARY", SEC_LIBRARY },
-       { "SYNOPSIS", SEC_SYNOPSIS },
-       { "DESCRIPTION", SEC_DESCRIPTION },
-       { "IMPLEMENTATION NOTES", SEC_IMPLEMENTATION },
-       { "EXIT STATUS", SEC_EXIT_STATUS },
-       { "RETURN VALUES", SEC_RETURN_VALUES },
-       { "ENVIRONMENT", SEC_ENVIRONMENT },
-       { "FILES", SEC_FILES },
-       { "EXAMPLES", SEC_EXAMPLES },
-       { "DIAGNOSTICS", SEC_DIAGNOSTICS },
-       { "COMPATIBILITY", SEC_COMPATIBILITY },
-       { "ERRORS", SEC_ERRORS },
-       { "SEE ALSO", SEC_SEE_ALSO },
-       { "STANDARDS", SEC_STANDARDS },
-       { "HISTORY", SEC_HISTORY },
-       { "AUTHORS", SEC_AUTHORS },
-       { "CAVEATS", SEC_CAVEATS },
-       { "BUGS", SEC_BUGS },
-       { "SECURITY CONSIDERATIONS", SEC_SECURITY }
+static const char * const secnames[SEC__MAX] = {
+       NULL,
+       "NAME",
+       "LIBRARY",
+       "SYNOPSIS",
+       "DESCRIPTION",
+       "IMPLEMENTATION NOTES",
+       "RETURN VALUES",
+       "ENVIRONMENT",
+       "FILES",
+       "EXIT STATUS",
+       "EXAMPLES",
+       "DIAGNOSTICS",
+       "COMPATIBILITY",
+       "ERRORS",
+       "SEE ALSO",
+       "STANDARDS",
+       "HISTORY",
+       "AUTHORS",
+       "CAVEATS",
+       "BUGS",
+       "SECURITY CONSIDERATIONS",
+       NULL
 };
 
-
 /* 
  * FIXME: this is repeated in print_text() (html.c) and term_word()
  * (term.c).
  */
-int
+enum mdelim
 mdoc_iscdelim(char p)
 {
 
        switch (p) {
-       case('|'):
-               /* FALLTHROUGH */
        case('('):
                /* FALLTHROUGH */
        case('['):
-               return(1);
+               return(DELIM_OPEN);
+       case('|'):
+               return(DELIM_MIDDLE);
        case('.'):
                /* FALLTHROUGH */
        case(','):
@@ -91,21 +83,21 @@ mdoc_iscdelim(char p)
        case(')'):
                /* FALLTHROUGH */
        case(']'):
-               return(2);
+               return(DELIM_CLOSE);
        default:
                break;
        }
 
-       return(0);
+       return(DELIM_NONE);
 }
 
 
-int
+enum mdelim
 mdoc_isdelim(const char *p)
 {
 
        if ('\0' == p[0])
-               return(0);
+               return(DELIM_NONE);
        if ('\0' == p[1])
                return(mdoc_iscdelim(p[0]));
 
@@ -114,18 +106,18 @@ 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.
         */
-       return(0 == strcmp(p, "\\*(Ba"));
+       return(strcmp(p, "\\*(Ba") ? DELIM_NONE : DELIM_MIDDLE);
 }
 
 
 enum mdoc_sec 
-mdoc_atosec(const char *p)
+mdoc_str2sec(const char *p)
 {
        int              i;
 
-       for (i = 0; i < SECNAME_MAX; i++) 
-               if (0 == strcmp(p, secnames[i].name))
-                       return(secnames[i].sec);
+       for (i = 0; i < (int)SEC__MAX; i++) 
+               if (secnames[i] && 0 == strcmp(p, secnames[i]))
+                       return((enum mdoc_sec)i);
 
        return(SEC_CUSTOM);
 }