summaryrefslogtreecommitdiffstats
path: root/term_ps.c
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2010-07-04 20:06:59 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2010-07-04 20:06:59 +0000
commita6dcadc095a90f39dc0c4f1edd94608d4488f665 (patch)
treeb18c03b5a982bbf94705b1458b9e15cda14c406a /term_ps.c
parent52314992a888bfb56c8cb815cf5a9e32b4ad0c50 (diff)
downloadmandoc-a6dcadc095a90f39dc0c4f1edd94608d4488f665.tar.gz
Set line-height to be 1.4em. Removed check for minimum margins that are no
longer important.
Diffstat (limited to 'term_ps.c')
-rw-r--r--term_ps.c23
1 files changed, 5 insertions, 18 deletions
diff --git a/term_ps.c b/term_ps.c
index 180b54b8..fecb86c8 100644
--- a/term_ps.c
+++ b/term_ps.c
@@ -33,11 +33,6 @@
#include "main.h"
#include "term.h"
-#define MINMARGIN_MM 20 /* Minimum 2cm margins. */
-#define MINMARGIN_PNT 56.68
-#define DEFPAGEX_MM 216 /* Default page size is US-letter. */
-#define DEFPAGEY_MM 279
-
/* Convert PostScript point "x" to an AFM unit. */
#define PNT2AFM(p, x) /* LINTED */ \
(size_t)((double)(x) * (1000.0 / (double)(p)->engine.ps.scale))
@@ -426,8 +421,8 @@ ps_alloc(char *outopts)
/* Default to US letter (millimetres). */
- pagex = DEFPAGEX_MM;
- pagey = DEFPAGEY_MM;
+ pagex = 216;
+ pagey = 279;
/*
* The ISO-269 paper sizes can be calculated automatically, but
@@ -454,16 +449,6 @@ ps_alloc(char *outopts)
} else if (NULL == pp)
pp = "letter";
- /* Enforce minimum page size >= (2 times) min-margin. */
-
- if ((2 * MINMARGIN_MM) >= pagex) {
- fprintf(stderr, "%s: Insufficient page width\n", pp);
- pagex = DEFPAGEX_MM;
- } else if ((2 * MINMARGIN_MM >= pagey)) {
- fprintf(stderr, "%s: Insufficient page length\n", pp);
- pagey = DEFPAGEY_MM;
- }
-
/*
* This MUST be defined before any PNT2AFM or AFM2PNT
* calculations occur.
@@ -483,7 +468,9 @@ ps_alloc(char *outopts)
marginy = /* LINTED */
(size_t)((double)pagey / 9.0);
- lineheight = PNT2AFM(p, 16);
+ /* Line-height is 1.4em. */
+
+ lineheight = PNT2AFM(p, ((double)p->engine.ps.scale * 1.4));
p->engine.ps.width = pagex;
p->engine.ps.height = pagey;