summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mandoc.11
-rw-r--r--term_ps.c23
2 files changed, 6 insertions, 18 deletions
diff --git a/mandoc.1 b/mandoc.1
index a4010cea..9c60ba8d 100644
--- a/mandoc.1
+++ b/mandoc.1
@@ -305,6 +305,7 @@ Level-2 pages may be generated by
Output pages default to letter sized and are rendered in the Times font
family, 11-point.
Margins are calculated as 1/9 the page length and width.
+Line-height is 1.4m.
.Pp
Special characters are rendered as in
.Sx ASCII Output .
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;