Correctly make quotes around `Lk' link-name argument. Noted by Aldis

[mandoc.git] / mandoc.c

diff --git a/mandoc.c b/mandoc.c
index a8c63ff175f3404c6bfb8535de2053ec70aeed4f..f63d7864df364b48a3c35fa0a60d1113789aa6f1 100644 (file)
--- a/mandoc.c
+++ b/mandoc.c
@@ -1,6 +1,6 @@
-/*     $Id: mandoc.c,v 1.18 2010/06/09 19:22:56 kristaps Exp $ */
+/*     $Id: mandoc.c,v 1.27 2010/07/25 19:05:59 joerg 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


@@ -31,187 +31,161 @@
 #include "libmandoc.h"
 
 static int      a2time(time_t *, const char *, const char *);
 #include "libmandoc.h"
 
 static int      a2time(time_t *, const char *, const char *);

-static int      spec_norm(char *, int);
-
-
-/*
- * "Normalise" a special string by converting its ASCII_HYPH entries
- * into actual hyphens.
- */
-static int
-spec_norm(char *p, int sz)
-{
-       int              i;
-
-       for (i = 0; i < sz; i++)
-               if (ASCII_HYPH == p[i])
-                       p[i] = '-';
-
-       return(sz);
-}

 
 
 int
 mandoc_special(char *p)
 {
 
 
 int
 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;
        
        char            *sv;
        

+       len = 0;
+       term = '\0';

        sv = p;
 
        sv = p;
 

-       if ('\\' != *p++)
-               return(spec_norm(sv, 0));
+       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 (ASCII_HYPH):
+       case ('S'):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case ('-'):
+       case ('R'):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case ('~'):
+       case ('o'):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case ('^'):
+       case ('N'):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case ('%'):
+       case ('l'):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case ('0'):
+       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 ('.'):
+       case ('b'):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (':'):
+       case ('B'):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case ('c'):
+       case ('a'):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case ('e'):
-               return(spec_norm(sv, 2));
+       case ('A'):
+               if (*p++ != '\'')
+                       return(0);
+               term = '\'';
+               break;
+#endif

        case ('s'):
        case ('s'):

-               if ('\0' == *++p)
-                       return(spec_norm(sv, 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 (*p == '+' || *p == '-') {
-                       ++p;
-                       ++c;
-               }
+               if (ASCII_HYPH == *p)
+                       *p = '-';
+               if ('+' == *p || '-' == *p)
+                       p++;

 
 

-               if (*p == '\'') {
-                       if (terminator)
-                               return(spec_norm(sv, 0));
-                       lim = 0;
-                       terminator = 1;
-                       ++p;
-                       ++c;
-               } else if (*p == '[') {
-                       if (terminator)
-                               return(spec_norm(sv, 0));
-                       lim = 0;
-                       terminator = 2;
-                       ++p;
-                       ++c;
-               } else if (*p == '(') {
-                       if (terminator)
-                               return(spec_norm(sv, 0));
-                       lim = 2;
-                       terminator = 3;
-                       ++p;
-                       ++c;
-               }
+               i = ('s' != *(p - 1));

 
 

-               /* TODO: needs to handle floating point. */
-
-               if ( ! isdigit((u_char)*p))
-                       return(spec_norm(sv, 0));
-
-               for (i = 0; isdigit((u_char)*p); i++) {
-                       if (lim && i >= lim)
-                               break;
-                       ++p;
-                       ++c;
-               }
-
-               if (terminator && terminator < 3) {
-                       if (1 == terminator && *p != '\'')
-                               return(spec_norm(sv, 0));
-                       if (2 == terminator && *p != ']')
-                               return(spec_norm(sv, 0));
-                       ++p;
-                       ++c;
+               switch (*p++) {
+               case ('('):
+                       len = 2;
+                       break;
+               case ('['):
+                       term = ']';
+                       break;
+               case ('\''):
+                       term = '\'';
+                       break;
+               case ('0'):
+                       i++;
+                       /* FALLTHROUGH */
+               default:
+                       len = 1;
+                       p--;
+                       break;

                }
 
                }
 

-               return(spec_norm(sv, c));
+               if (ASCII_HYPH == *p)
+                       *p = '-';
+               if ('+' == *p || '-' == *p) {
+                       if (i++)
+                               return(0);
+                       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 || isspace((u_char)*p))
-                       return(spec_norm(sv, 0));
-               switch (*p) {
+               switch (*p++) {

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

-                       if ('\0' == *++p || isspace((u_char)*p))
-                               return(spec_norm(sv, 0));
-                       return(spec_norm(sv, 4));
+                       len = 2;
+                       break;

                case ('['):
                case ('['):

-                       for (c = 3, p++; *p && ']' != *p; p++, c++)
-                               if (isspace((u_char)*p))
-                                       break;
-                       return(spec_norm(sv, *p == ']' ? c : 0));
+                       term = ']';
+                       break;

                default:
                default:

+                       len = 1;
+                       p--;

                        break;
                }
                        break;
                }

-               return(spec_norm(sv, 3));
+               break;

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

-               if ('\0' == *++p || isspace((u_char)*p))
-                       return(spec_norm(sv, 0));
-               if ('\0' == *++p || isspace((u_char)*p))
-                       return(spec_norm(sv, 0));
-               return(spec_norm(sv, 4));
+               len = 2;
+               break;

        case ('['):
        case ('['):

+               term = ']';

                break;
        default:
                break;
        default:

-               return(spec_norm(sv, 0));
+               len = 1;
+               p--;
+               break;

        }
 
        }
 

-       for (c = 3, p++; *p && ']' != *p; p++, c++)
-               if (isspace((u_char)*p))
-                       break;
+       if (term) {
+               for ( ; *p && term != *p; p++)
+                       if (ASCII_HYPH == *p)
+                               *p = '-';
+               return(*p ? (int)(p - sv) : 0);
+       }

 
 

-       return(spec_norm(sv, *p == ']' ? c : 0));
+       for (i = 0; *p && i < len; i++, p++)
+               if (ASCII_HYPH == *p)
+                       *p = '-';
+       return(i == len ? (int)(p - sv) : 0);

 }
 
 
 }
 
 


@@ -328,8 +302,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);


@@ -340,8 +316,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 ('\''):


@@ -349,22 +326,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((unsigned char)*q)));

                }
        }
 
                }
        }
 

-       return(0);
+       return(found && !enclosed);

 }
 
 
 }