From: konn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Date: Fri, 18 Jul 2008 06:34:40 +0000 (+0000)
Subject:   * Added option tag with CSS for au XHTML converter.
X-Git-Tag: v0.13.0~1353
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=62a4ef946804617023e5e68c98b794b56015bb92;p=modchxj%2Fmod_chxj.git

  * Added option tag with CSS for au XHTML converter.


git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/sandbox@3012 1a406e8e-add9-4483-a2c8-d8cac5b7c224
---

diff --git a/src/chxj_xhtml_mobile_1_0.c b/src/chxj_xhtml_mobile_1_0.c
index 6e1c62c7..af34aae6 100644
--- a/src/chxj_xhtml_mobile_1_0.c
+++ b/src/chxj_xhtml_mobile_1_0.c
@@ -3460,17 +3460,18 @@ s_xhtml_1_0_end_select_tag(void *pdoc, Node *UNUSED(child))
  * @return The conversion result is returned.
  */
 static char *
-s_xhtml_1_0_start_option_tag(void *pdoc, Node *child)
+s_xhtml_1_0_start_option_tag(void *pdoc, Node *node)
 {
   xhtml_t *xhtml = GET_XHTML(pdoc);
   Doc     *doc   = xhtml->doc;
   Attr    *attr;
+  char    *attr_style = NULL;
 
   char *selected   = NULL;
   char *value      = NULL;
 
   W_L("<option");
-  for (attr = qs_get_attr(doc,child);
+  for (attr = qs_get_attr(doc,node);
        attr;
        attr = qs_get_next_attr(doc,attr)) {
     char *nm  = qs_get_attr_name(doc,attr);
@@ -3479,6 +3480,10 @@ s_xhtml_1_0_start_option_tag(void *pdoc, Node *child)
       /* CHTML version 2.0 */
       selected = apr_pstrdup(doc->buf.pool, val);
     }
+    else if (STRCASEEQ('s','S',"style",nm) && val && *val) {
+      /* CHTML version 2.0 */
+      attr_style = apr_pstrdup(doc->buf.pool, val);
+    }
     else if (STRCASEEQ('v','V',"value",nm)) {
       /* CHTML version 2.0 */
       value = apr_pstrdup(doc->buf.pool, val);
@@ -3493,6 +3498,9 @@ s_xhtml_1_0_start_option_tag(void *pdoc, Node *child)
     W_L(" selected=\"selected\"");
   }
   W_L(">");
+  if (IS_CSS_ON(xhtml->entryp)) {
+    s_xhtml_1_0_push_and_get_now_style(pdoc, node, attr_style);
+  }
   return xhtml->out;
 }
 
@@ -3512,6 +3520,10 @@ s_xhtml_1_0_end_option_tag(void *pdoc, Node *UNUSED(child))
   Doc     *doc   = xhtml->doc;
 
   W_L("</option>");
+  if (IS_CSS_ON(xhtml->entryp)) {
+    chxj_css_pop_prop_list(xhtml->css_prop_stack);
+  }
+
   return xhtml->out;
 }