diff options
| -rw-r--r-- | html.c | 2 | ||||
| -rw-r--r-- | man_html.c | 14 | ||||
| -rw-r--r-- | mdoc_html.c | 9 | ||||
| -rw-r--r-- | regress/man/HP/literal.out_html | 18 | ||||
| -rw-r--r-- | regress/man/IP/literal.out_html | 42 | ||||
| -rw-r--r-- | regress/man/RS/literal.out_html | 18 | ||||
| -rw-r--r-- | regress/man/SY/literal.out_html | 16 | ||||
| -rw-r--r-- | regress/man/TP/literal.out_html | 18 | ||||
| -rw-r--r-- | regress/mdoc/Bd/nf.out_html | 18 | ||||
| -rw-r--r-- | regress/mdoc/Bd/paragraph.out_html | 6 | ||||
| -rw-r--r-- | regress/mdoc/Rs/paragraph.out_html | 1 | ||||
| -rw-r--r-- | regress/roff/sp/fill-man.out_html | 6 | ||||
| -rw-r--r-- | regress/roff/string/dotT.out_html | 1 |
13 files changed, 58 insertions, 111 deletions
@@ -81,7 +81,7 @@ static const struct htmldata htmltags[TAG_MAX] = { {"h1", HTML_TOPHRASE | HTML_NLAROUND}, {"h2", HTML_TOPHRASE | HTML_NLAROUND}, {"p", HTML_TOPHRASE | HTML_NLAROUND | HTML_INDENT}, - {"pre", HTML_TOPHRASE | HTML_NLALL | HTML_NOINDENT}, + {"pre", HTML_TOPHRASE | HTML_NLAROUND | HTML_NOINDENT}, {"a", HTML_INPHRASE | HTML_TOPHRASE}, {"b", HTML_INPHRASE | HTML_TOPHRASE}, {"cite", HTML_INPHRASE | HTML_TOPHRASE}, @@ -169,7 +169,12 @@ print_man_node(MAN_ARGS) if (n->type == ROFFT_COMMENT || n->flags & NODE_NOPRT) return; - html_fillmode(h, n->flags & NODE_NOFILL ? ROFF_nf : ROFF_fi); + if ((n->flags & NODE_NOFILL) == 0) + html_fillmode(h, ROFF_fi); + else if (html_fillmode(h, ROFF_nf) == ROFF_nf && + n->tok != ROFF_fi && n->flags & NODE_LINE && + (n->prev == NULL || n->prev->tok != MAN_YS)) + print_endline(h); child = 1; switch (n->type) { @@ -253,13 +258,6 @@ print_man_node(MAN_ARGS) } if (t != NULL) print_stagq(h, t); - - if (n->flags & NODE_NOFILL && n->tok != MAN_YS && - (n->next != NULL && n->next->flags & NODE_LINE)) { - /* In .nf = <pre>, print even empty lines. */ - h->col++; - print_endline(h); - } } static void diff --git a/mdoc_html.c b/mdoc_html.c index 5b7bfc85..f698bc27 100644 --- a/mdoc_html.c +++ b/mdoc_html.c @@ -349,12 +349,11 @@ print_mdoc_node(MDOC_ARGS) if (n->type == ROFFT_COMMENT || n->flags & NODE_NOPRT) return; - if (n->flags & NODE_NOFILL) { - html_fillmode(h, ROFF_nf); - if (n->flags & NODE_LINE) - print_endline(h); - } else + if ((n->flags & NODE_NOFILL) == 0) html_fillmode(h, ROFF_fi); + else if (html_fillmode(h, ROFF_nf) == ROFF_nf && + n->tok != ROFF_fi && n->flags & NODE_LINE) + print_endline(h); child = 1; n->flags &= ~NODE_ENDED; diff --git a/regress/man/HP/literal.out_html b/regress/man/HP/literal.out_html index 08fb26b9..48089e36 100644 --- a/regress/man/HP/literal.out_html +++ b/regress/man/HP/literal.out_html @@ -1,18 +1,12 @@ <p class="Pp HP">tag indented text</p> <p class="Pp">regular paragraph</p> -<pre> -literal -text -</pre> -<pre> -tag +<pre>literal +text</pre> +<pre>tag literal hanged -paragraph -</pre> -<pre> -literal -paragraph -</pre> +paragraph</pre> +<pre>literal +paragraph</pre> regular text <br/> diff --git a/regress/man/IP/literal.out_html b/regress/man/IP/literal.out_html index aa0536e7..ceb26a56 100644 --- a/regress/man/IP/literal.out_html +++ b/regress/man/IP/literal.out_html @@ -3,42 +3,32 @@ <dd>indented regular text</dd> </dl> <p class="Pp">new regular paragraph</p> -<pre> -literal -text -</pre> +<pre>literal +text</pre> <dl class="Bl-tag"> <dt id="tag~2"><a class="permalink" href="#tag~2">tag</a></dt> <dd> - <pre> -indented + <pre>indented literal -text - </pre> +text</pre> </dd> </dl> -<pre> -new +<pre>new literal -paragraph -</pre> +paragraph</pre> regular text <section class="Ss"> <h2 class="Ss" id="literal_into_indented_paragraph"><a class="permalink" href="#literal_into_indented_paragraph">literal into indented paragraph</a></h2> <p class="Pp">regular text</p> -<pre> -literal -text -</pre> +<pre>literal +text</pre> <dl class="Bl-tag"> <dt id="tag~3"><a class="permalink" href="#tag~3">tag</a></dt> <dd> - <pre> -indented + <pre>indented literal -text - </pre> +text</pre> indented regular text</dd> </dl> <p class="Pp">new regular paragraph</p> @@ -50,17 +40,13 @@ text <dl class="Bl-tag"> <dt id="tag~4"><a class="permalink" href="#tag~4">tag</a></dt> <dd>indented regular text - <pre> -indented + <pre>indented literal -text - </pre> +text</pre> </dd> </dl> -<pre> -new +<pre>new literal -paragraph -</pre> +paragraph</pre> regular text <br/> diff --git a/regress/man/RS/literal.out_html b/regress/man/RS/literal.out_html index 7bd5431b..3429d849 100644 --- a/regress/man/RS/literal.out_html +++ b/regress/man/RS/literal.out_html @@ -1,18 +1,12 @@ <br/> initial regular text</p> -<pre> -literal text -before display -</pre> +<pre>literal text +before display</pre> <div class="Bd-indent"> -<pre> -This is a short line. -This is a very long line that would wrap if it weren't in literal context. -</pre> +<pre>This is a short line. +This is a very long line that would wrap if it weren't in literal context.</pre> </div> -<pre> -literal text -after display -</pre> +<pre>literal text +after display</pre> <p class="Pp">final regular text <br/> diff --git a/regress/man/SY/literal.out_html b/regress/man/SY/literal.out_html index 9b3e8486..3d63b516 100644 --- a/regress/man/SY/literal.out_html +++ b/regress/man/SY/literal.out_html @@ -7,23 +7,17 @@ </tr> </table> middle regular text -<pre> -literal text -before display -</pre> +<pre>literal text +before display</pre> <table class="Nm"> <tr> <td><code class="Nm">command</code></td> <td> - <pre> -<i>arguments</i> - </pre> + <pre><i>arguments</i></pre> </td> </tr> </table> -<pre> -literal text -after display -</pre> +<pre>literal text +after display</pre> <p class="Pp">final regular text <br/> diff --git a/regress/man/TP/literal.out_html b/regress/man/TP/literal.out_html index 914c7b5c..71194770 100644 --- a/regress/man/TP/literal.out_html +++ b/regress/man/TP/literal.out_html @@ -3,23 +3,17 @@ <dd>regular indented text</dd> </dl> <p class="Pp">regular paragraph</p> -<pre> -literal -text -</pre> +<pre>literal +text</pre> <dl class="Bl-tag"> <dt id="tag~2"><a class="permalink" href="#tag~2">tag</a></dt> <dd> - <pre> -indented + <pre>indented literal -text - </pre> +text</pre> </dd> </dl> -<pre> -literal -paragraph -</pre> +<pre>literal +paragraph</pre> regular text <br/> diff --git a/regress/mdoc/Bd/nf.out_html b/regress/mdoc/Bd/nf.out_html index 394eb7ed..83083353 100644 --- a/regress/mdoc/Bd/nf.out_html +++ b/regress/mdoc/Bd/nf.out_html @@ -1,20 +1,14 @@ -<pre> -after .nf -request -</pre> +<pre>after .nf +request</pre> <p class="Pp">after .fi request</p> <div class="Bd Pp"> -<pre> -in unfilled -block -</pre> +<pre>in unfilled +block</pre> after .fi request in unfilled block</div> after end of unfilled block <div class="Bd Pp">in filled block -<pre> -after .nf request -in filled block -</pre> +<pre>after .nf request +in filled block</pre> </div> after end of filled block <br/> diff --git a/regress/mdoc/Bd/paragraph.out_html b/regress/mdoc/Bd/paragraph.out_html index cc3491c9..22355ed1 100644 --- a/regress/mdoc/Bd/paragraph.out_html +++ b/regress/mdoc/Bd/paragraph.out_html @@ -8,13 +8,11 @@ back to normal <p class="Pp">another paragraph</p> <div class="Bd Pp" id="unfilled"> -<pre> -<a class="permalink" href="#unfilled">unfilled</a> literal +<pre><a class="permalink" href="#unfilled">unfilled</a> literal display <mark id="upara"></mark> <a class="permalink" href="#upara">unfilled</a> literal -paragraph -</pre> +paragraph</pre> </div> again back to normal <br/> diff --git a/regress/mdoc/Rs/paragraph.out_html b/regress/mdoc/Rs/paragraph.out_html index ba5fb63a..bfb0a724 100644 --- a/regress/mdoc/Rs/paragraph.out_html +++ b/regress/mdoc/Rs/paragraph.out_html @@ -13,4 +13,3 @@ <p class="Pp">in a paragraph:</p> <p class="Pp"><cite class="Rs"><span class="RsA">another author</span>, <i class="RsB">another book</i>.</cite></p> -<pre> diff --git a/regress/roff/sp/fill-man.out_html b/regress/roff/sp/fill-man.out_html index 054b6359..213d4601 100644 --- a/regress/roff/sp/fill-man.out_html +++ b/regress/roff/sp/fill-man.out_html @@ -1,7 +1,5 @@ <p class="Pp">switch to no-fill mode:</p> -<pre> -in no-fill mode: +<pre>in no-fill mode: back to -fill mode: -</pre> +fill mode:</pre> diff --git a/regress/roff/string/dotT.out_html b/regress/roff/string/dotT.out_html index 0a019b20..51ab1411 100644 --- a/regress/roff/string/dotT.out_html +++ b/regress/roff/string/dotT.out_html @@ -1,3 +1,2 @@ <p class="Pp">We are using the html device.</p> <p class="Pp">The device name can be overridden.</p> -<pre> |