Massively reduce the amount of text, cutting it down to what is needed

[mandoc.git] / mdoc_markdown.c

diff --git a/mdoc_markdown.c b/mdoc_markdown.c
index 79d1f3dcec27a0bbcdc22565b13af6026b44a834..301b71c724600de9aae5a17eb9e617b79fb36417 100644 (file)
--- a/mdoc_markdown.c
+++ b/mdoc_markdown.c
@@ -1,6 +1,6 @@
-/*     $Id: mdoc_markdown.c,v 1.5 2017/03/07 13:09:27 schwarze Exp $ */
+/*     $Id: mdoc_markdown.c,v 1.26 2018/08/17 20:33:38 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -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_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 *);
 
 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_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 *);
 static int      md_pre_Nd(struct roff_node *);
 static int      md_pre_Nm(struct roff_node *);
 static int      md_pre_No(struct roff_node *);


@@ -90,6 +92,7 @@ static        void     md_post_En(struct roff_node *);
 static void     md_post_Eo(struct roff_node *);
 static void     md_post_Fa(struct roff_node *);
 static void     md_post_Fd(struct roff_node *);
 static void     md_post_Eo(struct roff_node *);
 static void     md_post_Fa(struct roff_node *);
 static void     md_post_Fd(struct roff_node *);

+static void     md_post_Fl(struct roff_node *);

 static void     md_post_Fn(struct roff_node *);
 static void     md_post_Fo(struct roff_node *);
 static void     md_post_In(struct roff_node *);
 static void     md_post_Fn(struct roff_node *);
 static void     md_post_Fo(struct roff_node *);
 static void     md_post_In(struct roff_node *);


@@ -100,8 +103,7 @@ static      void     md_post_Pf(struct roff_node *);
 static void     md_post_Vt(struct roff_node *);
 static void     md_post__T(struct roff_node *);
 
 static void     md_post_Vt(struct roff_node *);
 static void     md_post__T(struct roff_node *);
 

-static const struct md_act md_acts[MDOC_MAX + 1] = {
-       { NULL, md_pre_Ap, NULL, NULL, NULL }, /* Ap */
+static const struct md_act md_acts[MDOC_MAX - MDOC_Dd] = {

        { NULL, NULL, NULL, NULL, NULL }, /* Dd */
        { NULL, NULL, NULL, NULL, NULL }, /* Dt */
        { NULL, NULL, NULL, NULL, NULL }, /* Os */
        { NULL, NULL, NULL, NULL, NULL }, /* Dd */
        { NULL, NULL, NULL, NULL, NULL }, /* Dt */
        { NULL, NULL, NULL, NULL, NULL }, /* Os */


@@ -117,6 +119,7 @@ static      const struct md_act md_acts[MDOC_MAX + 1] = {
        { NULL, md_pre_It, md_post_It, NULL, NULL }, /* It */
        { NULL, md_pre_raw, md_post_raw, "*", "*" }, /* Ad */
        { NULL, md_pre_An, NULL, NULL, NULL }, /* An */
        { NULL, md_pre_It, md_post_It, NULL, NULL }, /* It */
        { NULL, md_pre_raw, md_post_raw, "*", "*" }, /* Ad */
        { NULL, md_pre_An, NULL, NULL, NULL }, /* An */

+       { NULL, md_pre_Ap, NULL, NULL, NULL }, /* Ap */

        { NULL, md_pre_raw, md_post_raw, "*", "*" }, /* Ar */
        { NULL, md_pre_raw, md_post_raw, "**", "**" }, /* Cd */
        { NULL, md_pre_raw, md_post_raw, "**", "**" }, /* Cm */
        { NULL, md_pre_raw, md_post_raw, "*", "*" }, /* Ar */
        { NULL, md_pre_raw, md_post_raw, "**", "**" }, /* Cd */
        { NULL, md_pre_raw, md_post_raw, "**", "**" }, /* Cm */


@@ -126,7 +129,7 @@ static      const struct md_act md_acts[MDOC_MAX + 1] = {
        { NULL, NULL, NULL, NULL, NULL }, /* Ex */
        { NULL, md_pre_Fa, md_post_Fa, NULL, NULL }, /* Fa */
        { NULL, md_pre_Fd, md_post_Fd, "**", "**" }, /* Fd */
        { NULL, NULL, NULL, NULL, NULL }, /* Ex */
        { NULL, md_pre_Fa, md_post_Fa, NULL, NULL }, /* Fa */
        { NULL, md_pre_Fd, md_post_Fd, "**", "**" }, /* Fd */

-       { NULL, md_pre_raw, md_post_raw, "**-", "**" }, /* Fl */
+       { NULL, md_pre_raw, md_post_Fl, "**-", "**" }, /* Fl */

        { NULL, md_pre_Fn, md_post_Fn, NULL, NULL }, /* Fn */
        { NULL, md_pre_Fd, md_post_raw, "*", "*" }, /* Ft */
        { NULL, md_pre_raw, md_post_raw, "**", "**" }, /* Ic */
        { NULL, md_pre_Fn, md_post_Fn, NULL, NULL }, /* Fn */
        { NULL, md_pre_Fd, md_post_raw, "*", "*" }, /* Ft */
        { NULL, md_pre_raw, md_post_raw, "**", "**" }, /* Ic */


@@ -210,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, 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 */
        { 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 */


@@ -219,13 +222,10 @@ static    const struct md_act md_acts[MDOC_MAX + 1] = {
        { md_cond_body, md_pre_En, md_post_En, NULL, NULL }, /* En */
        { NULL, NULL, NULL, NULL, NULL }, /* Dx */
        { NULL, NULL, md_post_pc, NULL, NULL }, /* %Q */
        { md_cond_body, md_pre_En, md_post_En, NULL, NULL }, /* En */
        { NULL, NULL, NULL, NULL, NULL }, /* Dx */
        { NULL, NULL, md_post_pc, NULL, NULL }, /* %Q */

-       { NULL, md_pre_br, NULL, NULL, NULL }, /* br */
-       { NULL, md_pre_Pp, NULL, NULL, NULL }, /* sp */

        { NULL, md_pre_Lk, md_post_pc, NULL, NULL }, /* %U */
        { NULL, NULL, NULL, NULL, NULL }, /* Ta */
        { NULL, md_pre_Lk, md_post_pc, NULL, NULL }, /* %U */
        { NULL, NULL, NULL, NULL, NULL }, /* Ta */

-       { NULL, NULL, NULL, NULL, NULL }, /* ll */
-       { NULL, NULL, NULL, NULL, NULL }, /* ROOT */

 };
 };

+static const struct md_act *md_act(enum roff_tok);

 
 static int      outflags;
 #define        MD_spc           (1 << 0)  /* Blank character before next word. */
 
 static int      outflags;
 #define        MD_spc           (1 << 0)  /* Blank character before next word. */


@@ -243,13 +243,21 @@ static    int      escflags; /* Escape in generated markdown code: */
 #define        ESC_BOL  (1 << 0)  /* "#*+-" near the beginning of a line. */
 #define        ESC_NUM  (1 << 1)  /* "." after a leading number. */
 #define        ESC_HYP  (1 << 2)  /* "(" immediately after "]". */
 #define        ESC_BOL  (1 << 0)  /* "#*+-" near the beginning of a line. */
 #define        ESC_NUM  (1 << 1)  /* "." after a leading number. */
 #define        ESC_HYP  (1 << 2)  /* "(" immediately after "]". */

-#define        ESC_PAR  (1 << 3)  /* ")" when "(" is open. */

 #define        ESC_SQU  (1 << 4)  /* "]" when "[" is open. */
 #define        ESC_FON  (1 << 5)  /* "*" immediately after unrelated "*". */
 #define        ESC_SQU  (1 << 4)  /* "]" when "[" is open. */
 #define        ESC_FON  (1 << 5)  /* "*" immediately after unrelated "*". */

+#define        ESC_EOL  (1 << 6)  /* " " at the and of a line. */

 
 static int      code_blocks, quote_blocks, list_blocks;
 static int      outcount;
 
 
 static int      code_blocks, quote_blocks, list_blocks;
 static int      outcount;
 

+
+static const struct md_act *
+md_act(enum roff_tok tok)
+{
+       assert(tok >= MDOC_Dd && tok <= MDOC_MAX);
+       return md_acts + (tok - MDOC_Dd);
+}
+

 void
 markdown_mdoc(void *arg, const struct roff_man *mdoc)
 {
 void
 markdown_mdoc(void *arg, const struct roff_man *mdoc)
 {


@@ -294,7 +302,7 @@ md_node(struct roff_node *n)
        const struct md_act     *act;
        int                      cond, process_children;
 
        const struct md_act     *act;
        int                      cond, process_children;
 

-       if (n->flags & NODE_NOPRT)
+       if (n->type == ROFFT_COMMENT || n->flags & NODE_NOPRT)

                return;
 
        if (outflags & MD_nonl)
                return;
 
        if (outflags & MD_nonl)


@@ -307,8 +315,7 @@ md_node(struct roff_node *n)
        process_children = 1;
        n->flags &= ~NODE_ENDED;
 
        process_children = 1;
        n->flags &= ~NODE_ENDED;
 

-       switch (n->type) {
-       case ROFFT_TEXT:
+       if (n->type == ROFFT_TEXT) {

                if (n->flags & NODE_DELIMC)
                        outflags &= ~(MD_spc | MD_spc_force);
                else if (outflags & MD_Sm)
                if (n->flags & NODE_DELIMC)
                        outflags &= ~(MD_spc | MD_spc_force);
                else if (outflags & MD_Sm)


@@ -318,14 +325,24 @@ md_node(struct roff_node *n)
                        outflags &= ~(MD_spc | MD_spc_force);
                else if (outflags & MD_Sm)
                        outflags |= MD_spc;
                        outflags &= ~(MD_spc | MD_spc_force);
                else if (outflags & MD_Sm)
                        outflags |= MD_spc;

-               break;
-       default:
-               act = md_acts + n->tok;
+       } else if (n->tok < ROFF_MAX) {
+               switch (n->tok) {
+               case ROFF_br:
+                       process_children = md_pre_br(n);
+                       break;
+               case ROFF_sp:
+                       process_children = md_pre_Pp(n);
+                       break;
+               default:
+                       process_children = 0;
+                       break;
+               }
+       } else {
+               act = md_act(n->tok);

                cond = act->cond == NULL || (*act->cond)(n);
                if (cond && act->pre != NULL &&
                    (n->end == ENDBODY_NOT || n->child != NULL))
                        process_children = (*act->pre)(n);
                cond = act->cond == NULL || (*act->cond)(n);
                if (cond && act->pre != NULL &&
                    (n->end == ENDBODY_NOT || n->child != NULL))
                        process_children = (*act->pre)(n);

-               break;

        }
 
        if (process_children && n->child != NULL)
        }
 
        if (process_children && n->child != NULL)


@@ -373,37 +390,43 @@ md_stack(char c)
 static void
 md_preword(void)
 {
 static void
 md_preword(void)
 {

+       const char      *cp;
+

        /*
         * If a list block is nested inside a code block or a blockquote,
         * blank lines for paragraph breaks no longer work; instead,
         * they terminate the list.  Work around this markdown issue
         * by using mere line breaks instead.
         */
        /*
         * If a list block is nested inside a code block or a blockquote,
         * blank lines for paragraph breaks no longer work; instead,
         * they terminate the list.  Work around this markdown issue
         * by using mere line breaks instead.
         */

+

        if (list_blocks && outflags & MD_sp) {
                outflags &= ~MD_sp;
                outflags |= MD_br;
        }
 
        if (list_blocks && outflags & MD_sp) {
                outflags &= ~MD_sp;
                outflags |= MD_br;
        }
 

-       /* End the old line if requested. */
+       /*
+        * End the old line if requested.
+        * Escape whitespace at the end of the markdown line
+        * such that it won't look like an output line break.
+        */

 
        if (outflags & MD_sp)
                putchar('\n');
        else if (outflags & MD_br) {
                putchar(' ');
                putchar(' ');
 
        if (outflags & MD_sp)
                putchar('\n');
        else if (outflags & MD_br) {
                putchar(' ');
                putchar(' ');

-#ifdef DEBUG
-               putchar(':');
-               putchar(':');
-               putchar(' ');
-               putchar(' ');
-#endif
-       }
+       } else if (outflags & MD_nl && escflags & ESC_EOL)
+               md_named("zwnj");

 
        /* Start a new line if necessary. */
 
        if (outflags & (MD_nl | MD_br | MD_sp)) {
                putchar('\n');
 
        /* Start a new line if necessary. */
 
        if (outflags & (MD_nl | MD_br | MD_sp)) {
                putchar('\n');

-               fputs(md_stack('\0'), stdout);
+               for (cp = md_stack('\0'); *cp != '\0'; cp++) {
+                       putchar(*cp);
+                       if (*cp == '>')
+                               putchar(' ');
+               }

                outflags &= ~(MD_nl | MD_br | MD_sp);
                escflags = ESC_BOL;
                outcount = 0;
                outflags &= ~(MD_nl | MD_br | MD_sp);
                escflags = ESC_BOL;
                outcount = 0;


@@ -436,7 +459,7 @@ md_rawword(const char *s)
 {
        md_preword();
 
 {
        md_preword();
 

-       if (*s == 0)
+       if (*s == '\0')

                return;
 
        if (escflags & ESC_FON) {
                return;
 
        if (escflags & ESC_FON) {


@@ -447,12 +470,6 @@ md_rawword(const char *s)
 
        while (*s != '\0') {
                switch(*s) {
 
        while (*s != '\0') {
                switch(*s) {

-               case '(':
-                       escflags |= ESC_PAR;
-                       break;
-               case ')':
-                       escflags |= ~ESC_PAR;
-                       break;

                case '*':
                        if (s[1] == '\0')
                                escflags |= ESC_FON;
                case '*':
                        if (s[1] == '\0')
                                escflags |= ESC_FON;


@@ -469,6 +486,10 @@ md_rawword(const char *s)
                }
                md_char(*s++);
        }
                }
                md_char(*s++);
        }

+       if (s[-1] == ' ')
+               escflags |= ESC_EOL;
+       else
+               escflags &= ~ESC_EOL;

 }
 
 /*
 }
 
 /*


@@ -479,7 +500,7 @@ md_word(const char *s)
 {
        const char      *seq, *prevfont, *currfont, *nextfont;
        char             c;
 {
        const char      *seq, *prevfont, *currfont, *nextfont;
        char             c;

-       int              bs, sz, uc;
+       int              bs, sz, uc, breakline;

 
        /* No spacing before closing delimiters. */
        if (s[0] != '\0' && s[1] == '\0' &&
 
        /* No spacing before closing delimiters. */
        if (s[0] != '\0' && s[1] == '\0' &&


@@ -489,10 +510,14 @@ md_word(const char *s)
 
        md_preword();
 
 
        md_preword();
 

+       if (*s == '\0')
+               return;
+

        /* No spacing after opening delimiters. */
        if ((s[0] == '(' || s[0] == '[') && s[1] == '\0')
                outflags &= ~MD_spc;
 
        /* No spacing after opening delimiters. */
        if ((s[0] == '(' || s[0] == '[') && s[1] == '\0')
                outflags &= ~MD_spc;
 

+       breakline = 0;

        prevfont = currfont = "";
        while ((c = *s++) != '\0') {
                bs = 0;
        prevfont = currfont = "";
        while ((c = *s++) != '\0') {
                bs = 0;


@@ -520,7 +545,7 @@ md_word(const char *s)
                        bs = escflags & ESC_HYP && !code_blocks;
                        break;
                case ')':
                        bs = escflags & ESC_HYP && !code_blocks;
                        break;
                case ')':

-                       bs = escflags & ESC_PAR && !code_blocks;
+                       bs = escflags & ESC_NUM && !code_blocks;

                        break;
                case '*':
                case '[':
                        break;
                case '*':
                case '[':


@@ -562,6 +587,9 @@ md_word(const char *s)
                        case ESCAPE_SPECIAL:
                                uc = mchars_spec2cp(seq, sz);
                                break;
                        case ESCAPE_SPECIAL:
                                uc = mchars_spec2cp(seq, sz);
                                break;

+                       case ESCAPE_DEVICE:
+                               md_rawword("markdown");
+                               continue;

                        case ESCAPE_FONTBOLD:
                                nextfont = "**";
                                break;
                        case ESCAPE_FONTBOLD:
                                nextfont = "**";
                                break;


@@ -578,6 +606,9 @@ md_word(const char *s)
                        case ESCAPE_FONTPREV:
                                nextfont = prevfont;
                                break;
                        case ESCAPE_FONTPREV:
                                nextfont = prevfont;
                                break;

+                       case ESCAPE_BREAK:
+                               breakline = 1;
+                               break;

                        case ESCAPE_NOSPACE:
                        case ESCAPE_SKIPCHAR:
                        case ESCAPE_OVERSTRIKE:
                        case ESCAPE_NOSPACE:
                        case ESCAPE_SKIPCHAR:
                        case ESCAPE_OVERSTRIKE:


@@ -625,11 +656,21 @@ md_word(const char *s)
                if (bs)
                        putchar('\\');
                md_char(c);
                if (bs)
                        putchar('\\');
                md_char(c);

+               if (breakline &&
+                   (*s == '\0' || *s == ' ' || *s == ASCII_NBRSP)) {
+                       printf("  \n");
+                       breakline = 0;
+                       while (*s == ' ' || *s == ASCII_NBRSP)
+                               s++;
+               }

        }
        if (*currfont != '\0') {
                outflags &= ~MD_spc;
                md_rawword(currfont);
        }
        if (*currfont != '\0') {
                outflags &= ~MD_spc;
                md_rawword(currfont);

-       }
+       } else if (s[-2] == ' ')
+               escflags |= ESC_EOL;
+       else
+               escflags &= ~ESC_EOL;

 }
 
 /*
 }
 
 /*


@@ -639,7 +680,7 @@ static void
 md_named(const char *s)
 {
        printf("&%s;", s);
 md_named(const char *s)
 {
        printf("&%s;", s);

-       escflags &= ~ESC_FON;
+       escflags &= ~(ESC_FON | ESC_EOL);

        outcount++;
 }
 
        outcount++;
 }
 


@@ -685,9 +726,11 @@ md_pre_raw(struct roff_node *n)
 {
        const char      *prefix;
 
 {
        const char      *prefix;
 

-       if ((prefix = md_acts[n->tok].prefix) != NULL) {
+       if ((prefix = md_act(n->tok)->prefix) != NULL) {

                md_rawword(prefix);
                outflags &= ~MD_spc;
                md_rawword(prefix);
                outflags &= ~MD_spc;

+               if (*prefix == '`')
+                       code_blocks++;

        }
        return 1;
 }
        }
        return 1;
 }


@@ -697,9 +740,11 @@ md_post_raw(struct roff_node *n)
 {
        const char      *suffix;
 
 {
        const char      *suffix;
 

-       if ((suffix = md_acts[n->tok].suffix) != NULL) {
+       if ((suffix = md_act(n->tok)->suffix) != NULL) {

                outflags &= ~(MD_spc | MD_nl);
                md_rawword(suffix);
                outflags &= ~(MD_spc | MD_nl);
                md_rawword(suffix);

+               if (*suffix == '`')
+                       code_blocks--;

        }
 }
 
        }
 }
 


@@ -708,7 +753,7 @@ md_pre_word(struct roff_node *n)
 {
        const char      *prefix;
 
 {
        const char      *prefix;
 

-       if ((prefix = md_acts[n->tok].prefix) != NULL) {
+       if ((prefix = md_act(n->tok)->prefix) != NULL) {

                md_word(prefix);
                outflags &= ~MD_spc;
        }
                md_word(prefix);
                outflags &= ~MD_spc;
        }


@@ -720,7 +765,7 @@ md_post_word(struct roff_node *n)
 {
        const char      *suffix;
 
 {
        const char      *suffix;
 

-       if ((suffix = md_acts[n->tok].suffix) != NULL) {
+       if ((suffix = md_act(n->tok)->suffix) != NULL) {

                outflags &= ~(MD_spc | MD_nl);
                md_word(suffix);
        }
                outflags &= ~(MD_spc | MD_nl);
                md_word(suffix);
        }


@@ -956,21 +1001,17 @@ md_pre_Eo(struct roff_node *n)
 static void
 md_post_Eo(struct roff_node *n)
 {
 static void
 md_post_Eo(struct roff_node *n)
 {

-       int      body, tail;
-

        if (n->end != ENDBODY_NOT) {
                outflags |= MD_spc;
                return;
        }
 
        if (n->end != ENDBODY_NOT) {
                outflags |= MD_spc;
                return;
        }
 

-       body = n->child != NULL || n->parent->head->child != NULL;
-       tail = n->parent->tail != NULL && n->parent->tail->child != NULL;
+       if (n->child == NULL && n->parent->head->child == NULL)
+               return;

 
 

-       if (body && tail)
+       if (n->parent->tail != NULL && n->parent->tail->child != NULL)

                outflags &= ~MD_spc;
                outflags &= ~MD_spc;

-        else if ( ! (body || tail))
-               md_preword();
-        else if ( ! tail)
+        else

                outflags |= MD_spc;
 }
 
                outflags |= MD_spc;
 }
 


@@ -1018,6 +1059,15 @@ md_post_Fd(struct roff_node *n)
        outflags |= MD_br;
 }
 
        outflags |= MD_br;
 }
 

+static void
+md_post_Fl(struct roff_node *n)
+{
+       md_post_raw(n);
+       if (n->child == NULL && n->next != NULL &&
+           n->next->type != ROFFT_TEXT && !(n->next->flags & NODE_LINE))
+               outflags &= ~MD_spc;
+}
+

 static int
 md_pre_Fn(struct roff_node *n)
 {
 static int
 md_pre_Fn(struct roff_node *n)
 {


@@ -1128,7 +1178,8 @@ md_pre_It(struct roff_node *n)
 
        case ROFFT_HEAD:
                bln = n->parent->parent;
 
        case ROFFT_HEAD:
                bln = n->parent->parent;

-               if (bln->norm->Bl.comp == 0)
+               if (bln->norm->Bl.comp == 0 &&
+                   bln->norm->Bl.type != LIST_column)

                        outflags |= MD_sp;
                outflags |= MD_nl;
 
                        outflags |= MD_sp;
                outflags |= MD_nl;
 


@@ -1154,9 +1205,14 @@ md_pre_It(struct roff_node *n)
                        break;
                case LIST_enum:
                        md_preword();
                        break;
                case LIST_enum:
                        md_preword();

-                       printf("%d.\t", ++bln->norm->Bl.count);
+                       if (bln->norm->Bl.count < 99)
+                               bln->norm->Bl.count++;
+                       printf("%d.\t", bln->norm->Bl.count);

                        escflags &= ~ESC_FON;
                        break;
                        escflags &= ~ESC_FON;
                        break;

+               case LIST_column:
+                       outflags |= MD_br;
+                       return 0;

                default:
                        return 0;
                }
                default:
                        return 0;
                }


@@ -1253,39 +1309,81 @@ md_post_Lb(struct roff_node *n)
                outflags |= MD_br;
 }
 
                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)
 {
 static int
 md_pre_Lk(struct roff_node *n)
 {

-       const struct roff_node *link, *descr;
-       const unsigned char *s;
+       const struct roff_node *link, *descr, *punct;

 
        if ((link = n->child) == NULL)
                return 0;
 
 
        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("<");
+       /* Find beginning of trailing punctuation. */
+       punct = n->last;
+       while (punct != link && punct->flags & NODE_DELIMC)
+               punct = punct->prev;
+       punct = punct->next;
+
+       /* Link text. */
+       descr = link->next;
+       if (descr == punct)
+               descr = link;  /* no text */
+       md_rawword("[");
+       outflags &= ~MD_spc;
+       do {
+               md_word(descr->string);
+               descr = descr->next;
+       } while (descr != punct);
+       outflags &= ~MD_spc;

 
 

-       for (s = link->string; *s != '\0'; s++) {
-               if (strchr("%)<>", *s) != NULL) {
-                       printf("%%%2.2hhX", *s);
-                       outcount += 3;
-               } else {
-                       putchar(*s);
+       /* Link target. */
+       md_rawword("](");
+       md_uri(link->string);
+       outflags &= ~MD_spc;
+       md_rawword(")");
+
+       /* Trailing punctuation. */
+       while (punct != NULL) {
+               md_word(punct->string);
+               punct = punct->next;
+       }
+       return 0;
+}
+
+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++;
                }
        }
                        outcount++;
                }
        }

-

        outflags &= ~MD_spc;
        outflags &= ~MD_spc;

-       md_rawword(link->next == NULL ? ">" : ")");
+       md_rawword(")");

        return 0;
 }
 
        return 0;
 }