diff --git a/packages/HTML.package/CSSFontFormatter.class/instance/fontMap.st b/packages/HTML.package/CSSFontFormatter.class/instance/fontMap.st index c2524b00..6c6f1098 100644 --- a/packages/HTML.package/CSSFontFormatter.class/instance/fontMap.st +++ b/packages/HTML.package/CSSFontFormatter.class/instance/fontMap.st @@ -16,7 +16,7 @@ fontMap 'cursive' -> 'URWChanceryL'. 'URW Chancery L' -> 'URWChanceryL'. 'monospace' -> 'NimbusMonoL'. - 'Courier New' -> 'NimubsMonoL'. + 'Courier New' -> 'NimbusMonoL'. 'Nimbus Mono L' -> 'NimbusMonoL'. 'Trebuchet MS' -> 'TrebuchetMS'. 'Andale Mono' -> 'AndaleMono'. diff --git a/packages/HTML.package/CSSFontFormatter.class/methodProperties.json b/packages/HTML.package/CSSFontFormatter.class/methodProperties.json index 650f282f..997abc47 100644 --- a/packages/HTML.package/CSSFontFormatter.class/methodProperties.json +++ b/packages/HTML.package/CSSFontFormatter.class/methodProperties.json @@ -13,7 +13,7 @@ "instance" : { "attributeMap" : "SN 6/11/2014 22:54", "factorForNamedSize:" : "SN 6/21/2014 12:13", - "fontMap" : "SN 6/12/2014 14:31", + "fontMap" : "SS 6/28/2014 19:59", "isValidStyleValue:" : "rs 5/21/2014 15:44:29.914", "isValidWeightValue:" : "rs 5/21/2014 15:43:47.846", "parseTextAttributesFrom:into:" : "SN 6/12/2014 22:14", diff --git a/packages/HTML.package/HtmlANode.class/instance/target.st b/packages/HTML.package/HtmlANode.class/instance/target.st new file mode 100644 index 00000000..bba6a85a --- /dev/null +++ b/packages/HTML.package/HtmlANode.class/instance/target.st @@ -0,0 +1,3 @@ +accessing +target + ^ self attributes at: 'target' ifAbsent: [nil] \ No newline at end of file diff --git a/packages/HTML.package/HtmlANode.class/methodProperties.json b/packages/HTML.package/HtmlANode.class/methodProperties.json index 01439e07..e1501a37 100644 --- a/packages/HTML.package/HtmlANode.class/methodProperties.json +++ b/packages/HTML.package/HtmlANode.class/methodProperties.json @@ -7,4 +7,5 @@ "endStyles:" : "rs 6/7/2014 18:33:42.305", "href" : "rs 6/7/2014 19:16:14.784", "startStyles:" : "rs 6/7/2014 18:33:14.832", - "tag" : "" } } + "tag" : "", + "target" : "SS 6/28/2014 18:02" } } diff --git a/packages/HTML.package/HtmlCODENode.class/instance/addDefaultStyle.st b/packages/HTML.package/HtmlCODENode.class/instance/addDefaultStyle.st new file mode 100644 index 00000000..c45c9aa9 --- /dev/null +++ b/packages/HTML.package/HtmlCODENode.class/instance/addDefaultStyle.st @@ -0,0 +1,7 @@ +accessing +addDefaultStyle + | styles | + styles := Dictionary newFrom: { + 'font-family' -> 'Courier New'. + }. + self addStyle: (CSSStyleRule fromDictionary: styles) \ No newline at end of file diff --git a/packages/HTML.package/HtmlCODENode.class/methodProperties.json b/packages/HTML.package/HtmlCODENode.class/methodProperties.json index 88d7363f..302e7ea3 100644 --- a/packages/HTML.package/HtmlCODENode.class/methodProperties.json +++ b/packages/HTML.package/HtmlCODENode.class/methodProperties.json @@ -2,4 +2,5 @@ "class" : { }, "instance" : { + "addDefaultStyle" : "SS 6/28/2014 20:47", "tag" : "" } } diff --git a/packages/HTML.package/HtmlDFNNode.class/instance/addDefaultStyle.st b/packages/HTML.package/HtmlDFNNode.class/instance/addDefaultStyle.st new file mode 100644 index 00000000..965111a6 --- /dev/null +++ b/packages/HTML.package/HtmlDFNNode.class/instance/addDefaultStyle.st @@ -0,0 +1,8 @@ +accessing +addDefaultStyle + | styles | + styles := Dictionary newFrom: { + 'font-style' -> 'italic'. + 'font-family' -> 'Times'. + }. + self addStyle: (CSSStyleRule fromDictionary: styles) \ No newline at end of file diff --git a/packages/HTML.package/HtmlDFNNode.class/methodProperties.json b/packages/HTML.package/HtmlDFNNode.class/methodProperties.json index 88d7363f..9b7a4d6f 100644 --- a/packages/HTML.package/HtmlDFNNode.class/methodProperties.json +++ b/packages/HTML.package/HtmlDFNNode.class/methodProperties.json @@ -2,4 +2,5 @@ "class" : { }, "instance" : { + "addDefaultStyle" : "SS 6/28/2014 18:42", "tag" : "" } } diff --git a/packages/HTML.package/HtmlEMNode.class/instance/addDefaultStyle.st b/packages/HTML.package/HtmlEMNode.class/instance/addDefaultStyle.st new file mode 100644 index 00000000..81e183bc --- /dev/null +++ b/packages/HTML.package/HtmlEMNode.class/instance/addDefaultStyle.st @@ -0,0 +1,7 @@ +accessing +addDefaultStyle + | styles | + styles := Dictionary newFrom: { + 'font-style' -> 'italic'. + }. + self addStyle: (CSSStyleRule fromDictionary: styles) \ No newline at end of file diff --git a/packages/HTML.package/HtmlEMNode.class/methodProperties.json b/packages/HTML.package/HtmlEMNode.class/methodProperties.json index 88d7363f..d4b460c0 100644 --- a/packages/HTML.package/HtmlEMNode.class/methodProperties.json +++ b/packages/HTML.package/HtmlEMNode.class/methodProperties.json @@ -2,4 +2,5 @@ "class" : { }, "instance" : { + "addDefaultStyle" : "SS 6/28/2014 18:35", "tag" : "" } } diff --git a/packages/HTML.package/HtmlKBDNode.class/instance/addDefaultStyle.st b/packages/HTML.package/HtmlKBDNode.class/instance/addDefaultStyle.st new file mode 100644 index 00000000..f01c4156 --- /dev/null +++ b/packages/HTML.package/HtmlKBDNode.class/instance/addDefaultStyle.st @@ -0,0 +1,7 @@ +accessing +addDefaultStyle + | styles | + styles := Dictionary newFrom: { + 'font-family' -> 'TrebuchetMS'. + }. + self addStyle: (CSSStyleRule fromDictionary: styles) \ No newline at end of file diff --git a/packages/HTML.package/HtmlKBDNode.class/methodProperties.json b/packages/HTML.package/HtmlKBDNode.class/methodProperties.json index 88d7363f..fc97cece 100644 --- a/packages/HTML.package/HtmlKBDNode.class/methodProperties.json +++ b/packages/HTML.package/HtmlKBDNode.class/methodProperties.json @@ -2,4 +2,5 @@ "class" : { }, "instance" : { + "addDefaultStyle" : "SS 6/29/2014 18:13", "tag" : "" } } diff --git a/packages/HTML.package/HtmlNodeDefaultStyleTest.class/README.md b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/README.md new file mode 100644 index 00000000..e69de29b diff --git a/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/htmlFormatter..st b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/htmlFormatter..st new file mode 100644 index 00000000..8a1c4bfd --- /dev/null +++ b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/htmlFormatter..st @@ -0,0 +1,4 @@ +accessing +htmlFormatter: anObject + + htmlFormatter := anObject \ No newline at end of file diff --git a/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/htmlFormatter.st b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/htmlFormatter.st new file mode 100644 index 00000000..a5e8d4f0 --- /dev/null +++ b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/htmlFormatter.st @@ -0,0 +1,4 @@ +accessing +htmlFormatter + + ^ htmlFormatter \ No newline at end of file diff --git a/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/setUp.st b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/setUp.st new file mode 100644 index 00000000..89bce7d6 --- /dev/null +++ b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/setUp.st @@ -0,0 +1,5 @@ +accessing +setUp + self timeout: 300. + self htmlFormatter: DHtmlFormatter new. + self styleResolver: CSSStyleResolver new \ No newline at end of file diff --git a/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/styleResolver..st b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/styleResolver..st new file mode 100644 index 00000000..b1fd3528 --- /dev/null +++ b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/styleResolver..st @@ -0,0 +1,4 @@ +accessing +styleResolver: anObject + + styleResolver := anObject \ No newline at end of file diff --git a/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/styleResolver.st b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/styleResolver.st new file mode 100644 index 00000000..864236f0 --- /dev/null +++ b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/styleResolver.st @@ -0,0 +1,4 @@ +accessing +styleResolver + + ^ styleResolver \ No newline at end of file diff --git a/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test01EmphasizedTextShouldBeItalic.st b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test01EmphasizedTextShouldBeItalic.st new file mode 100644 index 00000000..84a2a2b4 --- /dev/null +++ b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test01EmphasizedTextShouldBeItalic.st @@ -0,0 +1,7 @@ +accessing +test01EmphasizedTextShouldBeItalic + | document node | + document := HtmlDocument new. + document parseContents: (ReadStream on: 'emphasized text'). + node := document children first. + self assert: (self styleResolver getStyle: #italic for: node) equals: true. \ No newline at end of file diff --git a/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test02StrongTextShouldBeBold.st b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test02StrongTextShouldBeBold.st new file mode 100644 index 00000000..3b165179 --- /dev/null +++ b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test02StrongTextShouldBeBold.st @@ -0,0 +1,7 @@ +accessing +test02StrongTextShouldBeBold + | document node | + document := HtmlDocument new. + document parseContents: (ReadStream on: 'strong text'). + node := document children first. + self assert: (self styleResolver getStyle: #bold for: node) equals: true. \ No newline at end of file diff --git a/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test03DefinitionShouldBeItalicAndTimes.st b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test03DefinitionShouldBeItalicAndTimes.st new file mode 100644 index 00000000..77958e56 --- /dev/null +++ b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test03DefinitionShouldBeItalicAndTimes.st @@ -0,0 +1,9 @@ +accessing +test03DefinitionShouldBeItalicAndTimes + | document node | + document := HtmlDocument new. + document parseContents: (ReadStream on: 'definition'). + node := document children first. + self assert: (self styleResolver getStyle: #italic for: node) equals: true. + self assert: (self styleResolver getStyle: #family for: node) + equals: (TextStyle named: 'NimbusRomanNo9L'). \ No newline at end of file diff --git a/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test04CodeShouldBeCourierNew.st b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test04CodeShouldBeCourierNew.st new file mode 100644 index 00000000..eb9465f2 --- /dev/null +++ b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test04CodeShouldBeCourierNew.st @@ -0,0 +1,8 @@ +accessing +test04CodeShouldBeCourierNew + | document node | + document := HtmlDocument new. + document parseContents: (ReadStream on: 'computer code'). + node := document children first. + self assert: (self styleResolver getStyle: #family for: node) + equals: (TextStyle named: 'NimbusMonoL'). \ No newline at end of file diff --git a/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test05OutputShouldBeGeorgia.st b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test05OutputShouldBeGeorgia.st new file mode 100644 index 00000000..adbbd9c1 --- /dev/null +++ b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test05OutputShouldBeGeorgia.st @@ -0,0 +1,8 @@ +accessing +test05OutputShouldBeGeorgia + | document node | + document := HtmlDocument new. + document parseContents: (ReadStream on: 'sample output'). + node := document children first. + self assert: (self styleResolver getStyle: #family for: node) + equals: (TextStyle named: 'Georgia'). \ No newline at end of file diff --git a/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06InputShouldBeTrebuchetMS.st b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06InputShouldBeTrebuchetMS.st new file mode 100644 index 00000000..640d3caa --- /dev/null +++ b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06InputShouldBeTrebuchetMS.st @@ -0,0 +1,8 @@ +accessing +test06InputShouldBeTrebuchetMS + | document node | + document := HtmlDocument new. + document parseContents: (ReadStream on: 'sample input'). + node := document children first. + self assert: (self styleResolver getStyle: #family for: node) + equals: (TextStyle named: 'TrebuchetMS'). \ No newline at end of file diff --git a/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test07TeletypeShouldBeTrebuchetMS.st b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test07TeletypeShouldBeTrebuchetMS.st new file mode 100644 index 00000000..e5765e32 --- /dev/null +++ b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test07TeletypeShouldBeTrebuchetMS.st @@ -0,0 +1,8 @@ +accessing +test07TeletypeShouldBeTrebuchetMS + | document node | + document := HtmlDocument new. + document parseContents: (ReadStream on: 'teletype text'). + node := document children first. + self assert: (self styleResolver getStyle: #family for: node) + equals: (TextStyle named: 'TrebuchetMS'). \ No newline at end of file diff --git a/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test08VariableShouldBeCourierNew.st b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test08VariableShouldBeCourierNew.st new file mode 100644 index 00000000..fe267a37 --- /dev/null +++ b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test08VariableShouldBeCourierNew.st @@ -0,0 +1,8 @@ +accessing +test08VariableShouldBeCourierNew + | document node | + document := HtmlDocument new. + document parseContents: (ReadStream on: 'sample variable'). + node := document children first. + self assert: (self styleResolver getStyle: #family for: node) + equals: (TextStyle named: 'NimbusMonoL'). \ No newline at end of file diff --git a/packages/HTML.package/HtmlNodeDefaultStyleTest.class/methodProperties.json b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/methodProperties.json new file mode 100644 index 00000000..83c2a933 --- /dev/null +++ b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/methodProperties.json @@ -0,0 +1,17 @@ +{ + "class" : { + }, + "instance" : { + "htmlFormatter" : "SS 6/28/2014 19:37", + "htmlFormatter:" : "SS 6/28/2014 19:37", + "setUp" : "SS 6/28/2014 19:38", + "styleResolver" : "SS 6/28/2014 19:38", + "styleResolver:" : "SS 6/28/2014 19:38", + "test01EmphasizedTextShouldBeItalic" : "SS 6/28/2014 19:41", + "test02StrongTextShouldBeBold" : "SS 6/28/2014 19:42", + "test03DefinitionShouldBeItalicAndTimes" : "SS 6/28/2014 19:53", + "test04CodeShouldBeCourierNew" : "SS 6/28/2014 20:50", + "test05OutputShouldBeGeorgia" : "SS 6/28/2014 20:49", + "test06InputShouldBeTrebuchetMS" : "SS 6/29/2014 18:14", + "test07TeletypeShouldBeTrebuchetMS" : "SS 6/29/2014 18:15", + "test08VariableShouldBeCourierNew" : "SS 6/29/2014 18:15" } } diff --git a/packages/HTML.package/HtmlNodeDefaultStyleTest.class/properties.json b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/properties.json new file mode 100644 index 00000000..142484b1 --- /dev/null +++ b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/properties.json @@ -0,0 +1,15 @@ +{ + "category" : "HTML-Tests", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "htmlFormatter", + "styleResolver" ], + "name" : "HtmlNodeDefaultStyleTest", + "pools" : [ + ], + "super" : "TestCase", + "type" : "normal" } diff --git a/packages/HTML.package/HtmlSAMPNode.class/instance/addDefaultStyle.st b/packages/HTML.package/HtmlSAMPNode.class/instance/addDefaultStyle.st new file mode 100644 index 00000000..d666ada1 --- /dev/null +++ b/packages/HTML.package/HtmlSAMPNode.class/instance/addDefaultStyle.st @@ -0,0 +1,7 @@ +accessing +addDefaultStyle + | styles | + styles := Dictionary newFrom: { + 'font-family' -> 'Georgia'. + }. + self addStyle: (CSSStyleRule fromDictionary: styles) \ No newline at end of file diff --git a/packages/HTML.package/HtmlSAMPNode.class/methodProperties.json b/packages/HTML.package/HtmlSAMPNode.class/methodProperties.json index 88d7363f..d4a5f8c6 100644 --- a/packages/HTML.package/HtmlSAMPNode.class/methodProperties.json +++ b/packages/HTML.package/HtmlSAMPNode.class/methodProperties.json @@ -2,4 +2,5 @@ "class" : { }, "instance" : { + "addDefaultStyle" : "SS 6/28/2014 20:49", "tag" : "" } } diff --git a/packages/HTML.package/HtmlTTNode.class/instance/addDefaultStyle.st b/packages/HTML.package/HtmlTTNode.class/instance/addDefaultStyle.st new file mode 100644 index 00000000..f01c4156 --- /dev/null +++ b/packages/HTML.package/HtmlTTNode.class/instance/addDefaultStyle.st @@ -0,0 +1,7 @@ +accessing +addDefaultStyle + | styles | + styles := Dictionary newFrom: { + 'font-family' -> 'TrebuchetMS'. + }. + self addStyle: (CSSStyleRule fromDictionary: styles) \ No newline at end of file diff --git a/packages/HTML.package/HtmlTTNode.class/methodProperties.json b/packages/HTML.package/HtmlTTNode.class/methodProperties.json index 88d7363f..fc97cece 100644 --- a/packages/HTML.package/HtmlTTNode.class/methodProperties.json +++ b/packages/HTML.package/HtmlTTNode.class/methodProperties.json @@ -2,4 +2,5 @@ "class" : { }, "instance" : { + "addDefaultStyle" : "SS 6/29/2014 18:13", "tag" : "" } } diff --git a/packages/HTML.package/HtmlVARNode.class/instance/addDefaultStyle.st b/packages/HTML.package/HtmlVARNode.class/instance/addDefaultStyle.st new file mode 100644 index 00000000..7e1264ae --- /dev/null +++ b/packages/HTML.package/HtmlVARNode.class/instance/addDefaultStyle.st @@ -0,0 +1,8 @@ +accessing +addDefaultStyle + | styles | + styles := Dictionary newFrom: { + 'font-style' -> 'italic'. + 'font-family' -> 'Courier New'. + }. + self addStyle: (CSSStyleRule fromDictionary: styles) \ No newline at end of file diff --git a/packages/HTML.package/HtmlVARNode.class/methodProperties.json b/packages/HTML.package/HtmlVARNode.class/methodProperties.json index 88d7363f..302e7ea3 100644 --- a/packages/HTML.package/HtmlVARNode.class/methodProperties.json +++ b/packages/HTML.package/HtmlVARNode.class/methodProperties.json @@ -2,4 +2,5 @@ "class" : { }, "instance" : { + "addDefaultStyle" : "SS 6/28/2014 20:47", "tag" : "" } } diff --git a/packages/HTML.package/monticello.meta/version b/packages/HTML.package/monticello.meta/version index 3540bd19..ecfa3322 100644 --- a/packages/HTML.package/monticello.meta/version +++ b/packages/HTML.package/monticello.meta/version @@ -1 +1 @@ -a9c1b4cd-3f84-8344-a94e-e1f22e4351f8 \ No newline at end of file +fea643b6-5bbb-4b70-9584-e8f6b9377725 \ No newline at end of file diff --git a/packages/HTML.package/monticello.meta/version.d/HTML-SS.111_496850ef-58a0-4f71-b120-ab36520a38c2 b/packages/HTML.package/monticello.meta/version.d/HTML-SS.111_496850ef-58a0-4f71-b120-ab36520a38c2 new file mode 100644 index 00000000..0f060024 --- /dev/null +++ b/packages/HTML.package/monticello.meta/version.d/HTML-SS.111_496850ef-58a0-4f71-b120-ab36520a38c2 @@ -0,0 +1 @@ +(name 'HTML-SS.111' message 'change TT, VAR, CODE so that it looks more like it should.' id '496850ef-58a0-4f71-b120-ab36520a38c2' date '28 June 2014' time '8:51:30.179 pm' author 'SS' ancestors ((id 'a9c1b4cd-3f84-8344-a94e-e1f22e4351f8')) stepChildren ()) \ No newline at end of file diff --git a/packages/HTML.package/monticello.meta/version.d/HTML-SS.112_fea643b6-5bbb-4b70-9584-e8f6b9377725 b/packages/HTML.package/monticello.meta/version.d/HTML-SS.112_fea643b6-5bbb-4b70-9584-e8f6b9377725 new file mode 100644 index 00000000..088395b1 --- /dev/null +++ b/packages/HTML.package/monticello.meta/version.d/HTML-SS.112_fea643b6-5bbb-4b70-9584-e8f6b9377725 @@ -0,0 +1 @@ +(name 'HTML-SS.112' message 'Use only Scamper fonts as default' id 'fea643b6-5bbb-4b70-9584-e8f6b9377725' date '29 June 2014' time '6:16:15.985 pm' author 'SS' ancestors ((id '496850ef-58a0-4f71-b120-ab36520a38c2')) stepChildren ()) \ No newline at end of file