Initial PDF shim over PS. This produces working PDF output with -Tpdf.

[mandoc.git] / mdoc_strings.c

diff --git a/mdoc_strings.c b/mdoc_strings.c
index 126a2439e0ca9126e8e66e02d1c86f351ad10c07..c05807f1b63247a938c2bce709b6dc8746782d78 100644 (file)
--- a/mdoc_strings.c
+++ b/mdoc_strings.c
@@ -1,6 +1,6 @@
-/*     $Id: mdoc_strings.c,v 1.8 2009/06/22 12:22:35 kristaps Exp $ */
+/*     $Id: mdoc_strings.c,v 1.23 2010/06/19 20:46:28 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008 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


@@ -14,134 +14,61 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+

 #include <sys/types.h>
 
 #include <assert.h>
 #include <sys/types.h>
 
 #include <assert.h>

-#include <ctype.h>

 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

+#include <time.h>

 
 

+#include "mandoc.h"

 #include "libmdoc.h"
 
 #include "libmdoc.h"
 

-/* FIXME: this file is poorly named. */
-
-struct mdoc_secname {
-       const char      *name;  /* Name of section. */
-       enum mdoc_sec    sec;   /* Corresponding section. */
+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

 };
 
 };
 

-#define        SECNAME_MAX     (18)
-
-static const struct mdoc_secname secnames[SECNAME_MAX] = {
-       { "NAME", SEC_NAME },
-       { "LIBRARY", SEC_LIBRARY },
-       { "SYNOPSIS", SEC_SYNOPSIS },
-       { "DESCRIPTION", SEC_DESCRIPTION },
-       { "IMPLEMENTATION NOTES", SEC_IMPLEMENTATION },
-       { "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 },
-};
-
-#ifdef __linux__
-extern char            *strptime(const char *, const char *, struct tm *);
-#endif
-
-
-size_t
-mdoc_isescape(const char *p)
-{
-       size_t           c;
-       
-       if ('\\' != *p++)
-               return(0);
-
-       switch (*p) {
-       case ('\\'):
-               /* FALLTHROUGH */
-       case ('\''):
-               /* FALLTHROUGH */
-       case ('`'):
-               /* FALLTHROUGH */
-       case ('q'):
-               /* FALLTHROUGH */
-       case ('-'):
-               /* FALLTHROUGH */
-       case ('~'):
-               /* FALLTHROUGH */
-       case ('^'):
-               /* FALLTHROUGH */
-       case ('%'):
-               /* FALLTHROUGH */
-       case ('0'):
-               /* FALLTHROUGH */
-       case (' '):
-               /* FALLTHROUGH */
-       case ('|'):
-               /* FALLTHROUGH */
-       case ('&'):
-               /* FALLTHROUGH */
-       case ('.'):
-               /* FALLTHROUGH */
-       case (':'):
-               /* FALLTHROUGH */
-       case ('e'):
-               return(2);
-       case ('*'):
-               if (0 == *++p || ! isgraph((u_char)*p))
-                       return(0);
-               switch (*p) {
-               case ('('):
-                       if (0 == *++p || ! isgraph((u_char)*p))
-                               return(0);
-                       return(4);
-               case ('['):
-                       for (c = 3, p++; *p && ']' != *p; p++, c++)
-                               if ( ! isgraph((u_char)*p))
-                                       break;
-                       return(*p == ']' ? c : 0);
-               default:
-                       break;
-               }
-               return(3);
-       case ('('):
-               if (0 == *++p || ! isgraph((u_char)*p))
-                       return(0);
-               if (0 == *++p || ! isgraph((u_char)*p))
-                       return(0);
-               return(4);
-       case ('['):
-               break;
-       default:
-               return(0);
-       }
-
-       for (c = 3, p++; *p && ']' != *p; p++, c++)
-               if ( ! isgraph((u_char)*p))
-                       break;
-
-       return(*p == ']' ? c : 0);
-}
-
-
-int
+/* 
+ * FIXME: this is repeated in print_text() (html.c) and term_word()
+ * (term.c).
+ */
+enum mdelim

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

-       case('|'):
+       case('('):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

+       case('['):
+               return(DELIM_OPEN);
+       case('|'):
+               return(DELIM_MIDDLE);

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


@@ -154,76 +81,52 @@ mdoc_iscdelim(char p)
                /* FALLTHROUGH */
        case('!'):
                /* FALLTHROUGH */
                /* FALLTHROUGH */
        case('!'):
                /* FALLTHROUGH */

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

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

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

        case(']'):
        case(']'):

-               /* FALLTHROUGH */
-       case('{'):
-               /* FALLTHROUGH */
-       case('}'):
-               return(1);
+               return(DELIM_CLOSE);

        default:
                break;
        }
 
        default:
                break;
        }
 

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

 }
 
 
 }
 
 

-int
+enum mdelim

 mdoc_isdelim(const char *p)
 {
 
 mdoc_isdelim(const char *p)
 {
 

-       if (0 == *p)
-               return(0);
-       if (0 != *(p + 1))
-               return(0);
-       return(mdoc_iscdelim(*p));
+       if ('\0' == p[0])
+               return(DELIM_NONE);
+       if ('\0' == p[1])
+               return(mdoc_iscdelim(p[0]));
+
+       /*
+        * XXX; account for groff bubu where the \*(Ba reserved string
+        * is treated in exactly the same way as the vertical bar.  This
+        * is the only function that checks for this.
+        */
+       return(strcmp(p, "\\*(Ba") ? DELIM_NONE : DELIM_MIDDLE);

 }
 
 
 enum mdoc_sec 
 }
 
 
 enum mdoc_sec 

-mdoc_atosec(const char *p)
+mdoc_str2sec(const char *p)

 {
        int              i;
 
 {
        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);
 }
 
 
 
        return(SEC_CUSTOM);
 }
 
 

-time_t
-mdoc_atotime(const char *p)
-{
-       struct tm        tm;
-       char            *pp;
-
-       bzero(&tm, sizeof(struct tm));
-
-       if (0 == strcmp(p, "$" "Mdocdate$"))
-               return(time(NULL));
-       if ((pp = strptime(p, "$" "Mdocdate: %b %d %Y $", &tm)) && 0 == *pp)
-               return(mktime(&tm));
-       /* XXX - this matches "June 1999", which is wrong. */
-       if ((pp = strptime(p, "%b %d %Y", &tm)) && 0 == *pp)
-               return(mktime(&tm));
-       if ((pp = strptime(p, "%b %d, %Y", &tm)) && 0 == *pp)
-               return(mktime(&tm));
-
-       return(0);
-}
-
-

 /* FIXME: move this into an editable .in file. */
 size_t
 /* FIXME: move this into an editable .in file. */
 size_t

-mdoc_macro2len(int macro)
+mdoc_macro2len(enum mdoct macro)

 {
 
        switch (macro) {
 {
 
        switch (macro) {