diff options
-rw-r--r-- | Makefile.depend | 4 | ||||
-rw-r--r-- | html.c | 16 | ||||
-rw-r--r-- | read.c | 1 | ||||
-rw-r--r-- | regress/mdoc/Cm/tag.out_html | 10 | ||||
-rw-r--r-- | regress/mdoc/Dv/tag.out_html | 4 | ||||
-rw-r--r-- | regress/mdoc/Em/tag.out_html | 4 | ||||
-rw-r--r-- | regress/mdoc/Er/tag.out_html | 2 | ||||
-rw-r--r-- | regress/mdoc/Ev/tag.out_html | 4 | ||||
-rw-r--r-- | regress/mdoc/Fl/tag.out_html | 4 | ||||
-rw-r--r-- | regress/mdoc/Fo/tag.out_html | 13 | ||||
-rw-r--r-- | regress/mdoc/Ic/tag.out_html | 4 | ||||
-rw-r--r-- | regress/mdoc/Li/tag.out_html | 4 | ||||
-rw-r--r-- | regress/mdoc/Ms/tag.out_html | 4 | ||||
-rw-r--r-- | regress/mdoc/No/tag.out_html | 4 | ||||
-rw-r--r-- | regress/mdoc/Sy/tag.out_html | 4 | ||||
-rw-r--r-- | regress/mdoc/Tg/column.in | 5 | ||||
-rw-r--r-- | regress/mdoc/Tg/column.out_ascii | 2 | ||||
-rw-r--r-- | regress/mdoc/Tg/column.out_markdown | 2 | ||||
-rw-r--r-- | regress/mdoc/Tg/warn.out_html | 2 | ||||
-rw-r--r-- | tag.c | 94 | ||||
-rw-r--r-- | tag.h | 1 | ||||
-rw-r--r-- | tree.c | 5 |
22 files changed, 148 insertions, 45 deletions
diff --git a/Makefile.depend b/Makefile.depend index eb8606d5..5ac54712 100644 --- a/Makefile.depend +++ b/Makefile.depend @@ -33,7 +33,7 @@ eqn_html.o: eqn_html.c config.h mandoc.h roff.h eqn.h out.h html.h eqn_term.o: eqn_term.c config.h eqn.h out.h term.h html.o: html.c config.h mandoc_aux.h mandoc_ohash.h compat_ohash.h mandoc.h roff.h out.h html.h manconf.h main.h lib.o: lib.c config.h roff.h libmdoc.h lib.in -main.o: main.c config.h mandoc_aux.h mandoc.h mandoc_xr.h roff.h mdoc.h man.h mandoc_parse.h term_tag.h main.h manconf.h mansearch.h +main.o: main.c config.h mandoc_aux.h mandoc.h mandoc_xr.h roff.h mdoc.h man.h mandoc_parse.h tag.h term_tag.h main.h manconf.h mansearch.h man.o: man.c config.h mandoc_aux.h mandoc.h roff.h man.h libmandoc.h roff_int.h libman.h man_html.o: man_html.c config.h mandoc_aux.h mandoc.h roff.h man.h out.h html.h main.h man_macro.o: man_macro.c config.h mandoc.h roff.h man.h libmandoc.h roff_int.h libman.h @@ -67,7 +67,7 @@ roff_term.o: roff_term.c mandoc.h roff.h out.h term.h roff_validate.o: roff_validate.c mandoc.h roff.h libmandoc.h roff_int.h soelim.o: soelim.c config.h compat_stringlist.h st.o: st.c config.h mandoc.h roff.h libmdoc.h -tag.o: tag.c config.h mandoc_aux.h mandoc_ohash.h compat_ohash.h roff.h tag.h +tag.o: tag.c config.h mandoc_aux.h mandoc_ohash.h compat_ohash.h roff.h mdoc.h tag.h tbl.o: tbl.c config.h mandoc_aux.h mandoc.h tbl.h libmandoc.h tbl_parse.h tbl_int.h tbl_data.o: tbl_data.c config.h mandoc_aux.h mandoc.h tbl.h libmandoc.h tbl_int.h tbl_html.o: tbl_html.c config.h mandoc.h roff.h tbl.h out.h html.h @@ -779,18 +779,20 @@ print_otag_id(struct html *h, enum htmltag elemtype, const char *cattr, { struct roff_node *nch; struct tag *ret, *t; - const char *id; + char *id, *href; ret = NULL; - id = NULL; + id = href = NULL; if (n->flags & NODE_ID) id = html_make_id(n, 1); - if (id != NULL && htmltags[elemtype].flags & HTML_INPHRASE) - ret = print_otag(h, TAG_A, "chR", "permalink", id); + if (n->flags & NODE_HREF) + href = id == NULL ? html_make_id(n, 0) : id; + if (href != NULL && htmltags[elemtype].flags & HTML_INPHRASE) + ret = print_otag(h, TAG_A, "chR", "permalink", href); t = print_otag(h, elemtype, "ci", cattr, id); if (ret == NULL) { ret = t; - if (id != NULL && (nch = n->child) != NULL) { + if (href != NULL && (nch = n->child) != NULL) { /* man(7) is safe, it tags phrasing content only. */ if (n->tok > MDOC_MAX || htmltags[elemtype].flags & HTML_TOPHRASE) @@ -799,9 +801,11 @@ print_otag_id(struct html *h, enum htmltag elemtype, const char *cattr, while (nch != NULL && nch->type == ROFFT_TEXT) nch = nch->next; if (nch == NULL) - print_otag(h, TAG_A, "chR", "permalink", id); + print_otag(h, TAG_A, "chR", "permalink", href); } } + if (id == NULL) + free(href); return ret; } @@ -708,6 +708,7 @@ mparse_result(struct mparse *curp) mdoc_validate(curp->man); else man_validate(curp->man); + tag_postprocess(curp->man->meta.first); } return &curp->man->meta; } diff --git a/regress/mdoc/Cm/tag.out_html b/regress/mdoc/Cm/tag.out_html index 134f21c4..5141f52a 100644 --- a/regress/mdoc/Cm/tag.out_html +++ b/regress/mdoc/Cm/tag.out_html @@ -1,15 +1,15 @@ <dl class="Bl-tag"> - <dt><a class="permalink" href="#one"><code class="Cm" id="one">one</code></a> + <dt id="one"><a class="permalink" href="#one"><code class="Cm">one</code></a> | <a class="permalink" href="#two"><code class="Cm" id="two">two</code></a></dt> <dd>text</dd> - <dt><a class="permalink" href="#three"><code class="Cm" id="three">three</code></a></dt> + <dt id="three"><a class="permalink" href="#three"><code class="Cm">three</code></a></dt> <dd>text</dd> - <dt><a class="permalink" href="#hyphen"><code class="Cm" id="hyphen">-hyphen</code></a></dt> + <dt id="hyphen"><a class="permalink" href="#hyphen"><code class="Cm">-hyphen</code></a></dt> <dd>text</dd> - <dt><a class="permalink" href="#minus"><code class="Cm" id="minus">-minus-sign</code></a></dt> + <dt id="minus"><a class="permalink" href="#minus"><code class="Cm">-minus-sign</code></a></dt> <dd>text</dd> - <dt><a class="permalink" href="#backslash"><code class="Cm" id="backslash">\backslash</code></a></dt> + <dt id="backslash"><a class="permalink" href="#backslash"><code class="Cm">\backslash</code></a></dt> <dd>text</dd> </dl> <a class="permalink" href="#four"><code class="Cm" id="four">four</code></a> diff --git a/regress/mdoc/Dv/tag.out_html b/regress/mdoc/Dv/tag.out_html index cee78340..4f04e0b7 100644 --- a/regress/mdoc/Dv/tag.out_html +++ b/regress/mdoc/Dv/tag.out_html @@ -1,9 +1,9 @@ <dl class="Bl-tag"> - <dt><a class="permalink" href="#one"><code class="Dv" id="one">one</code></a> + <dt id="one"><a class="permalink" href="#one"><code class="Dv">one</code></a> | <a class="permalink" href="#two"><code class="Dv" id="two">two</code></a></dt> <dd>text</dd> - <dt><a class="permalink" href="#three"><code class="Dv" id="three">three</code></a></dt> + <dt id="three"><a class="permalink" href="#three"><code class="Dv">three</code></a></dt> <dd>text</dd> </dl> <a class="permalink" href="#four"><code class="Dv" id="four">four</code></a> diff --git a/regress/mdoc/Em/tag.out_html b/regress/mdoc/Em/tag.out_html index 225343ee..f5c47121 100644 --- a/regress/mdoc/Em/tag.out_html +++ b/regress/mdoc/Em/tag.out_html @@ -1,8 +1,8 @@ <dl class="Bl-tag"> - <dt><a class="permalink" href="#one"><i class="Em" id="one">one</i></a> | + <dt id="one"><a class="permalink" href="#one"><i class="Em">one</i></a> | <a class="permalink" href="#two"><i class="Em" id="two">two</i></a></dt> <dd>text</dd> - <dt><a class="permalink" href="#three-with-hyphens"><i class="Em" id="three-with-hyphens">three-with-hyphens</i></a></dt> + <dt id="three-with-hyphens"><a class="permalink" href="#three-with-hyphens"><i class="Em">three-with-hyphens</i></a></dt> <dd>text</dd> </dl> <a class="permalink" href="#four"><i class="Em" id="four">four</i></a> diff --git a/regress/mdoc/Er/tag.out_html b/regress/mdoc/Er/tag.out_html index a2c2978f..80daa28b 100644 --- a/regress/mdoc/Er/tag.out_html +++ b/regress/mdoc/Er/tag.out_html @@ -7,6 +7,6 @@ <section class="Sh"> <h1 class="Sh" id="ERRORS"><a class="permalink" href="#ERRORS">ERRORS</a></h1> <dl class="Bl-tag"> - <dt>[<a class="permalink" href="#ENOENT"><code class="Er" id="ENOENT">ENOENT</code></a>]</dt> + <dt id="ENOENT">[<a class="permalink" href="#ENOENT"><code class="Er">ENOENT</code></a>]</dt> <dd>text</dd> </dl> diff --git a/regress/mdoc/Ev/tag.out_html b/regress/mdoc/Ev/tag.out_html index 1e1c92b9..ccc5beb0 100644 --- a/regress/mdoc/Ev/tag.out_html +++ b/regress/mdoc/Ev/tag.out_html @@ -1,9 +1,9 @@ <dl class="Bl-tag"> - <dt><a class="permalink" href="#one"><code class="Ev" id="one">one</code></a> + <dt id="one"><a class="permalink" href="#one"><code class="Ev">one</code></a> | <a class="permalink" href="#two"><code class="Ev" id="two">two</code></a></dt> <dd>text</dd> - <dt><a class="permalink" href="#three"><code class="Ev" id="three">three</code></a></dt> + <dt id="three"><a class="permalink" href="#three"><code class="Ev">three</code></a></dt> <dd>text</dd> </dl> <a class="permalink" href="#four"><code class="Ev" id="four">four</code></a> diff --git a/regress/mdoc/Fl/tag.out_html b/regress/mdoc/Fl/tag.out_html index f67a30c0..c101124f 100644 --- a/regress/mdoc/Fl/tag.out_html +++ b/regress/mdoc/Fl/tag.out_html @@ -1,8 +1,8 @@ <dl class="Bl-tag"> - <dt><a class="permalink" href="#a"><code class="Fl" id="a">-a</code></a> | + <dt id="a"><a class="permalink" href="#a"><code class="Fl">-a</code></a> | <a class="permalink" href="#b"><code class="Fl" id="b">-b</code></a></dt> <dd>text</dd> - <dt><a class="permalink" href="#c"><code class="Fl" id="c">-c</code></a></dt> + <dt id="c"><a class="permalink" href="#c"><code class="Fl">-c</code></a></dt> <dd>text</dd> </dl> <a class="permalink" href="#d"><code class="Fl" id="d">-d</code></a> diff --git a/regress/mdoc/Fo/tag.out_html b/regress/mdoc/Fo/tag.out_html index b3508614..018ff92e 100644 --- a/regress/mdoc/Fo/tag.out_html +++ b/regress/mdoc/Fo/tag.out_html @@ -1,9 +1,8 @@ -<p class="Pp">automatic: - <a class="permalink" href="#first"><code class="Fn" id="first">first</code></a>() - and <code class="Fn">second</code>()</p> -<p class="Pp"><a class="permalink" href="#second"><code class="Fn" id="second">second</code></a>() +<p class="Pp" id="first">automatic: + <a class="permalink" href="#first"><code class="Fn">first</code></a>() and + <code class="Fn">second</code>()</p> +<p class="Pp" id="second"><a class="permalink" href="#second"><code class="Fn">second</code></a>() and <code class="Fn">first</code>()</p> -<p class="Pp">explicit: - <a class="permalink" href="#e3"><code class="Fn" id="e3">third</code></a>() - and +<p class="Pp" id="e3">explicit: + <a class="permalink" href="#e3"><code class="Fn">third</code></a>() and <a class="permalink" href="#e4"><code class="Fn" id="e4">fourth</code></a>(<var class="Fa">void</var>);</p> diff --git a/regress/mdoc/Ic/tag.out_html b/regress/mdoc/Ic/tag.out_html index ad3cc1ef..7148cc88 100644 --- a/regress/mdoc/Ic/tag.out_html +++ b/regress/mdoc/Ic/tag.out_html @@ -1,9 +1,9 @@ <dl class="Bl-tag"> - <dt><a class="permalink" href="#one"><code class="Ic" id="one">one</code></a> + <dt id="one"><a class="permalink" href="#one"><code class="Ic">one</code></a> | <a class="permalink" href="#two"><code class="Ic" id="two">two</code></a></dt> <dd>text</dd> - <dt><a class="permalink" href="#three"><code class="Ic" id="three">three</code></a></dt> + <dt id="three"><a class="permalink" href="#three"><code class="Ic">three</code></a></dt> <dd>text</dd> </dl> <a class="permalink" href="#four"><code class="Ic" id="four">four</code></a> diff --git a/regress/mdoc/Li/tag.out_html b/regress/mdoc/Li/tag.out_html index 3730caa6..d1b71573 100644 --- a/regress/mdoc/Li/tag.out_html +++ b/regress/mdoc/Li/tag.out_html @@ -1,9 +1,9 @@ <dl class="Bl-tag"> - <dt><a class="permalink" href="#one"><code class="Li" id="one">one</code></a> + <dt id="one"><a class="permalink" href="#one"><code class="Li">one</code></a> | <a class="permalink" href="#two"><code class="Li" id="two">two</code></a></dt> <dd>text</dd> - <dt><a class="permalink" href="#three"><code class="Li" id="three">three</code></a></dt> + <dt id="three"><a class="permalink" href="#three"><code class="Li">three</code></a></dt> <dd>text</dd> </dl> <a class="permalink" href="#four"><code class="Li" id="four">four</code></a> diff --git a/regress/mdoc/Ms/tag.out_html b/regress/mdoc/Ms/tag.out_html index 0f24b2ac..9ae0292b 100644 --- a/regress/mdoc/Ms/tag.out_html +++ b/regress/mdoc/Ms/tag.out_html @@ -1,9 +1,9 @@ <dl class="Bl-tag"> - <dt><a class="permalink" href="#one"><span class="Ms" id="one">one</span></a> + <dt id="one"><a class="permalink" href="#one"><span class="Ms">one</span></a> | <a class="permalink" href="#two"><span class="Ms" id="two">two</span></a></dt> <dd>text</dd> - <dt><a class="permalink" href="#three"><span class="Ms" id="three">three</span></a></dt> + <dt id="three"><a class="permalink" href="#three"><span class="Ms">three</span></a></dt> <dd>text</dd> </dl> <a class="permalink" href="#four"><span class="Ms" id="four">four</span></a> diff --git a/regress/mdoc/No/tag.out_html b/regress/mdoc/No/tag.out_html index 32696917..97109cee 100644 --- a/regress/mdoc/No/tag.out_html +++ b/regress/mdoc/No/tag.out_html @@ -1,9 +1,9 @@ <dl class="Bl-tag"> - <dt><a class="permalink" href="#one"><span class="No" id="one">one</span></a> + <dt id="one"><a class="permalink" href="#one"><span class="No">one</span></a> | <a class="permalink" href="#two"><span class="No" id="two">two</span></a></dt> <dd>text</dd> - <dt><a class="permalink" href="#three"><span class="No" id="three">three</span></a></dt> + <dt id="three"><a class="permalink" href="#three"><span class="No">three</span></a></dt> <dd>text</dd> </dl> <a class="permalink" href="#four"><span class="No" id="four">four</span></a> diff --git a/regress/mdoc/Sy/tag.out_html b/regress/mdoc/Sy/tag.out_html index 69276a18..cca78319 100644 --- a/regress/mdoc/Sy/tag.out_html +++ b/regress/mdoc/Sy/tag.out_html @@ -1,8 +1,8 @@ <dl class="Bl-tag"> - <dt><a class="permalink" href="#one"><b class="Sy" id="one">one</b></a> | + <dt id="one"><a class="permalink" href="#one"><b class="Sy">one</b></a> | <a class="permalink" href="#two"><b class="Sy" id="two">two</b></a></dt> <dd>text</dd> - <dt><a class="permalink" href="#three"><b class="Sy" id="three">three</b></a></dt> + <dt id="three"><a class="permalink" href="#three"><b class="Sy">three</b></a></dt> <dd>text</dd> </dl> <a class="permalink" href="#four"><b class="Sy" id="four">four</b></a> diff --git a/regress/mdoc/Tg/column.in b/regress/mdoc/Tg/column.in index 347e7594..f12ca41d 100644 --- a/regress/mdoc/Tg/column.in +++ b/regress/mdoc/Tg/column.in @@ -1,4 +1,4 @@ -.\" $OpenBSD: column.in,v 1.1 2020/04/06 09:55:50 schwarze Exp $ +.\" $OpenBSD: column.in,v 1.2 2020/04/07 22:45:38 schwarze Exp $ .Dd $Mdocdate$ .Dt TG-COLUMN 1 .Os @@ -9,8 +9,9 @@ BEGINTEST .Tg list .Bl -column one two +.It one Ta .Tg row1 -.It one Ta two +two .Tg row2 .It 1 2 .El diff --git a/regress/mdoc/Tg/column.out_ascii b/regress/mdoc/Tg/column.out_ascii index 3051005b..60391cff 100644 --- a/regress/mdoc/Tg/column.out_ascii +++ b/regress/mdoc/Tg/column.out_ascii @@ -10,4 +10,4 @@ DDEESSCCRRIIPPTTIIOONN 1 2 ENDTEST -OpenBSD April 6, 2020 OpenBSD +OpenBSD April 7, 2020 OpenBSD diff --git a/regress/mdoc/Tg/column.out_markdown b/regress/mdoc/Tg/column.out_markdown index a6820fd0..2042eb99 100644 --- a/regress/mdoc/Tg/column.out_markdown +++ b/regress/mdoc/Tg/column.out_markdown @@ -13,4 +13,4 @@ BEGINTEST ENDTEST -OpenBSD - April 6, 2020 +OpenBSD - April 7, 2020 diff --git a/regress/mdoc/Tg/warn.out_html b/regress/mdoc/Tg/warn.out_html index fdc333b6..a7f92574 100644 --- a/regress/mdoc/Tg/warn.out_html +++ b/regress/mdoc/Tg/warn.out_html @@ -1,4 +1,4 @@ -<p class="Pp"><mark id="start-tag"></mark>initial text +<p class="Pp" id="start-tag">initial text <a class="permalink" href="#macro"><code class="Ic" id="macro">macro</code></a> too many badstart badend whitespace <mark id="sub"></mark></p> <section class="Ss"> @@ -31,6 +31,7 @@ #include "mandoc_aux.h" #include "mandoc_ohash.h" #include "roff.h" +#include "mdoc.h" #include "tag.h" struct tag_entry { @@ -41,6 +42,8 @@ struct tag_entry { char s[]; }; +static void tag_move_id(struct roff_node *); + static struct ohash tag_data; @@ -182,3 +185,94 @@ tag_exists(const char *tag) { return ohash_find(&tag_data, ohash_qlookup(&tag_data, tag)) != NULL; } + +/* + * For in-line elements, move the link target + * to the enclosing paragraph when appropriate. + */ +static void +tag_move_id(struct roff_node *n) +{ + struct roff_node *np; + + np = n; + for (;;) { + if (np->prev != NULL) + np = np->prev; + else if ((np = np->parent) == NULL) + return; + switch (np->tok) { + case MDOC_It: + switch (np->parent->parent->norm->Bl.type) { + case LIST_column: + /* Target the ROFFT_BLOCK = <tr>. */ + np = np->parent; + break; + case LIST_diag: + case LIST_hang: + case LIST_inset: + case LIST_ohang: + case LIST_tag: + /* Target the ROFFT_HEAD = <dt>. */ + np = np->parent->head; + break; + default: + /* Target the ROFF_BODY = <li>. */ + break; + } + /* FALLTHROUGH */ + case MDOC_Pp: /* Target the ROFFT_ELEM = <p>. */ + if (np->string == NULL) { + np->string = mandoc_strdup(n->string == NULL ? + n->child->string : n->string); + np->flags |= NODE_ID; + n->flags &= ~NODE_ID; + } + return; + case MDOC_Sh: + case MDOC_Ss: + case MDOC_Bd: + case MDOC_Bl: + case MDOC_D1: + case MDOC_Dl: + case MDOC_Rs: + /* Do not move past major blocks. */ + return; + default: + /* + * Move past in-line content and partial + * blocks, for example .It Xo or .It Bq Er. + */ + break; + } + } +} + +/* + * When all tags have been set, decide where to put + * the associated permalinks, and maybe move some tags + * to the beginning of the respective paragraphs. + */ +void +tag_postprocess(struct roff_node *n) +{ + if (n->flags & NODE_ID) { + switch (n->tok) { + case MDOC_Bd: + case MDOC_Bl: + case MDOC_Pp: + /* XXX No permalink for now. */ + break; + default: + if (n->type == ROFFT_ELEM || n->tok == MDOC_Fo) + tag_move_id(n); + if (n->tok != MDOC_Tg) + n->flags |= NODE_HREF; + else if ((n->flags & NODE_ID) == 0) + n->flags |= NODE_NOPRT; + break; + } + } + for (n = n->child; n != NULL; n = n->next) + tag_postprocess(n); +} @@ -31,4 +31,5 @@ void tag_alloc(void); int tag_exists(const char *); void tag_put(const char *, int, struct roff_node *); +void tag_postprocess(struct roff_node *); void tag_free(void); @@ -207,8 +207,11 @@ print_mdoc(const struct roff_node *n, int indent) if (n->string != NULL) printf("=%s", n->string); } - if (n->flags & NODE_HREF) + if (n->flags & NODE_HREF) { printf(" HREF"); + if (n->string != NULL && (n->flags & NODE_ID) == 0) + printf("=%s", n->string); + } if (n->flags & NODE_BROKEN) printf(" BROKEN"); if (n->flags & NODE_NOFILL) |