aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTatsuya Kinoshita <tats@debian.org>2013-08-01 22:07:22 +0000
committerTatsuya Kinoshita <tats@debian.org>2013-08-01 22:07:22 +0000
commitc400b2f1676b2a127c2fd3e79d5b797b18a74952 (patch)
tree23239c119bb7f074a35452c15f19e8da775e125d
parentDrop unneeded menu dependency (closes: #647385) (diff)
downloadw3m-c400b2f1676b2a127c2fd3e79d5b797b18a74952.tar.gz
w3m-c400b2f1676b2a127c2fd3e79d5b797b18a74952.zip
New patch 170_w3mman2html-utf8.patch (LP: #680202)
-rw-r--r--debian/patches/170_w3mman2html-utf8.patch25
-rw-r--r--debian/patches/series1
2 files changed, 26 insertions, 0 deletions
diff --git a/debian/patches/170_w3mman2html-utf8.patch b/debian/patches/170_w3mman2html-utf8.patch
new file mode 100644
index 0000000..53e93e6
--- /dev/null
+++ b/debian/patches/170_w3mman2html-utf8.patch
@@ -0,0 +1,25 @@
+Subject: Correct underline processing and more UTF-8 support for w3mman2html.cgi
+Origin: https://bugs.launchpad.net/ubuntu/+source/w3m/+bug/680202
+Author: Piotr P. Karwasz
+
+diff -ru w3m-0.5.2.orig/scripts/w3mman/w3mman2html.cgi.in w3m-0.5.2/scripts/w3mman/w3mman2html.cgi.in
+--- w3m-0.5.2.orig/scripts/w3mman/w3mman2html.cgi.in 2010-11-22 14:00:11.000000000 +0100
++++ w3m-0.5.2/scripts/w3mman/w3mman2html.cgi.in 2010-11-22 14:02:48.000000000 +0100
+@@ -126,12 +126,14 @@
+ s/\&/\&amp;/g;
+ s/\</\&lt;/g;
+ s/\>/\&gt;/g;
++ # non ASCII UTF-8 codepoint
++ my $utf8="[\300-\337][\200-\277]|[\340-\357][\200-\277]{2}|[\360-\367][\200-\277]{3}|[\370-\373][\200-\277]{4}|[\374\375][\200-\277]{5}";
+
+- s@([\200-\377].)(\010{1,2}\1)+@<b>$1</b>@g;
++ s@($utf8)(\010\1)+@<b>$1</b>@g;
+ s@(\&\w+;|.)(\010\1)+@<b>$1</b>@g;
+- s@__\010{1,2}((\<b\>)?[\200-\377].(\</b\>)?)@<u>$1</u>@g;
++ s@_\010((\<b\>)?($utf8)(\</b\>)?)@<u>$1</u>@g;
+ s@_\010((\<b\>)?(\&\w+\;|.)(\</b\>)?)@<u>$1</u>@g;
+- s@((\<b\>)?[\200-\377].(\</b\>)?)\010{1,2}__@<u>$1</u>@g;
++ s@((\<b\>)?($utf8)(\</b\>)?)\010_@<u>$1</u>@g;
+ s@((\<b\>)?(\&\w+\;|.)(\</b\>)?)\010_@<u>$1</u>@g;
+ s@.\010(.)@$1@g;
+
diff --git a/debian/patches/series b/debian/patches/series
index 8b22a7e..fb0d5c6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@
140_sort-dump-links.patch
150_contact-list.patch
160_ignore-shy.patch
+170_w3mman2html-utf8.patch