diff options
| -rw-r--r-- | man_html.c | 4 | ||||
| -rw-r--r-- | mdoc_html.c | 6 | ||||
| -rw-r--r-- | out.c | 6 | ||||
| -rw-r--r-- | term.c | 14 | ||||
| -rw-r--r-- | term_ascii.c | 14 | ||||
| -rw-r--r-- | term_ps.c | 8 |
6 files changed, 26 insertions, 26 deletions
@@ -1,4 +1,4 @@ -/* $Id: man_html.c,v 1.95 2014/04/23 16:08:33 schwarze Exp $ */ +/* $Id: man_html.c,v 1.96 2014/08/01 19:25:52 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -388,7 +388,7 @@ man_br_pre(MAN_ARGS) if ( ! a2roffsu(n->string, &su, SCALE_VS)) SCALE_VS_INIT(&su, atoi(n->string)); } else - su.scale = 0; + su.scale = 0.0; bufinit(h); bufcat_su(h, "height", &su); diff --git a/mdoc_html.c b/mdoc_html.c index fcde3658..e863e281 100644 --- a/mdoc_html.c +++ b/mdoc_html.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_html.c,v 1.193 2014/07/30 00:19:16 schwarze Exp $ */ +/* $Id: mdoc_html.c,v 1.194 2014/08/01 19:25:52 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -699,7 +699,7 @@ mdoc_nm_pre(MDOC_ARGS) if (0 == len && meta->name) len = html_strlen(meta->name); - SCALE_HS_INIT(&su, (double)len); + SCALE_HS_INIT(&su, len); bufinit(h); bufcat_su(h, "width", &su); PAIR_STYLE_INIT(&tag, h); @@ -1565,7 +1565,7 @@ mdoc_sp_pre(MDOC_ARGS) if ( ! a2roffsu(n->string, &su, SCALE_VS)) SCALE_VS_INIT(&su, atoi(n->string)); } else - su.scale = 0; + su.scale = 0.0; bufinit(h); bufcat_su(h, "height", &su); @@ -1,4 +1,4 @@ -/* $Id: out.c,v 1.48 2014/04/20 16:46:05 schwarze Exp $ */ +/* $Id: out.c,v 1.49 2014/08/01 19:25:52 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org> @@ -128,8 +128,8 @@ a2roffsu(const char *src, struct roffsu *dst, enum roffscale def) } /* FIXME: do this in the caller. */ - if ((dst->scale = atof(buf)) < 0) - dst->scale = 0; + if ((dst->scale = atof(buf)) < 0.0) + dst->scale = 0.0; dst->unit = unit; return(1); } @@ -1,4 +1,4 @@ -/* $Id: term.c,v 1.224 2014/07/06 18:51:13 schwarze Exp $ */ +/* $Id: term.c,v 1.225 2014/08/01 19:25:52 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org> @@ -769,25 +769,25 @@ term_vspan(const struct termp *p, const struct roffsu *su) switch (su->unit) { case SCALE_CM: - r = su->scale * 2; + r = su->scale * 2.0; break; case SCALE_IN: - r = su->scale * 6; + r = su->scale * 6.0; break; case SCALE_PC: r = su->scale; break; case SCALE_PT: - r = su->scale / 8; + r = su->scale / 8.0; break; case SCALE_MM: - r = su->scale / 1000; + r = su->scale / 1000.0; break; case SCALE_VS: r = su->scale; break; default: - r = su->scale - 1; + r = su->scale - 1.0; break; } @@ -801,7 +801,7 @@ term_hspan(const struct termp *p, const struct roffsu *su) { double v; - v = ((*p->hspan)(p, su)); + v = (*p->hspan)(p, su); if (v < 0.0) v = 0.0; return((size_t)v); diff --git a/term_ascii.c b/term_ascii.c index adcbe590..b1e328c0 100644 --- a/term_ascii.c +++ b/term_ascii.c @@ -1,4 +1,4 @@ -/* $Id: term_ascii.c,v 1.26 2014/07/27 21:52:16 schwarze Exp $ */ +/* $Id: term_ascii.c,v 1.27 2014/08/01 19:25:52 schwarze Exp $ */ /* * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -238,22 +238,22 @@ ascii_hspan(const struct termp *p, const struct roffsu *su) switch (su->unit) { case SCALE_CM: - r = 4 * su->scale; + r = su->scale * 4.0; break; case SCALE_IN: - r = 10 * su->scale; + r = su->scale * 10.0; break; case SCALE_PC: - r = (10 * su->scale) / 6; + r = (su->scale * 10.0) / 6.0; break; case SCALE_PT: - r = (10 * su->scale) / 72; + r = (su->scale * 10.0) / 72.0; break; case SCALE_MM: - r = su->scale / 1000; + r = su->scale / 1000.0; break; case SCALE_VS: - r = su->scale * 2 - 1; + r = su->scale * 2.0 - 1.0; break; default: r = su->scale; @@ -1,4 +1,4 @@ -/* $Id: term_ps.c,v 1.61 2014/07/27 21:53:17 schwarze Exp $ */ +/* $Id: term_ps.c,v 1.62 2014/08/01 19:25:52 schwarze Exp $ */ /* * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -1123,13 +1123,13 @@ ps_hspan(const struct termp *p, const struct roffsu *su) r = PNT2AFM(p, su->scale * 28.34); break; case SCALE_IN: - r = PNT2AFM(p, su->scale * 72); + r = PNT2AFM(p, su->scale * 72.0); break; case SCALE_PC: - r = PNT2AFM(p, su->scale * 12); + r = PNT2AFM(p, su->scale * 12.0); break; case SCALE_PT: - r = PNT2AFM(p, su->scale * 100); + r = PNT2AFM(p, su->scale * 100.0); break; case SCALE_EM: r = su->scale * |