From 1a26f52fd1d8761ca8da155a8503936dbb22bf1c Mon Sep 17 00:00:00 2001
From: Myun2 <myun2@nwhite.info>
Date: Wed, 29 Dec 2010 15:13:17 +0900
Subject: [PATCH] =?utf8?q?web/css/attr=5Ftext.hpp:=20font=5Fsize=E5=AF=BE?=
 =?utf8?q?=E5=BF=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 roast/include/roast/web/css/attr_text.hpp | 18 ++++++++++++++++++
 roast/test/lexical_test/css_test.cpp      |  6 ++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/roast/include/roast/web/css/attr_text.hpp b/roast/include/roast/web/css/attr_text.hpp
index 77ff7c9f..996326f0 100644
--- a/roast/include/roast/web/css/attr_text.hpp
+++ b/roast/include/roast/web/css/attr_text.hpp
@@ -119,6 +119,24 @@ namespace roast
 				ROAST_CSS_STR_DEF(inherit)
 			};
 			typedef font_variant_<_true_analyze> font_variant;
+
+			//	font_size
+			template <typename _Value>//<absolute-size> | <relative-size> | <length> | <percentage> | inherit
+			struct font_size_ : declaration_<_attrname_str::font_size, _Value>
+			{
+				ROAST_LEXICAL_FIXSTR(xx_small, "xx-small")
+				ROAST_LEXICAL_FIXSTR(x_small, "x-small")
+				ROAST_CSS_STR_DEF(small)
+				ROAST_CSS_STR_DEF(medium)	//	default
+				ROAST_CSS_STR_DEF(large)
+				ROAST_LEXICAL_FIXSTR(x_large, "x-large")
+				ROAST_LEXICAL_FIXSTR(xx_large, "xx-large")
+				
+				ROAST_CSS_STR_DEF(larger)
+				ROAST_CSS_STR_DEF(smaller)
+				ROAST_CSS_STR_DEF(inherit)
+			};
+			typedef font_size_<_true_analyze> font_size;
 		}
 	}
 }
diff --git a/roast/test/lexical_test/css_test.cpp b/roast/test/lexical_test/css_test.cpp
index 189f0f5f..0b8c65ce 100644
--- a/roast/test/lexical_test/css_test.cpp
+++ b/roast/test/lexical_test/css_test.cpp
@@ -42,8 +42,10 @@ int main()
 	//float_string<132,58,2> a;
 	//num_string<592116> a;
 	font_<_Family, _Size/*, _Style, _Weight*/, _Variant, _Height> b;
-	font_style_<font_style::italic> c;
-	font_style_<font_style::bold> d;
+	//font_style_<font_style::italic> c;
+	//font_style_<font_style::bold> d;
+	font_variant_<font_variant::small_caps> c;
+	font_size_<font_size::x_large> d;
 	//unit::px_<10> a;
 	a.generate(printer(),printer());
 	printf(";\n");
-- 
2.11.0