.Bl -column phrases ignore spacing rules for trailing punctuation

[mandoc.git] / term.h

diff --git a/term.h b/term.h
index 7f67e246bdeaa6b52260ff339c40c79df48e2694..dc28d33e9ef42ac550ac989c6ef7be1547566d3c 100644 (file)
--- a/term.h
+++ b/term.h
@@ -1,6 +1,6 @@
-/*     $Id: term.h,v 1.62 2010/06/11 07:23:04 kristaps Exp $ */
+/*     $Id: term.h,v 1.76 2010/07/25 22:15:07 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * 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
@@ -27,13 +27,15 @@ enum        termenc {
 
 enum   termtype {
        TERMTYPE_CHAR,
-       TERMTYPE_PS
+       TERMTYPE_PS,
+       TERMTYPE_PDF
 };
 
 enum   termfont {
        TERMFONT_NONE = 0,
        TERMFONT_BOLD,
-       TERMFONT_UNDER
+       TERMFONT_UNDER,
+       TERMFONT__MAX
 };
 
 #define        TERM_MAXMARGIN    100000 /* FIXME */
@@ -41,16 +43,32 @@ 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 */
-       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 */
-       size_t            psmargcur;    /* current pos in margin buf */
-       size_t            pspage;       /* current page */
+       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) */
+       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) */
+       size_t            pdfbytes;     /* current output byte */
+       size_t            pdflastpg;    /* byte of last page mark */
+       size_t            pdfbody;      /* start of body object */
+       size_t           *pdfobjs;      /* table of object offsets */
+       size_t            pdfobjsz;     /* size of pdfobjs */
 };
 
 struct termp {
@@ -77,6 +95,8 @@ struct        termp {
 #define        TERMP_NOSPLIT    (1 << 11)      /* See termp_an_pre/post(). */
 #define        TERMP_SPLIT      (1 << 12)      /* See termp_an_pre/post(). */
 #define        TERMP_ANPREC     (1 << 13)      /* See termp_an_pre(). */
+#define        TERMP_KEEP       (1 << 14)      /* Keep words together. */
+#define        TERMP_PREKEEP    (1 << 15)      /* ...starting with the next one. */
        char             *buf;          /* Output buffer. */
        enum termenc      enc;          /* Type of encoding. */
        void             *symtab;       /* Encoded-symbol table. */
@@ -90,6 +110,9 @@ struct       termp {
        void            (*end)(struct termp *);
        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;
@@ -106,8 +129,12 @@ void                 term_begin(struct termp *, term_margin,
                        term_margin, const void *);
 void             term_end(struct termp *);
 
-size_t           term_hspan(const struct roffsu *);
-size_t           term_vspan(const struct roffsu *);
+size_t           term_hspan(const struct termp *, 
+                       const struct roffsu *);
+size_t           term_vspan(const struct termp *,
+                       const struct roffsu *);
+size_t           term_strlen(const struct termp *, const char *);
+size_t           term_len(const struct termp *, size_t);
 
 enum termfont    term_fonttop(struct termp *);
 const void      *term_fontq(struct termp *);