diff -u csstidy/csspp_globals.hpp ../csstidy1.4-original/csstidy/csspp_globals.hpp --- csstidy/csspp_globals.hpp 2010-10-26 21:20:13.707154001 +0900 +++ ../csstidy1.4-original/csstidy/csspp_globals.hpp 2007-07-10 10:21:28.000000000 +0900 @@ -28,7 +28,6 @@ #include #include #include -#include "string.h" #include "umap.hpp" #include "datastruct.hpp" diff -u csstidy/csstidy.cpp ../csstidy1.4-original/csstidy/csstidy.cpp --- csstidy/csstidy.cpp 2010-10-26 21:57:51.000000000 +0900 +++ ../csstidy1.4-original/csstidy/csstidy.cpp 2010-10-26 21:16:52.000000000 +0900 @@ -43,12 +43,6 @@ settings["silent"] = 0; settings["preserve_css"] = 0; settings["timestamp"] = 0; - // create multiple properties values by assigning its key to a boolean integer (1:true, 0:false) - bool_array_settings["multiple_properties"]["cursor"] = 1; - bool_array_settings["multiple_properties"]["background"] = 1; - // define here all the property value need to be printed as they are (because of complex CSS3 rule) - bool_array_settings["escape_optimize"]["-webkit-gradient"] = 1; - bool_array_settings["escape_optimize"]["-moz-linear-gradient"] = 1; csstemplate.push_back(""); //string before @rule csstemplate.push_back(" {\n"); //bracket after @-rule @@ -89,13 +83,10 @@ } if (css[media][selector].has(property)) { - if (!bool_array_settings["multiple_properties"].has(property) && (!is_important(css[media][selector][property]) || (is_important(css[media][selector][property]) && is_important(value)))) { + if (!is_important(css[media][selector][property]) || (is_important(css[media][selector][property]) && is_important(value))) { css[media][selector].erase(property); css[media][selector][property] = trim(value); } - if (bool_array_settings["multiple_properties"].has(property)){ - css_multi[media][selector][property][css_multi[media][selector][property].size() + 1] = trim(value); - } } else { css[media][selector][property] = trim(value); } diff -u csstidy/csstidy.hpp ../csstidy1.4-original/csstidy/csstidy.hpp --- csstidy/csstidy.hpp 2010-10-26 21:14:17.759154000 +0900 +++ ../csstidy1.4-original/csstidy/csstidy.hpp 2007-07-10 10:20:54.000000000 +0900 @@ -27,11 +27,9 @@ vector import, csstemplate; map > logs; map settings; - bool_string_array bool_array_settings; private: css_struct css; - css_struct_multi css_multi; vector csstokens; string tokens, cur_selector, cur_at, cur_property, cur_sub_value, cur_value, cur_string; int line; diff -u csstidy/datastruct.hpp ../csstidy1.4-original/csstidy/datastruct.hpp --- csstidy/datastruct.hpp 2010-10-26 20:55:33.027154000 +0900 +++ ../csstidy1.4-original/csstidy/datastruct.hpp 2007-07-10 10:20:54.000000000 +0900 @@ -24,14 +24,6 @@ typedef umap sstore; typedef umap css_struct; -typedef umap node_multi; -typedef umap pstore_multi; -typedef umap sstore_multi; -typedef umap css_struct_multi; - -typedef umap bool_node; -typedef umap bool_string_array; - enum parse_status { is,ip,iv,instr,ic,at diff -u csstidy/parse_css.cpp ../csstidy1.4-original/csstidy/parse_css.cpp --- csstidy/parse_css.cpp 2010-10-26 21:57:25.000000000 +0900 +++ ../csstidy1.4-original/csstidy/parse_css.cpp 2010-10-26 21:20:47.000000000 +0900 @@ -146,7 +146,7 @@ if (css_input[i] == ':' || css_input[i] == '=' && cur_property != "") // IE really accepts =, so csstidy will fix those mistakes { status = iv; - bool valid = bool_array_settings["multiple_properties"].has(cur_property) || !settings["discard_invalid_properties"] || + bool valid = !settings["discard_invalid_properties"] || (all_properties.count(cur_property) > 0 && all_properties[cur_property].find(css_level, 0) != string::npos); if (valid) { add_token(PROPERTY, cur_property); @@ -354,12 +354,6 @@ } else if (from == is) { cur_selector += cur_string; } - } else { - if (temp_add == " ") { - if (css_input[i - 1] != ',') { - cur_string += temp_add; - } - } } break; @@ -405,12 +399,6 @@ string csstidy::optimise_subvalue(string subvalue, const string property) { subvalue = trim(subvalue); - for (bool_node::iterator i = bool_array_settings["escape_optimize"].begin(); i != bool_array_settings["escape_optimize"].end(); ++i) { - if (subvalue.find(i->first) >= 0) { - return subvalue; - } - - } string temp = compress_numbers(subvalue, property); if (temp != subvalue) { if (temp.length() > subvalue.length()) { diff -u csstidy/print_css.cpp ../csstidy1.4-original/csstidy/print_css.cpp --- csstidy/print_css.cpp 2010-10-26 21:23:19.695154001 +0900 +++ ../csstidy1.4-original/csstidy/print_css.cpp 2007-07-10 10:20:52.000000000 +0900 @@ -48,11 +48,6 @@ { add_token(PROPERTY, k->first, true); add_token(VALUE, k->second, true); - for(umap::iterator l = css_multi[i->first][j->first][k->first].begin(); l != css_multi[i->first][j->first][k->first].end(); ++l) - { - add_token(PROPERTY, k->first, true); - add_token(VALUE, l->second, true); - } } add_token(SEL_END, j->first, true);