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

[mandoc.git] / term.h

diff --git a/term.h b/term.h
index 78577714e129be370fc35e17b68286cd1b7de03e..3e1d4df06d7e7efb935a020060c31e7014875b13 100644 (file)
--- a/term.h
+++ b/term.h
@@ -1,6 +1,6 @@
-/*     $Id: term.h,v 1.70 2010/06/30 12:27:55 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
@@ -42,9 +42,10 @@ enum termfont {
 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_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 */
@@ -52,6 +53,7 @@ struct        termp_ps {
        size_t            psmargcur;    /* cur index in margin buf */
        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) */
@@ -103,7 +105,7 @@ struct      termp {
        void            (*endline)(struct termp *);
        void            (*advance)(struct termp *, size_t);
        size_t          (*width)(const struct termp *, char);
-       size_t          (*hspan)(const struct termp *,
+       double          (*hspan)(const struct termp *,
                                const struct roffsu *);
        const void       *argf;         /* arg for headf/footf */
        union {