Handle nested, recursive mathematical subexpressions. This is

[mandoc.git] / out.c

diff --git a/out.c b/out.c
index 5bc69ca20f616bb6474783940af006782e1f12fd..8be9514e5d6394771a315f53572d036d79b50004 100644 (file)
--- a/out.c
+++ b/out.c
@@ -1,4 +1,4 @@
-/*     $Id: out.c,v 1.25 2010/08/24 12:18:49 kristaps Exp $ */
+/*     $Id: out.c,v 1.28 2010/08/24 13:56:51 kristaps Exp $ */

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


@@ -220,6 +220,8 @@ a2roffdeco(enum roffdeco *d, const char **word, size_t *sz)
                        break;
                }
                break;
                        break;
                }
                break;

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

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


@@ -277,6 +279,26 @@ a2roffdeco(enum roffdeco *d, const char **word, size_t *sz)
                        i++;
                } 
 
                        i++;
                } 
 

+               /* Handle embedded numerical subexp or escape. */
+
+               if ('(' == wp[i]) {
+                       while (wp[i] && ')' != wp[i])
+                               if ('\\' == wp[i++]) {
+                                       /* Handle embedded escape. */
+                                       *word = &wp[i];
+                                       i += a2roffdeco(&dd, word, sz);
+                               }
+
+                       if (')' == wp[i++])
+                               break;
+
+                       *d = DECO_NONE;
+                       return(i - 1);
+               } else if ('\\' == wp[i]) {
+                       *word = &wp[++i];
+                       i += a2roffdeco(&dd, word, sz);
+               }
+

                break;
        case ('['):
                *d = DECO_SPECIAL;
                break;
        case ('['):
                *d = DECO_SPECIAL;


@@ -293,6 +315,12 @@ a2roffdeco(enum roffdeco *d, const char **word, size_t *sz)
                } else
                        lim = 1;
                break;
                } else
                        lim = 1;
                break;

+       case ('w'):
+               if ('\'' == wp[i++]) {
+                       term = '\'';
+                       break;
+               } 
+               /* FALLTHROUGH */

        default:
                *d = DECO_SSPECIAL;
                i--;
        default:
                *d = DECO_SSPECIAL;
                i--;