2007-01-03 [paul] 2.6.1cvs94

	* src/html.c
		html entity conversion:
		move ™ to a more suitable place
		add • and –
		make sure — and — are both
		converted the same

diff --git a/ChangeLog b/ChangeLog
index 6b7ce7a4a28109bb18608a03f515d6cfc7243a39..7e3f0099488a5e308b0a90a2475a65ffcd82445c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-01-03 [paul]      2.6.1cvs94
+
+       * src/html.c
+               html entity conversion:
+               move ™ to a more suitable place
+               add • and –
+               make sure — and — are both
+               converted the same
+
 2007-01-02 [colin]     2.6.1cvs93
 
        * src/addrbook.c

diff --git a/PATCHSETS b/PATCHSETS
index e1055c235ef057627b988340f023a555a1c3d810..179b4c35b1d1d709ca191b650de88ff87037c465 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2201,3 +2201,4 @@
 ( cvs diff -u -r 1.213.2.128 -r 1.213.2.129 src/folder.c;  cvs diff -u -r 1.1.2.34 -r 1.1.2.35 src/imap_gtk.c;  cvs diff -u -r 1.2.2.24 -r 1.2.2.25 src/mh_gtk.c;  ) > 2.6.1cvs91.patchset
 ( cvs diff -u -r 1.1.2.31 -r 1.1.2.32 src/prefs_summaries.c;  ) > 2.6.1cvs92.patchset
 ( cvs diff -u -r 1.22.2.10 -r 1.22.2.11 src/addrbook.c;  cvs diff -u -r 1.13.2.23 -r 1.13.2.24 src/common/plugin.c;  cvs diff -u -r 1.1.4.61 -r 1.1.4.62 src/etpan/imap-thread.c;  ) > 2.6.1cvs93.patchset
+( cvs diff -u -r 1.12.2.16 -r 1.12.2.17 src/html.c;  ) > 2.6.1cvs94.patchset

diff --git a/configure.ac b/configure.ac
index 7650f23b5117b5709bfeaafe836b36fd5f8db9de..1a53fb0e0ae3d1633b8dfaed89c854ecedafd8f3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=93
+EXTRA_VERSION=94
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/html.c b/src/html.c
index 2d8042cdbbdc6062497f320af97dc449a8793b65..64f6a2618c2b795c9fde00b2ff175b69e6c320f0 100644 (file)
--- a/src/html.c
+++ b/src/html.c
@@ -48,9 +48,10 @@ static SC_HTMLSymbol symbol_list[] = {
        {"”",  "\""},
        {" "  , " "},
        {"™" , "(TM)"},
-       {"™", "(TM)"},
        {"…", "..."},
-       {"—", "-"},
+       {"•", "*"},
+       {"–", "-"},
+       {"—", "--"},
 };
 
 static SC_HTMLSymbol ascii_symbol_list[] = {
@@ -535,6 +536,9 @@ static void sc_html_parse_special(SC_HTMLParser *parser)
                        case 96:        /* backtick  */
                                symb = "`";
                                break;
+                       case 153:       /* trademark */
+                               symb = "(TM)";
+                               break;
                        case 338:       /* capital ligature OE  Π */
                                symb = "OE";  
                                break;
@@ -584,6 +588,9 @@ static void sc_html_parse_special(SC_HTMLParser *parser)
                        case 8224:      /* dagger               † */
                        case 8225:      /* double dagger        ‡ */
                                break;
+                       case 8226:      /* bullet       •  */
+                               symb = "*";  
+                               break;
                        case 8230:      /* horizontal ellipsis  … */
                                symb = "...";  
                                break;