]> git.cameronkatri.com Git - mandoc.git/blobdiff - mandoc.c
git.ckatri.com / mandoc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
In the SYNOPSIS, .Nm at the beginning of an input line starts
[mandoc.git] / mandoc.c
diff --git a/mandoc.c b/mandoc.c
index f1ac7c9ac8e8c001647f79b307cdb2b20e586383..69972c04dd560997ddcadd3ceaf46b31adb8b884 100644 (file)
--- a/mandoc.c
+++ b/mandoc.c
@@ -1,6 +1,6 @@
-/*     $Id: mandoc.c,v 1.16 2010/05/25 12:37:20 kristaps Exp $ */
+/*     $Id: mandoc.c,v 1.25 2010/07/21 20:35:03 kristaps Exp $ */
 /*
 /*
- * Copyright (c) 2008, 2009 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
@@ -27,165 +27,162 @@
 #include <string.h>
 #include <time.h>
 
 #include <string.h>
 #include <time.h>
 
+#include "mandoc.h"
 #include "libmandoc.h"
 
 #include "libmandoc.h"
 
-static int      a2time(time_t *, const char *, const char *);
+static int      a2time(time_t *, const char *, const char *);
 
 
 int
 
 
 int
-mandoc_special(const char *p)
+mandoc_special(char *p)
 {
 {
-       int              terminator;    /* Terminator for \s. */
-       int              lim;           /* Limit for N in \s. */
-       int              c, i;
+       int              len, i;
+       char             term;
+       char            *sv;
        
        
-       if ('\\' != *p++)
-               return(0);
+       len = 0;
+       term = '\0';
+       sv = p;
+
+       assert('\\' == *p);
+       p++;
 
 
-       switch (*p) {
-       case ('\''):
+       switch (*p++) {
+#if 0
+       case ('Z'):
+               /* FALLTHROUGH */
+       case ('X'):
+               /* FALLTHROUGH */
+       case ('x'):
                /* FALLTHROUGH */
                /* FALLTHROUGH */
-       case ('`'):
+       case ('w'):
                /* FALLTHROUGH */
                /* FALLTHROUGH */
-       case ('q'):
+       case ('v'):
                /* FALLTHROUGH */
                /* FALLTHROUGH */
-       case ('-'):
+       case ('S'):
                /* FALLTHROUGH */
                /* FALLTHROUGH */
-       case ('~'):
+       case ('R'):
                /* FALLTHROUGH */
                /* FALLTHROUGH */
-       case ('^'):
+       case ('o'):
                /* FALLTHROUGH */
                /* FALLTHROUGH */
-       case ('%'):
+       case ('N'):
                /* FALLTHROUGH */
                /* FALLTHROUGH */
-       case ('0'):
+       case ('l'):
                /* FALLTHROUGH */
                /* FALLTHROUGH */
-       case (' '):
+       case ('L'):
                /* FALLTHROUGH */
                /* FALLTHROUGH */
-       case ('|'):
+       case ('H'):
                /* FALLTHROUGH */
                /* FALLTHROUGH */
-       case ('&'):
+       case ('h'):
                /* FALLTHROUGH */
                /* FALLTHROUGH */
-       case ('.'):
+       case ('D'):
                /* FALLTHROUGH */
                /* FALLTHROUGH */
-       case (':'):
+       case ('C'):
                /* FALLTHROUGH */
                /* FALLTHROUGH */
-       case ('c'):
-               return(2);
-       case ('e'):
-               return(2);
+       case ('b'):
+               /* FALLTHROUGH */
+       case ('B'):
+               /* FALLTHROUGH */
+       case ('a'):
+               /* FALLTHROUGH */
+       case ('A'):
+               if (*p++ != '\'')
+                       return(0);
+               term = '\'';
+               break;
+#endif
        case ('s'):
        case ('s'):
-               if ('\0' == *++p)
-                       return(2);
-
-               c = 2;
-               terminator = 0;
-               lim = 1;
-
-               if (*p == '\'') {
-                       lim = 0;
-                       terminator = 1;
-                       ++p;
-                       ++c;
-               } else if (*p == '[') {
-                       lim = 0;
-                       terminator = 2;
-                       ++p;
-                       ++c;
-               } else if (*p == '(') {
-                       lim = 2;
-                       terminator = 3;
-                       ++p;
-                       ++c;
-               }
+               if (ASCII_HYPH == *p)
+                       *p = '-';
+               if ('+' == *p || '-' == *p)
+                       p++;
 
 
-               if (*p == '+' || *p == '-') {
-                       ++p;
-                       ++c;
-               }
+               i = ('s' != *(p - 1));
 
 
-               if (*p == '\'') {
-                       if (terminator)
-                               return(0);
-                       lim = 0;
-                       terminator = 1;
-                       ++p;
-                       ++c;
-               } else if (*p == '[') {
-                       if (terminator)
-                               return(0);
-                       lim = 0;
-                       terminator = 2;
-                       ++p;
-                       ++c;
-               } else if (*p == '(') {
-                       if (terminator)
-                               return(0);
-                       lim = 2;
-                       terminator = 3;
-                       ++p;
-                       ++c;
-               }
-
-               /* TODO: needs to handle floating point. */
-
-               if ( ! isdigit((u_char)*p))
-                       return(0);
-
-               for (i = 0; isdigit((u_char)*p); i++) {
-                       if (lim && i >= lim)
-                               break;
-                       ++p;
-                       ++c;
+               switch (*p++) {
+               case ('('):
+                       len = 2;
+                       break;
+               case ('['):
+                       term = ']';
+                       break;
+               case ('\''):
+                       term = '\'';
+                       break;
+               default:
+                       len = 1;
+                       p--;
+                       break;
                }
 
                }
 
-               if (terminator && terminator < 3) {
-                       if (1 == terminator && *p != '\'')
-                               return(0);
-                       if (2 == terminator && *p != ']')
+               if (ASCII_HYPH == *p)
+                       *p = '-';
+               if ('+' == *p || '-' == *p) {
+                       if (i++)
                                return(0);
                                return(0);
-                       ++p;
-                       ++c;
-               }
-
-               return(c);
+                       p++;
+               } 
+               
+               if (0 == i)
+                       return(0);
+               break;
+#if 0
+       case ('Y'):
+               /* FALLTHROUGH */
+       case ('V'):
+               /* FALLTHROUGH */
+       case ('$'):
+               /* FALLTHROUGH */
+       case ('n'):
+               /* FALLTHROUGH */
+       case ('k'):
+               /* FALLTHROUGH */
+#endif
+       case ('M'):
+               /* FALLTHROUGH */
+       case ('m'):
+               /* FALLTHROUGH */
        case ('f'):
                /* FALLTHROUGH */
        case ('F'):
                /* FALLTHROUGH */
        case ('*'):
        case ('f'):
                /* FALLTHROUGH */
        case ('F'):
                /* FALLTHROUGH */
        case ('*'):
-               if (0 == *++p || ! isgraph((u_char)*p))
-                       return(0);
-               switch (*p) {
+               switch (*p++) {
                case ('('):
                case ('('):
-                       if (0 == *++p || ! isgraph((u_char)*p))
-                               return(0);
-                       return(4);
+                       len = 2;
+                       break;
                case ('['):
                case ('['):
-                       for (c = 3, p++; *p && ']' != *p; p++, c++)
-                               if ( ! isgraph((u_char)*p))
-                                       break;
-                       return(*p == ']' ? c : 0);
+                       term = ']';
+                       break;
                default:
                default:
+                       len = 1;
+                       p--;
                        break;
                }
                        break;
                }
-               return(3);
+               break;
        case ('('):
        case ('('):
-               if (0 == *++p || ! isgraph((u_char)*p))
-                       return(0);
-               if (0 == *++p || ! isgraph((u_char)*p))
-                       return(0);
-               return(4);
+               len = 2;
+               break;
        case ('['):
        case ('['):
+               term = ']';
                break;
        default:
                break;
        default:
-               return(0);
+               len = 1;
+               p--;
+               break;
        }
 
        }
 
