* mdocml: Set line-height to be 1.4em.
@ 2010-07-04 20:07 kristaps
0 siblings, 0 replies; only message in thread
From: kristaps @ 2010-07-04 20:07 UTC (permalink / raw)
To: source
Log Message:
-----------
Set line-height to be 1.4em. Removed check for minimum margins that are no
longer important.
Modified Files:
--------------
mdocml:
mandoc.1
term_ps.c
Revision Data
-------------
Index: mandoc.1
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mandoc.1,v
retrieving revision 1.70
retrieving revision 1.71
diff -Lmandoc.1 -Lmandoc.1 -u -p -r1.70 -r1.71
--- mandoc.1
+++ 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 .
Index: term_ps.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/term_ps.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -Lterm_ps.c -Lterm_ps.c -u -p -r1.30 -r1.31
--- term_ps.c
+++ 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;
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-07-04 20:07 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-07-04 20:07 mdocml: Set line-height to be 1.4em kristaps
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).