version 1.103, 2014/09/27 10:56:18 |
version 1.107, 2014/12/04 02:05:42 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
|
|
#include <stdlib.h> |
#include <stdlib.h> |
#include <string.h> |
#include <string.h> |
|
|
#include "mandoc.h" |
|
#include "mandoc_aux.h" |
#include "mandoc_aux.h" |
|
#include "man.h" |
#include "out.h" |
#include "out.h" |
#include "html.h" |
#include "html.h" |
#include "man.h" |
|
#include "main.h" |
#include "main.h" |
|
|
/* TODO: preserve ident widths. */ |
/* TODO: preserve ident widths. */ |
Line 213 print_man_node(MAN_ARGS) |
|
Line 212 print_man_node(MAN_ARGS) |
|
man_root_pre(man, n, mh, h); |
man_root_pre(man, n, mh, h); |
break; |
break; |
case MAN_TEXT: |
case MAN_TEXT: |
/* |
|
* If we have a blank line, output a vertical space. |
|
* If we have a space as the first character, break |
|
* before printing the line's data. |
|
*/ |
|
if ('\0' == *n->string) { |
if ('\0' == *n->string) { |
print_paragraph(h); |
print_paragraph(h); |
return; |
return; |
} |
} |
|
if (n->flags & MAN_LINE && (*n->string == ' ' || |
if (' ' == *n->string && MAN_LINE & n->flags) |
(n->prev != NULL && mh->fl & MANH_LITERAL && |
|
! (h->flags & HTML_NONEWLINE)))) |
print_otag(h, TAG_BR, 0, NULL); |
print_otag(h, TAG_BR, 0, NULL); |
else if (MANH_LITERAL & mh->fl && n->prev) |
|
print_otag(h, TAG_BR, 0, NULL); |
|
|
|
print_text(h, n->string); |
print_text(h, n->string); |
return; |
return; |
case MAN_EQN: |
case MAN_EQN: |
Line 290 a2width(const struct man_node *n, struct roffsu *su) |
|
Line 282 a2width(const struct man_node *n, struct roffsu *su) |
|
|
|
if (MAN_TEXT != n->type) |
if (MAN_TEXT != n->type) |
return(0); |
return(0); |
if (a2roffsu(n->string, su, SCALE_BU)) |
if (a2roffsu(n->string, su, SCALE_EN)) |
return(1); |
return(1); |
|
|
return(0); |
return(0); |