man.openbsd.org/table.5

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

man.openbsd.org/table.5

Edgar Pettijohn III-2
Not sure if its just me or not, but I was looking at the table(5) manual online and sections look odd.

Particularly `Mailaddr tables' and `Addrname tables'.

Thanks,

Edgar

Reply | Threaded
Open this post in threaded view
|

Re: man.openbsd.org/table.5

Ingo Schwarze
Hi Edgar,

Edgar Pettijohn wrote on Sun, Sep 08, 2019 at 03:00:57PM -0500:

> Not sure if its just me or not, but I was looking at the table(5)
> manual online and sections look odd.
> Particularly `Mailaddr tables' and `Addrname tables'.

Yes, that was indeed badly misformatted:
In <pre> blocks, in some situations, damaging line breaks were
inserted into the HTML code.

I fixed it with the following commit.

I also installed the patch on man.openbsd.org, so people can easily
check whether everything looks right now.

Thanks for the useful report!
  Ingo


Log Message:
-----------
Fix line breaking in no-fill mode (.Bd -unfilled/<pre>),
which apparently didn't work since the .Pp/<p> reorg.
The new logic is more similar to what the terminal formatter does:

1. Before a node that starts a new mdoc(7) input line,
start a new HTML output line.
2. An empty input line or a .Pp causes an empty output line.
3. Nothing needs to be done at the end of a node.

Severe misformatting was reported in table(5) by
Edgar Pettijohn <edgar at pettijohn dash web dot com> on misc@.

Modified Files:
--------------
    mandoc:
        mdoc_html.c

Revision Data
-------------
Index: mdoc_html.c
===================================================================
RCS file: /home/cvs/mandoc/mandoc/mdoc_html.c,v
retrieving revision 1.330
retrieving revision 1.331
diff -Lmdoc_html.c -Lmdoc_html.c -u -p -r1.330 -r1.331
--- mdoc_html.c
+++ mdoc_html.c
@@ -351,26 +351,34 @@ print_mdoc_node(MDOC_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) {
+ html_fillmode(h, ROFF_nf);
+ if (n->flags & NODE_LINE)
+ print_endline(h);
+ } else
+ html_fillmode(h, ROFF_fi);
 
  child = 1;
  n->flags &= ~NODE_ENDED;
  switch (n->type) {
  case ROFFT_TEXT:
+ if (n->flags & NODE_LINE) {
+ switch (*n->string) {
+ case '\0':
+ h->col = 1;
+ print_endline(h);
+ return;
+ case ' ':
+ if ((h->flags & HTML_NONEWLINE) == 0 &&
+    (n->flags & NODE_NOFILL) == 0)
+ print_otag(h, TAG_BR, "");
+ break;
+ default:
+ break;
+ }
+ }
  t = h->tag;
  t->refcnt++;
-
- /* No tables in this mode... */
- assert(NULL == h->tblt);
-
- /*
- * Make sure that if we're in a literal mode already
- * (i.e., within a <PRE>) don't print the newline.
- */
- if (*n->string == ' ' && n->flags & NODE_LINE &&
-    (h->flags & HTML_NONEWLINE) == 0 &&
-    (n->flags & NODE_NOFILL) == 0)
- print_otag(h, TAG_BR, "");
  if (NODE_DELIMC & n->flags)
  h->flags |= HTML_NOSPACE;
  print_text(h, n->string);
@@ -439,12 +447,6 @@ print_mdoc_node(MDOC_ARGS)
  n->body->flags |= NODE_ENDED;
  break;
  }
-
- if (n->flags & NODE_NOFILL &&
-    (n->next == NULL || n->next->flags & NODE_LINE)) {
- h->col++;
- print_endline(h);
- }
 }
 
 static void
@@ -1270,7 +1272,11 @@ mdoc_skip_pre(MDOC_ARGS)
 static int
 mdoc_pp_pre(MDOC_ARGS)
 {
- if ((n->flags & NODE_NOFILL) == 0) {
+ if (n->flags & NODE_NOFILL) {
+ print_endline(h);
+ h->col = 1;
+ print_endline(h);
+ } else {
  html_close_paragraph(h);
  print_otag(h, TAG_P, "c", "Pp");
  }