Back out OpenBSD special case (ok Ingo Schwarze).

[mandoc.git] / mdoc_strings.c

diff --git a/mdoc_strings.c b/mdoc_strings.c
index 0d63dac1d7d982b4c0eeb52a1b8d8a31c92f4547..33f5da15f207b641954fb1457e6ffaa99c82351e 100644 (file)
--- a/mdoc_strings.c
+++ b/mdoc_strings.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_strings.c,v 1.12 2009/10/27 08:26:12 kristaps Exp $ */
+/*     $Id: mdoc_strings.c,v 1.18 2010/05/09 21:06:50 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -14,6 +14,10 @@
  * 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>
@@ -56,11 +60,11 @@ static      const struct mdoc_secname secnames[SECNAME_MAX] = {
        { "SECURITY CONSIDERATIONS", SEC_SECURITY }
 };
 
-#ifdef __linux__
-extern char            *strptime(const char *, const char *, struct tm *);
-#endif
-
 
+/* 
+ * FIXME: this is repeated in print_text() (html.c) and term_word()
+ * (term.c).
+ */
 int
 mdoc_iscdelim(char p)
 {
@@ -68,6 +72,10 @@ mdoc_iscdelim(char p)
        switch (p) {
        case('|'):
                /* FALLTHROUGH */
+       case('('):
+               /* FALLTHROUGH */
+       case('['):
+               return(1);
        case('.'):
                /* FALLTHROUGH */
        case(','):
@@ -80,18 +88,10 @@ mdoc_iscdelim(char p)
                /* FALLTHROUGH */
        case('!'):
                /* FALLTHROUGH */
-       case('('):
-               /* FALLTHROUGH */
        case(')'):
                /* FALLTHROUGH */
-       case('['):
-               /* FALLTHROUGH */
        case(']'):
-               /* FALLTHROUGH */
-       case('{'):
-               /* FALLTHROUGH */
-       case('}'):
-               return(1);
+               return(2);
        default:
                break;
        }
@@ -104,11 +104,17 @@ int
 mdoc_isdelim(const char *p)
 {
 
-       if (0 == *p)
+       if ('\0' == p[0])
                return(0);
-       if (0 != *(p + 1))
-               return(0);
-       return(mdoc_iscdelim(*p));
+       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(0 == strcmp(p, "\\*(Ba"));
 }
 
 
@@ -125,31 +131,9 @@ mdoc_atosec(const char *p)
 }
 
 
-time_t
-mdoc_atotime(const char *p)
-{
-       struct tm        tm;
-       char            *pp;
-
-       memset(&tm, 0, 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
-mdoc_macro2len(int macro)
+mdoc_macro2len(enum mdoct macro)
 {
 
        switch (macro) {