1 files changed, 13 insertions, 1 deletions
diff --git a/entity.c b/entity.c
index 45dc95e..67b8cfb 100644
--- a/entity.c
+++ b/entity.c
@@ -58,11 +58,23 @@ conv_entity(unsigned int c)
 #ifdef USE_M17N
 #ifdef USE_UNICODE
     if (c <= WC_C_UCS4_END) {	/* Unicode */
+	char *chk;
 	wc_uchar utf8[7];
 	wc_ucs_to_utf8(c, utf8);
-	return wc_conv((char *)utf8, WC_CES_UTF_8, InnerCharset)->ptr;
+	/* we eventually need to display it so check DisplayCharset */
+	chk = wc_conv((char *)utf8, WC_CES_UTF_8, DisplayCharset ? DisplayCharset : WC_CES_US_ASCII)->ptr;
+	if (strcmp(chk, "?") != 0)
+	    return wc_conv((char *)utf8, WC_CES_UTF_8, InnerCharset)->ptr;
     }
 #endif
 #endif
+    if (c == 0x201c || c == 0x201f || c == 0x201d || c == 0x2033)
+	return "\"";
+    if (c == 0x2018 || c == 0x201b || c == 0x2019 || c == 0x2032)
+	return "'";
+    if (c >= 0x2010 && c < 0x2014)
+	return "-";
+    if (c == 0x2014)
+	return "--";
     return "?";
 }