-       for (c = 3, p++; *p && ']' != *p; p++, c++)
-               if ( ! isgraph((u_char)*p))
-                       break;
+       if (term) {
+               for ( ; *p && term != *p; p++)
+                       if (ASCII_HYPH == *p)
+                               *p = '-';
+               return(*p ? (int)(p - sv) : 0);
+       }
 
 
-       return(*p == ']' ? c : 0);
+       for (i = 0; *p && i < len; i++, p++)
+               if (ASCII_HYPH == *p)
+                       *p = '-';
+       return(i == len ? (int)(p - sv) : 0);
 }
 
 
 }
 
 
@@ -302,8 +299,10 @@ mandoc_a2time(int flags, const char *p)
 
 
 int
 
 
 int
-mandoc_eos(const char *p, size_t sz)
+mandoc_eos(const char *p, size_t sz, int enclosed)
 {
 {
+       const char *q;
+       int found;
 
        if (0 == sz)
                return(0);
 
        if (0 == sz)
                return(0);
@@ -314,8 +313,9 @@ mandoc_eos(const char *p, size_t sz)
         * propogate outward.
         */
 
         * propogate outward.
         */
 
-       for ( ; sz; sz--) {
-               switch (p[(int)sz - 1]) {
+       found = 0;
+       for (q = p + (int)sz - 1; q >= p; q--) {
+               switch (*q) {
                case ('\"'):
                        /* FALLTHROUGH */
                case ('\''):
                case ('\"'):
                        /* FALLTHROUGH */
                case ('\''):
@@ -323,22 +323,22 @@ mandoc_eos(const char *p, size_t sz)
                case (']'):
                        /* FALLTHROUGH */
                case (')'):
                case (']'):
                        /* FALLTHROUGH */
                case (')'):
+                       if (0 == found)
+                               enclosed = 1;
                        break;
                case ('.'):
                        break;
                case ('.'):
-                       /* Escaped periods. */
-                       if (sz > 1 && '\\' == p[(int)sz - 2])
-                               return(0);
                        /* FALLTHROUGH */
                case ('!'):
                        /* FALLTHROUGH */
                case ('?'):
                        /* FALLTHROUGH */
                case ('!'):
                        /* FALLTHROUGH */
                case ('?'):
-                       return(1);
+                       found = 1;
+                       break;
                default:
                default:
-                       return(0);
+                       return(found && (!enclosed || isalnum(*q)));
                }
        }
 
                }
        }
 
-       return(0);
+       return(found && !enclosed);
 }
 
 
 }
 
 
A git conversion mirror of mandoc.bsd.lv