From a4e205315d73993fe84e136a2b079c2179b6b8b1 Mon Sep 17 00:00:00 2001 From: MrSerth Date: Sat, 28 Jun 2014 20:34:17 +0200 Subject: [PATCH 1/3] Closes #135: Closes #23 Add HR support Closes #65 Add EM support Closes #68 Add TT support Closes #69 Add KBD support Closes #71 Add BIG support Closes #72 Add SMALL support I also changed CSSFontFormatter>>fontMap because of a typo at key 'Courier New'. --- .../CSSFontFormatter.class/instance/fontMap.st | 2 +- .../methodProperties.json | 2 +- .../HtmlANode.class/instance/target.st | 3 +++ .../HtmlANode.class/methodProperties.json | 3 ++- .../instance/addDefaultStyle.st | 7 +++++++ .../HtmlCODENode.class/methodProperties.json | 1 + .../instance/addDefaultStyle.st | 8 ++++++++ .../HtmlDFNNode.class/methodProperties.json | 1 + .../instance/addDefaultStyle.st | 7 +++++++ .../HtmlEMNode.class/methodProperties.json | 1 + .../instance/addDefaultStyle.st | 7 +++++++ .../HtmlKBDNode.class/methodProperties.json | 1 + .../HtmlNodeDefaultStyleTest.class/README.md | 0 .../instance/htmlFormatter..st | 4 ++++ .../instance/htmlFormatter.st | 4 ++++ .../instance/setUp.st | 5 +++++ .../instance/styleResolver..st | 4 ++++ .../instance/styleResolver.st | 4 ++++ .../test01EmphasizedTextShouldBeItalic.st | 7 +++++++ .../instance/test02StrongTextShouldBeBold.st | 7 +++++++ .../test03DefinitionShouldBeItalicAndTimes.st | 9 +++++++++ .../instance/test04CodeShouldBeUnifont.st | 8 ++++++++ .../instance/test05OutputShouldBeCourierNew.st | 8 ++++++++ .../instance/test06InputShouldBeAccushi.st | 8 ++++++++ .../test06TeletypeShouldBeItalicAndAccushi.st | 9 +++++++++ .../instance/test06VariableShouldBeUnifont.st | 8 ++++++++ .../methodProperties.json | 17 +++++++++++++++++ .../properties.json | 15 +++++++++++++++ .../instance/addDefaultStyle.st | 7 +++++++ .../HtmlSAMPNode.class/methodProperties.json | 1 + .../instance/addDefaultStyle.st | 8 ++++++++ .../HtmlTTNode.class/methodProperties.json | 1 + .../instance/addDefaultStyle.st | 7 +++++++ .../HtmlVARNode.class/methodProperties.json | 1 + packages/HTML.package/monticello.meta/version | 2 +- ...-SN.100_3ea7780c-c166-2742-9a2c-073e76337a71 | 1 - ...L-SN.99_718a4503-45ea-1c49-8836-2bba84f5b907 | 1 - ...-SS.110_956eff8a-389d-4311-bda7-f2da86cd5436 | 1 + ...-pf.105_e1eb9047-8fa9-d243-b952-6271807a7518 | 1 - ...-pf.106_40a52aeb-2636-1c4c-aeac-24b27eb8335e | 1 - 40 files changed, 184 insertions(+), 8 deletions(-) create mode 100644 packages/HTML.package/HtmlANode.class/instance/target.st create mode 100644 packages/HTML.package/HtmlCODENode.class/instance/addDefaultStyle.st create mode 100644 packages/HTML.package/HtmlDFNNode.class/instance/addDefaultStyle.st create mode 100644 packages/HTML.package/HtmlEMNode.class/instance/addDefaultStyle.st create mode 100644 packages/HTML.package/HtmlKBDNode.class/instance/addDefaultStyle.st create mode 100644 packages/HTML.package/HtmlNodeDefaultStyleTest.class/README.md create mode 100644 packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/htmlFormatter..st create mode 100644 packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/htmlFormatter.st create mode 100644 packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/setUp.st create mode 100644 packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/styleResolver..st create mode 100644 packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/styleResolver.st create mode 100644 packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test01EmphasizedTextShouldBeItalic.st create mode 100644 packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test02StrongTextShouldBeBold.st create mode 100644 packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test03DefinitionShouldBeItalicAndTimes.st create mode 100644 packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test04CodeShouldBeUnifont.st create mode 100644 packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test05OutputShouldBeCourierNew.st create mode 100644 packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06InputShouldBeAccushi.st create mode 100644 packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06TeletypeShouldBeItalicAndAccushi.st create mode 100644 packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06VariableShouldBeUnifont.st create mode 100644 packages/HTML.package/HtmlNodeDefaultStyleTest.class/methodProperties.json create mode 100644 packages/HTML.package/HtmlNodeDefaultStyleTest.class/properties.json create mode 100644 packages/HTML.package/HtmlSAMPNode.class/instance/addDefaultStyle.st create mode 100644 packages/HTML.package/HtmlTTNode.class/instance/addDefaultStyle.st create mode 100644 packages/HTML.package/HtmlVARNode.class/instance/addDefaultStyle.st delete mode 100644 packages/HTML.package/monticello.meta/version.d/HTML-SN.100_3ea7780c-c166-2742-9a2c-073e76337a71 delete mode 100644 packages/HTML.package/monticello.meta/version.d/HTML-SN.99_718a4503-45ea-1c49-8836-2bba84f5b907 create mode 100644 packages/HTML.package/monticello.meta/version.d/HTML-SS.110_956eff8a-389d-4311-bda7-f2da86cd5436 delete mode 100644 packages/HTML.package/monticello.meta/version.d/HTML-pf.105_e1eb9047-8fa9-d243-b952-6271807a7518 delete mode 100644 packages/HTML.package/monticello.meta/version.d/HTML-pf.106_40a52aeb-2636-1c4c-aeac-24b27eb8335e 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 35e5185a..5caf25e7 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..371f8b41 --- /dev/null +++ b/packages/HTML.package/HtmlCODENode.class/instance/addDefaultStyle.st @@ -0,0 +1,7 @@ +accessing +addDefaultStyle + | styles | + styles := Dictionary newFrom: { + 'font-family' -> 'Unifont'. + }. + 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..021091c1 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 18:44", "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..22497c71 --- /dev/null +++ b/packages/HTML.package/HtmlKBDNode.class/instance/addDefaultStyle.st @@ -0,0 +1,7 @@ +accessing +addDefaultStyle + | styles | + styles := Dictionary newFrom: { + 'font-family' -> 'Accushi'. + }. + 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..9ddfd9ed 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/28/2014 18:46", "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/test04CodeShouldBeUnifont.st b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test04CodeShouldBeUnifont.st new file mode 100644 index 00000000..aca4e29e --- /dev/null +++ b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test04CodeShouldBeUnifont.st @@ -0,0 +1,8 @@ +accessing +test04CodeShouldBeUnifont + | 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: 'Unifont'). \ No newline at end of file diff --git a/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test05OutputShouldBeCourierNew.st b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test05OutputShouldBeCourierNew.st new file mode 100644 index 00000000..4a42e21c --- /dev/null +++ b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test05OutputShouldBeCourierNew.st @@ -0,0 +1,8 @@ +accessing +test05OutputShouldBeCourierNew + | 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: 'NimbusMonoL'). \ No newline at end of file diff --git a/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06InputShouldBeAccushi.st b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06InputShouldBeAccushi.st new file mode 100644 index 00000000..c4357fae --- /dev/null +++ b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06InputShouldBeAccushi.st @@ -0,0 +1,8 @@ +accessing +test06InputShouldBeAccushi + | 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: 'Accushi'). \ No newline at end of file diff --git a/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06TeletypeShouldBeItalicAndAccushi.st b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06TeletypeShouldBeItalicAndAccushi.st new file mode 100644 index 00000000..e0c339d3 --- /dev/null +++ b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06TeletypeShouldBeItalicAndAccushi.st @@ -0,0 +1,9 @@ +accessing +test06TeletypeShouldBeItalicAndAccushi + | document node | + document := HtmlDocument new. + document parseContents: (ReadStream on: 'teletype text'). + 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: 'Accushi'). \ No newline at end of file diff --git a/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06VariableShouldBeUnifont.st b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06VariableShouldBeUnifont.st new file mode 100644 index 00000000..05ebf61b --- /dev/null +++ b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06VariableShouldBeUnifont.st @@ -0,0 +1,8 @@ +accessing +test06VariableShouldBeUnifont + | 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: 'Unifont'). \ 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..dc40c01d --- /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", + "test04CodeShouldBeUnifont" : "SS 6/28/2014 19:54", + "test05OutputShouldBeCourierNew" : "SS 6/28/2014 20:00", + "test06InputShouldBeAccushi" : "SS 6/28/2014 20:01", + "test06TeletypeShouldBeItalicAndAccushi" : "SS 6/28/2014 20:07", + "test06VariableShouldBeUnifont" : "SS 6/28/2014 20:01" } } 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..c45c9aa9 --- /dev/null +++ b/packages/HTML.package/HtmlSAMPNode.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/HtmlSAMPNode.class/methodProperties.json b/packages/HTML.package/HtmlSAMPNode.class/methodProperties.json index 88d7363f..216aa23d 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 18:45", "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..6d93dd75 --- /dev/null +++ b/packages/HTML.package/HtmlTTNode.class/instance/addDefaultStyle.st @@ -0,0 +1,8 @@ +accessing +addDefaultStyle + | styles | + styles := Dictionary newFrom: { + 'font-style' -> 'italic'. + 'font-family' -> 'Accushi'. + }. + 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..771802df 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/28/2014 20:05", "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..371f8b41 --- /dev/null +++ b/packages/HTML.package/HtmlVARNode.class/instance/addDefaultStyle.st @@ -0,0 +1,7 @@ +accessing +addDefaultStyle + | styles | + styles := Dictionary newFrom: { + 'font-family' -> 'Unifont'. + }. + 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..ba60ff6c 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 18:49", "tag" : "" } } diff --git a/packages/HTML.package/monticello.meta/version b/packages/HTML.package/monticello.meta/version index 8527c68d..a8c04596 100644 --- a/packages/HTML.package/monticello.meta/version +++ b/packages/HTML.package/monticello.meta/version @@ -1 +1 @@ -b14f50e1-4b5b-2146-a643-7c314b7b8ebe \ No newline at end of file +956eff8a-389d-4311-bda7-f2da86cd5436 \ No newline at end of file diff --git a/packages/HTML.package/monticello.meta/version.d/HTML-SN.100_3ea7780c-c166-2742-9a2c-073e76337a71 b/packages/HTML.package/monticello.meta/version.d/HTML-SN.100_3ea7780c-c166-2742-9a2c-073e76337a71 deleted file mode 100644 index d2c87343..00000000 --- a/packages/HTML.package/monticello.meta/version.d/HTML-SN.100_3ea7780c-c166-2742-9a2c-073e76337a71 +++ /dev/null @@ -1 +0,0 @@ -(name 'HTML-SN.100' message 'Scale font sizes and add missing sizes on the fly.' id '3ea7780c-c166-2742-9a2c-073e76337a71' date '28 June 2014' time '2:44:40.536 pm' author 'SN' ancestors ((id '718a4503-45ea-1c49-8836-2bba84f5b907')) stepChildren ()) \ No newline at end of file diff --git a/packages/HTML.package/monticello.meta/version.d/HTML-SN.99_718a4503-45ea-1c49-8836-2bba84f5b907 b/packages/HTML.package/monticello.meta/version.d/HTML-SN.99_718a4503-45ea-1c49-8836-2bba84f5b907 deleted file mode 100644 index 03c35d2f..00000000 --- a/packages/HTML.package/monticello.meta/version.d/HTML-SN.99_718a4503-45ea-1c49-8836-2bba84f5b907 +++ /dev/null @@ -1 +0,0 @@ -(name 'HTML-SN.99' message 'Add larger and smaller, check for font-family order.' id '718a4503-45ea-1c49-8836-2bba84f5b907' date '28 June 2014' time '10:59:49.177 am' author 'SN' ancestors ((id '6cfa7f32-744a-da4e-839d-2d444502bc40')) stepChildren ()) \ No newline at end of file diff --git a/packages/HTML.package/monticello.meta/version.d/HTML-SS.110_956eff8a-389d-4311-bda7-f2da86cd5436 b/packages/HTML.package/monticello.meta/version.d/HTML-SS.110_956eff8a-389d-4311-bda7-f2da86cd5436 new file mode 100644 index 00000000..d25b9a34 --- /dev/null +++ b/packages/HTML.package/monticello.meta/version.d/HTML-SS.110_956eff8a-389d-4311-bda7-f2da86cd5436 @@ -0,0 +1 @@ +(name 'HTML-SS.110' message 'Add support for different HTML tags.' id '956eff8a-389d-4311-bda7-f2da86cd5436' date '28 June 2014' time '8:19:35.608 pm' author 'SS' ancestors ((id 'b14f50e1-4b5b-2146-a643-7c314b7b8ebe')) stepChildren ()) \ No newline at end of file diff --git a/packages/HTML.package/monticello.meta/version.d/HTML-pf.105_e1eb9047-8fa9-d243-b952-6271807a7518 b/packages/HTML.package/monticello.meta/version.d/HTML-pf.105_e1eb9047-8fa9-d243-b952-6271807a7518 deleted file mode 100644 index ed1d14a4..00000000 --- a/packages/HTML.package/monticello.meta/version.d/HTML-pf.105_e1eb9047-8fa9-d243-b952-6271807a7518 +++ /dev/null @@ -1 +0,0 @@ -(name 'HTML-pf.105' message 'Fix #119: Check if parent is nil' id 'e1eb9047-8fa9-d243-b952-6271807a7518' date '28 June 2014' time '12:15:23.818 pm' author 'pf' ancestors ((id 'f9b06da3-193a-e946-90c1-5251ff072530')) stepChildren ()) \ No newline at end of file diff --git a/packages/HTML.package/monticello.meta/version.d/HTML-pf.106_40a52aeb-2636-1c4c-aeac-24b27eb8335e b/packages/HTML.package/monticello.meta/version.d/HTML-pf.106_40a52aeb-2636-1c4c-aeac-24b27eb8335e deleted file mode 100644 index 3329c4d9..00000000 --- a/packages/HTML.package/monticello.meta/version.d/HTML-pf.106_40a52aeb-2636-1c4c-aeac-24b27eb8335e +++ /dev/null @@ -1 +0,0 @@ -(name 'HTML-pf.106' message 'Ref #119: Add test for node without parent' id '40a52aeb-2636-1c4c-aeac-24b27eb8335e' date '28 June 2014' time '1:41:38.374 pm' author 'pf' ancestors ((id 'e1eb9047-8fa9-d243-b952-6271807a7518')) stepChildren ()) \ No newline at end of file From 8dd13cd74f4e3bd18c827c6ad3a1233c3016804b Mon Sep 17 00:00:00 2001 From: MrSerth Date: Sat, 28 Jun 2014 20:52:23 +0200 Subject: [PATCH 2/3] Ref #135: change TT, VAR, CODE so that it looks more like it should. --- .../HtmlCODENode.class/instance/addDefaultStyle.st | 2 +- .../HTML.package/HtmlCODENode.class/methodProperties.json | 2 +- ...ShouldBeUnifont.st => test04CodeShouldBeCourierNew.st} | 4 ++-- ...ouldBeCourierNew.st => test05OutputShouldBeGeorgia.st} | 4 ++-- ...alicAndAccushi.st => test06TeletypeShouldBeAccushi.st} | 3 +-- ...ldBeUnifont.st => test06VariableShouldBeCourierNew.st} | 4 ++-- .../HtmlNodeDefaultStyleTest.class/methodProperties.json | 8 ++++---- .../HtmlSAMPNode.class/instance/addDefaultStyle.st | 2 +- .../HTML.package/HtmlSAMPNode.class/methodProperties.json | 2 +- .../HtmlTTNode.class/instance/addDefaultStyle.st | 1 - .../HTML.package/HtmlTTNode.class/methodProperties.json | 2 +- .../HtmlVARNode.class/instance/addDefaultStyle.st | 3 ++- .../HTML.package/HtmlVARNode.class/methodProperties.json | 2 +- packages/HTML.package/monticello.meta/version | 2 +- .../HTML-SS.110_956eff8a-389d-4311-bda7-f2da86cd5436 | 1 - .../HTML-SS.111_496850ef-58a0-4f71-b120-ab36520a38c2 | 1 + 16 files changed, 21 insertions(+), 22 deletions(-) rename packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/{test04CodeShouldBeUnifont.st => test04CodeShouldBeCourierNew.st} (76%) rename packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/{test05OutputShouldBeCourierNew.st => test05OutputShouldBeGeorgia.st} (75%) rename packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/{test06TeletypeShouldBeItalicAndAccushi.st => test06TeletypeShouldBeAccushi.st} (69%) rename packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/{test06VariableShouldBeUnifont.st => test06VariableShouldBeCourierNew.st} (75%) delete mode 100644 packages/HTML.package/monticello.meta/version.d/HTML-SS.110_956eff8a-389d-4311-bda7-f2da86cd5436 create mode 100644 packages/HTML.package/monticello.meta/version.d/HTML-SS.111_496850ef-58a0-4f71-b120-ab36520a38c2 diff --git a/packages/HTML.package/HtmlCODENode.class/instance/addDefaultStyle.st b/packages/HTML.package/HtmlCODENode.class/instance/addDefaultStyle.st index 371f8b41..c45c9aa9 100644 --- a/packages/HTML.package/HtmlCODENode.class/instance/addDefaultStyle.st +++ b/packages/HTML.package/HtmlCODENode.class/instance/addDefaultStyle.st @@ -2,6 +2,6 @@ accessing addDefaultStyle | styles | styles := Dictionary newFrom: { - 'font-family' -> 'Unifont'. + '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 021091c1..302e7ea3 100644 --- a/packages/HTML.package/HtmlCODENode.class/methodProperties.json +++ b/packages/HTML.package/HtmlCODENode.class/methodProperties.json @@ -2,5 +2,5 @@ "class" : { }, "instance" : { - "addDefaultStyle" : "SS 6/28/2014 18:44", + "addDefaultStyle" : "SS 6/28/2014 20:47", "tag" : "" } } diff --git a/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test04CodeShouldBeUnifont.st b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test04CodeShouldBeCourierNew.st similarity index 76% rename from packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test04CodeShouldBeUnifont.st rename to packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test04CodeShouldBeCourierNew.st index aca4e29e..eb9465f2 100644 --- a/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test04CodeShouldBeUnifont.st +++ b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test04CodeShouldBeCourierNew.st @@ -1,8 +1,8 @@ accessing -test04CodeShouldBeUnifont +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: 'Unifont'). \ No newline at end of file + equals: (TextStyle named: 'NimbusMonoL'). \ No newline at end of file diff --git a/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test05OutputShouldBeCourierNew.st b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test05OutputShouldBeGeorgia.st similarity index 75% rename from packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test05OutputShouldBeCourierNew.st rename to packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test05OutputShouldBeGeorgia.st index 4a42e21c..adbbd9c1 100644 --- a/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test05OutputShouldBeCourierNew.st +++ b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test05OutputShouldBeGeorgia.st @@ -1,8 +1,8 @@ accessing -test05OutputShouldBeCourierNew +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: 'NimbusMonoL'). \ No newline at end of file + equals: (TextStyle named: 'Georgia'). \ No newline at end of file diff --git a/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06TeletypeShouldBeItalicAndAccushi.st b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06TeletypeShouldBeAccushi.st similarity index 69% rename from packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06TeletypeShouldBeItalicAndAccushi.st rename to packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06TeletypeShouldBeAccushi.st index e0c339d3..0b78fa63 100644 --- a/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06TeletypeShouldBeItalicAndAccushi.st +++ b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06TeletypeShouldBeAccushi.st @@ -1,9 +1,8 @@ accessing -test06TeletypeShouldBeItalicAndAccushi +test06TeletypeShouldBeAccushi | document node | document := HtmlDocument new. document parseContents: (ReadStream on: 'teletype text'). 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: 'Accushi'). \ No newline at end of file diff --git a/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06VariableShouldBeUnifont.st b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06VariableShouldBeCourierNew.st similarity index 75% rename from packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06VariableShouldBeUnifont.st rename to packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06VariableShouldBeCourierNew.st index 05ebf61b..c7818df9 100644 --- a/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06VariableShouldBeUnifont.st +++ b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06VariableShouldBeCourierNew.st @@ -1,8 +1,8 @@ accessing -test06VariableShouldBeUnifont +test06VariableShouldBeCourierNew | 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: 'Unifont'). \ No newline at end of file + 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 index dc40c01d..5c2d0411 100644 --- a/packages/HTML.package/HtmlNodeDefaultStyleTest.class/methodProperties.json +++ b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/methodProperties.json @@ -10,8 +10,8 @@ "test01EmphasizedTextShouldBeItalic" : "SS 6/28/2014 19:41", "test02StrongTextShouldBeBold" : "SS 6/28/2014 19:42", "test03DefinitionShouldBeItalicAndTimes" : "SS 6/28/2014 19:53", - "test04CodeShouldBeUnifont" : "SS 6/28/2014 19:54", - "test05OutputShouldBeCourierNew" : "SS 6/28/2014 20:00", + "test04CodeShouldBeCourierNew" : "SS 6/28/2014 20:50", + "test05OutputShouldBeGeorgia" : "SS 6/28/2014 20:49", "test06InputShouldBeAccushi" : "SS 6/28/2014 20:01", - "test06TeletypeShouldBeItalicAndAccushi" : "SS 6/28/2014 20:07", - "test06VariableShouldBeUnifont" : "SS 6/28/2014 20:01" } } + "test06TeletypeShouldBeAccushi" : "SS 6/28/2014 20:46", + "test06VariableShouldBeCourierNew" : "SS 6/28/2014 20:49" } } diff --git a/packages/HTML.package/HtmlSAMPNode.class/instance/addDefaultStyle.st b/packages/HTML.package/HtmlSAMPNode.class/instance/addDefaultStyle.st index c45c9aa9..d666ada1 100644 --- a/packages/HTML.package/HtmlSAMPNode.class/instance/addDefaultStyle.st +++ b/packages/HTML.package/HtmlSAMPNode.class/instance/addDefaultStyle.st @@ -2,6 +2,6 @@ accessing addDefaultStyle | styles | styles := Dictionary newFrom: { - 'font-family' -> 'Courier New'. + '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 216aa23d..d4a5f8c6 100644 --- a/packages/HTML.package/HtmlSAMPNode.class/methodProperties.json +++ b/packages/HTML.package/HtmlSAMPNode.class/methodProperties.json @@ -2,5 +2,5 @@ "class" : { }, "instance" : { - "addDefaultStyle" : "SS 6/28/2014 18:45", + "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 index 6d93dd75..22497c71 100644 --- a/packages/HTML.package/HtmlTTNode.class/instance/addDefaultStyle.st +++ b/packages/HTML.package/HtmlTTNode.class/instance/addDefaultStyle.st @@ -2,7 +2,6 @@ accessing addDefaultStyle | styles | styles := Dictionary newFrom: { - 'font-style' -> 'italic'. 'font-family' -> 'Accushi'. }. 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 771802df..9523dc2b 100644 --- a/packages/HTML.package/HtmlTTNode.class/methodProperties.json +++ b/packages/HTML.package/HtmlTTNode.class/methodProperties.json @@ -2,5 +2,5 @@ "class" : { }, "instance" : { - "addDefaultStyle" : "SS 6/28/2014 20:05", + "addDefaultStyle" : "SS 6/28/2014 20:46", "tag" : "" } } diff --git a/packages/HTML.package/HtmlVARNode.class/instance/addDefaultStyle.st b/packages/HTML.package/HtmlVARNode.class/instance/addDefaultStyle.st index 371f8b41..7e1264ae 100644 --- a/packages/HTML.package/HtmlVARNode.class/instance/addDefaultStyle.st +++ b/packages/HTML.package/HtmlVARNode.class/instance/addDefaultStyle.st @@ -2,6 +2,7 @@ accessing addDefaultStyle | styles | styles := Dictionary newFrom: { - 'font-family' -> 'Unifont'. + '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 ba60ff6c..302e7ea3 100644 --- a/packages/HTML.package/HtmlVARNode.class/methodProperties.json +++ b/packages/HTML.package/HtmlVARNode.class/methodProperties.json @@ -2,5 +2,5 @@ "class" : { }, "instance" : { - "addDefaultStyle" : "SS 6/28/2014 18:49", + "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..b72db874 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 +496850ef-58a0-4f71-b120-ab36520a38c2 \ No newline at end of file diff --git a/packages/HTML.package/monticello.meta/version.d/HTML-SS.110_956eff8a-389d-4311-bda7-f2da86cd5436 b/packages/HTML.package/monticello.meta/version.d/HTML-SS.110_956eff8a-389d-4311-bda7-f2da86cd5436 deleted file mode 100644 index d25b9a34..00000000 --- a/packages/HTML.package/monticello.meta/version.d/HTML-SS.110_956eff8a-389d-4311-bda7-f2da86cd5436 +++ /dev/null @@ -1 +0,0 @@ -(name 'HTML-SS.110' message 'Add support for different HTML tags.' id '956eff8a-389d-4311-bda7-f2da86cd5436' date '28 June 2014' time '8:19:35.608 pm' author 'SS' ancestors ((id 'b14f50e1-4b5b-2146-a643-7c314b7b8ebe')) stepChildren ()) \ 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 From 6e916ede31341adc55da2d9c529dbd091cde7dcd Mon Sep 17 00:00:00 2001 From: MrSerth Date: Sun, 29 Jun 2014 18:17:06 +0200 Subject: [PATCH 3/3] Ref #135: Use only Scamper fonts as default --- .../HtmlKBDNode.class/instance/addDefaultStyle.st | 2 +- .../HTML.package/HtmlKBDNode.class/methodProperties.json | 2 +- ...ShouldBeAccushi.st => test06InputShouldBeTrebuchetMS.st} | 4 ++-- ...uldBeAccushi.st => test07TeletypeShouldBeTrebuchetMS.st} | 4 ++-- ...dBeCourierNew.st => test08VariableShouldBeCourierNew.st} | 2 +- .../HtmlNodeDefaultStyleTest.class/methodProperties.json | 6 +++--- .../HtmlTTNode.class/instance/addDefaultStyle.st | 2 +- .../HTML.package/HtmlTTNode.class/methodProperties.json | 2 +- packages/HTML.package/monticello.meta/version | 2 +- .../HTML-SS.112_fea643b6-5bbb-4b70-9584-e8f6b9377725 | 1 + 10 files changed, 14 insertions(+), 13 deletions(-) rename packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/{test06InputShouldBeAccushi.st => test06InputShouldBeTrebuchetMS.st} (75%) rename packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/{test06TeletypeShouldBeAccushi.st => test07TeletypeShouldBeTrebuchetMS.st} (74%) rename packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/{test06VariableShouldBeCourierNew.st => test08VariableShouldBeCourierNew.st} (89%) create mode 100644 packages/HTML.package/monticello.meta/version.d/HTML-SS.112_fea643b6-5bbb-4b70-9584-e8f6b9377725 diff --git a/packages/HTML.package/HtmlKBDNode.class/instance/addDefaultStyle.st b/packages/HTML.package/HtmlKBDNode.class/instance/addDefaultStyle.st index 22497c71..f01c4156 100644 --- a/packages/HTML.package/HtmlKBDNode.class/instance/addDefaultStyle.st +++ b/packages/HTML.package/HtmlKBDNode.class/instance/addDefaultStyle.st @@ -2,6 +2,6 @@ accessing addDefaultStyle | styles | styles := Dictionary newFrom: { - 'font-family' -> 'Accushi'. + '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 9ddfd9ed..fc97cece 100644 --- a/packages/HTML.package/HtmlKBDNode.class/methodProperties.json +++ b/packages/HTML.package/HtmlKBDNode.class/methodProperties.json @@ -2,5 +2,5 @@ "class" : { }, "instance" : { - "addDefaultStyle" : "SS 6/28/2014 18:46", + "addDefaultStyle" : "SS 6/29/2014 18:13", "tag" : "" } } diff --git a/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06InputShouldBeAccushi.st b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06InputShouldBeTrebuchetMS.st similarity index 75% rename from packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06InputShouldBeAccushi.st rename to packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06InputShouldBeTrebuchetMS.st index c4357fae..640d3caa 100644 --- a/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06InputShouldBeAccushi.st +++ b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06InputShouldBeTrebuchetMS.st @@ -1,8 +1,8 @@ accessing -test06InputShouldBeAccushi +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: 'Accushi'). \ No newline at end of file + equals: (TextStyle named: 'TrebuchetMS'). \ No newline at end of file diff --git a/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06TeletypeShouldBeAccushi.st b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test07TeletypeShouldBeTrebuchetMS.st similarity index 74% rename from packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06TeletypeShouldBeAccushi.st rename to packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test07TeletypeShouldBeTrebuchetMS.st index 0b78fa63..e5765e32 100644 --- a/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06TeletypeShouldBeAccushi.st +++ b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test07TeletypeShouldBeTrebuchetMS.st @@ -1,8 +1,8 @@ accessing -test06TeletypeShouldBeAccushi +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: 'Accushi'). \ No newline at end of file + equals: (TextStyle named: 'TrebuchetMS'). \ No newline at end of file diff --git a/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06VariableShouldBeCourierNew.st b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test08VariableShouldBeCourierNew.st similarity index 89% rename from packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06VariableShouldBeCourierNew.st rename to packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test08VariableShouldBeCourierNew.st index c7818df9..fe267a37 100644 --- a/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test06VariableShouldBeCourierNew.st +++ b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/instance/test08VariableShouldBeCourierNew.st @@ -1,5 +1,5 @@ accessing -test06VariableShouldBeCourierNew +test08VariableShouldBeCourierNew | document node | document := HtmlDocument new. document parseContents: (ReadStream on: 'sample variable'). diff --git a/packages/HTML.package/HtmlNodeDefaultStyleTest.class/methodProperties.json b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/methodProperties.json index 5c2d0411..83c2a933 100644 --- a/packages/HTML.package/HtmlNodeDefaultStyleTest.class/methodProperties.json +++ b/packages/HTML.package/HtmlNodeDefaultStyleTest.class/methodProperties.json @@ -12,6 +12,6 @@ "test03DefinitionShouldBeItalicAndTimes" : "SS 6/28/2014 19:53", "test04CodeShouldBeCourierNew" : "SS 6/28/2014 20:50", "test05OutputShouldBeGeorgia" : "SS 6/28/2014 20:49", - "test06InputShouldBeAccushi" : "SS 6/28/2014 20:01", - "test06TeletypeShouldBeAccushi" : "SS 6/28/2014 20:46", - "test06VariableShouldBeCourierNew" : "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/HtmlTTNode.class/instance/addDefaultStyle.st b/packages/HTML.package/HtmlTTNode.class/instance/addDefaultStyle.st index 22497c71..f01c4156 100644 --- a/packages/HTML.package/HtmlTTNode.class/instance/addDefaultStyle.st +++ b/packages/HTML.package/HtmlTTNode.class/instance/addDefaultStyle.st @@ -2,6 +2,6 @@ accessing addDefaultStyle | styles | styles := Dictionary newFrom: { - 'font-family' -> 'Accushi'. + '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 9523dc2b..fc97cece 100644 --- a/packages/HTML.package/HtmlTTNode.class/methodProperties.json +++ b/packages/HTML.package/HtmlTTNode.class/methodProperties.json @@ -2,5 +2,5 @@ "class" : { }, "instance" : { - "addDefaultStyle" : "SS 6/28/2014 20:46", + "addDefaultStyle" : "SS 6/29/2014 18:13", "tag" : "" } } diff --git a/packages/HTML.package/monticello.meta/version b/packages/HTML.package/monticello.meta/version index b72db874..ecfa3322 100644 --- a/packages/HTML.package/monticello.meta/version +++ b/packages/HTML.package/monticello.meta/version @@ -1 +1 @@ -496850ef-58a0-4f71-b120-ab36520a38c2 \ 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.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