diff options
| -rw-r--r-- | mdoc_markdown.c | 71 | ||||
| -rw-r--r-- | regress/mdoc/Aq/author.out_markdown | 6 | ||||
| -rw-r--r-- | regress/mdoc/Lk/noarg.out_markdown | 2 | ||||
| -rw-r--r-- | regress/mdoc/Mt/simple.out_markdown | 4 | ||||
| -rw-r--r-- | regress/mdoc/Rs/allch.out_markdown | 4 |
5 files changed, 57 insertions, 30 deletions
diff --git a/mdoc_markdown.c b/mdoc_markdown.c index 1bf1c13c..6f80d70c 100644 --- a/mdoc_markdown.c +++ b/mdoc_markdown.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_markdown.c,v 1.14 2017/03/08 19:23:43 schwarze Exp $ */ +/* $Id: mdoc_markdown.c,v 1.15 2017/03/11 12:35:45 schwarze Exp $ */ /* * Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org> * @@ -43,6 +43,7 @@ static void md_rawword(const char *); static void md_word(const char *); static void md_named(const char *); static void md_char(unsigned char); +static void md_uri(const char *); static int md_cond_head(struct roff_node *); static int md_cond_body(struct roff_node *); @@ -67,6 +68,7 @@ static int md_pre_Fo(struct roff_node *); static int md_pre_In(struct roff_node *); static int md_pre_It(struct roff_node *); static int md_pre_Lk(struct roff_node *); +static int md_pre_Mt(struct roff_node *); static int md_pre_Nd(struct roff_node *); static int md_pre_Nm(struct roff_node *); static int md_pre_No(struct roff_node *); @@ -211,7 +213,7 @@ static const struct md_act md_acts[MDOC_MAX + 1] = { { NULL, NULL, md_post_Lb, NULL, NULL }, /* Lb */ { NULL, md_pre_Pp, NULL, NULL, NULL }, /* Lp */ { NULL, md_pre_Lk, NULL, NULL, NULL }, /* Lk */ - { NULL, md_pre_raw, md_post_raw, "<", ">" }, /* Mt */ + { NULL, md_pre_Mt, NULL, NULL, NULL }, /* Mt */ { md_cond_body, md_pre_word, md_post_word, "{", "}" }, /* Brq */ { md_cond_body, md_pre_word, md_post_word, "{", "}" }, /* Bro */ { NULL, NULL, NULL, NULL, NULL }, /* Brc */ @@ -1279,39 +1281,64 @@ md_post_Lb(struct roff_node *n) outflags |= MD_br; } +static void +md_uri(const char *s) +{ + while (*s != '\0') { + if (strchr("%()<>", *s) != NULL) { + printf("%%%2.2hhX", *s); + outcount += 3; + } else { + putchar(*s); + outcount++; + } + s++; + } +} + static int md_pre_Lk(struct roff_node *n) { const struct roff_node *link, *descr; - const unsigned char *s; if ((link = n->child) == NULL) return 0; - if ((descr = link->next) != NULL) { - md_rawword("["); - outflags &= ~MD_spc; - while (descr != NULL) { - md_word(descr->string); - descr = descr->next; - } - outflags &= ~MD_spc; - md_rawword("]("); - } else - md_rawword("<"); + descr = link->next == NULL ? link : link->next; + md_rawword("["); + outflags &= ~MD_spc; + do { + md_word(descr->string); + descr = link->next == NULL ? NULL : descr->next; + } while (descr != NULL); + outflags &= ~MD_spc; + md_rawword("]("); + md_uri(link->string); + outflags &= ~MD_spc; + md_rawword(")"); + return 0; +} - for (s = link->string; *s != '\0'; s++) { - if (strchr("%()<>", *s) != NULL) { - printf("%%%2.2hhX", *s); - outcount += 3; - } else { - putchar(*s); +static int +md_pre_Mt(struct roff_node *n) +{ + const struct roff_node *nch; + + md_rawword("["); + outflags &= ~MD_spc; + for (nch = n->child; nch != NULL; nch = nch->next) + md_word(nch->string); + outflags &= ~MD_spc; + md_rawword("](mailto:"); + for (nch = n->child; nch != NULL; nch = nch->next) { + md_uri(nch->string); + if (nch->next != NULL) { + putchar(' '); outcount++; } } - outflags &= ~MD_spc; - md_rawword(link->next == NULL ? ">" : ")"); + md_rawword(")"); return 0; } diff --git a/regress/mdoc/Aq/author.out_markdown b/regress/mdoc/Aq/author.out_markdown index 292eb5c5..85803ee7 100644 --- a/regress/mdoc/Aq/author.out_markdown +++ b/regress/mdoc/Aq/author.out_markdown @@ -6,11 +6,11 @@ AQ-AUTHOR(1) - General Commands Manual # DESCRIPTION -Name <<addr>> Name <<addr>> +Name <[addr](mailto:addr)> Name <[addr](mailto:addr)> # AUTHORS -Name <<addr>> -Name <<addr>> +Name <[addr](mailto:addr)> +Name <[addr](mailto:addr)> OpenBSD - November 19, 2014 diff --git a/regress/mdoc/Lk/noarg.out_markdown b/regress/mdoc/Lk/noarg.out_markdown index f27e0895..16c01df2 100644 --- a/regress/mdoc/Lk/noarg.out_markdown +++ b/regress/mdoc/Lk/noarg.out_markdown @@ -9,7 +9,7 @@ LK-NOARG(1) - General Commands Manual two arguments [mandoc](http://mdocml.bsd.lv/) one argument -<http://www.openbsd.org/> +[http://www.openbsd.org/](http://www.openbsd.org/) no argument end of test document diff --git a/regress/mdoc/Mt/simple.out_markdown b/regress/mdoc/Mt/simple.out_markdown index 0b85b45d..78c21be4 100644 --- a/regress/mdoc/Mt/simple.out_markdown +++ b/regress/mdoc/Mt/simple.out_markdown @@ -7,9 +7,9 @@ MT-SIMPLE(1) - General Commands Manual # DESCRIPTION Please send mail to -<schwarze@openbsd.org>. +[schwarze@openbsd.org](mailto:schwarze@openbsd.org). Do not send mail to -<~>. +[~](mailto:~). OpenBSD - February 17, 2010 diff --git a/regress/mdoc/Rs/allch.out_markdown b/regress/mdoc/Rs/allch.out_markdown index afc6488f..64b891cc 100644 --- a/regress/mdoc/Rs/allch.out_markdown +++ b/regress/mdoc/Rs/allch.out_markdown @@ -18,7 +18,7 @@ author name, report name, number of journal, volume number, -<uniform resource locator>, +[uniform resource locator](uniform resource locator), page number, institutional author, city name, @@ -40,7 +40,7 @@ author name, report name, number of journal, volume number, -<uniform resource locator>, +[uniform resource locator](uniform resource locator), page number, institutional author, city name, |