Fixed TERMP_NOBREAK and line overruns.

[mandoc.git] / term.h

diff --git a/term.h b/term.h
index c51ee48d6bc574e3f00153fc5c40301da3263e7c..95e75d2af55fd7f32d8c5c8f5265529efe4ec864 100644 (file)
--- a/term.h
+++ b/term.h
@@ -1,4 +1,4 @@
-/* $Id: term.h,v 1.6 2009/02/25 12:09:20 kristaps Exp $ */
+/* $Id: term.h,v 1.12 2009/03/01 13:06:49 kristaps Exp $ */

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


@@ -37,21 +37,26 @@ struct      termp {
 #define        TERMP_NOBREAK    (1 << 4)       /* No break after flush. */
 #define        TERMP_LITERAL    (1 << 5)       /* Literal words. */
 #define        TERMP_IGNDELIM   (1 << 6)       /* Delims like regulars. */
 #define        TERMP_NOBREAK    (1 << 4)       /* No break after flush. */
 #define        TERMP_LITERAL    (1 << 5)       /* Literal words. */
 #define        TERMP_IGNDELIM   (1 << 6)       /* Delims like regulars. */

+#define        TERMP_NONOSPACE  (1 << 7)       /* No space (no autounset). */

        char             *buf;
 };
 
 struct termpair {
        char             *buf;
 };
 
 struct termpair {

+       struct termpair  *ppair;

        int               type;
 #define        TERMPAIR_FLAG    (1 << 0)
        int               type;
 #define        TERMPAIR_FLAG    (1 << 0)

-       union {
-               int       flag;
-       } data;
+       int               flag;
+       size_t            offset;
+       size_t            rmargin;
+       int               count;

 };
 
 };
 

-#define        TERMPAIR_SETFLAG(p, fl) \
+#define        TERMPAIR_SETFLAG(termp, p, fl) \

        do { \
        do { \

-               (p)->data.flag = (fl); \
-               (p)->type = TERMPAIR_FLAG; \
+               assert(! (TERMPAIR_FLAG & (p)->type)); \
+               (termp)->flags |= (fl); \
+               (p)->flag = (fl); \
+               (p)->type |= TERMPAIR_FLAG; \

        } while (0)
 
 struct termact {
        } while (0)
 
 struct termact {