Merge pull request #148 from SWTI2014/rendering/css-text-attribute

Rendering/css text attribute

Author: JenniferStamm

packages/HTML.package/CSSStyleResolver.class/class/inheritableAttributes.st

@@ -2,4 +2,4 @@ constants
 inheritableAttributes
 	"The following CSS Attributes are inheritable:"
 	"'azimuth', 'border-collapse', 'border-spacing', 'caption-side', 'color', 'cursor', 'direction', 'elevation', 'empty-cells', 'font-family', 'font-size', 'font-style', 'font-variant', 'font-weight', 'font', 'letter-spacing', 'line-height', 'list-style-image', 'list-style-position', 'list-style-type', 'list-style', 'orphans', 'pitch-range', 'pitch', 'quotes', 'richness', 'speak-header', 'speak-numeral', 'speak-punctuation', 'speak', 'speak-rate', 'stress', 'text-align', 'text-indent', 'text-transform', 'visibility', 'voice-family', 'volume', 'white-space', 'widows', 'word-spacing'"
-	^ #( #italic. #bold. #size. #color. #family)
+	^ #( #italic. #bold. #size. #color. #family. #align)

packages/HTML.package/CSSStyleResolver.class/instance/cssPrefixMap.st

@@ -5,6 +5,7 @@ cssPrefixMap
 		sizeFormatter := CSSSizeFormatter new.
 		cssPrefixMap := Dictionary newFrom: {
 			'font' -> CSSFontFormatter new.
+			'text' -> CSSTextFormatter new.
 			'color' -> CSSColorFormatter new.
 			'display' -> CSSDisplayFormatter new.
 			'list' -> CSSListFormatter new.

packages/HTML.package/CSSStyleResolver.class/methodProperties.json

@@ -1,9 +1,9 @@
 {
 	"class" : {
 		"for:" : "rs 6/7/2014 11:24:06.679",
-		"inheritableAttributes" : "SN 6/15/2014 13:13" },
+		"inheritableAttributes" : "SN 7/5/2014 16:04" },
 	"instance" : {
-		"cssPrefixMap" : "rs 6/20/2014 20:17:24.757",
+		"cssPrefixMap" : "SN 7/5/2014 11:57",
 		"domNode:" : "rs 6/7/2014 11:23:34.652",
 		"evaluateLocalStylesFor:" : "rs 6/7/2014 13:22:25.554",
 		"getFormatterFor:" : "rs 6/8/2014 14:03:12.648",

packages/HTML.package/CSSTextFormatter.class/README.md

@@ -0,0 +1,10 @@
+accessing
+attributeMap
+
+	^ attributeMap ifNil:
+		[ Dictionary newFrom: {
+			'text-decoration' -> [ :prop :fontAttribs | 
+					self readTextDecorationAttribute: prop propertyString to: fontAttribs ].
+			'text-align' -> [ :prop :fontAttribs | 
+					self readTextAlignAttribute: prop propertyString to: fontAttribs ]
+		}]

packages/HTML.package/CSSTextFormatter.class/instance/attributeMap.st

@@ -0,0 +1,4 @@
+parsing
+parseTextAttributesFrom: aCSSProperty into: aContext
+	(self attributeMap at: aCSSProperty propertyName ifAbsent: [nil])
+		ifNotNilDo: [:process | process value: aCSSProperty value: aContext ]

packages/HTML.package/CSSTextFormatter.class/instance/parseTextAttributesFrom.into..st

@@ -0,0 +1,7 @@
+parsing
+readTextAlignAttribute: aString to: aContext
+	aString splitBy: ' ' do: [:attribute | 
+		(attribute = 'center') ifTrue: [aContext at: #align put: #centered].
+		((attribute = 'left') or: [attribute = 'start']) ifTrue: [aContext at: #align put: #leftFlush].
+		((attribute = 'right') or: [attribute = 'end']) ifTrue: [aContext at: #align put: #rightFlush].
+		(attribute = 'justify') ifTrue: [aContext at: #align put: #justified].]

packages/HTML.package/CSSTextFormatter.class/instance/readTextAlignAttribute.to..st

@@ -0,0 +1,5 @@
+parsing
+readTextDecorationAttribute: aString to: aContext
+	aString splitBy: ' ' do: [:attribute | 
+		(attribute = 'underline') ifTrue: [aContext at: #underlined put: true].
+		(attribute = 'line-through') ifTrue: [aContext at: #struckOut put: true]]

packages/HTML.package/CSSTextFormatter.class/instance/readTextDecorationAttribute.to..st

@@ -0,0 +1,8 @@
+{
+	"class" : {
+		 },
+	"instance" : {
+		"attributeMap" : "SN 7/5/2014 12:30",
+		"parseTextAttributesFrom:into:" : "SN 7/5/2014 12:12",
+		"readTextAlignAttribute:to:" : "SN 7/5/2014 12:20",
+		"readTextDecorationAttribute:to:" : "SN 7/5/2014 11:57" } }

packages/HTML.package/CSSTextFormatter.class/methodProperties.json

@@ -0,0 +1,14 @@
+{
+	"category" : "HTML-Formatter",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "",
+	"instvars" : [
+		"attributeMap" ],
+	"name" : "CSSTextFormatter",
+	"pools" : [
+		 ],
+	"super" : "CSSFormatter",
+	"type" : "normal" }