Remove all references to ESCAPE_PREDEF, which is now not exposed passed

[mandoc.git] / mandoc.c

diff --git a/mandoc.c b/mandoc.c
index 249a0dea92aa389961aeeaac17be73b44ece63de..465965a469c2b946a353e57c7afc9c85015696b2 100644 (file)
--- a/mandoc.c
+++ b/mandoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mandoc.c,v 1.50 2011/05/14 16:06:09 kristaps Exp $ */
+/*     $Id: mandoc.c,v 1.53 2011/05/24 21:31:23 kristaps Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>


@@ -125,6 +125,14 @@ mandoc_escape(const char **end, const char **start, int *sz)
                break;
        case ('['):
                gly = ESCAPE_SPECIAL;
                break;
        case ('['):
                gly = ESCAPE_SPECIAL;

+               /*
+                * Unicode escapes are defined in groff as \[uXXXX] to
+                * \[u10FFFF], where the contained value must be a valid
+                * Unicode codepoint.  Here, however, only check whether
+                * it's not a zero-width escape.
+                */
+               if ('u' == cp[i] && ']' != cp[i + 1])
+                       gly = ESCAPE_UNICODE;

                term = ']';
                break;
        case ('C'):
                term = ']';
                break;
        case ('C'):


@@ -156,10 +164,6 @@ mandoc_escape(const char **end, const char **start, int *sz)
                if (ESCAPE_ERROR == gly)
                        gly = ESCAPE_IGNORE;
                /* FALLTHROUGH */
                if (ESCAPE_ERROR == gly)
                        gly = ESCAPE_IGNORE;
                /* FALLTHROUGH */

-       case ('*'):
-               if (ESCAPE_ERROR == gly)
-                       gly = ESCAPE_PREDEF;
-               /* FALLTHROUGH */

        case ('f'):
                if (ESCAPE_ERROR == gly)
                        gly = ESCAPE_FONT;
        case ('f'):
                if (ESCAPE_ERROR == gly)
                        gly = ESCAPE_FONT;


@@ -704,7 +708,7 @@ mandoc_strntou(const char *p, size_t sz, int base)
                return(-1);
 
        memcpy(buf, p, sz);
                return(-1);
 
        memcpy(buf, p, sz);

-       buf[sz] = '\0';
+       buf[(int)sz] = '\0';

 
        errno = 0;
        v = strtol(buf, &ep, base);
 
        errno = 0;
        v = strtol(buf, &ep, base);