`Sm' no longer produces a linebreak when used in `Bd'.

[mandoc.git] / mandoc.c

diff --git a/mandoc.c b/mandoc.c
index 7bba8cbb6878a3df4a957146d9fcb2b330d45478..56a187de7a798ff73b28c5a97bceac68daa3ee03 100644 (file)
--- a/mandoc.c
+++ b/mandoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mandoc.c,v 1.28 2010/08/16 09:37:58 kristaps Exp $ */
+/*     $Id: mandoc.c,v 1.35 2010/09/04 20:18:53 kristaps Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *


@@ -55,14 +55,10 @@ mandoc_special(char *p)
                /* FALLTHROUGH */
        case ('x'):
                /* FALLTHROUGH */
                /* FALLTHROUGH */
        case ('x'):
                /* FALLTHROUGH */

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

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

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

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


@@ -130,6 +126,27 @@ mandoc_special(char *p)
                        p++;
                } 
                
                        p++;
                } 
                

+               /* Handle embedded numerical subexp or escape. */
+
+               if ('(' == *p) {
+                       while (*p && ')' != *p)
+                               if ('\\' == *p++) {
+                                       i = mandoc_special(--p);
+                                       if (0 == i)
+                                               return(0);
+                                       p += i;
+                               }
+
+                       if (')' == *p++)
+                               break;
+
+                       return(0);
+               } else if ('\\' == *p) {
+                       if (0 == (i = mandoc_special(p)))
+                               return(0);
+                       p += i;
+               }
+

                break;
 #if 0
        case ('Y'):
                break;
 #if 0
        case ('Y'):


@@ -140,9 +157,9 @@ mandoc_special(char *p)
                /* FALLTHROUGH */
        case ('n'):
                /* FALLTHROUGH */
                /* FALLTHROUGH */
        case ('n'):
                /* FALLTHROUGH */

+#endif

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

-#endif

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


@@ -171,6 +188,23 @@ mandoc_special(char *p)
        case ('['):
                term = ']';
                break;
        case ('['):
                term = ']';
                break;

+       case ('z'):
+               len = 1;
+               if ('\\' == *p) {
+                       if (0 == (i = mandoc_special(p)))
+                               return(0);
+                       p += i;
+                       return(*p ? (int)(p - sv) : 0);
+               }
+               break;
+       case ('o'):
+               /* FALLTHROUGH */
+       case ('w'):
+               if ('\'' == *p++) {
+                       term = '\'';
+                       break;
+               }
+               /* FALLTHROUGH */

        default:
                len = 1;
                p--;
        default:
                len = 1;
                p--;


@@ -199,7 +233,7 @@ mandoc_calloc(size_t num, size_t size)
        ptr = calloc(num, size);
        if (NULL == ptr) {
                perror(NULL);
        ptr = calloc(num, size);
        if (NULL == ptr) {
                perror(NULL);

-               exit(EXIT_FAILURE);
+               exit((int)MANDOCLEVEL_SYSERR);

        }
 
        return(ptr);
        }
 
        return(ptr);


@@ -214,7 +248,7 @@ mandoc_malloc(size_t size)
        ptr = malloc(size);
        if (NULL == ptr) {
                perror(NULL);
        ptr = malloc(size);
        if (NULL == ptr) {
                perror(NULL);

-               exit(EXIT_FAILURE);
+               exit((int)MANDOCLEVEL_SYSERR);

        }
 
        return(ptr);
        }
 
        return(ptr);


@@ -228,7 +262,7 @@ mandoc_realloc(void *ptr, size_t size)
        ptr = realloc(ptr, size);
        if (NULL == ptr) {
                perror(NULL);
        ptr = realloc(ptr, size);
        if (NULL == ptr) {
                perror(NULL);

-               exit(EXIT_FAILURE);
+               exit((int)MANDOCLEVEL_SYSERR);

        }
 
        return(ptr);
        }
 
        return(ptr);


@@ -243,7 +277,7 @@ mandoc_strdup(const char *ptr)
        p = strdup(ptr);
        if (NULL == p) {
                perror(NULL);
        p = strdup(ptr);
        if (NULL == p) {
                perror(NULL);

-               exit(EXIT_FAILURE);
+               exit((int)MANDOCLEVEL_SYSERR);

        }
 
        return(p);
        }
 
        return(p);