From c460d651aec1651fa97152efcc173294e0af2121 Mon Sep 17 00:00:00 2001
From: konn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Date: Fri, 18 Jul 2008 06:34:34 +0000
Subject: [PATCH]   * Added option tag with CSS for CHTML4.0 converter.   *
 Added option tag with CSS for CHTML5.0 converter.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/sandbox@3010 1a406e8e-add9-4483-a2c8-d8cac5b7c224
---
 src/chxj_chtml50.c | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/chxj_chtml50.c b/src/chxj_chtml50.c
index 3a263aaa..3bdfdb0a 100644
--- a/src/chxj_chtml50.c
+++ b/src/chxj_chtml50.c
@@ -2471,7 +2471,7 @@ s_chtml50_end_select_tag(void *pdoc, Node *UNUSED(child))
  * @return The conversion result is returned.
  */
 static char *
-s_chtml50_start_option_tag(void *pdoc, Node *child)
+s_chtml50_start_option_tag(void *pdoc, Node *node)
 {
   Attr        *attr;
   chtml50_t   *chtml50;
@@ -2479,6 +2479,7 @@ s_chtml50_start_option_tag(void *pdoc, Node *child)
   request_rec *r;
   char        *selected;
   char        *value;
+  char        *attr_style = NULL;
 
   chtml50    = GET_CHTML50(pdoc);
   doc        = chtml50->doc;
@@ -2487,7 +2488,7 @@ s_chtml50_start_option_tag(void *pdoc, Node *child)
   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);
@@ -2498,6 +2499,12 @@ s_chtml50_start_option_tag(void *pdoc, Node *child)
       /*----------------------------------------------------------------------*/
       selected = apr_pstrdup(doc->buf.pool, val);
     }
+    else if (STRCASEEQ('s','S',"style", nm) && val && *val) {
+      /*----------------------------------------------------------------------*/
+      /* CHTML 1.0 version 2.0                                                */
+      /*----------------------------------------------------------------------*/
+      attr_style = apr_pstrdup(doc->buf.pool, val);
+    }
     else if (STRCASEEQ('v','V',"value", nm)) {
       /*----------------------------------------------------------------------*/
       /* CHTML 1.0 version 2.0                                                */
@@ -2514,6 +2521,11 @@ s_chtml50_start_option_tag(void *pdoc, Node *child)
     W_L(" selected");
   }
   W_L(">");
+
+  if (IS_CSS_ON(chtml50->entryp)) {
+    s_chtml50_push_and_get_now_style(pdoc, node, attr_style);
+  }
+
   return chtml50->out;
 }
 
@@ -2532,6 +2544,9 @@ s_chtml50_end_option_tag(void *pdoc, Node *UNUSED(child))
   chtml50_t *chtml50 = GET_CHTML50(pdoc);
 
   /* Don't close */
+  if (IS_CSS_ON(chtml50->entryp)) {
+    chxj_css_pop_prop_list(chtml50->css_prop_stack);
+  }
 
   return chtml50->out;
 }
-- 
2.11.0