.Bl -column phrases ignore spacing rules for trailing punctuation

[mandoc.git] / term.h

diff --git a/term.h b/term.h
index d12e754f632e7710409d688ebc69c7c96d4ca7ce..dc28d33e9ef42ac550ac989c6ef7be1547566d3c 100644 (file)
--- a/term.h
+++ b/term.h
@@ -1,6 +1,6 @@
-/*     $Id: term.h,v 1.68 2010/06/29 14:18:05 kristaps Exp $ */
+/*     $Id: term.h,v 1.76 2010/07/25 22:15:07 kristaps 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


@@ -27,7 +27,8 @@ enum  termenc {
 
 enum   termtype {
        TERMTYPE_CHAR,
 
 enum   termtype {
        TERMTYPE_CHAR,

-       TERMTYPE_PS
+       TERMTYPE_PS,
+       TERMTYPE_PDF

 };
 
 enum   termfont {
 };
 
 enum   termfont {


@@ -42,25 +43,32 @@ 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 (points) */
-       size_t            psrow;        /* visible row (points) */
+#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;    /* cur index in margin buf */
        char              last;         /* character buffer */
        enum termfont     lastf;        /* last set font */
        char             *psmarg;       /* margin buf */
        size_t            psmargsz;     /* margin buf size */
        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            pages;        /* number of pages shown */

-       size_t            lineheight;   /* each line's height (points) */
-       size_t            top;          /* body top (points) */
-       size_t            bottom;       /* body bottom (points) */
-       size_t            height;       /* total height (points) */
-       size_t            width;        /* total width (points) */
-       size_t            left;         /* body left (points) */
-       size_t            header;       /* header position (points) */
-       size_t            footer;       /* footer position (points) */
+       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 {
 };
 
 struct termp {


@@ -103,6 +111,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;