attr_list.hpp: list_style_position 追加

diff --git a/roast/include/roast/web/css/attr_list.hpp b/roast/include/roast/web/css/attr_list.hpp
index 35a8ae3..15512c6 100644 (file)
--- a/roast/include/roast/web/css/attr_list.hpp
+++ b/roast/include/roast/web/css/attr_list.hpp
@@ -31,14 +31,14 @@ namespace roast
                        struct list_style_ : _values<_attrname_str::list_style, _Type, _Position, _Image>{};
                        
                        //      list_style_type
-                       template <typename _Value>
-                       struct list_style_type_ : declaration_<_attrname_str::list_style_type, _Value>
+                       template <typename _ListVisual>
+                       struct list_style_type_ : declaration_<_attrname_str::list_style_type, _ListVisual>
                        {
                                ROAST_CSS_STR_DEF(disc)
                                ROAST_CSS_STR_DEF(circle)
                                ROAST_CSS_STR_DEF(square)
                                ROAST_CSS_STR_DEF(decimal)
-                               ROAST_LEXICAL_FIXSTR(decimal_leading-zero,"decimal-leading-zero")
+                               ROAST_LEXICAL_FIXSTR(decimal_leading_zero,"decimal-leading-zero")
                                ROAST_LEXICAL_FIXSTR(lower_roman,       "lower-roman")
                                ROAST_LEXICAL_FIXSTR(upper_roman,       "upper-roman")
                                ROAST_LEXICAL_FIXSTR(lower_greek,       "lower-greek")
@@ -62,45 +62,15 @@ namespace roast
                        typedef list_style_type_<list_style_type_<_true_analyze>::square> list_style_type_square;
                        typedef list_style_type_<list_style_type_<_true_analyze>::decimal> list_style_type_decimal;
                        
-                       //      top
-                       template <typename _Pos>
-                       struct top_ : declaration_<_attrname_str::top, _Pos> {};
-                       
-                       //      left
-                       template <typename _Pos>
-                       struct left_ : declaration_<_attrname_str::left, _Pos> {};
-                       
-                       //      bottom
-                       template <typename _Pos>
-                       struct bottom_ : declaration_<_attrname_str::bottom, _Pos> {};
-                       
-                       //      right
-                       template <typename _Pos>
-                       struct right_ : declaration_<_attrname_str::right, _Pos> {};
-                       
-                       /////////////
-                       
-                       //      float
-                       template <typename _Value>
-                       struct float_ : declaration_<_attrname_str::_float, _Value>
+                       //      list_style_position
+                       template <typename _NewLinePos>
+                       struct list_style_position_ : declaration_<_attrname_str::list_style_position, _NewLinePos>
                        {
-                               ROAST_CSS_STR_DEF(left)
-                               ROAST_CSS_STR_DEF(right)
-                               ROAST_CSS_STR_DEF(none)
+                               ROAST_CSS_STR_DEF(inside)
+                               ROAST_CSS_STR_DEF(outside)
                                ROAST_CSS_STR_DEF(inherit)
                        };
-                       typedef float_<_true_analyze> _float, Float;
-
-                       //      clear
-                       template <typename _Value>
-                       struct clear_ : declaration_<_attrname_str::clear, _Value>
-                       {
-                               ROAST_CSS_STR_DEF(none)
-                               ROAST_CSS_STR_DEF(left)
-                               ROAST_CSS_STR_DEF(right)
-                               ROAST_CSS_STR_DEF(both)
-                       };
-                       typedef clear_<_true_analyze> clear;
+                       typedef list_style_position_<list_style_position_<_true_analyze>::inside> list_nl_pos_inside;
 
                        /////////////////////////////////////////////////////////////////////////
                }

diff --git a/roast/include/roast/web/css/attributes.hpp b/roast/include/roast/web/css/attributes.hpp
index 887a3e2..a0abae8 100644 (file)
--- a/roast/include/roast/web/css/attributes.hpp
+++ b/roast/include/roast/web/css/attributes.hpp
@@ -124,6 +124,7 @@ namespace roast
 
 #include "roast/web/css/attr_box.hpp"
 #include "roast/web/css/attr_visual.hpp"
+#include "roast/web/css/attr_list.hpp"
 #include "roast/web/css/attr_background.hpp"
 
 #undef ROAST_CSS_DECL_ATTR