From 2da973e1cbee8826e4ccfd50d7f8ab5517bd9006 Mon Sep 17 00:00:00 2001
From: Ingo Schwarze <schwarze@openbsd.org>
Date: Mon, 6 Mar 2017 14:58:10 +0000
Subject: URIs need different escaping; reported by reyk@

---
 mdoc_markdown.c                    | 17 +++++++++++++----
 regress/mdoc/Rs/allch.out_markdown |  4 ++--
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/mdoc_markdown.c b/mdoc_markdown.c
index cb1bdfa3..e43eb568 100644
--- a/mdoc_markdown.c
+++ b/mdoc_markdown.c
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_markdown.c,v 1.2 2017/03/04 21:41:29 schwarze Exp $ */
+/*	$Id: mdoc_markdown.c,v 1.3 2017/03/06 14:58:10 schwarze Exp $ */
 /*
  * Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -220,7 +220,7 @@ static	const struct md_act md_acts[MDOC_MAX + 1] = {
 	{ 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, NULL, md_post_pc, NULL, NULL }, /* %U */
+	{ 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 */
@@ -1235,6 +1235,7 @@ 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;
@@ -1251,8 +1252,16 @@ md_pre_Lk(struct roff_node *n)
 	} else
 		md_rawword("<");
 
-	outflags &= ~MD_spc;
-	md_word(link->string);
+	for (s = link->string; *s != '\0'; s++) {
+		if (strchr("%)<>", *s) != NULL) {
+			printf("%%%2.2hhX", *s);
+			outcount += 3;
+		} else {
+			putchar(*s);
+			outcount++;
+		}
+	}
+
 	outflags &= ~MD_spc;
 	md_rawword(link->next == NULL ? ">" : ")");
 	return 0;
diff --git a/regress/mdoc/Rs/allch.out_markdown b/regress/mdoc/Rs/allch.out_markdown
index 7faac2a3..afc6488f 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>,
 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>,
 page number,
 institutional author,
 city name,
-- 
cgit v1.2.3-56-ge451