Cleaned up ctype functions (netbsd).

[mandoc.git] / mdocterm.c

diff --git a/mdocterm.c b/mdocterm.c
index 7fbd94665c2b2e9fa7f9ace2a376e9b748387f50..278d224e840a53f1f8d441977a583835d1b2692a 100644 (file)
--- a/mdocterm.c
+++ b/mdocterm.c
@@ -1,4 +1,4 @@
-/* $Id: mdocterm.c,v 1.31 2009/03/04 14:13:05 kristaps Exp $ */
+/* $Id: mdocterm.c,v 1.33 2009/03/05 13:12:12 kristaps Exp $ */

 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -287,7 +287,7 @@ flushln(struct termp *p)
 
                /* LINTED */
                for (j = i, vsz = 0; j < p->col; j++) {
 
                /* LINTED */
                for (j = i, vsz = 0; j < p->col; j++) {

-                       if (isspace((int)p->buf[j]))
+                       if (isspace((u_char)p->buf[j]))

                                break;
                        else if (27 == p->buf[j]) {
                                assert(j + 4 <= p->col);
                                break;
                        else if (27 == p->buf[j]) {
                                assert(j + 4 <= p->col);


@@ -334,7 +334,7 @@ flushln(struct termp *p)
                 */
 
                for ( ; i < p->col; i++) {
                 */
 
                for ( ; i < p->col; i++) {

-                       if (isspace((int)p->buf[i]))
+                       if (isspace((u_char)p->buf[i]))

                                break;
                        putchar(p->buf[i]);
                }
                                break;
                        putchar(p->buf[i]);
                }


@@ -351,9 +351,11 @@ flushln(struct termp *p)
         */
 
        if ((TERMP_NOBREAK & p->flags) && vis >= maxvis) {
         */
 
        if ((TERMP_NOBREAK & p->flags) && vis >= maxvis) {

-               putchar('\n');
-               for (i = 0; i < p->rmargin; i++)
-                       putchar(' ');
+               if ( ! (TERMP_NONOBREAK & p->flags)) {
+                       putchar('\n');
+                       for (i = 0; i < p->rmargin; i++)
+                               putchar(' ');
+               }

                p->col = 0;
                return;
        }
                p->col = 0;
                return;
        }


@@ -363,10 +365,11 @@ flushln(struct termp *p)
         * pad to the right margin and stay off.
         */
 
         * pad to the right margin and stay off.
         */
 

-       if (p->flags & TERMP_NOBREAK) 
-               for ( ; vis < maxvis; vis++)
-                       putchar(' ');
-       else
+       if (p->flags & TERMP_NOBREAK) {
+               if ( ! (TERMP_NONOBREAK & p->flags))
+                       for ( ; vis < maxvis; vis++)
+                               putchar(' ');
+       } else

                putchar('\n');
 
        p->col = 0;
                putchar('\n');
 
        p->col = 0;


@@ -434,13 +437,13 @@ word(struct termp *p, const char *word)
 
        /* LINTED */
        for (j = i = 0; i < len; i++) {
 
        /* LINTED */
        for (j = i = 0; i < len; i++) {

-               if ( ! isspace((int)word[i])) {
+               if ( ! isspace((u_char)word[i])) {

                        j++;
                        continue;
                } 
                
                /* Escaped spaces don't delimit... */
                        j++;
                        continue;
                } 
                
                /* Escaped spaces don't delimit... */

-               if (i > 0 && isspace((int)word[i]) && 
+               if (i > 0 && isspace((u_char)word[i]) && 

                                '\\' == word[i - 1]) {
                        j++;
                        continue;
                                '\\' == word[i - 1]) {
                        j++;
                        continue;


@@ -646,7 +649,7 @@ header(struct termp *p, const struct mdoc_meta *meta)
                        meta->title, pp ? pp : "");
 
        for (bufp = title; *bufp; bufp++)
                        meta->title, pp ? pp : "");
 
        for (bufp = title; *bufp; bufp++)

-               *bufp = toupper(*bufp);
+               *bufp = toupper((u_char)*bufp);

        
        p->offset = 0;
        p->rmargin = (p->maxrmargin - strlen(buf)) / 2;
        
        p->offset = 0;
        p->rmargin = (p->maxrmargin - strlen(buf)) / 2;