OSDN Git Service

(root) / modchxj / mod_chxj.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 735ba95)
* Changed rgb_func_to_value function.
authorAtsushi Konno <konn@users.sourceforge.jp>
Sat, 15 Nov 2008 16:56:01 +0000 (01:56 +0900)
committerAtsushi Konno <konn@users.sourceforge.jp>
Sat, 15 Nov 2008 16:56:01 +0000 (01:56 +0900)
src/chxj_css.c patch | blob | history
test/chxj_ixhtml10/test_chxj_ixhtml10.c patch | blob | history

diff --git a/src/chxj_css.c b/src/chxj_css.c
index 668540c..fe2fb66 100644 (file)
--- a/src/chxj_css.c
+++ b/src/chxj_css.c
@@ -1204,10 +1204,10 @@ chxj_css_rgb_func_to_value(apr_pool_t *pool, const char *rgb_func_string)
     }
     if (blue && (pstat = strchr(blue, '%'))) {
       *pstat = 0;
+      blue_per_flag = 1;
     }
     else {
       blue = "0";
-      blue_per_flag = 1;
     }
     double d_red   = (double)chxj_atoi(red);
     double d_green = (double)chxj_atoi(green);
diff --git a/test/chxj_ixhtml10/test_chxj_ixhtml10.c b/test/chxj_ixhtml10/test_chxj_ixhtml10.c
index 667c552..7ff253c 100644 (file)
--- a/test/chxj_ixhtml10/test_chxj_ixhtml10.c
+++ b/test/chxj_ixhtml10/test_chxj_ixhtml10.c
@@ -32615,8 +32615,12 @@ void test_ixhtml10_nlmark_001()
 
 void test_ixhtml10_nlmark_002()
 {
-#define  TEST_STRING   "<div>\n</div>"
-#define  RESULT_STRING "<div>\r\n</div>"
+#define  TEST_STRING   "<html><div>\n</div></html>"
+#define  RESULT_STRING "<?xml version=\"1.0\" encoding=\"Shift_JIS\" ?>\r\n" \
+                       "<!DOCTYPE html PUBLIC \"-//i-mode group (ja)//DTD XHTML i-XHTML(Locale/Ver.=ja/1.0) 1.0//EN\" \"i-xhtml_4ja_10.dtd\">\r\n" \
+                       "<html xmlns=\"http://www.w3.org/1999/xhtml\">" \
+                       "<div>\r\n</div>" \
+                       "</html>"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -32652,8 +32656,12 @@ void test_ixhtml10_nlmark_002()
 }
 void test_ixhtml10_nlmark_003()
 {
-#define  TEST_STRING   "<div>\n</div>"
-#define  RESULT_STRING "<div>\r</div>"
+#define  TEST_STRING   "<html><div>\n</div></html>"
+#define  RESULT_STRING "<?xml version=\"1.0\" encoding=\"Shift_JIS\" ?>\r" \
+                       "<!DOCTYPE html PUBLIC \"-//i-mode group (ja)//DTD XHTML i-XHTML(Locale/Ver.=ja/1.0) 1.0//EN\" \"i-xhtml_4ja_10.dtd\">\r" \
+                       "<html xmlns=\"http://www.w3.org/1999/xhtml\">" \
+                       "<div>\r</div>" \
+                       "</html>"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -32690,8 +32698,12 @@ void test_ixhtml10_nlmark_003()
 
 void test_ixhtml10_nlmark_004()
 {
-#define  TEST_STRING   "<div>\n</div>"
-#define  RESULT_STRING "<div>\n</div>"
+#define  TEST_STRING   "<html><div>\n</div></html>"
+#define  RESULT_STRING "<?xml version=\"1.0\" encoding=\"Shift_JIS\" ?>\n" \
+                       "<!DOCTYPE html PUBLIC \"-//i-mode group (ja)//DTD XHTML i-XHTML(Locale/Ver.=ja/1.0) 1.0//EN\" \"i-xhtml_4ja_10.dtd\">\n" \
+                       "<html xmlns=\"http://www.w3.org/1999/xhtml\">" \
+                       "<div>\n</div>" \
+                       "</html>"
   char  *ret;
   char  *tmp;
   device_table spec;
mod_chxj
About OSDN
Find Software
Develop Software
Help