Fixed some character-escapes.

[mandoc.git] / mdocterm.c

diff --git a/mdocterm.c b/mdocterm.c
index 820edd5b61de087f366ce3cabff64dd7c4728639..7fbd94665c2b2e9fa7f9ace2a376e9b748387f50 100644 (file)
--- a/mdocterm.c
+++ b/mdocterm.c
@@ -1,4 +1,4 @@
-/* $Id: mdocterm.c,v 1.29 2009/03/04 13:57:35 kristaps Exp $ */
+/* $Id: mdocterm.c,v 1.31 2009/03/04 14:13:05 kristaps Exp $ */

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


@@ -78,6 +78,8 @@ static        struct termenc    termenc1[] = {
 static struct termenc    termenc2[] = {
        { "rB",           TERMSYM_RBRACK },
        { "lB",           TERMSYM_LBRACK },
 static struct termenc    termenc2[] = {
        { "rB",           TERMSYM_RBRACK },
        { "lB",           TERMSYM_LBRACK },

+       { "ra",           TERMSYM_RANGLE },
+       { "la",           TERMSYM_LANGLE },

        { "Lq",           TERMSYM_LDQUOTE },
        { "lq",           TERMSYM_LDQUOTE },
        { "Rq",           TERMSYM_RDQUOTE },
        { "Lq",           TERMSYM_LDQUOTE },
        { "lq",           TERMSYM_LDQUOTE },
        { "Rq",           TERMSYM_RDQUOTE },


@@ -99,7 +101,7 @@ static       struct termenc    termenc2[] = {
        { "Le",           TERMSYM_LE },
        { "<=",           TERMSYM_LE },
        { "Ge",           TERMSYM_GE },
        { "Le",           TERMSYM_LE },
        { "<=",           TERMSYM_LE },
        { "Ge",           TERMSYM_GE },

-       { "=>",           TERMSYM_GE },
+       { ">=",           TERMSYM_GE },

        { "==",           TERMSYM_EQ },
        { "Ne",           TERMSYM_NEQ },
        { "!=",           TERMSYM_NEQ },
        { "==",           TERMSYM_EQ },
        { "Ne",           TERMSYM_NEQ },
        { "!=",           TERMSYM_NEQ },


@@ -161,6 +163,8 @@ static      struct termsym    termsym_ansi[] = {
        { " ", 1 },             /* TERMSYM_SPACE */
        { ".", 1 },             /* TERMSYM_PERIOD */
        { "", 0 },              /* TERMSYM_BREAK */
        { " ", 1 },             /* TERMSYM_SPACE */
        { ".", 1 },             /* TERMSYM_PERIOD */
        { "", 0 },              /* TERMSYM_BREAK */

+       { "<", 1 },             /* TERMSYM_LANGLE */
+       { ">", 1 },             /* TERMSYM_RANGLE */

 };
 
 static const char        ansi_clear[]  = { 27, '[', '0', 'm' };
 };
 
 static const char        ansi_clear[]  = { 27, '[', '0', 'm' };


@@ -316,7 +320,7 @@ flushln(struct termp *p)
                                putchar('\n');
                                for (j = 0; j < p->rmargin; j++)
                                        putchar(' ');
                                putchar('\n');
                                for (j = 0; j < p->rmargin; j++)
                                        putchar(' ');

-                               vis = p->offset;
+                               vis = p->rmargin - p->offset;

                        } else if (vis + vsz > bp) 
                                warnx("word breaks right margin");
 
                        } else if (vis + vsz > bp) 
                                warnx("word breaks right margin");