storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleaned version of 20200823_q branch. Changes the behaviour of the q tag (when m17n and Unicode are configured) to use "smart" quotes if the display charset can handle them. Falls back to old behaviour (ASCII quotes with left/right quote semantics for 6/0 and 2/6) if display charset is us-ascii.

Browse Source 
Also changes the behaviour of conv_entity() to convert left/right quotes and some dashes because named entities are needed for the new code for the q tag.
This commit is contained in:
Ambrose Li
2020-08-23 22:20:43 -04:00
parent b65f7b243d
commit 9f18e67a9b
25 changed files with 103 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
entity.c
View File

@@ -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 "?";
}