aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFumitoshi UKAI <ukai@debian.or.jp>2004-11-04 17:25:44 +0000
committerFumitoshi UKAI <ukai@debian.or.jp>2004-11-04 17:25:44 +0000
commit42508f56c5026efd969eb88e553dbb879e22e50d (patch)
tree9b9fbd1c107353573c122b4338c6c6ad92a57327
parentBug#276246: w3m's locale parsing should at least see '@euro' modifier (diff)
downloadw3m-42508f56c5026efd969eb88e553dbb879e22e50d.tar.gz
w3m-42508f56c5026efd969eb88e553dbb879e22e50d.zip
[w3m-dev 04117] Re: start attribute and value attribute on ordered lists
* file.c (HTMLtagproc1): allow negative value for start attr From: Hiroyuki Ito <ZXB01226@nifty.com>
-rw-r--r--ChangeLog7
-rw-r--r--file.c8
2 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 8def00b..8124dc4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-05 Hiroyuki Ito <ZXB01226@nifty.com>
+
+ * [w3m-dev 04117] Re: start attribute and value attribute on ordered lists
+ * file.c (HTMLtagproc1): allow negative value for start attr
+
2004-10-14 Fumitoshi UKAI <ukai@debian.or.jp>
* Bug#276246: w3m's locale parsing should at least see '@euro' modifier
@@ -8588,4 +8593,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.939 2004/10/13 16:52:49 ukai Exp $
+$Id: ChangeLog,v 1.940 2004/11/04 17:25:44 ukai Exp $
diff --git a/file.c b/file.c
index 18346e9..7869dcb 100644
--- a/file.c
+++ b/file.c
@@ -1,4 +1,4 @@
-/* $Id: file.c,v 1.235 2004/04/16 18:47:19 ukai Exp $ */
+/* $Id: file.c,v 1.236 2004/11/04 17:25:45 ukai Exp $ */
#include "fm.h"
#include <sys/types.h>
#include "myctype.h"
@@ -4180,7 +4180,7 @@ HTMLtagproc1(struct parsed_tag *tag, struct html_feed_environ *h_env)
}
PUSH_ENV(cmd);
if (cmd == HTML_UL || cmd == HTML_OL) {
- if (parsedtag_get_value(tag, ATTR_START, &count) && count > 0) {
+ if (parsedtag_get_value(tag, ATTR_START, &count)) {
envs[h_env->envc].count = count - 1;
}
}
@@ -4239,6 +4239,8 @@ HTMLtagproc1(struct parsed_tag *tag, struct html_feed_environ *h_env)
count = atoi(p);
if (count > 0)
envs[h_env->envc].count = count;
+ else
+ envs[h_env->envc].count = 0;
}
switch (envs[h_env->envc].env) {
case HTML_UL:
@@ -4272,7 +4274,7 @@ HTMLtagproc1(struct parsed_tag *tag, struct html_feed_environ *h_env)
case HTML_OL:
if (parsedtag_get_value(tag, ATTR_TYPE, &p))
envs[h_env->envc].type = (int)*p;
- switch (envs[h_env->envc].type) {
+ switch ((envs[h_env->envc].count > 0)? envs[h_env->envc].type: '1') {
case 'i':
num = romanNumeral(envs[h_env->envc].count);
break;