summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--term.c33
-rw-r--r--term.h1
-rw-r--r--term_ps.c20
3 files changed, 29 insertions, 25 deletions
diff --git a/term.c b/term.c
index 38c1be60..d87f123b 100644
--- a/term.c
+++ b/term.c
@@ -161,21 +161,17 @@ term_flushln(struct termp *p)
*/
vbl = p->flags & TERMP_NOLPAD ? 0 : p->offset;
- /*
- * FIXME: if bp is zero, we still output the first word before
- * breaking the line.
- */
-
vis = vend = i = 0;
- while (i < (int)p->col) {
+ while (i < (int)p->col) {
/*
- * Handle literal tab characters.
+ * Handle literal tab characters: collapse all
+ * subsequent tabs into a single huge set of spaces.
*/
for (j = i; j < (int)p->col; j++) {
if ('\t' != p->buf[j])
break;
- vend = (vis/p->tabwidth+1)*p->tabwidth;
+ vend = (vis / p->tabwidth + 1) * p->tabwidth;
vbl += vend - vis;
vis = vend;
}
@@ -191,15 +187,21 @@ term_flushln(struct termp *p)
for (jhy = 0; j < (int)p->col; j++) {
if ((j && ' ' == p->buf[j]) || '\t' == p->buf[j])
break;
- if (8 != p->buf[j]) {
- if (vend > vis && vend < bp &&
- ASCII_HYPH == p->buf[j])
- jhy = j;
- vend += (*p->width)(p, p->buf[j]);
- } else {
+
+ /* Back over the the last printed character. */
+ if (8 == p->buf[j]) {
assert(j);
vend -= (*p->width)(p, p->buf[j - 1]);
+ continue;
}
+
+ /* Regular word. */
+ /* Break at the hyphen point if we overrun. */
+ if (vend > vis && vend < bp &&
+ ASCII_HYPH == p->buf[j])
+ jhy = j;
+
+ vend += (*p->width)(p, p->buf[j]);
}
/*
@@ -308,7 +310,8 @@ term_flushln(struct termp *p)
/* Right-pad. */
if (maxvis > vis + /* LINTED */
- ((TERMP_TWOSPACE & p->flags) ? (*p->width)(p, ' ') : 0)) {
+ ((TERMP_TWOSPACE & p->flags) ?
+ (*p->width)(p, ' ') : 0)) {
p->viscol += maxvis - vis;
(*p->advance)(p, maxvis - vis);
vis += (maxvis - vis);
diff --git a/term.h b/term.h
index 28efc9e7..298d232a 100644
--- a/term.h
+++ b/term.h
@@ -49,7 +49,6 @@ struct termp_ps {
char *psmarg; /* margin buf */
size_t psmargsz; /* margin buf size */
size_t psmargcur; /* current pos in margin buf */
- size_t pspage; /* current page */
char last; /* character buffer */
enum termfont lastf; /* last set font */
};
diff --git a/term_ps.c b/term_ps.c
index 4b232ab1..19cb19c1 100644
--- a/term_ps.c
+++ b/term_ps.c
@@ -31,14 +31,21 @@
#include "main.h"
#include "term.h"
+/* TODO: all this will go away with different paper sizes. */
+#define PS_CHAR_HEIGHT 12
+#define PS_CHAR_TOPMARG (792 - 24)
+#define PS_CHAR_TOP (PS_CHAR_TOPMARG - 36)
+#define PS_CHAR_LEFT 36
+#define PS_CHAR_BOTMARG 24
+#define PS_CHAR_BOT (PS_CHAR_BOTMARG + 36)
+
struct glyph {
int wx; /* WX in AFM */
};
-#define MAXCHAR 95
-
struct font {
const char *name; /* FontName in AFM */
+#define MAXCHAR 95 /* total characters we can handle */
struct glyph gly[MAXCHAR]; /* glyph metrics */
};
@@ -342,13 +349,7 @@ static const struct font fonts[3] = {
} },
};
-#define PS_CHAR_HEIGHT 12
-#define PS_CHAR_TOPMARG (792 - 24)
-#define PS_CHAR_TOP (PS_CHAR_TOPMARG - 36)
-#define PS_CHAR_LEFT 36
-#define PS_CHAR_BOTMARG 24
-#define PS_CHAR_BOT (PS_CHAR_BOTMARG + 36)
-
+/* These work the buffer used by the header and footer. */
#define PS_BUFSLOP 128
#define PS_GROWBUF(p, sz) \
do if ((p)->engine.ps.psmargcur + (sz) > \
@@ -388,6 +389,7 @@ ps_alloc(void)
return(NULL);
p->defrmargin = 612 - (PS_CHAR_LEFT * 2);
+
p->type = TERMTYPE_PS;
p->letter = ps_letter;
p->begin = ps_begin;