Note discarding of \m, \M, and \s in COMPATIBILITY sections.

[mandoc.git] / term.h

diff --git a/term.h b/term.h
index 861abc70ab9354a83bcb7f52f5801113b31f11c4..3e1d4df06d7e7efb935a020060c31e7014875b13 100644 (file)
--- a/term.h
+++ b/term.h
@@ -1,6 +1,6 @@
-/*     $Id: term.h,v 1.67 2010/06/28 23:26:09 kristaps Exp $ */
+/*     $Id: term.h,v 1.74 2010/07/13 23:53:20 schwarze Exp $ */

 /*
 /*

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

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -33,7 +33,8 @@ enum  termtype {
 enum   termfont {
        TERMFONT_NONE = 0,
        TERMFONT_BOLD,
 enum   termfont {
        TERMFONT_NONE = 0,
        TERMFONT_BOLD,

-       TERMFONT_UNDER
+       TERMFONT_UNDER,
+       TERMFONT__MAX

 };
 
 #define        TERM_MAXMARGIN    100000 /* FIXME */
 };
 
 #define        TERM_MAXMARGIN    100000 /* FIXME */


@@ -41,16 +42,27 @@ enum        termfont {
 typedef void   (*term_margin)(struct termp *, const void *);
 
 struct termp_ps {
 typedef void   (*term_margin)(struct termp *, const void *);
 
 struct termp_ps {

-       int               psstate;      /* state of ps output */
+       int               flags;

 #define        PS_INLINE        (1 << 0)       /* we're in a word */
 #define        PS_MARGINS       (1 << 1)       /* we're in the margins */
 #define        PS_INLINE        (1 << 0)       /* we're in a word */
 #define        PS_MARGINS       (1 << 1)       /* we're in the margins */

-       size_t            pscol;        /* visible column */
-       size_t            psrow;        /* visible row */
+#define        PS_NEWPAGE       (1 << 2)       /* new page, no words yet */
+       size_t            pscol;        /* visible column (AFM units) */
+       size_t            psrow;        /* visible row (AFM units) */

        char             *psmarg;       /* margin buf */
        size_t            psmargsz;     /* margin buf size */
        char             *psmarg;       /* margin buf */
        size_t            psmargsz;     /* margin buf size */

-       size_t            psmargcur;    /* current pos in margin buf */
+       size_t            psmargcur;    /* cur index in margin buf */

        char              last;         /* character buffer */
        enum termfont     lastf;        /* last set font */
        char              last;         /* character buffer */
        enum termfont     lastf;        /* last set font */

+       size_t            scale;        /* font scaling factor */
+       size_t            pages;        /* number of pages shown */
+       size_t            lineheight;   /* line height (AFM units) */
+       size_t            top;          /* body top (AFM units) */
+       size_t            bottom;       /* body bottom (AFM units) */
+       size_t            height;       /* page height (AFM units */
+       size_t            width;        /* page width (AFM units) */
+       size_t            left;         /* body left (AFM units) */
+       size_t            header;       /* header pos (AFM units) */
+       size_t            footer;       /* footer pos (AFM units) */

 };
 
 struct termp {
 };
 
 struct termp {


@@ -93,6 +105,8 @@ struct       termp {
        void            (*endline)(struct termp *);
        void            (*advance)(struct termp *, size_t);
        size_t          (*width)(const struct termp *, char);
        void            (*endline)(struct termp *);
        void            (*advance)(struct termp *, size_t);
        size_t          (*width)(const struct termp *, char);

+       double          (*hspan)(const struct termp *,
+                               const struct roffsu *);

        const void       *argf;         /* arg for headf/footf */
        union {
                struct termp_ps ps;
        const void       *argf;         /* arg for headf/footf */
        union {
                struct termp_ps ps;