-/* $Id: term_ps.c,v 1.72 2015/01/21 19:40:54 schwarze Exp $ */
+/* $Id: term_ps.c,v 1.85 2017/06/07 17:38:26 schwarze Exp $ */
/*
* Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze <schwarze@openbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
#include <sys/types.h>
#include <assert.h>
+#if HAVE_ERR
+#include <err.h>
+#endif
#include <stdarg.h>
#include <stdint.h>
#include <stdio.h>
#include "mandoc_aux.h"
#include "out.h"
#include "term.h"
+#include "manconf.h"
#include "main.h"
/* These work the buffer used by the header and footer. */
size_t pdfobjsz; /* size of pdfobjs */
};
-static double ps_hspan(const struct termp *,
+static int ps_hspan(const struct termp *,
const struct roffsu *);
static size_t ps_width(const struct termp *, int);
static void ps_advance(struct termp *, size_t);
static void ps_closepage(struct termp *);
static void ps_end(struct termp *);
static void ps_endline(struct termp *);
-static void ps_fclose(struct termp *);
static void ps_growbuf(struct termp *, size_t);
static void ps_letter(struct termp *, int);
static void ps_pclose(struct termp *);
+static void ps_plast(struct termp *);
static void ps_pletter(struct termp *, int);
-#if __GNUC__ - 0 >= 4
-__attribute__((__format__ (__printf__, 2, 3)))
-#endif
-static void ps_printf(struct termp *, const char *, ...);
+static void ps_printf(struct termp *, const char *, ...)
+ __attribute__((__format__ (__printf__, 2, 3)));
static void ps_putchar(struct termp *, char);
static void ps_setfont(struct termp *, enum termfont);
-static void ps_setwidth(struct termp *, int, size_t);
-static struct termp *pspdf_alloc(const struct mchars *, char *);
+static void ps_setwidth(struct termp *, int, int);
+static struct termp *pspdf_alloc(const struct manoutput *);
static void pdf_obj(struct termp *, size_t);
/*
};
void *
-pdf_alloc(const struct mchars *mchars, char *outopts)
+pdf_alloc(const struct manoutput *outopts)
{
struct termp *p;
- if (NULL != (p = pspdf_alloc(mchars, outopts)))
+ if (NULL != (p = pspdf_alloc(outopts)))
p->type = TERMTYPE_PDF;
- return(p);
+ return p;
}
void *
-ps_alloc(const struct mchars *mchars, char *outopts)
+ps_alloc(const struct manoutput *outopts)
{
struct termp *p;
- if (NULL != (p = pspdf_alloc(mchars, outopts)))
+ if (NULL != (p = pspdf_alloc(outopts)))
p->type = TERMTYPE_PS;
- return(p);
+ return p;
}
static struct termp *
-pspdf_alloc(const struct mchars *mchars, char *outopts)
+pspdf_alloc(const struct manoutput *outopts)
{
struct termp *p;
unsigned int pagex, pagey;
size_t marginx, marginy, lineheight;
- const char *toks[2];
const char *pp;
- char *v;
- p = mandoc_calloc(1, sizeof(struct termp));
- p->symtab = mchars;
+ p = mandoc_calloc(1, sizeof(*p));
+ p->tcol = p->tcols = mandoc_calloc(1, sizeof(*p->tcol));
+ p->maxtcol = 1;
+
p->enc = TERMENC_ASCII;
p->fontq = mandoc_reallocarray(NULL,
- (p->fontsz = 8), sizeof(enum termfont));
+ (p->fontsz = 8), sizeof(*p->fontq));
p->fontq[0] = p->fontl = TERMFONT_NONE;
- p->ps = mandoc_calloc(1, sizeof(struct termp_ps));
+ p->ps = mandoc_calloc(1, sizeof(*p->ps));
p->advance = ps_advance;
p->begin = ps_begin;
p->setwidth = ps_setwidth;
p->width = ps_width;
- toks[0] = "paper";
- toks[1] = NULL;
-
- pp = NULL;
-
- while (outopts && *outopts)
- switch (getsubopt(&outopts, UNCONST(toks), &v)) {
- case 0:
- pp = v;
- break;
- default:
- break;
- }
-
/* Default to US letter (millimetres). */
pagex = 216;
* only happens once, I'm not terribly concerned.
*/
+ pp = outopts->paper;
if (pp && strcasecmp(pp, "letter")) {
if (0 == strcasecmp(pp, "a3")) {
pagex = 297;
pagex = 216;
pagey = 356;
} else if (2 != sscanf(pp, "%ux%u", &pagex, &pagey))
- fprintf(stderr, "%s: Unknown paper\n", pp);
+ warnx("%s: Unknown paper", pp);
}
/*
p->ps->lineheight = lineheight;
p->defrmargin = pagex - (marginx * 2);
- return(p);
+ return p;
}
static void
-ps_setwidth(struct termp *p, int iop, size_t width)
+ps_setwidth(struct termp *p, int iop, int width)
{
size_t lastwidth;
if (iop > 0)
p->ps->width += width;
else if (iop == 0)
- p->ps->width = width ? width : p->ps->lastwidth;
- else if (p->ps->width > width)
+ p->ps->width = width ? (size_t)width : p->ps->lastwidth;
+ else if (p->ps->width > (size_t)width)
p->ps->width -= width;
else
p->ps->width = 0;
p = (struct termp *)arg;
- if (p->ps->psmarg)
- free(p->ps->psmarg);
- if (p->ps->pdfobjs)
- free(p->ps->pdfobjs);
+ free(p->ps->psmarg);
+ free(p->ps->pdfobjs);
free(p->ps);
term_free(p);
{
size_t i, xref, base;
+ ps_plast(p);
+ ps_pclose(p);
+
/*
* At the end of the file, do one last showpage. This is the
* same behaviour as groff(1) and works for multiple pages as
switch (c) {
case '(':
- /* FALLTHROUGH */
case ')':
- /* FALLTHROUGH */
case '\\':
ps_putchar(p, '\\');
break;
p->ps->flags &= ~PS_INLINE;
}
+/* If we have a `last' char that wasn't printed yet, print it now. */
static void
-ps_fclose(struct termp *p)
+ps_plast(struct termp *p)
{
+ size_t wx;
+
+ if (p->ps->last == '\0')
+ return;
+
+ /* Check the font mode; open a new scope if it doesn't match. */
+
+ if (p->ps->nextf != p->ps->lastf) {
+ ps_pclose(p);
+ ps_setfont(p, p->ps->nextf);
+ }
+ p->ps->nextf = TERMFONT_NONE;
/*
- * Strong closure: if we have a last-char, spit it out after
- * checking that we're in the right font mode. This will of
- * course open a new scope, if applicable.
- *
- * Following this, close out any scope that's open.
+ * For an overstrike, if a previous character
+ * was wider, advance to center the new one.
*/
- if (p->ps->last != '\0') {
- assert( ! (p->ps->flags & PS_BACKSP));
- if (p->ps->nextf != p->ps->lastf) {
- ps_pclose(p);
- ps_setfont(p, p->ps->nextf);
- }
- p->ps->nextf = TERMFONT_NONE;
- ps_pletter(p, p->ps->last);
- p->ps->last = '\0';
+ if (p->ps->pscolnext) {
+ wx = fonts[p->ps->lastf].gly[(int)p->ps->last-32].wx;
+ if (p->ps->pscol + wx < p->ps->pscolnext)
+ p->ps->pscol = (p->ps->pscol +
+ p->ps->pscolnext - wx) / 2;
}
- if ( ! (PS_INLINE & p->ps->flags))
- return;
+ ps_pletter(p, p->ps->last);
+ p->ps->last = '\0';
- ps_pclose(p);
+ /*
+ * For an overstrike, if a previous character
+ * was wider, advance to the end of the old one.
+ */
+
+ if (p->ps->pscol < p->ps->pscolnext) {
+ ps_pclose(p);
+ p->ps->pscol = p->ps->pscolnext;
+ }
}
static void
ps_letter(struct termp *p, int arg)
{
- size_t savecol, wx;
+ size_t savecol;
char c;
c = arg >= 128 || arg <= 0 ? '?' : arg;
* Use them and print it.
*/
- if (p->ps->last != '\0') {
- if (p->ps->nextf != p->ps->lastf) {
- ps_pclose(p);
- ps_setfont(p, p->ps->nextf);
- }
- p->ps->nextf = TERMFONT_NONE;
-
- /*
- * For an overstrike, if a previous character
- * was wider, advance to center the new one.
- */
-
- if (p->ps->pscolnext) {
- wx = fonts[p->ps->lastf].gly[(int)p->ps->last-32].wx;
- if (p->ps->pscol + wx < p->ps->pscolnext)
- p->ps->pscol = (p->ps->pscol +
- p->ps->pscolnext - wx) / 2;
- }
-
- ps_pletter(p, p->ps->last);
-
- /*
- * For an overstrike, if a previous character
- * was wider, advance to the end of the old one.
- */
-
- if (p->ps->pscol < p->ps->pscolnext) {
- ps_pclose(p);
- p->ps->pscol = p->ps->pscolnext;
- }
- }
+ ps_plast(p);
/*
* Do not print the current character yet because font
- * instructions might follow; only remember it.
- * For the first character, nothing else is done.
- * The final character will get printed from ps_fclose().
+ * instructions might follow; only remember the character.
+ * It will get printed later from ps_plast().
*/
p->ps->last = c;
* and readjust our column settings.
*/
- ps_fclose(p);
+ ps_plast(p);
+ ps_pclose(p);
p->ps->pscol += len;
}
/* Close out any scopes we have open: we're at eoln. */
- ps_fclose(p);
+ ps_plast(p);
+ ps_pclose(p);
/*
* If we're in the margin, don't try to recalculate our current
}
ps_closepage(p);
+
+ p->tcol->offset -= p->ti;
+ p->ti = 0;
}
static void
else
c -= 32;
- return((size_t)fonts[(int)TERMFONT_NONE].gly[c].wx);
+ return (size_t)fonts[(int)TERMFONT_NONE].gly[c].wx;
}
-static double
+static int
ps_hspan(const struct termp *p, const struct roffsu *su)
{
double r;
break;
}
- return(r);
+ return r * 24.0;
}
static void
git.ckatri.com / mandoc.git / blobdiff