From d229b484f50f21ed57c12b527ca3f3c4538a1088 Mon Sep 17 00:00:00 2001 From: Konrad Hanff Date: Thu, 18 Jun 2020 15:43:26 +0200 Subject: [PATCH 01/12] Modify TextStructure to hold a Collection of TextAttributes --- .../instance/actOnClickFor..st | 4 ++++ .../instance/addTextAttribute..st | 4 ++++ .../TextStructure.class/instance/amount.st | 4 ---- .../instance/attributes..st | 4 ++++ .../instance/attributes.st | 4 ++++ .../TextStructure.class/instance/color..st | 5 ----- .../TextStructure.class/instance/color.st | 4 ---- .../instance/emphasisCode.st | 9 +------- .../instance/emphasizeScanner..st | 10 ++------- .../TextStructure.class/instance/font..st | 5 ----- .../TextStructure.class/instance/font.st | 4 ---- .../TextStructure.class/instance/getFont.st | 4 ---- .../instance/initialize.st | 3 ++- .../TextStructure.class/instance/isBold.st | 4 ---- .../instance/isIndented.st | 4 ---- .../TextStructure.class/instance/isItalic.st | 4 ---- .../instance/isStruckOut.st | 4 ---- .../instance/isTextIndent.st | 4 ---- .../instance/isUnderlined.st | 4 ---- .../TextStructure.class/methodProperties.json | 22 ++++++------------- .../TextStructure.class/properties.json | 3 ++- 21 files changed, 30 insertions(+), 83 deletions(-) create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/actOnClickFor..st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/addTextAttribute..st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/amount.st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/attributes..st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/attributes.st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/color..st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/color.st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/font..st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/font.st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/getFont.st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/isBold.st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/isIndented.st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/isItalic.st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/isStruckOut.st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/isTextIndent.st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/isUnderlined.st diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/actOnClickFor..st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/actOnClickFor..st new file mode 100644 index 0000000..ab94bfc --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/actOnClickFor..st @@ -0,0 +1,4 @@ +as yet unclassified +actOnClickFor: model + + ^ (self attributes collect: [:each | each actOnClickFor: model]) includes: true \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/addTextAttribute..st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/addTextAttribute..st new file mode 100644 index 0000000..95a5ae0 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/addTextAttribute..st @@ -0,0 +1,4 @@ +as yet unclassified +addTextAttribute: aTextAttribute + + self attributes add: aTextAttribute \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/amount.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/amount.st deleted file mode 100644 index e0fae75..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/amount.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -amount -"A textIndent attribute has to provide a amount method specifying the indentationAmount" - ^ 2 \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/attributes..st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/attributes..st new file mode 100644 index 0000000..edcc7c3 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/attributes..st @@ -0,0 +1,4 @@ +accessing +attributes: aCollecion + + attributes := aCollecion \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/attributes.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/attributes.st new file mode 100644 index 0000000..0086bed --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/attributes.st @@ -0,0 +1,4 @@ +accessing +attributes + + ^ attributes \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/color..st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/color..st deleted file mode 100644 index 22e512f..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/color..st +++ /dev/null @@ -1,5 +0,0 @@ -accessing -color: aColor - - color := aColor. - self changed: #color \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/color.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/color.st deleted file mode 100644 index 3190e3f..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/color.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -color - - ^ color \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/emphasisCode.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/emphasisCode.st index 5666b45..c7b38a1 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/emphasisCode.st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/emphasisCode.st @@ -1,11 +1,4 @@ emphasis emphasisCode - | code | - code := 0. - self isBold ifTrue: [code := code bitOr: 1]. - self isItalic ifTrue: [code := code bitOr: 2]. - self isUnderlined ifTrue: [code := code bitOr: 4]. - self isStruckOut ifTrue: [code := code bitOr: 16]. - - ^ code \ No newline at end of file + ^ self attributes reduce: [:acc :each | acc bitOr: each emphasisCode] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/emphasizeScanner..st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/emphasizeScanner..st index 6a42cf5..30851ef 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/emphasizeScanner..st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/emphasizeScanner..st @@ -1,10 +1,4 @@ emphasis emphasizeScanner: aScanner - - aScanner addEmphasis: self emphasisCode. - self color ifNotNil: [ - aScanner textColor: self color]. - self font ifNotNil: [ - aScanner setActualFont: self font]. - self isTextIndent ifTrue: [ - aScanner indentationLevel: self amount] \ No newline at end of file + + self attributes do: [:each | each emphasizeScanner: aScanner] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/font..st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/font..st deleted file mode 100644 index f18e672..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/font..st +++ /dev/null @@ -1,5 +0,0 @@ -accessing -font: aFont - - font := aFont. - self changed: #font \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/font.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/font.st deleted file mode 100644 index 3a14761..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/font.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -font - - ^ font \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/getFont.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/getFont.st deleted file mode 100644 index 0eca0c4..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/getFont.st +++ /dev/null @@ -1,4 +0,0 @@ -font -getFont - - ^ self font \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/initialize.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/initialize.st index 9a1ffcd..2fa6011 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/initialize.st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/initialize.st @@ -5,4 +5,5 @@ initialize self initializeStyles; color: nil; - font: nil \ No newline at end of file + font: nil; + attributes: OrderedCollection new \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/isBold.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/isBold.st deleted file mode 100644 index 5287101..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/isBold.st +++ /dev/null @@ -1,4 +0,0 @@ -testing -isBold - - ^ self stylesActivated at: self class boldStyle \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/isIndented.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/isIndented.st deleted file mode 100644 index e2eb1c4..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/isIndented.st +++ /dev/null @@ -1,4 +0,0 @@ -testing -isIndented - - ^ self stylesActivated at: self class indentedStyle \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/isItalic.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/isItalic.st deleted file mode 100644 index dea18eb..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/isItalic.st +++ /dev/null @@ -1,4 +0,0 @@ -testing -isItalic - - ^ self stylesActivated at: self class italicStyle \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/isStruckOut.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/isStruckOut.st deleted file mode 100644 index 8735e5f..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/isStruckOut.st +++ /dev/null @@ -1,4 +0,0 @@ -testing -isStruckOut - - ^ self stylesActivated at: self class struckOutStyle \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/isTextIndent.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/isTextIndent.st deleted file mode 100644 index fc66d74..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/isTextIndent.st +++ /dev/null @@ -1,4 +0,0 @@ -testing -isTextIndent - - ^ self isIndented \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/isUnderlined.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/isUnderlined.st deleted file mode 100644 index d4a2444..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/isUnderlined.st +++ /dev/null @@ -1,4 +0,0 @@ -testing -isUnderlined - - ^ self stylesActivated at: self class underlinedStyle \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json b/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json index b588457..16c1862 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json @@ -12,25 +12,17 @@ "underlinedStyle" : "tok 6/8/2020 12:07" }, "instance" : { "=" : "lh 7/24/2019 20:24", - "amount" : "tok 6/1/2020 13:32", - "color" : "AG 6/19/2019 19:03", - "color:" : "ls 7/24/2019 21:55", - "emphasisCode" : "lh 7/24/2019 22:50", - "emphasizeScanner:" : "tok 6/1/2020 13:31", - "font" : "SR 6/26/2019 18:05", - "font:" : "ls 7/24/2019 21:22", - "getFont" : "ls 7/24/2019 21:19", + "actOnClickFor:" : "kh 6/18/2020 14:45", + "addTextAttribute:" : "kh 6/18/2020 14:19", + "attributes" : "kh 6/18/2020 14:14", + "attributes:" : "kh 6/18/2020 14:15", + "emphasisCode" : "kh 6/18/2020 14:58", + "emphasizeScanner:" : "kh 6/18/2020 14:31", "hash" : "lh 7/24/2019 20:47", - "initialize" : "tok 6/8/2020 12:39", + "initialize" : "kh 6/18/2020 14:27", "initializeStyles" : "tok 6/8/2020 12:38", - "isBold" : "tok 6/8/2020 12:40", "isExtendable" : "tok 6/8/2020 12:40", - "isIndented" : "tok 6/8/2020 12:41", - "isItalic" : "tok 6/8/2020 12:41", - "isStruckOut" : "tok 6/8/2020 12:41", - "isTextIndent" : "tok 6/8/2020 12:41", "isTextStructure" : "ls 5/29/2019 17:41", - "isUnderlined" : "tok 6/8/2020 12:41", "mayBeExtended" : "ls 6/12/2019 18:49", "openColorPicker" : "AG 7/24/2019 15:45", "openFontChooser" : "ls 7/24/2019 21:22", diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/properties.json b/packages/RichTextEditing-Core.package/TextStructure.class/properties.json index df7d4cf..fde7121 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/properties.json +++ b/packages/RichTextEditing-Core.package/TextStructure.class/properties.json @@ -10,7 +10,8 @@ "color", "font", "styleSet", - "stylesActivated" ], + "stylesActivated", + "attributes" ], "name" : "TextStructure", "pools" : [ ], From 5fa6c5943184fa8d151a70fb20f19b0171f0e9ce Mon Sep 17 00:00:00 2001 From: Konrad Hanff Date: Thu, 18 Jun 2020 17:00:10 +0200 Subject: [PATCH 02/12] Application of structures somewhat working --- .../ExtendableText.class/README.md | 0 .../instance/mayBeExtended.st | 4 ++++ .../methodProperties.json | 5 +++++ .../ExtendableText.class/properties.json | 19 +++++++++++++++++++ .../class/commonStyles.st | 4 ++++ .../class/initialBoldStructure.st | 10 +++++++--- .../class/initialItalicStructure.st | 10 +++++++--- .../class/initialTextStructures.st | 9 ++------- .../class/initialUnderlinedStructure.st | 10 +++++----- .../methodProperties.json | 9 +++++---- .../class/new.withAttributes..st | 8 ++++++++ .../instance/initialize.st | 4 ++-- .../instance/isExtendable.st | 3 ++- .../TextStructure.class/methodProperties.json | 5 +++-- 14 files changed, 73 insertions(+), 27 deletions(-) create mode 100644 packages/RichTextEditing-Core.package/ExtendableText.class/README.md create mode 100644 packages/RichTextEditing-Core.package/ExtendableText.class/instance/mayBeExtended.st create mode 100644 packages/RichTextEditing-Core.package/ExtendableText.class/methodProperties.json create mode 100644 packages/RichTextEditing-Core.package/ExtendableText.class/properties.json create mode 100644 packages/RichTextEditing-Core.package/RichTextDocument.class/class/commonStyles.st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/new.withAttributes..st diff --git a/packages/RichTextEditing-Core.package/ExtendableText.class/README.md b/packages/RichTextEditing-Core.package/ExtendableText.class/README.md new file mode 100644 index 0000000..e69de29 diff --git a/packages/RichTextEditing-Core.package/ExtendableText.class/instance/mayBeExtended.st b/packages/RichTextEditing-Core.package/ExtendableText.class/instance/mayBeExtended.st new file mode 100644 index 0000000..da8bb71 --- /dev/null +++ b/packages/RichTextEditing-Core.package/ExtendableText.class/instance/mayBeExtended.st @@ -0,0 +1,4 @@ +as yet unclassified +mayBeExtended + + ^ true \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/ExtendableText.class/methodProperties.json b/packages/RichTextEditing-Core.package/ExtendableText.class/methodProperties.json new file mode 100644 index 0000000..d234355 --- /dev/null +++ b/packages/RichTextEditing-Core.package/ExtendableText.class/methodProperties.json @@ -0,0 +1,5 @@ +{ + "class" : { + }, + "instance" : { + "mayBeExtended" : "kh 6/18/2020 16:48" } } diff --git a/packages/RichTextEditing-Core.package/ExtendableText.class/properties.json b/packages/RichTextEditing-Core.package/ExtendableText.class/properties.json new file mode 100644 index 0000000..dd4c4db --- /dev/null +++ b/packages/RichTextEditing-Core.package/ExtendableText.class/properties.json @@ -0,0 +1,19 @@ +{ + "category" : "RichTextEditing-Core", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "structureIdentifier", + "color", + "font", + "styleSet", + "stylesActivated", + "attributes" ], + "name" : "ExtendableText", + "pools" : [ + ], + "super" : "TextAttribute", + "type" : "normal" } diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/commonStyles.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/commonStyles.st new file mode 100644 index 0000000..c8af828 --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/commonStyles.st @@ -0,0 +1,4 @@ +constants +commonStyles + + ^ {ExtendableText new} asSet \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialBoldStructure.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialBoldStructure.st index 6950866..faf6c22 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialBoldStructure.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialBoldStructure.st @@ -1,6 +1,10 @@ -constants +initial structures initialBoldStructure - ^ TextStructure + "^ TextStructure newWith: #bold - withStyles: (self defaultStyles union: {TextStructure boldStyle}) \ No newline at end of file + withStyles: (self defaultStyles union: {TextStructure boldStyle})" + + ^ TextStructure + new: #bold + withAttributes: (self commonStyles union: {TextEmphasis bold}) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialItalicStructure.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialItalicStructure.st index 51f4ada..a29cf99 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialItalicStructure.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialItalicStructure.st @@ -1,6 +1,10 @@ -constants +initial structures initialItalicStructure - ^ TextStructure + "^ TextStructure newWith: #italic - withStyles: (self defaultStyles union: {TextStructure italicStyle}) \ No newline at end of file + withStyles: (self defaultStyles union: {TextStructure italicStyle})" + + ^ TextStructure + new: #italic + withAttributes: (self commonStyles union: {TextEmphasis italic}) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialTextStructures.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialTextStructures.st index 8af455b..2a13816 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialTextStructures.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialTextStructures.st @@ -1,11 +1,6 @@ -constants +initial structures initialTextStructures ^ {self initialBoldStructure. self initialItalicStructure. - self initialUnderlinedStructure. - self initialFootnoteStructure. - self initialHeading1Structure. - self initialHeading2Structure. - self initialHeading3Structure. - self initialListStructure} asOrderedCollection \ No newline at end of file + self initialUnderlinedStructure} asOrderedCollection \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialUnderlinedStructure.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialUnderlinedStructure.st index aaba823..0ccfa6b 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialUnderlinedStructure.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialUnderlinedStructure.st @@ -1,6 +1,6 @@ -constants +initial structures initialUnderlinedStructure - - ^ TextStructure - newWith: #underlined - withStyles: (self defaultStyles union: {TextStructure underlinedStyle}) \ No newline at end of file + + ^ TextStructure + new: #underlined + withAttributes: (self commonStyles union: {TextEmphasis underlined}) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextDocument.class/methodProperties.json index 829f859..cf9637b 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/methodProperties.json @@ -1,17 +1,18 @@ { "class" : { + "commonStyles" : "kh 6/18/2020 16:49", "defaultStyles" : "tok 6/8/2020 12:21", "editorClass" : "ls 6/26/2019 17:33", "fromText:withStructures:" : "ls 6/26/2019 17:31", - "initialBoldStructure" : "tok 6/8/2020 12:22", + "initialBoldStructure" : "kh 6/18/2020 16:50", "initialFootnoteStructure" : "tok 6/8/2020 12:06", "initialHeading1Structure" : "tok 6/8/2020 12:22", "initialHeading2Structure" : "tok 6/8/2020 12:22", "initialHeading3Structure" : "tok 6/8/2020 12:22", - "initialItalicStructure" : "tok 6/8/2020 12:22", + "initialItalicStructure" : "kh 6/18/2020 16:50", "initialListStructure" : "tok 6/8/2020 12:22", - "initialTextStructures" : "tok 5/31/2020 21:15", - "initialUnderlinedStructure" : "tok 6/8/2020 12:23" }, + "initialTextStructures" : "kh 6/18/2020 16:52", + "initialUnderlinedStructure" : "kh 6/18/2020 16:51" }, "instance" : { "addAttribute:from:to:" : "AG 7/25/2019 13:08", "charcount" : "frc 5/25/2020 16:02", diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/new.withAttributes..st b/packages/RichTextEditing-Core.package/TextStructure.class/class/new.withAttributes..st new file mode 100644 index 0000000..5c24bb6 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/new.withAttributes..st @@ -0,0 +1,8 @@ +instance creation +new: aSymbol withAttributes: aSet + + | instance | + instance := self new structureIdentifier: aSymbol. + instance attributes: aSet. + + ^ instance \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/initialize.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/initialize.st index 2fa6011..cde1d57 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/initialize.st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/initialize.st @@ -4,6 +4,6 @@ initialize super initialize. self initializeStyles; - color: nil; - font: nil; + "color: nil; + font: nil;" attributes: OrderedCollection new \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/isExtendable.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/isExtendable.st index acd8b51..0252841 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/isExtendable.st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/isExtendable.st @@ -1,4 +1,5 @@ testing isExtendable - ^ self stylesActivated at: self class extendableStyle \ No newline at end of file + "^ self stylesActivated at: self class extendableStyle" + ^ self attributes anySatisfy: [:each | each mayBeExtended] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json b/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json index 16c1862..21d07c4 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json @@ -7,6 +7,7 @@ "extendableStyle" : "tok 6/8/2020 12:07", "indentedStyle" : "tok 6/8/2020 12:14", "italicStyle" : "tok 6/8/2020 12:07", + "new:withAttributes:" : "kh 6/18/2020 16:45", "newWith:withStyles:" : "tok 6/8/2020 12:06", "struckOutStyle" : "tok 6/8/2020 12:07", "underlinedStyle" : "tok 6/8/2020 12:07" }, @@ -19,9 +20,9 @@ "emphasisCode" : "kh 6/18/2020 14:58", "emphasizeScanner:" : "kh 6/18/2020 14:31", "hash" : "lh 7/24/2019 20:47", - "initialize" : "kh 6/18/2020 14:27", + "initialize" : "kh 6/18/2020 16:58", "initializeStyles" : "tok 6/8/2020 12:38", - "isExtendable" : "tok 6/8/2020 12:40", + "isExtendable" : "kh 6/18/2020 16:48", "isTextStructure" : "ls 5/29/2019 17:41", "mayBeExtended" : "ls 6/12/2019 18:49", "openColorPicker" : "AG 7/24/2019 15:45", From 9e31d0d28d284ae326042f94caac7c181f133e9b Mon Sep 17 00:00:00 2001 From: Konrad Hanff Date: Thu, 18 Jun 2020 22:41:11 +0200 Subject: [PATCH 03/12] Everything except Font and Color seems to work --- .../NullTextStructure.class/instance/add..st | 2 ++ .../instance/at.ifAbsent..st | 4 +++ .../instance/includes..st | 4 +++ .../instance/remove..st | 2 ++ .../instance/structureIdentifier..st | 2 ++ .../methodProperties.json | 7 +++- .../class/commonStyles.st | 2 +- .../class/defaultStyles.st | 2 +- .../class/initialBoldStructure.st | 2 +- .../class/initialItalicStructure.st | 2 +- .../class/initialTextStructures.st | 2 +- .../class/initialUnderlinedStructure.st | 2 +- .../instance/getTextStructure..st | 5 +++ .../instance/initializeStructure..st | 3 +- .../methodProperties.json | 15 ++++---- .../class/allAttributes.st | 5 +++ .../class/textStyles.st | 5 --- .../instance/allAttributes.st | 4 +++ .../instance/buildStructureFieldWith..st | 4 +-- .../instance/buildStyleFieldWith..st | 6 ++-- .../instance/currentPriority.st | 2 +- .../instance/currentStructure.st | 4 +-- .../instance/currentStructureSymbol..st | 7 ---- .../instance/currentStructureSymbol.st | 4 --- .../instance/getAttributeAt..st | 4 +++ .../instance/getStyleSelectionAt..st | 4 --- .../instance/initialize.st | 5 +-- .../instance/loremIpsumDefault.st | 2 +- .../instance/newNullTextStructure.st | 2 +- .../instance/removeStructure.st | 4 +-- .../instance/selectedStructure.st | 4 +++ .../instance/selectedStructureSymbol..st | 7 ++++ .../instance/selectedStructureSymbol.st | 4 +++ .../instance/selectedStyles..st | 5 --- .../instance/selectedStyles.st | 4 --- .../instance/setAttributeAt.put..st | 10 ++++++ .../instance/structureList..st | 4 --- .../instance/styleList..st | 4 --- .../instance/styleSelectionAt.put..st | 10 ------ .../instance/textStyles.st | 4 --- .../instance/updateLoremIpsum.st | 2 +- .../methodProperties.json | 35 +++++++++---------- .../properties.json | 2 +- .../class/allAttributeIdentifiers.st | 4 +++ .../class/allAttributes.st | 9 +++++ .../class/availableStyles.st | 5 --- .../TextStructure.class/class/bold.st | 4 +++ .../TextStructure.class/class/boldStyle.st | 4 --- .../TextStructure.class/class/defaultColor.st | 2 +- .../TextStructure.class/class/defaultFont.st | 2 +- .../TextStructure.class/class/extendable.st | 4 +++ .../class/extendableStyle.st | 4 --- .../TextStructure.class/class/indented.st | 4 +++ .../class/indentedStyle.st | 2 +- .../TextStructure.class/class/italic.st | 4 +++ .../TextStructure.class/class/italicStyle.st | 4 --- .../class/{new.withAttributes..st => new..st} | 3 +- .../TextStructure.class/class/new.with..st | 8 +++++ .../class/newWith.withStyles..st | 2 +- .../TextStructure.class/class/struckOut.st | 4 +++ .../class/struckOutStyle.st | 4 --- .../TextStructure.class/class/underlined.st | 4 +++ .../class/underlinedStyle.st | 4 --- .../instance/actOnClickFor..st | 2 +- .../TextStructure.class/instance/add..st | 4 +++ .../instance/addTextAttribute..st | 4 --- .../TextStructure.class/instance/at..st | 4 +++ .../instance/at.ifAbsent..st | 4 +++ .../instance/emphasisCode.st | 2 +- .../instance/emphasizeScanner..st | 2 +- .../TextStructure.class/instance/includes..st | 4 +++ .../instance/initialize.st | 6 +--- .../instance/initializeStyles.st | 5 --- .../instance/isTextStructure.st | 2 +- .../TextStructure.class/instance/remove..st | 4 +++ .../TextStructure.class/instance/styleSet.st | 4 --- .../instance/stylesActivated..st | 4 --- .../instance/stylesActivated.st | 4 --- .../instance/updateStyles..st | 6 ---- .../TextStructure.class/methodProperties.json | 32 +++++++++-------- .../TextStructure.class/properties.json | 4 --- 81 files changed, 202 insertions(+), 189 deletions(-) create mode 100644 packages/RichTextEditing-Core.package/NullTextStructure.class/instance/add..st create mode 100644 packages/RichTextEditing-Core.package/NullTextStructure.class/instance/at.ifAbsent..st create mode 100644 packages/RichTextEditing-Core.package/NullTextStructure.class/instance/includes..st create mode 100644 packages/RichTextEditing-Core.package/NullTextStructure.class/instance/remove..st create mode 100644 packages/RichTextEditing-Core.package/NullTextStructure.class/instance/structureIdentifier..st create mode 100644 packages/RichTextEditing-Core.package/RichTextDocument.class/instance/getTextStructure..st create mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/class/allAttributes.st delete mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/class/textStyles.st create mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/allAttributes.st delete mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentStructureSymbol..st delete mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentStructureSymbol.st create mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/getAttributeAt..st delete mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/getStyleSelectionAt..st create mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStructure.st create mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStructureSymbol..st create mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStructureSymbol.st delete mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStyles..st delete mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStyles.st create mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setAttributeAt.put..st delete mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/structureList..st delete mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/styleList..st delete mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/styleSelectionAt.put..st delete mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/textStyles.st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/allAttributeIdentifiers.st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/allAttributes.st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/availableStyles.st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/bold.st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/boldStyle.st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/extendable.st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/extendableStyle.st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/indented.st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/italic.st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/italicStyle.st rename packages/RichTextEditing-Core.package/TextStructure.class/class/{new.withAttributes..st => new..st} (54%) create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/new.with..st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/struckOut.st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/struckOutStyle.st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/underlined.st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/underlinedStyle.st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/add..st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/addTextAttribute..st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/at..st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/at.ifAbsent..st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/includes..st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/initializeStyles.st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/remove..st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/styleSet.st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/stylesActivated..st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/stylesActivated.st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/updateStyles..st diff --git a/packages/RichTextEditing-Core.package/NullTextStructure.class/instance/add..st b/packages/RichTextEditing-Core.package/NullTextStructure.class/instance/add..st new file mode 100644 index 0000000..b2ec8d6 --- /dev/null +++ b/packages/RichTextEditing-Core.package/NullTextStructure.class/instance/add..st @@ -0,0 +1,2 @@ +adding +add: aTextAttribute \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/NullTextStructure.class/instance/at.ifAbsent..st b/packages/RichTextEditing-Core.package/NullTextStructure.class/instance/at.ifAbsent..st new file mode 100644 index 0000000..6c23226 --- /dev/null +++ b/packages/RichTextEditing-Core.package/NullTextStructure.class/instance/at.ifAbsent..st @@ -0,0 +1,4 @@ +accessing +at: aSymbol ifAbsent: aBlock + + ^ NullTextStructure new \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/NullTextStructure.class/instance/includes..st b/packages/RichTextEditing-Core.package/NullTextStructure.class/instance/includes..st new file mode 100644 index 0000000..76a1ba4 --- /dev/null +++ b/packages/RichTextEditing-Core.package/NullTextStructure.class/instance/includes..st @@ -0,0 +1,4 @@ +testing +includes: aTextAttribute + + ^ false \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/NullTextStructure.class/instance/remove..st b/packages/RichTextEditing-Core.package/NullTextStructure.class/instance/remove..st new file mode 100644 index 0000000..47b691d --- /dev/null +++ b/packages/RichTextEditing-Core.package/NullTextStructure.class/instance/remove..st @@ -0,0 +1,2 @@ +removing +remove: aTextAttribute \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/NullTextStructure.class/instance/structureIdentifier..st b/packages/RichTextEditing-Core.package/NullTextStructure.class/instance/structureIdentifier..st new file mode 100644 index 0000000..30e34d4 --- /dev/null +++ b/packages/RichTextEditing-Core.package/NullTextStructure.class/instance/structureIdentifier..st @@ -0,0 +1,2 @@ +accessing +structureIdentifier: aSymbol \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/NullTextStructure.class/methodProperties.json b/packages/RichTextEditing-Core.package/NullTextStructure.class/methodProperties.json index d222223..3a847aa 100644 --- a/packages/RichTextEditing-Core.package/NullTextStructure.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/NullTextStructure.class/methodProperties.json @@ -2,9 +2,14 @@ "class" : { "warningText" : "tok 6/12/2020 12:41" }, "instance" : { + "add:" : "kh 6/18/2020 21:24", + "at:ifAbsent:" : "kh 6/18/2020 21:25", + "includes:" : "kh 6/18/2020 21:25", "noCurrentStructureWarning" : "tok 6/12/2020 12:41", "openColorPicker" : "ls 7/24/2019 21:54", "openFontChooser" : "ls 7/24/2019 21:22", + "remove:" : "kh 6/18/2020 21:24", "resetColor" : "ls 7/24/2019 21:57", "resetFont" : "ls 7/24/2019 21:23", - "structureIdentifier" : "ls 7/24/2019 22:17" } } + "structureIdentifier" : "ls 7/24/2019 22:17", + "structureIdentifier:" : "kh 6/18/2020 21:57" } } diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/commonStyles.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/commonStyles.st index c8af828..d9b4cbb 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/commonStyles.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/commonStyles.st @@ -1,4 +1,4 @@ constants commonStyles - ^ {ExtendableText new} asSet \ No newline at end of file + ^ {TextStructure extendable} asSet \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/defaultStyles.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/defaultStyles.st index 76e79bf..4df132a 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/defaultStyles.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/defaultStyles.st @@ -1,4 +1,4 @@ constants defaultStyles - ^ {TextStructure extendableStyle} asSet \ No newline at end of file + ^ self commonStyles \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialBoldStructure.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialBoldStructure.st index faf6c22..5af47ce 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialBoldStructure.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialBoldStructure.st @@ -7,4 +7,4 @@ initialBoldStructure ^ TextStructure new: #bold - withAttributes: (self commonStyles union: {TextEmphasis bold}) \ No newline at end of file + with: (self commonStyles union: {TextStructure bold}) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialItalicStructure.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialItalicStructure.st index a29cf99..5ba6cfb 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialItalicStructure.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialItalicStructure.st @@ -7,4 +7,4 @@ initialItalicStructure ^ TextStructure new: #italic - withAttributes: (self commonStyles union: {TextEmphasis italic}) \ No newline at end of file + with: (self commonStyles union: {TextStructure italic}) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialTextStructures.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialTextStructures.st index 2a13816..2e1b8d4 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialTextStructures.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialTextStructures.st @@ -3,4 +3,4 @@ initialTextStructures ^ {self initialBoldStructure. self initialItalicStructure. - self initialUnderlinedStructure} asOrderedCollection \ No newline at end of file + "self initialUnderlinedStructure"} asOrderedCollection \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialUnderlinedStructure.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialUnderlinedStructure.st index 0ccfa6b..1490605 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialUnderlinedStructure.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialUnderlinedStructure.st @@ -3,4 +3,4 @@ initialUnderlinedStructure ^ TextStructure new: #underlined - withAttributes: (self commonStyles union: {TextEmphasis underlined}) \ No newline at end of file + with: (self commonStyles union: {TextStructure underlined}) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/getTextStructure..st b/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/getTextStructure..st new file mode 100644 index 0000000..ccc3a90 --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/getTextStructure..st @@ -0,0 +1,5 @@ +text structures +getTextStructure: aSymbol + + ^ self textStructures detect: [:each | each structureIdentifier = aSymbol] + ifNone: [^ NullTextStructure new] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/initializeStructure..st b/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/initializeStructure..st index 68e32c4..7267169 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/initializeStructure..st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/initializeStructure..st @@ -1,4 +1,5 @@ text structures initializeStructure: aSymbol - self initializeStructure: aSymbol withEmphasis: self class defaultStyles \ No newline at end of file + "self initializeStructure: aSymbol withEmphasis: self class defaultStyles" + self textStructures add: (TextStructure new: aSymbol with: self class defaultStyles) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextDocument.class/methodProperties.json index cf9637b..affdf1c 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/methodProperties.json @@ -1,18 +1,18 @@ { "class" : { - "commonStyles" : "kh 6/18/2020 16:49", - "defaultStyles" : "tok 6/8/2020 12:21", + "commonStyles" : "kh 6/18/2020 21:39", + "defaultStyles" : "kh 6/18/2020 22:35", "editorClass" : "ls 6/26/2019 17:33", "fromText:withStructures:" : "ls 6/26/2019 17:31", - "initialBoldStructure" : "kh 6/18/2020 16:50", + "initialBoldStructure" : "kh 6/18/2020 21:39", "initialFootnoteStructure" : "tok 6/8/2020 12:06", "initialHeading1Structure" : "tok 6/8/2020 12:22", "initialHeading2Structure" : "tok 6/8/2020 12:22", "initialHeading3Structure" : "tok 6/8/2020 12:22", - "initialItalicStructure" : "kh 6/18/2020 16:50", + "initialItalicStructure" : "kh 6/18/2020 21:39", "initialListStructure" : "tok 6/8/2020 12:22", - "initialTextStructures" : "kh 6/18/2020 16:52", - "initialUnderlinedStructure" : "kh 6/18/2020 16:51" }, + "initialTextStructures" : "kh 6/18/2020 21:35", + "initialUnderlinedStructure" : "kh 6/18/2020 21:39" }, "instance" : { "addAttribute:from:to:" : "AG 7/25/2019 13:08", "charcount" : "frc 5/25/2020 16:02", @@ -20,9 +20,10 @@ "copy:" : "MB 7/3/2019 18:58", "createNewStructure:" : "ls 7/24/2019 15:24", "emptyChars" : "frc 6/1/2020 13:43", + "getTextStructure:" : "kh 6/18/2020 21:18", "hasStructure:forText:from:to:" : "AG 7/25/2019 13:20", "initialize" : "ls 7/24/2019 15:10", - "initializeStructure:" : "ls 7/24/2019 15:13", + "initializeStructure:" : "kh 6/18/2020 22:37", "initializeStructure:withEmphasis:" : "tok 6/8/2020 12:06", "initializeStructures" : "ls 7/24/2019 15:12", "isUnsavedDocument" : "OS 6/14/2020 18:19", diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/class/allAttributes.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/class/allAttributes.st new file mode 100644 index 0000000..ce07ee2 --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/class/allAttributes.st @@ -0,0 +1,5 @@ +constants +allAttributes + + ^ TextStructure allAttributeIdentifiers + \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/class/textStyles.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/class/textStyles.st deleted file mode 100644 index 5ff620f..0000000 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/class/textStyles.st +++ /dev/null @@ -1,5 +0,0 @@ -constants -textStyles - - ^ TextStructure availableStyles asOrderedCollection - \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/allAttributes.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/allAttributes.st new file mode 100644 index 0000000..4b313d4 --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/allAttributes.st @@ -0,0 +1,4 @@ +text attributes +allAttributes + + ^ self class allAttributes \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildStructureFieldWith..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildStructureFieldWith..st index e1dcf57..940fa7d 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildStructureFieldWith..st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildStructureFieldWith..st @@ -6,6 +6,6 @@ buildStructureFieldWith: aBuilder model: self; frame: (0 @ 0 corner: 0.5 @ 0.9); list: #textStructures; - getSelected: #currentStructureSymbol; - setSelected: #currentStructureSymbol:; + getSelected: #selectedStructureSymbol; + setSelected: #selectedStructureSymbol:; yourself \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildStyleFieldWith..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildStyleFieldWith..st index a0b0a37..e9f01a6 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildStyleFieldWith..st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildStyleFieldWith..st @@ -5,7 +5,7 @@ buildStyleFieldWith: aBuilder name: 'styleField'; model: self; frame: (0.5 @ 0 corner: 1 @ 0.45); - list: #textStyles; - getSelectionList: #getStyleSelectionAt:; - setSelectionList: #styleSelectionAt:put:; + list: #allAttributes; + getSelectionList: #getAttributeAt:; + setSelectionList: #setAttributeAt:put:; yourself \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentPriority.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentPriority.st index 6876bcc..8e2b3b5 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentPriority.st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentPriority.st @@ -1,4 +1,4 @@ text structures currentPriority - ^ self textStructures indexOf: self currentStructureSymbol \ No newline at end of file + ^ self textStructures indexOf: self selectedStructureSymbol \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentStructure.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentStructure.st index 664a0cd..4631606 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentStructure.st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentStructure.st @@ -1,6 +1,6 @@ text structures currentStructure - self currentStructureSymbol ifNil: [^ self newNullTextStructure]. + self selectedStructureSymbol ifNil: [^ self newNullTextStructure]. - ^ self document symbolToStructure: self currentStructureSymbol \ No newline at end of file + ^ self document symbolToStructure: self selectedStructureSymbol \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentStructureSymbol..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentStructureSymbol..st deleted file mode 100644 index cfb4e7d..0000000 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentStructureSymbol..st +++ /dev/null @@ -1,7 +0,0 @@ -accessing -currentStructureSymbol: aSymbol - - self lastStructureSymbol: self currentStructureSymbol. - currentStructureSymbol := aSymbol. - self changed: #allSelections; - updateLoremIpsum \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentStructureSymbol.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentStructureSymbol.st deleted file mode 100644 index c881320..0000000 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentStructureSymbol.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -currentStructureSymbol - - ^ currentStructureSymbol \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/getAttributeAt..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/getAttributeAt..st new file mode 100644 index 0000000..9e1cd44 --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/getAttributeAt..st @@ -0,0 +1,4 @@ +text attributes +getAttributeAt: anIndex + + ^ self selectedStructure includes: (TextStructure new: (self allAttributes at: anIndex)) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/getStyleSelectionAt..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/getStyleSelectionAt..st deleted file mode 100644 index fd000fc..0000000 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/getStyleSelectionAt..st +++ /dev/null @@ -1,4 +0,0 @@ -text styles -getStyleSelectionAt: anIndex - - ^ self selectedStyles includes: (self textStyles at: anIndex) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/initialize.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/initialize.st index 20d977b..cd3e8c1 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/initialize.st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/initialize.st @@ -1,7 +1,4 @@ initialize-release initialize - self - styleList: self textStyles; - structureList: self textStructures; - initializeLoremIpsum \ No newline at end of file + self initializeLoremIpsum \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/loremIpsumDefault.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/loremIpsumDefault.st index 32fd4b3..abd0164 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/loremIpsumDefault.st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/loremIpsumDefault.st @@ -1,4 +1,4 @@ -accessing +constants loremIpsumDefault ^ 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam at fringilla est, eget suscipit ex. Interdum et malesuada fames ac ante ipsum primis in faucibus.' \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/newNullTextStructure.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/newNullTextStructure.st index 7eae717..9d26895 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/newNullTextStructure.st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/newNullTextStructure.st @@ -1,4 +1,4 @@ initialize-release newNullTextStructure - ^ NullTextStructure newWith: #null withStyles: Set new \ No newline at end of file + ^ NullTextStructure new \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/removeStructure.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/removeStructure.st index 049407a..6a3e3ee 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/removeStructure.st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/removeStructure.st @@ -1,8 +1,8 @@ text structures removeStructure - self currentStructureSymbol ifNil: [ + self selectedStructureSymbol ifNil: [ self chooseStructureToRemove. ^nil]. - self document removeStructure: self currentStructureSymbol. + self document removeStructure: self selectedStructureSymbol. self changed: #textStructures \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStructure.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStructure.st new file mode 100644 index 0000000..6adcdb4 --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStructure.st @@ -0,0 +1,4 @@ +text attributes +selectedStructure + + ^ self document getTextStructure: self selectedStructureSymbol \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStructureSymbol..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStructureSymbol..st new file mode 100644 index 0000000..0e99a40 --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStructureSymbol..st @@ -0,0 +1,7 @@ +accessing +selectedStructureSymbol: aSymbol + + self lastStructureSymbol: self selectedStructureSymbol. + selectedStructureSymbol := aSymbol. + self changed: #allSelections; + updateLoremIpsum \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStructureSymbol.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStructureSymbol.st new file mode 100644 index 0000000..07b8515 --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStructureSymbol.st @@ -0,0 +1,4 @@ +accessing +selectedStructureSymbol + + ^ selectedStructureSymbol \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStyles..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStyles..st deleted file mode 100644 index 0f67fa4..0000000 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStyles..st +++ /dev/null @@ -1,5 +0,0 @@ -text styles -selectedStyles: aSet - - self currentStructureSymbol ifNotNil: [ - self document updateStyle: self currentStructureSymbol withEmphasis: aSet] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStyles.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStyles.st deleted file mode 100644 index 4b42d2e..0000000 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStyles.st +++ /dev/null @@ -1,4 +0,0 @@ -text styles -selectedStyles - - ^ self document stylesForStructure: self currentStructureSymbol \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setAttributeAt.put..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setAttributeAt.put..st new file mode 100644 index 0000000..80a9c43 --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setAttributeAt.put..st @@ -0,0 +1,10 @@ +text attributes +setAttributeAt: anIndex put: aBoolean + + | target targetTextStructure | + target := self selectedStructure. + targetTextStructure := (TextStructure perform: (self allAttributes at: anIndex)). + aBoolean + ifTrue: [ target add: targetTextStructure] + ifFalse: [ target remove: targetTextStructure]. + self updateLoremIpsum \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/structureList..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/structureList..st deleted file mode 100644 index 4b4102e..0000000 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/structureList..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -structureList: anObject - - structureList := anObject \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/styleList..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/styleList..st deleted file mode 100644 index 47dc1a4..0000000 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/styleList..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -styleList: anOrderedCollection - - styleList := anOrderedCollection \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/styleSelectionAt.put..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/styleSelectionAt.put..st deleted file mode 100644 index 3549123..0000000 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/styleSelectionAt.put..st +++ /dev/null @@ -1,10 +0,0 @@ -text styles -styleSelectionAt: anIndex put: aBoolean - - | target | - self currentStructureSymbol ifNotNil: [ - target := self textStyles at: anIndex. - self selectedStyles: (aBoolean - ifTrue: [ self selectedStyles copyWith: target ] - ifFalse: [ self selectedStyles copyWithout: target ]). - self updateLoremIpsum] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/textStyles.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/textStyles.st deleted file mode 100644 index 8a1c0e0..0000000 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/textStyles.st +++ /dev/null @@ -1,4 +0,0 @@ -text styles -textStyles - - ^ self class textStyles \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/updateLoremIpsum.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/updateLoremIpsum.st index 2e05246..cf1c8b1 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/updateLoremIpsum.st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/updateLoremIpsum.st @@ -4,7 +4,7 @@ updateLoremIpsum self lastStructureSymbol ifNotNil: [ self loremIpsum removeAttribute: (self document symbolToStructure: self lastStructureSymbol) from: 1 to: self loremIpsum size]. - self currentStructureSymbol ifNotNil: [ + self selectedStructureSymbol ifNotNil: [ self loremIpsum addAttribute: self currentStructure from: 1 to: self loremIpsum size]. self changed: #loremIpsum \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json index 809500f..60d9dec 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json @@ -1,11 +1,12 @@ { "class" : { - "openWith:" : "AG 7/25/2019 13:15", - "textStyles" : "tok 6/8/2020 12:26" }, + "allAttributes" : "kh 6/18/2020 22:14", + "openWith:" : "AG 7/25/2019 13:15" }, "instance" : { "addColor" : "ls 7/24/2019 21:51", "addFont" : "ls 7/24/2019 21:16", "addNewStructure" : "ls 7/24/2019 17:06", + "allAttributes" : "kh 6/18/2020 22:13", "buildAddStructureButtonWith:" : "lh 7/3/2019 17:26", "buildColorButtonWith:" : "lh 6/26/2019 18:40", "buildColorResetButtonWith:" : "lh 6/26/2019 18:40", @@ -14,41 +15,37 @@ "buildFontResetButtonWith:" : "lh 6/26/2019 18:40", "buildIncreasePriorityButtonWith:" : "lh 7/3/2019 17:25", "buildRemoveStructureButtonWith:" : "lh 7/3/2019 17:26", - "buildStructureFieldWith:" : "AG 7/5/2019 22:05", - "buildStyleFieldWith:" : "lh 6/26/2019 18:40", + "buildStructureFieldWith:" : "kh 6/18/2020 22:17", + "buildStyleFieldWith:" : "kh 6/18/2020 22:17", "buildTextPreviewFieldWith:" : "lh 6/26/2019 18:41", "buildWith:" : "lh 7/3/2019 17:24", "chooseStructureToRemove" : "ls 7/24/2019 17:26", "copyTextStructures" : "lh 7/24/2019 18:33", - "currentPriority" : "AG 7/5/2019 22:06", - "currentStructure" : "AG 7/25/2019 13:30", - "currentStructureSymbol" : "AG 7/5/2019 22:35", - "currentStructureSymbol:" : "AG 7/25/2019 10:43", + "currentPriority" : "kh 6/18/2020 22:30", + "currentStructure" : "kh 6/18/2020 22:18", "decreasePriority" : "ls 7/24/2019 22:36", "document" : "ls 7/24/2019 16:49", "document:" : "ls 7/24/2019 16:49", - "getStyleSelectionAt:" : "ls 5/30/2019 02:04", + "getAttributeAt:" : "kh 6/18/2020 22:12", "increasePriority" : "ls 7/24/2019 22:36", - "initialize" : "ls 7/24/2019 20:38", + "initialize" : "kh 6/18/2020 22:04", "initializeLoremIpsum" : "lh 7/24/2019 16:16", "lastStructureSymbol" : "AG 7/25/2019 10:43", "lastStructureSymbol:" : "AG 7/25/2019 10:43", "loremIpsum" : "ls 6/5/2019 22:07", "loremIpsum:" : "ls 6/5/2019 22:07", "loremIpsumDefault" : "lh 7/24/2019 16:16", - "newNullTextStructure" : "tok 6/8/2020 12:06", - "removeStructure" : "lh 7/24/2019 20:16", + "newNullTextStructure" : "kh 6/18/2020 22:07", + "removeStructure" : "kh 6/18/2020 22:38", "resetColor" : "ls 7/24/2019 21:57", "resetFont" : "ls 7/24/2019 21:24", - "selectedStyles" : "ls 7/24/2019 17:15", - "selectedStyles:" : "ls 7/24/2019 17:15", + "selectedStructure" : "kh 6/18/2020 22:15", + "selectedStructureSymbol" : "kh 6/18/2020 22:02", + "selectedStructureSymbol:" : "kh 6/18/2020 22:02", + "setAttributeAt:put:" : "kh 6/18/2020 22:12", "setColor:" : "ls 7/24/2019 21:56", "setFont:" : "ls 7/24/2019 21:36", - "structureList:" : "ls 5/30/2019 01:13", - "styleList:" : "AG 7/25/2019 10:45", - "styleSelectionAt:put:" : "lh 7/24/2019 22:49", "textStructures" : "ls 7/24/2019 16:55", - "textStyles" : "ls 7/24/2019 16:46", "update:" : "ls 7/24/2019 21:57", - "updateLoremIpsum" : "AG 7/25/2019 10:43", + "updateLoremIpsum" : "kh 6/18/2020 22:18", "updateStructures:" : "lh 7/25/2019 11:05" } } diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/properties.json b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/properties.json index eeb379c..4389d70 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/properties.json +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/properties.json @@ -10,7 +10,7 @@ "structureList", "styleList", "loremIpsum", - "currentStructureSymbol", + "selectedStructureSymbol", "lastStructureSymbol" ], "name" : "RichTextStructureEditor", "pools" : [ diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/allAttributeIdentifiers.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/allAttributeIdentifiers.st new file mode 100644 index 0000000..5ad2195 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/allAttributeIdentifiers.st @@ -0,0 +1,4 @@ +constants +allAttributeIdentifiers + + ^ self allAttributes collect: [:each | each structureIdentifier] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/allAttributes.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/allAttributes.st new file mode 100644 index 0000000..6589643 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/allAttributes.st @@ -0,0 +1,9 @@ +constants +allAttributes + + ^ {self bold. + self italic. + self underlined. + self struckOut. + self extendable. + self indented} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/availableStyles.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/availableStyles.st deleted file mode 100644 index 46ff40a..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/availableStyles.st +++ /dev/null @@ -1,5 +0,0 @@ -constants -availableStyles - - ^ {self boldStyle .self italicStyle . self underlinedStyle . - self struckOutStyle . self extendableStyle . self indentedStyle} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/bold.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/bold.st new file mode 100644 index 0000000..5699b42 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/bold.st @@ -0,0 +1,4 @@ +constants +bold + + ^ self new: #bold with: {TextEmphasis bold} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/boldStyle.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/boldStyle.st deleted file mode 100644 index 272302e..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/boldStyle.st +++ /dev/null @@ -1,4 +0,0 @@ -constants -boldStyle - - ^ #bold \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/defaultColor.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/defaultColor.st index f51e0cc..2b9c90d 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/defaultColor.st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/defaultColor.st @@ -1,4 +1,4 @@ -constants +old defaultColor ^ UserInterfaceTheme current get: #textColor for: #PluggableTextMorphPlus \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/defaultFont.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/defaultFont.st index 4ebb498..d971e40 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/defaultFont.st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/defaultFont.st @@ -1,4 +1,4 @@ -constants +old defaultFont ^ UserInterfaceTheme current get: #textFont for: #PluggableTextMorphPlus \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/extendable.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/extendable.st new file mode 100644 index 0000000..c4df756 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/extendable.st @@ -0,0 +1,4 @@ +constants +extendable + + ^ self new: #extendable with: {ExtendableText new} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/extendableStyle.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/extendableStyle.st deleted file mode 100644 index 958ed7f..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/extendableStyle.st +++ /dev/null @@ -1,4 +0,0 @@ -constants -extendableStyle - - ^ #extendable \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/indented.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/indented.st new file mode 100644 index 0000000..059187b --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/indented.st @@ -0,0 +1,4 @@ +constants +indented + + ^ self new: #indented with: {TextIndent amount: 1} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/indentedStyle.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/indentedStyle.st index 0f46d41..004e6d5 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/indentedStyle.st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/indentedStyle.st @@ -1,4 +1,4 @@ -constants +old indentedStyle ^ #indented \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/italic.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/italic.st new file mode 100644 index 0000000..4c0c097 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/italic.st @@ -0,0 +1,4 @@ +constants +italic + + ^ self new: #italic with: {TextEmphasis italic} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/italicStyle.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/italicStyle.st deleted file mode 100644 index b31fa09..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/italicStyle.st +++ /dev/null @@ -1,4 +0,0 @@ -constants -italicStyle - - ^ #italic \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/new.withAttributes..st b/packages/RichTextEditing-Core.package/TextStructure.class/class/new..st similarity index 54% rename from packages/RichTextEditing-Core.package/TextStructure.class/class/new.withAttributes..st rename to packages/RichTextEditing-Core.package/TextStructure.class/class/new..st index 5c24bb6..bf6d262 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/new.withAttributes..st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/new..st @@ -1,8 +1,7 @@ instance creation -new: aSymbol withAttributes: aSet +new: aSymbol | instance | instance := self new structureIdentifier: aSymbol. - instance attributes: aSet. ^ instance \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/new.with..st b/packages/RichTextEditing-Core.package/TextStructure.class/class/new.with..st new file mode 100644 index 0000000..b9ed00c --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/new.with..st @@ -0,0 +1,8 @@ +instance creation +new: aSymbol with: aSet + + | instance | + instance := self new: aSymbol. + instance attributes: aSet. + + ^ instance \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/newWith.withStyles..st b/packages/RichTextEditing-Core.package/TextStructure.class/class/newWith.withStyles..st index b018c0a..4fc542d 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/newWith.withStyles..st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/newWith.withStyles..st @@ -1,4 +1,4 @@ -instance creation +old newWith: aSymbol withStyles: aSet | instance | diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/struckOut.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/struckOut.st new file mode 100644 index 0000000..3605678 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/struckOut.st @@ -0,0 +1,4 @@ +constants +struckOut + + ^ self new: #struckOut with: {TextEmphasis struckOut} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/struckOutStyle.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/struckOutStyle.st deleted file mode 100644 index bc9d585..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/struckOutStyle.st +++ /dev/null @@ -1,4 +0,0 @@ -constants -struckOutStyle - - ^ #struckOut \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/underlined.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/underlined.st new file mode 100644 index 0000000..92ab337 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/underlined.st @@ -0,0 +1,4 @@ +constants +underlined + + ^ self new: #underlined with: {TextEmphasis underlined} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/underlinedStyle.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/underlinedStyle.st deleted file mode 100644 index f3d04f8..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/underlinedStyle.st +++ /dev/null @@ -1,4 +0,0 @@ -constants -underlinedStyle - - ^ #underlined \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/actOnClickFor..st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/actOnClickFor..st index ab94bfc..2135adc 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/actOnClickFor..st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/actOnClickFor..st @@ -1,4 +1,4 @@ -as yet unclassified +action actOnClickFor: model ^ (self attributes collect: [:each | each actOnClickFor: model]) includes: true \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/add..st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/add..st new file mode 100644 index 0000000..e971f73 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/add..st @@ -0,0 +1,4 @@ +adding +add: aTextAttribute + + self attributes add: aTextAttribute \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/addTextAttribute..st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/addTextAttribute..st deleted file mode 100644 index 95a5ae0..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/addTextAttribute..st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -addTextAttribute: aTextAttribute - - self attributes add: aTextAttribute \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/at..st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/at..st new file mode 100644 index 0000000..2c3b651 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/at..st @@ -0,0 +1,4 @@ +accessing +at: aSymbol + + ^ self at: aSymbol ifAbsent: [^ NullTextStructure new] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/at.ifAbsent..st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/at.ifAbsent..st new file mode 100644 index 0000000..a897417 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/at.ifAbsent..st @@ -0,0 +1,4 @@ +accessing +at: aSymbol ifAbsent: aBlock + + ^ self attributes detect: [:each | each structureIdentifier = aSymbol] ifNone: aBlock \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/emphasisCode.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/emphasisCode.st index c7b38a1..07d4ead 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/emphasisCode.st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/emphasisCode.st @@ -1,4 +1,4 @@ -emphasis +accessing emphasisCode ^ self attributes reduce: [:acc :each | acc bitOr: each emphasisCode] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/emphasizeScanner..st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/emphasizeScanner..st index 30851ef..8554588 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/emphasizeScanner..st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/emphasizeScanner..st @@ -1,4 +1,4 @@ -emphasis +accessing emphasizeScanner: aScanner self attributes do: [:each | each emphasizeScanner: aScanner] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/includes..st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/includes..st new file mode 100644 index 0000000..8425f74 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/includes..st @@ -0,0 +1,4 @@ +testing +includes: aTextAttribute + + ^ self attributes includes: aTextAttribute \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/initialize.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/initialize.st index cde1d57..8b554c1 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/initialize.st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/initialize.st @@ -2,8 +2,4 @@ initialize-release initialize super initialize. - self - initializeStyles; - "color: nil; - font: nil;" - attributes: OrderedCollection new \ No newline at end of file + self attributes: Set new \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/initializeStyles.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/initializeStyles.st deleted file mode 100644 index 47bbd3d..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/initializeStyles.st +++ /dev/null @@ -1,5 +0,0 @@ -initialize-release -initializeStyles - - self stylesActivated: Dictionary new. - self class availableStyles do: [:style | self stylesActivated at: style put: false] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/isTextStructure.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/isTextStructure.st index acada8e..5e0070d 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/isTextStructure.st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/isTextStructure.st @@ -1,4 +1,4 @@ -text structure +testing isTextStructure ^ true \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/remove..st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/remove..st new file mode 100644 index 0000000..afed00e --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/remove..st @@ -0,0 +1,4 @@ +removing +remove: aTextAttribute + + self attributes remove: aTextAttribute ifAbsent: [] diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/styleSet.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/styleSet.st deleted file mode 100644 index 4ba1cba..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/styleSet.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -styleSet - - ^ self stylesActivated keys select: [:style | (self stylesActivated at: style) = true] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/stylesActivated..st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/stylesActivated..st deleted file mode 100644 index 71c37c1..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/stylesActivated..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -stylesActivated: aDictionary - - stylesActivated := aDictionary \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/stylesActivated.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/stylesActivated.st deleted file mode 100644 index 39c4f49..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/stylesActivated.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -stylesActivated - - ^ stylesActivated \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/updateStyles..st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/updateStyles..st deleted file mode 100644 index 21b8cb1..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/updateStyles..st +++ /dev/null @@ -1,6 +0,0 @@ -text structure -updateStyles: aSet - - self class availableStyles do: - [:style | self stylesActivated at: style put: (aSet includes: style)] - \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json b/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json index 21d07c4..6866f85 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json @@ -1,27 +1,32 @@ { "class" : { - "availableStyles" : "tok 6/8/2020 12:46", - "boldStyle" : "tok 6/8/2020 12:07", + "allAttributeIdentifiers" : "kh 6/18/2020 20:44", + "allAttributes" : "kh 6/18/2020 22:25", + "bold" : "kh 6/18/2020 20:25", "defaultColor" : "AG 6/21/2019 14:08", "defaultFont" : "lh 6/26/2019 18:38", - "extendableStyle" : "tok 6/8/2020 12:07", + "extendable" : "kh 6/18/2020 21:38", + "indented" : "kh 6/18/2020 22:25", "indentedStyle" : "tok 6/8/2020 12:14", - "italicStyle" : "tok 6/8/2020 12:07", - "new:withAttributes:" : "kh 6/18/2020 16:45", + "italic" : "kh 6/18/2020 20:25", + "new:" : "kh 6/18/2020 22:36", + "new:with:" : "kh 6/18/2020 21:15", "newWith:withStyles:" : "tok 6/8/2020 12:06", - "struckOutStyle" : "tok 6/8/2020 12:07", - "underlinedStyle" : "tok 6/8/2020 12:07" }, + "struckOut" : "kh 6/18/2020 22:23", + "underlined" : "kh 6/18/2020 20:25" }, "instance" : { "=" : "lh 7/24/2019 20:24", "actOnClickFor:" : "kh 6/18/2020 14:45", - "addTextAttribute:" : "kh 6/18/2020 14:19", + "add:" : "kh 6/18/2020 20:16", + "at:" : "kh 6/18/2020 21:41", + "at:ifAbsent:" : "kh 6/18/2020 20:41", "attributes" : "kh 6/18/2020 14:14", "attributes:" : "kh 6/18/2020 14:15", "emphasisCode" : "kh 6/18/2020 14:58", "emphasizeScanner:" : "kh 6/18/2020 14:31", "hash" : "lh 7/24/2019 20:47", - "initialize" : "kh 6/18/2020 16:58", - "initializeStyles" : "tok 6/8/2020 12:38", + "includes:" : "kh 6/18/2020 20:54", + "initialize" : "kh 6/18/2020 21:00", "isExtendable" : "kh 6/18/2020 16:48", "isTextStructure" : "ls 5/29/2019 17:41", "mayBeExtended" : "ls 6/12/2019 18:49", @@ -29,12 +34,9 @@ "openFontChooser" : "ls 7/24/2019 21:22", "originalColor" : "ls 7/24/2019 21:52", "printOn:" : "ls 7/3/2019 17:32", + "remove:" : "kh 6/18/2020 22:38", "resetColor" : "ls 7/24/2019 21:57", "resetFont" : "ls 7/24/2019 21:23", "setColor:" : "ls 7/24/2019 21:56", "structureIdentifier" : "ls 5/29/2019 17:41", - "structureIdentifier:" : "AG 5/29/2019 18:33", - "styleSet" : "tok 6/12/2020 12:09", - "stylesActivated" : "tok 6/8/2020 12:37", - "stylesActivated:" : "tok 6/8/2020 12:37", - "updateStyles:" : "tok 6/12/2020 12:03" } } + "structureIdentifier:" : "AG 5/29/2019 18:33" } } diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/properties.json b/packages/RichTextEditing-Core.package/TextStructure.class/properties.json index fde7121..da069e9 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/properties.json +++ b/packages/RichTextEditing-Core.package/TextStructure.class/properties.json @@ -7,10 +7,6 @@ "commentStamp" : "tok 6/8/2020 12:45", "instvars" : [ "structureIdentifier", - "color", - "font", - "styleSet", - "stylesActivated", "attributes" ], "name" : "TextStructure", "pools" : [ From 7f2f0f69214b8ab94fef0586df61f19460318029 Mon Sep 17 00:00:00 2001 From: Konrad Hanff Date: Fri, 19 Jun 2020 00:54:39 +0200 Subject: [PATCH 04/12] Add font and color support --- .../RichTextDocument.class/README.md | 5 ++++- .../class/initialBoldStructure.st | 6 +---- .../class/initialFootnoteStructure.st | 11 +++++----- .../class/initialHeading1Structure.st | 13 ++++++----- .../class/initialHeading2Structure.st | 13 ++++++----- .../class/initialHeading3Structure.st | 13 ++++++----- .../class/initialItalicStructure.st | 4 ---- .../class/initialListStructure.st | 8 +++---- .../class/initialTextStructures.st | 7 +++++- .../instance/removeStructure..st | 2 +- .../methodProperties.json | 18 +++++++-------- .../RichTextDocument.class/properties.json | 2 +- .../instance/addExtendableStructures.st | 2 +- .../methodProperties.json | 2 +- .../instance/addColor..st | 4 ++++ .../instance/addColor.st | 4 ---- .../instance/addFont..st | 6 +++++ .../instance/addFont.st | 6 ----- .../instance/buildColorButtonWith..st | 2 +- .../instance/buildFontButtonWith..st | 2 +- .../instance}/defaultColor.st | 4 ++-- .../instance}/defaultFont.st | 2 +- .../instance/openColorPicker.st | 7 ++++++ .../instance/openFontChooser.st | 10 +++++++++ .../instance/removeColor.st | 4 ++++ .../instance/removeFont.st | 6 +++++ .../instance/resetColor.st | 4 +++- .../instance/resetFont.st | 4 +++- .../instance/setColor..st | 5 ++++- .../instance/setFont..st | 5 ++++- .../methodProperties.json | 22 ++++++++++++------- .../TextStructure.class/README.md | 16 +++++++------- .../class/allAttributeIdentifiers.st | 2 +- .../class/allAttributes.st | 2 +- .../TextStructure.class/class/bold.st | 2 +- .../TextStructure.class/class/color..st | 4 ++++ .../TextStructure.class/class/color.st | 4 ++++ .../TextStructure.class/class/extendable.st | 2 +- .../TextStructure.class/class/font..st | 4 ++++ .../TextStructure.class/class/font.st | 4 ++++ .../TextStructure.class/class/indented..st | 4 ++++ .../TextStructure.class/class/indented.st | 4 ++-- .../class/indentedStyle.st | 4 ---- .../TextStructure.class/class/italic.st | 2 +- .../class/newWith.withStyles..st | 8 ------- .../TextStructure.class/class/struckOut.st | 2 +- .../TextStructure.class/class/underlined.st | 2 +- .../TextStructure.class/instance/at..st | 4 ---- .../instance/at.ifAbsent..st | 4 ---- .../instance/isExtendable.st | 5 ----- .../instance/mayBeExtended.st | 2 +- .../instance/openColorPicker.st | 7 ------ .../instance/originalColor.st | 4 ---- .../instance/resetColor.st | 4 ---- .../TextStructure.class/instance/setColor..st | 4 ---- .../TextStructure.class/methodProperties.json | 20 ++++++----------- .../TextStructure.class/properties.json | 2 +- .../methodProperties.json | 1 + .../methodProperties.json | 1 + .../methodProperties.json | 4 ++-- 60 files changed, 174 insertions(+), 157 deletions(-) create mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addColor..st delete mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addColor.st create mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addFont..st delete mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addFont.st rename packages/RichTextEditing-Core.package/{TextStructure.class/class => RichTextStructureEditor.class/instance}/defaultColor.st (75%) rename packages/RichTextEditing-Core.package/{TextStructure.class/class => RichTextStructureEditor.class/instance}/defaultFont.st (80%) create mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/openColorPicker.st create mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/openFontChooser.st create mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/removeColor.st create mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/removeFont.st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/color..st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/color.st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/font..st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/font.st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/indented..st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/indentedStyle.st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/newWith.withStyles..st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/at..st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/at.ifAbsent..st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/isExtendable.st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/openColorPicker.st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/originalColor.st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/resetColor.st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/setColor..st diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/README.md b/packages/RichTextEditing-Core.package/RichTextDocument.class/README.md index a2bd86e..c8f0f8e 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/README.md +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/README.md @@ -2,8 +2,11 @@ I am a RichTextDocument. I represent the text someone wrote in order to improve I am independent from the RichTextEditorModel, as the textStructures as well as my name and my text can be manipulated directly, so the RichTextEditorModel is not always needed, even though it can always be used. +You can add a new structure to the structures available in new instances of me by adding a new TextStructure to my initialTextStructures method on class side. + My instance variables are: name - aString text - aText -textStructures - anOrderedCollection +textStructures - anOrderedCollection +timeLastSaved - aDateAndTime diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialBoldStructure.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialBoldStructure.st index 5af47ce..88a77af 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialBoldStructure.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialBoldStructure.st @@ -1,10 +1,6 @@ initial structures initialBoldStructure - - "^ TextStructure - newWith: #bold - withStyles: (self defaultStyles union: {TextStructure boldStyle})" - + ^ TextStructure new: #bold with: (self commonStyles union: {TextStructure bold}) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialFootnoteStructure.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialFootnoteStructure.st index 9a49efe..a8ee04d 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialFootnoteStructure.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialFootnoteStructure.st @@ -1,7 +1,6 @@ -constants +initial structures initialFootnoteStructure - - ^ (TextStructure - newWith: #footnote - withStyles: self defaultStyles) - font: (StrikeFont createDejaVuDark: 9) \ No newline at end of file + + ^ TextStructure + new: #footnote + with: (self commonStyles union: {TextStructure font: (StrikeFont createDejaVuDark: 9)}) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading1Structure.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading1Structure.st index f38a369..c895970 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading1Structure.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading1Structure.st @@ -1,7 +1,8 @@ -constants +initial structures initialHeading1Structure - - ^ (TextStructure - newWith: #heading1 - withStyles: (self defaultStyles union: {TextStructure boldStyle})) - font: (StrikeFont createDejaVuDark: 20) \ No newline at end of file + + ^ TextStructure + new: #heading1 + with: (self commonStyles union: + {TextStructure font: (StrikeFont createDejaVuDark: 20). + TextStructure bold}) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading2Structure.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading2Structure.st index e5b55df..80da390 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading2Structure.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading2Structure.st @@ -1,7 +1,8 @@ -constants +initial structures initialHeading2Structure - - ^ (TextStructure - newWith: #heading2 - withStyles: (self defaultStyles union: {TextStructure boldStyle})) - font: (StrikeFont createDejaVuDark: 17) \ No newline at end of file + + ^ TextStructure + new: #heading2 + with: (self commonStyles union: + {TextStructure font: (StrikeFont createDejaVuDark: 17). + TextStructure bold}) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading3Structure.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading3Structure.st index 7b5ab9e..41c89cc 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading3Structure.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading3Structure.st @@ -1,7 +1,8 @@ -constants +initial structures initialHeading3Structure - - ^ (TextStructure - newWith: #heading3 - withStyles: (self defaultStyles union: {TextStructure boldStyle})) - font: (StrikeFont createDejaVuDark: 14) \ No newline at end of file + + ^ TextStructure + new: #heading3 + with: (self commonStyles union: + {TextStructure font: (StrikeFont createDejaVuDark: 14). + TextStructure bold}) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialItalicStructure.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialItalicStructure.st index 5ba6cfb..d425107 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialItalicStructure.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialItalicStructure.st @@ -1,10 +1,6 @@ initial structures initialItalicStructure - "^ TextStructure - newWith: #italic - withStyles: (self defaultStyles union: {TextStructure italicStyle})" - ^ TextStructure new: #italic with: (self commonStyles union: {TextStructure italic}) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialListStructure.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialListStructure.st index aa2edee..9324c28 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialListStructure.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialListStructure.st @@ -1,6 +1,6 @@ -constants +initial structures initialListStructure - + ^ TextStructure - newWith: #list - withStyles: (self defaultStyles union: {TextStructure indentedStyle}) \ No newline at end of file + new: #list + with: (self commonStyles union: {TextStructure indented}) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialTextStructures.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialTextStructures.st index 2e1b8d4..5e1b3d4 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialTextStructures.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialTextStructures.st @@ -3,4 +3,9 @@ initialTextStructures ^ {self initialBoldStructure. self initialItalicStructure. - "self initialUnderlinedStructure"} asOrderedCollection \ No newline at end of file + self initialUnderlinedStructure. + self initialHeading1Structure. + self initialHeading2Structure. + self initialHeading3Structure. + self initialFootnoteStructure. + self initialListStructure} asOrderedCollection \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/removeStructure..st b/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/removeStructure..st index e980404..5beebe2 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/removeStructure..st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/removeStructure..st @@ -1,7 +1,7 @@ text structures removeStructure: aSymbol - self textStructures remove: (self symbolToStructure: aSymbol). + self textStructures remove: (self symbolToStructure: aSymbol) ifAbsent: []. self textChanged; structuresChanged \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextDocument.class/methodProperties.json index affdf1c..98417c0 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/methodProperties.json @@ -4,14 +4,14 @@ "defaultStyles" : "kh 6/18/2020 22:35", "editorClass" : "ls 6/26/2019 17:33", "fromText:withStructures:" : "ls 6/26/2019 17:31", - "initialBoldStructure" : "kh 6/18/2020 21:39", - "initialFootnoteStructure" : "tok 6/8/2020 12:06", - "initialHeading1Structure" : "tok 6/8/2020 12:22", - "initialHeading2Structure" : "tok 6/8/2020 12:22", - "initialHeading3Structure" : "tok 6/8/2020 12:22", - "initialItalicStructure" : "kh 6/18/2020 21:39", - "initialListStructure" : "tok 6/8/2020 12:22", - "initialTextStructures" : "kh 6/18/2020 21:35", + "initialBoldStructure" : "kh 6/19/2020 00:28", + "initialFootnoteStructure" : "kh 6/19/2020 00:29", + "initialHeading1Structure" : "kh 6/19/2020 00:30", + "initialHeading2Structure" : "kh 6/19/2020 00:31", + "initialHeading3Structure" : "kh 6/19/2020 00:31", + "initialItalicStructure" : "kh 6/19/2020 00:28", + "initialListStructure" : "kh 6/19/2020 00:32", + "initialTextStructures" : "kh 6/19/2020 00:34", "initialUnderlinedStructure" : "kh 6/18/2020 21:39" }, "instance" : { "addAttribute:from:to:" : "AG 7/25/2019 13:08", @@ -31,7 +31,7 @@ "name:" : "MB 7/3/2019 19:29", "openEditor" : "lh 7/24/2019 21:27", "openInEditor" : "ls 7/24/2019 20:14", - "removeStructure:" : "ls 7/24/2019 17:28", + "removeStructure:" : "kh 6/18/2020 22:49", "removeTextAttribute:from:to:" : "MB 7/24/2019 20:40", "sortRunsByPriority" : "JEH 5/20/2020 10:28", "structuresChanged" : "ls 7/24/2019 14:46", diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/properties.json b/packages/RichTextEditing-Core.package/RichTextDocument.class/properties.json index 268add2..7c729be 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/properties.json +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "lh 7/25/2019 11:57", + "commentStamp" : "kh 6/19/2020 00:40", "instvars" : [ "textStructures", "text", diff --git a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/addExtendableStructures.st b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/addExtendableStructures.st index 7144f19..7a6a60a 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/addExtendableStructures.st +++ b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/addExtendableStructures.st @@ -3,4 +3,4 @@ addExtendableStructures (self currentStructures collect: [:each | self symbolToStructure: each] - thenSelect: [:each | each isExtendable]) do: [:each | self addAttribute: each] \ No newline at end of file + thenSelect: [:each | each mayBeExtended]) do: [:each | self addAttribute: each] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/methodProperties.json index 0b45a7b..12cdbbc 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/methodProperties.json @@ -11,7 +11,7 @@ "yellowButtonMenuItems" : "tok 5/31/2020 20:54" }, "instance" : { "addAttribute:" : "ls 7/24/2019 20:26", - "addExtendableStructures" : "OS 5/31/2020 23:59", + "addExtendableStructures" : "kh 6/19/2020 00:51", "applyCurrentStructures" : "OS 6/3/2020 22:35", "bufferDocument" : "ls 6/26/2019 17:45", "bufferDocument:" : "ls 7/24/2019 20:57", diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addColor..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addColor..st new file mode 100644 index 0000000..1b22585 --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addColor..st @@ -0,0 +1,4 @@ +text coloring +addColor: aColor + + self currentStructure add: (TextStructure color: aColor) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addColor.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addColor.st deleted file mode 100644 index fa3fa9c..0000000 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addColor.st +++ /dev/null @@ -1,4 +0,0 @@ -text coloring -addColor - - self currentStructure openColorPicker \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addFont..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addFont..st new file mode 100644 index 0000000..90384f4 --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addFont..st @@ -0,0 +1,6 @@ +text font +addFont: aFont + + self currentStructure add: (TextStructure font: aFont) + + \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addFont.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addFont.st deleted file mode 100644 index ecfe0cd..0000000 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addFont.st +++ /dev/null @@ -1,6 +0,0 @@ -text font -addFont - - self currentStructure openFontChooser - - \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildColorButtonWith..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildColorButtonWith..st index 004593a..d90f258 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildColorButtonWith..st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildColorButtonWith..st @@ -6,7 +6,7 @@ buildColorButtonWith: aBuilder model: self; frame: (0.5 @ 0.55 corner: 0.75 @ 0.65); label: 'Color'; - action: #addColor; + action: #openColorPicker; yourself \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildFontButtonWith..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildFontButtonWith..st index 1cd5d71..7b45c63 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildFontButtonWith..st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildFontButtonWith..st @@ -6,7 +6,7 @@ buildFontButtonWith: aBuilder model: self; frame: (0.5 @ 0.45 corner: 0.75 @ 0.55); label: 'Font'; - action: #addFont; + action: #openFontChooser; yourself \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/defaultColor.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/defaultColor.st similarity index 75% rename from packages/RichTextEditing-Core.package/TextStructure.class/class/defaultColor.st rename to packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/defaultColor.st index 2b9c90d..966fa58 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/defaultColor.st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/defaultColor.st @@ -1,4 +1,4 @@ -old +text coloring defaultColor - + ^ UserInterfaceTheme current get: #textColor for: #PluggableTextMorphPlus \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/defaultFont.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/defaultFont.st similarity index 80% rename from packages/RichTextEditing-Core.package/TextStructure.class/class/defaultFont.st rename to packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/defaultFont.st index d971e40..9d8fa2d 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/defaultFont.st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/defaultFont.st @@ -1,4 +1,4 @@ -old +text font defaultFont ^ UserInterfaceTheme current get: #textFont for: #PluggableTextMorphPlus \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/openColorPicker.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/openColorPicker.st new file mode 100644 index 0000000..4f8c1e3 --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/openColorPicker.st @@ -0,0 +1,7 @@ +text coloring +openColorPicker + + (NewColorPickerMorph + on: self + originalColor: self defaultColor + setColorSelector: #setColor:) openInWorld \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/openFontChooser.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/openFontChooser.st new file mode 100644 index 0000000..9b29061 --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/openFontChooser.st @@ -0,0 +1,10 @@ +text font +openFontChooser + + FontChooserTool + openWithWindowTitle: 'FontChooser' + for: self + setSelector: #setFont: + getSelector: #defaultFont + + \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/removeColor.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/removeColor.st new file mode 100644 index 0000000..8288f63 --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/removeColor.st @@ -0,0 +1,4 @@ +text coloring +removeColor + + self currentStructure remove: (TextStructure color) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/removeFont.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/removeFont.st new file mode 100644 index 0000000..add83bf --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/removeFont.st @@ -0,0 +1,6 @@ +text font +removeFont + + self currentStructure remove: (TextStructure font) + + \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/resetColor.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/resetColor.st index 8ef52c4..c8b06f0 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/resetColor.st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/resetColor.st @@ -1,4 +1,6 @@ text coloring resetColor - self currentStructure resetColor \ No newline at end of file + self + removeColor; + updateLoremIpsum \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/resetFont.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/resetFont.st index d14bf01..d6e5d74 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/resetFont.st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/resetFont.st @@ -1,4 +1,6 @@ text font resetFont - self currentStructure resetFont \ No newline at end of file + self + removeFont; + updateLoremIpsum \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setColor..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setColor..st index ba0b2fe..8e20927 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setColor..st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setColor..st @@ -1,4 +1,7 @@ text coloring setColor: aColor - self currentStructure color: aColor \ No newline at end of file + self + removeColor; + addColor: aColor; + updateLoremIpsum \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setFont..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setFont..st index 36daaa5..25b7eec 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setFont..st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setFont..st @@ -1,4 +1,7 @@ text font setFont: aFont - self currentStructure font: aFont \ No newline at end of file + self + removeFont; + addFont: aFont; + updateLoremIpsum \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json index 60d9dec..d4c5ce7 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json @@ -3,15 +3,15 @@ "allAttributes" : "kh 6/18/2020 22:14", "openWith:" : "AG 7/25/2019 13:15" }, "instance" : { - "addColor" : "ls 7/24/2019 21:51", - "addFont" : "ls 7/24/2019 21:16", + "addColor:" : "kh 6/18/2020 23:15", + "addFont:" : "kh 6/18/2020 23:36", "addNewStructure" : "ls 7/24/2019 17:06", "allAttributes" : "kh 6/18/2020 22:13", "buildAddStructureButtonWith:" : "lh 7/3/2019 17:26", - "buildColorButtonWith:" : "lh 6/26/2019 18:40", + "buildColorButtonWith:" : "kh 6/18/2020 23:06", "buildColorResetButtonWith:" : "lh 6/26/2019 18:40", "buildDecreasePriorityButtonWith:" : "lh 7/3/2019 17:26", - "buildFontButtonWith:" : "lh 6/26/2019 18:40", + "buildFontButtonWith:" : "kh 6/18/2020 23:38", "buildFontResetButtonWith:" : "lh 6/26/2019 18:40", "buildIncreasePriorityButtonWith:" : "lh 7/3/2019 17:25", "buildRemoveStructureButtonWith:" : "lh 7/3/2019 17:26", @@ -24,6 +24,8 @@ "currentPriority" : "kh 6/18/2020 22:30", "currentStructure" : "kh 6/18/2020 22:18", "decreasePriority" : "ls 7/24/2019 22:36", + "defaultColor" : "kh 6/18/2020 23:09", + "defaultFont" : "kh 6/18/2020 23:35", "document" : "ls 7/24/2019 16:49", "document:" : "ls 7/24/2019 16:49", "getAttributeAt:" : "kh 6/18/2020 22:12", @@ -36,15 +38,19 @@ "loremIpsum:" : "ls 6/5/2019 22:07", "loremIpsumDefault" : "lh 7/24/2019 16:16", "newNullTextStructure" : "kh 6/18/2020 22:07", + "openColorPicker" : "kh 6/18/2020 23:08", + "openFontChooser" : "kh 6/18/2020 23:35", + "removeColor" : "kh 6/18/2020 23:15", + "removeFont" : "kh 6/18/2020 23:36", "removeStructure" : "kh 6/18/2020 22:38", - "resetColor" : "ls 7/24/2019 21:57", - "resetFont" : "ls 7/24/2019 21:24", + "resetColor" : "kh 6/18/2020 23:48", + "resetFont" : "kh 6/18/2020 23:49", "selectedStructure" : "kh 6/18/2020 22:15", "selectedStructureSymbol" : "kh 6/18/2020 22:02", "selectedStructureSymbol:" : "kh 6/18/2020 22:02", "setAttributeAt:put:" : "kh 6/18/2020 22:12", - "setColor:" : "ls 7/24/2019 21:56", - "setFont:" : "ls 7/24/2019 21:36", + "setColor:" : "kh 6/18/2020 23:15", + "setFont:" : "kh 6/18/2020 23:37", "textStructures" : "ls 7/24/2019 16:55", "update:" : "ls 7/24/2019 21:57", "updateLoremIpsum" : "kh 6/18/2020 22:18", diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/README.md b/packages/RichTextEditing-Core.package/TextStructure.class/README.md index 552d907..dcc26c5 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/README.md +++ b/packages/RichTextEditing-Core.package/TextStructure.class/README.md @@ -1,12 +1,12 @@ I am a TextStructure. You can add me to a text just like every other TextAttribute (e.g. Text>>addAttribute:). -You can set my instance variables bold, italic, struckOut and underlined as true to have the text be rendered accordingly. You can set my instance variable color to color the text, analogously you can set my font. -If you set extendable to true and continue writing, the text will keep the current structure. I am using a null object (NullTextStructure) so you do not have to check for nil values. -You find all available Styles in my classes TextStructure>>availableStyles method. -The stylesActivated dictionary contains the information on which styles are active on me. + +I am a Composite, you can #add: an instance of me to another instance and the first one will have the attributes from all its children. The Leafs of this Tree should be TextAttributes that actually do something (e.g. TextEmphasis, TextColor, TextIndent, ...). Predefined Leafs are available on class side. They are wrapped in a TextStructure to be able to identify them by name (structureIdentifier). +TextStructures in the class method #allAttributes are automatically displayed by the RichTextStructureEditor. + +If you set extendable to true and continue writing, the text will keep the current structure. + +I am using a null object (NullTextStructure) so you do not have to check for nil values. My instance variables are: structureIdentifier - aSymbol -color - aColor -font - aFont (e.g. StrikeFont) -styleSet - aSet -stylesActived - aSet \ No newline at end of file +attributes - aSet of TextAttributes \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/allAttributeIdentifiers.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/allAttributeIdentifiers.st index 5ad2195..4a1f67b 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/allAttributeIdentifiers.st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/allAttributeIdentifiers.st @@ -1,4 +1,4 @@ -constants +predefined allAttributeIdentifiers ^ self allAttributes collect: [:each | each structureIdentifier] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/allAttributes.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/allAttributes.st index 6589643..15d254f 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/allAttributes.st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/allAttributes.st @@ -1,4 +1,4 @@ -constants +predefined allAttributes ^ {self bold. diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/bold.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/bold.st index 5699b42..efa30f6 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/bold.st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/bold.st @@ -1,4 +1,4 @@ -constants +predefined bold ^ self new: #bold with: {TextEmphasis bold} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/color..st b/packages/RichTextEditing-Core.package/TextStructure.class/class/color..st new file mode 100644 index 0000000..82829cd --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/color..st @@ -0,0 +1,4 @@ +predefined +color: aColor + + ^ self new: #color with: {TextColor color: aColor} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/color.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/color.st new file mode 100644 index 0000000..c0381fe --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/color.st @@ -0,0 +1,4 @@ +predefined +color + + ^ self new: #color \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/extendable.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/extendable.st index c4df756..aebdb82 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/extendable.st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/extendable.st @@ -1,4 +1,4 @@ -constants +predefined extendable ^ self new: #extendable with: {ExtendableText new} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/font..st b/packages/RichTextEditing-Core.package/TextStructure.class/class/font..st new file mode 100644 index 0000000..0bc5c99 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/font..st @@ -0,0 +1,4 @@ +predefined +font: aFont + + ^ self new: #font with: {TextFontReference toFont: aFont} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/font.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/font.st new file mode 100644 index 0000000..3dce56f --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/font.st @@ -0,0 +1,4 @@ +predefined +font + + ^ self new: #font \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/indented..st b/packages/RichTextEditing-Core.package/TextStructure.class/class/indented..st new file mode 100644 index 0000000..1d0ab84 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/indented..st @@ -0,0 +1,4 @@ +predefined +indented: amount + + ^ self new: #indented with: {TextIndent amount: amount} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/indented.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/indented.st index 059187b..a918f39 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/indented.st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/indented.st @@ -1,4 +1,4 @@ -constants +predefined indented - ^ self new: #indented with: {TextIndent amount: 1} \ No newline at end of file + ^ self indented: 1 \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/indentedStyle.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/indentedStyle.st deleted file mode 100644 index 004e6d5..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/indentedStyle.st +++ /dev/null @@ -1,4 +0,0 @@ -old -indentedStyle - - ^ #indented \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/italic.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/italic.st index 4c0c097..55826bc 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/italic.st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/italic.st @@ -1,4 +1,4 @@ -constants +predefined italic ^ self new: #italic with: {TextEmphasis italic} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/newWith.withStyles..st b/packages/RichTextEditing-Core.package/TextStructure.class/class/newWith.withStyles..st deleted file mode 100644 index 4fc542d..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/newWith.withStyles..st +++ /dev/null @@ -1,8 +0,0 @@ -old -newWith: aSymbol withStyles: aSet - - | instance | - instance := self new structureIdentifier: aSymbol. - instance updateStyles: aSet. - - ^ instance \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/struckOut.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/struckOut.st index 3605678..6d552a5 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/struckOut.st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/struckOut.st @@ -1,4 +1,4 @@ -constants +predefined struckOut ^ self new: #struckOut with: {TextEmphasis struckOut} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/underlined.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/underlined.st index 92ab337..24a5444 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/underlined.st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/underlined.st @@ -1,4 +1,4 @@ -constants +predefined underlined ^ self new: #underlined with: {TextEmphasis underlined} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/at..st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/at..st deleted file mode 100644 index 2c3b651..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/at..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -at: aSymbol - - ^ self at: aSymbol ifAbsent: [^ NullTextStructure new] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/at.ifAbsent..st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/at.ifAbsent..st deleted file mode 100644 index a897417..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/at.ifAbsent..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -at: aSymbol ifAbsent: aBlock - - ^ self attributes detect: [:each | each structureIdentifier = aSymbol] ifNone: aBlock \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/isExtendable.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/isExtendable.st deleted file mode 100644 index 0252841..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/isExtendable.st +++ /dev/null @@ -1,5 +0,0 @@ -testing -isExtendable - - "^ self stylesActivated at: self class extendableStyle" - ^ self attributes anySatisfy: [:each | each mayBeExtended] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/mayBeExtended.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/mayBeExtended.st index 76b4d36..842a160 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/mayBeExtended.st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/mayBeExtended.st @@ -1,4 +1,4 @@ testing mayBeExtended - ^ self isExtendable \ No newline at end of file + ^ self attributes anySatisfy: [:each | each mayBeExtended] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/openColorPicker.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/openColorPicker.st deleted file mode 100644 index a38c0d5..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/openColorPicker.st +++ /dev/null @@ -1,7 +0,0 @@ -color -openColorPicker - - (NewColorPickerMorph - on: self - originalColor: self originalColor - setColorSelector: #setColor:) openInWorld \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/originalColor.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/originalColor.st deleted file mode 100644 index b0caed1..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/originalColor.st +++ /dev/null @@ -1,4 +0,0 @@ -color -originalColor - - ^ self color ifNil: [self class defaultColor] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/resetColor.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/resetColor.st deleted file mode 100644 index 39fb25e..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/resetColor.st +++ /dev/null @@ -1,4 +0,0 @@ -color -resetColor - - self color: nil \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/setColor..st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/setColor..st deleted file mode 100644 index a338064..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/setColor..st +++ /dev/null @@ -1,4 +0,0 @@ -color -setColor: aColor - - self color: aColor \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json b/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json index 6866f85..420877c 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json @@ -3,23 +3,22 @@ "allAttributeIdentifiers" : "kh 6/18/2020 20:44", "allAttributes" : "kh 6/18/2020 22:25", "bold" : "kh 6/18/2020 20:25", - "defaultColor" : "AG 6/21/2019 14:08", - "defaultFont" : "lh 6/26/2019 18:38", + "color" : "kh 6/18/2020 22:52", + "color:" : "kh 6/18/2020 22:51", "extendable" : "kh 6/18/2020 21:38", - "indented" : "kh 6/18/2020 22:25", - "indentedStyle" : "tok 6/8/2020 12:14", + "font" : "kh 6/18/2020 23:23", + "font:" : "kh 6/18/2020 23:30", + "indented" : "kh 6/18/2020 22:54", + "indented:" : "kh 6/18/2020 22:53", "italic" : "kh 6/18/2020 20:25", "new:" : "kh 6/18/2020 22:36", "new:with:" : "kh 6/18/2020 21:15", - "newWith:withStyles:" : "tok 6/8/2020 12:06", "struckOut" : "kh 6/18/2020 22:23", "underlined" : "kh 6/18/2020 20:25" }, "instance" : { "=" : "lh 7/24/2019 20:24", "actOnClickFor:" : "kh 6/18/2020 14:45", "add:" : "kh 6/18/2020 20:16", - "at:" : "kh 6/18/2020 21:41", - "at:ifAbsent:" : "kh 6/18/2020 20:41", "attributes" : "kh 6/18/2020 14:14", "attributes:" : "kh 6/18/2020 14:15", "emphasisCode" : "kh 6/18/2020 14:58", @@ -27,16 +26,11 @@ "hash" : "lh 7/24/2019 20:47", "includes:" : "kh 6/18/2020 20:54", "initialize" : "kh 6/18/2020 21:00", - "isExtendable" : "kh 6/18/2020 16:48", "isTextStructure" : "ls 5/29/2019 17:41", - "mayBeExtended" : "ls 6/12/2019 18:49", - "openColorPicker" : "AG 7/24/2019 15:45", + "mayBeExtended" : "kh 6/19/2020 00:52", "openFontChooser" : "ls 7/24/2019 21:22", - "originalColor" : "ls 7/24/2019 21:52", "printOn:" : "ls 7/3/2019 17:32", "remove:" : "kh 6/18/2020 22:38", - "resetColor" : "ls 7/24/2019 21:57", "resetFont" : "ls 7/24/2019 21:23", - "setColor:" : "ls 7/24/2019 21:56", "structureIdentifier" : "ls 5/29/2019 17:41", "structureIdentifier:" : "AG 5/29/2019 18:33" } } diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/properties.json b/packages/RichTextEditing-Core.package/TextStructure.class/properties.json index da069e9..5b441e6 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/properties.json +++ b/packages/RichTextEditing-Core.package/TextStructure.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "tok 6/8/2020 12:45", + "commentStamp" : "kh 6/19/2020 00:49", "instvars" : [ "structureIdentifier", "attributes" ], diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/methodProperties.json index 61c8900..3e96dc2 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/methodProperties.json +++ b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/methodProperties.json @@ -8,6 +8,7 @@ "ctrlShiftButtonCode" : "tok 6/13/2020 16:24", "demoText" : "tok 6/13/2020 12:11", "emphasisCodeNoStyle" : "AG 6/5/2019 18:56", + "firstStructureIsSelectedInList" : " 6/18/2020 19:16:32", "listTextStructure" : "tok 6/12/2020 12:12", "listTextStructureStyles" : "tok 6/12/2020 12:12", "menu" : "ls 6/18/2019 16:37", diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/methodProperties.json index cbcffe4..5c019c0 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/methodProperties.json +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/methodProperties.json @@ -29,6 +29,7 @@ "shiftButtonCode" : "MB 5/15/2019 21:06", "simulateKeyboardEventWithButtons:andKeyValue:" : "lh 7/24/2019 18:30", "testInspectDocument" : "frc 6/13/2020 11:08", + "testTextSizeReturnsCorrectSize" : " 6/18/2020 19:16:32", "testUS04loadButtonExists" : "AG 5/22/2019 18:38", "testUS04loadedTextIsInsertedIntoEditor" : "JEH 6/14/2020 18:13", "testUS04saveAsButtonExists" : "SR 5/22/2019 21:07", diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/methodProperties.json index 8154fb2..28cba58 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/methodProperties.json +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/methodProperties.json @@ -30,11 +30,11 @@ "rightArrowKey" : "JEH 6/14/2020 13:07", "setUp" : "MB 7/25/2019 12:15", "standardText" : "ls 6/21/2019 17:14", - "testPaste" : "kh 6/15/2020 20:48", "testCorrectLineColNumberAtArbitraryPositionInText" : "JEH 6/14/2020 18:12", "testCorrectLineColNumberAtEndOfText" : "JEH 6/14/2020 18:11", "testCorrectLineColNumberAtStartOfText" : "JEH 6/14/2020 18:11", - "testUS23TriangleDisappearsAfterSuccesfulSave" : "ls 7/25/2019 13:20", + "testPaste" : "kh 6/15/2020 20:48", + "testUS23TriangleDisappearsAfterSuccesfulSave" : "ls 7/25/2019 13:20", "testUS23TriangleIsStillVisibleWhenSaveDialogIsCancelled" : "AG 6/21/2019 14:16", "testUS23TriangleReappearsWhenEditing" : "AG 6/21/2019 14:33", "testUS23WhenTriangleIsVisibleCtrlSCanBePressedForSaveDialog" : "lh 7/24/2019 16:19", From 69bdfc8643d7d5c52320a29256e9eff938feb440 Mon Sep 17 00:00:00 2001 From: Konrad Hanff Date: Fri, 19 Jun 2020 11:58:32 +0200 Subject: [PATCH 05/12] Adjust tests to new TextStructure and improve it --- .../instance/buildStructureFieldWith..st | 4 ++-- .../instance/currentPriority.st | 2 +- .../instance/currentStructure.st | 4 ++-- .../instance/currentStructureSymbol..st | 7 +++++++ .../instance/currentStructureSymbol.st | 4 ++++ .../instance/removeStructure.st | 4 ++-- .../instance/selectedStructure.st | 2 +- .../instance/selectedStructureSymbol..st | 7 ------- .../instance/selectedStructureSymbol.st | 4 ---- .../instance/updateLoremIpsum.st | 2 +- .../methodProperties.json | 16 ++++++++-------- .../properties.json | 2 +- .../TextStructure.class/class/list..st | 4 ++++ .../TextStructure.class/class/new.with..st | 4 ++-- .../instance/actOnClickFor..st | 2 +- .../TextStructure.class/instance/amount.st | 6 ++++++ .../instance/couldDeriveFromPrettyPrinting.st | 4 ++++ .../TextStructure.class/instance/emphasisCode.st | 2 +- .../TextStructure.class/instance/flatten.st | 7 +++++++ .../TextStructure.class/instance/isKern.st | 4 ++++ .../instance/isTextAlignment.st | 4 ++++ .../TextStructure.class/instance/isTextColor.st | 4 ++++ .../TextStructure.class/instance/isTextIndent.st | 4 ++++ .../instance/mayActOnClick.st | 4 ++++ .../instance/openFontChooser.st | 8 -------- .../TextStructure.class/instance/resetFont.st | 4 ---- .../TextStructure.class/methodProperties.json | 15 +++++++++++---- .../instance/combinedTextStructure.st | 6 +++++- .../instance/listLevel.st | 4 ++++ .../instance/listTextStructure.st | 2 +- .../testUS64IndentedStructureIsRendered.st | 2 +- .../methodProperties.json | 7 ++++--- .../instance/boldTextStructure.st | 6 +----- .../methodProperties.json | 2 +- .../methodProperties.json | 2 +- .../instance/textHasColor..st | 8 +++++--- .../instance/textHasFont..st | 9 +++++++++ .../instance/textHasFontSize..st | 9 +++++++++ .../instance/textHasNoColor.st | 8 ++++++++ .../instance/textHasNoFont.st | 8 ++++++++ .../instance/textRuns.st | 2 +- .../methodProperties.json | 6 +++++- .../instance/testUS41ColorCanBeReset.st | 2 +- .../instance/testUS42FontCanBeReset.st | 2 +- .../instance/textHasFont..st | 7 ------- .../instance/textHasFontSize..st | 7 ------- .../instance/textHasNoColor.st | 4 ---- .../instance/textHasNoFont.st | 4 ---- .../methodProperties.json | 10 +++------- .../instance/testGetFontReturnsFont.st | 8 -------- .../testOriginalColorReturnsColorIfNotNil.st | 9 --------- ...OriginalColorReturnsDefaultClassColorIfNil.st | 8 -------- .../instance/testStyleSetReturnsActiveStyles.st | 7 ------- .../methodProperties.json | 6 +----- 54 files changed, 154 insertions(+), 135 deletions(-) create mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentStructureSymbol..st create mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentStructureSymbol.st delete mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStructureSymbol..st delete mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStructureSymbol.st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/list..st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/amount.st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/couldDeriveFromPrettyPrinting.st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/flatten.st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/isKern.st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/isTextAlignment.st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/isTextColor.st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/isTextIndent.st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/mayActOnClick.st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/openFontChooser.st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/resetFont.st create mode 100644 packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/listLevel.st create mode 100644 packages/RichTextEditing-Tests.package/RichTextStructureEditorTestCase.class/instance/textHasFont..st create mode 100644 packages/RichTextEditing-Tests.package/RichTextStructureEditorTestCase.class/instance/textHasFontSize..st create mode 100644 packages/RichTextEditing-Tests.package/RichTextStructureEditorTestCase.class/instance/textHasNoColor.st create mode 100644 packages/RichTextEditing-Tests.package/RichTextStructureEditorTestCase.class/instance/textHasNoFont.st delete mode 100644 packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/textHasFont..st delete mode 100644 packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/textHasFontSize..st delete mode 100644 packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/textHasNoColor.st delete mode 100644 packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/textHasNoFont.st delete mode 100644 packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testGetFontReturnsFont.st delete mode 100644 packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testOriginalColorReturnsColorIfNotNil.st delete mode 100644 packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testOriginalColorReturnsDefaultClassColorIfNil.st delete mode 100644 packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testStyleSetReturnsActiveStyles.st diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildStructureFieldWith..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildStructureFieldWith..st index 940fa7d..e1dcf57 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildStructureFieldWith..st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildStructureFieldWith..st @@ -6,6 +6,6 @@ buildStructureFieldWith: aBuilder model: self; frame: (0 @ 0 corner: 0.5 @ 0.9); list: #textStructures; - getSelected: #selectedStructureSymbol; - setSelected: #selectedStructureSymbol:; + getSelected: #currentStructureSymbol; + setSelected: #currentStructureSymbol:; yourself \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentPriority.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentPriority.st index 8e2b3b5..6876bcc 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentPriority.st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentPriority.st @@ -1,4 +1,4 @@ text structures currentPriority - ^ self textStructures indexOf: self selectedStructureSymbol \ No newline at end of file + ^ self textStructures indexOf: self currentStructureSymbol \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentStructure.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentStructure.st index 4631606..664a0cd 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentStructure.st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentStructure.st @@ -1,6 +1,6 @@ text structures currentStructure - self selectedStructureSymbol ifNil: [^ self newNullTextStructure]. + self currentStructureSymbol ifNil: [^ self newNullTextStructure]. - ^ self document symbolToStructure: self selectedStructureSymbol \ No newline at end of file + ^ self document symbolToStructure: self currentStructureSymbol \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentStructureSymbol..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentStructureSymbol..st new file mode 100644 index 0000000..cfb4e7d --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentStructureSymbol..st @@ -0,0 +1,7 @@ +accessing +currentStructureSymbol: aSymbol + + self lastStructureSymbol: self currentStructureSymbol. + currentStructureSymbol := aSymbol. + self changed: #allSelections; + updateLoremIpsum \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentStructureSymbol.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentStructureSymbol.st new file mode 100644 index 0000000..c881320 --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentStructureSymbol.st @@ -0,0 +1,4 @@ +accessing +currentStructureSymbol + + ^ currentStructureSymbol \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/removeStructure.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/removeStructure.st index 6a3e3ee..049407a 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/removeStructure.st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/removeStructure.st @@ -1,8 +1,8 @@ text structures removeStructure - self selectedStructureSymbol ifNil: [ + self currentStructureSymbol ifNil: [ self chooseStructureToRemove. ^nil]. - self document removeStructure: self selectedStructureSymbol. + self document removeStructure: self currentStructureSymbol. self changed: #textStructures \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStructure.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStructure.st index 6adcdb4..f1df228 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStructure.st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStructure.st @@ -1,4 +1,4 @@ text attributes selectedStructure - ^ self document getTextStructure: self selectedStructureSymbol \ No newline at end of file + ^ self document getTextStructure: self currentStructureSymbol \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStructureSymbol..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStructureSymbol..st deleted file mode 100644 index 0e99a40..0000000 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStructureSymbol..st +++ /dev/null @@ -1,7 +0,0 @@ -accessing -selectedStructureSymbol: aSymbol - - self lastStructureSymbol: self selectedStructureSymbol. - selectedStructureSymbol := aSymbol. - self changed: #allSelections; - updateLoremIpsum \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStructureSymbol.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStructureSymbol.st deleted file mode 100644 index 07b8515..0000000 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStructureSymbol.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -selectedStructureSymbol - - ^ selectedStructureSymbol \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/updateLoremIpsum.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/updateLoremIpsum.st index cf1c8b1..2e05246 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/updateLoremIpsum.st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/updateLoremIpsum.st @@ -4,7 +4,7 @@ updateLoremIpsum self lastStructureSymbol ifNotNil: [ self loremIpsum removeAttribute: (self document symbolToStructure: self lastStructureSymbol) from: 1 to: self loremIpsum size]. - self selectedStructureSymbol ifNotNil: [ + self currentStructureSymbol ifNotNil: [ self loremIpsum addAttribute: self currentStructure from: 1 to: self loremIpsum size]. self changed: #loremIpsum \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json index d4c5ce7..bdcb596 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json @@ -15,14 +15,16 @@ "buildFontResetButtonWith:" : "lh 6/26/2019 18:40", "buildIncreasePriorityButtonWith:" : "lh 7/3/2019 17:25", "buildRemoveStructureButtonWith:" : "lh 7/3/2019 17:26", - "buildStructureFieldWith:" : "kh 6/18/2020 22:17", + "buildStructureFieldWith:" : "kh 6/19/2020 10:47", "buildStyleFieldWith:" : "kh 6/18/2020 22:17", "buildTextPreviewFieldWith:" : "lh 6/26/2019 18:41", "buildWith:" : "lh 7/3/2019 17:24", "chooseStructureToRemove" : "ls 7/24/2019 17:26", "copyTextStructures" : "lh 7/24/2019 18:33", - "currentPriority" : "kh 6/18/2020 22:30", - "currentStructure" : "kh 6/18/2020 22:18", + "currentPriority" : "kh 6/19/2020 10:46", + "currentStructure" : "kh 6/19/2020 10:47", + "currentStructureSymbol" : "kh 6/19/2020 10:48", + "currentStructureSymbol:" : "kh 6/19/2020 10:48", "decreasePriority" : "ls 7/24/2019 22:36", "defaultColor" : "kh 6/18/2020 23:09", "defaultFont" : "kh 6/18/2020 23:35", @@ -42,16 +44,14 @@ "openFontChooser" : "kh 6/18/2020 23:35", "removeColor" : "kh 6/18/2020 23:15", "removeFont" : "kh 6/18/2020 23:36", - "removeStructure" : "kh 6/18/2020 22:38", + "removeStructure" : "kh 6/19/2020 10:47", "resetColor" : "kh 6/18/2020 23:48", "resetFont" : "kh 6/18/2020 23:49", - "selectedStructure" : "kh 6/18/2020 22:15", - "selectedStructureSymbol" : "kh 6/18/2020 22:02", - "selectedStructureSymbol:" : "kh 6/18/2020 22:02", + "selectedStructure" : "kh 6/19/2020 10:47", "setAttributeAt:put:" : "kh 6/18/2020 22:12", "setColor:" : "kh 6/18/2020 23:15", "setFont:" : "kh 6/18/2020 23:37", "textStructures" : "ls 7/24/2019 16:55", "update:" : "ls 7/24/2019 21:57", - "updateLoremIpsum" : "kh 6/18/2020 22:18", + "updateLoremIpsum" : "kh 6/19/2020 10:47", "updateStructures:" : "lh 7/25/2019 11:05" } } diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/properties.json b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/properties.json index 4389d70..eeb379c 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/properties.json +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/properties.json @@ -10,7 +10,7 @@ "structureList", "styleList", "loremIpsum", - "selectedStructureSymbol", + "currentStructureSymbol", "lastStructureSymbol" ], "name" : "RichTextStructureEditor", "pools" : [ diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/list..st b/packages/RichTextEditing-Core.package/TextStructure.class/class/list..st new file mode 100644 index 0000000..352e497 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/list..st @@ -0,0 +1,4 @@ +predefined +list: level + + ^ self new: #list with: {TextIndent amount: level} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/new.with..st b/packages/RichTextEditing-Core.package/TextStructure.class/class/new.with..st index b9ed00c..bc02383 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/new.with..st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/new.with..st @@ -1,8 +1,8 @@ instance creation -new: aSymbol with: aSet +new: aSymbol with: aCollection | instance | instance := self new: aSymbol. - instance attributes: aSet. + instance attributes: aCollection asSet. ^ instance \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/actOnClickFor..st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/actOnClickFor..st index 2135adc..cc53b07 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/actOnClickFor..st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/actOnClickFor..st @@ -1,4 +1,4 @@ -action +mouse events actOnClickFor: model ^ (self attributes collect: [:each | each actOnClickFor: model]) includes: true \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/amount.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/amount.st new file mode 100644 index 0000000..29160d4 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/amount.st @@ -0,0 +1,6 @@ +accessing +amount + + ^ self flatten detect: [:each | each isTextIndent and: [each isTextStructure not]] + ifFound: [:textIndent | textIndent amount] + ifNone: [0] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/couldDeriveFromPrettyPrinting.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/couldDeriveFromPrettyPrinting.st new file mode 100644 index 0000000..063c62f --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/couldDeriveFromPrettyPrinting.st @@ -0,0 +1,4 @@ +testing +couldDeriveFromPrettyPrinting + + ^ self attributes allSatisfy: [:each | each couldDeriveFromPrettyPrinting] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/emphasisCode.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/emphasisCode.st index 07d4ead..ca96d9e 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/emphasisCode.st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/emphasisCode.st @@ -1,4 +1,4 @@ accessing emphasisCode - ^ self attributes reduce: [:acc :each | acc bitOr: each emphasisCode] \ No newline at end of file + ^ self attributes fold: [:acc :each | acc bitOr: each emphasisCode] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/flatten.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/flatten.st new file mode 100644 index 0000000..1123ac6 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/flatten.st @@ -0,0 +1,7 @@ +converting +flatten + + ^ self attributes inject: (Set new) into: [:set :next | + set union: ((next isTextStructure) + ifTrue: [next flatten] + ifFalse: [Set newFrom: {next}])] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/isKern.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/isKern.st new file mode 100644 index 0000000..d7811c3 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/isKern.st @@ -0,0 +1,4 @@ +testing +isKern + + ^ self attributes anySatisfy: [:each | each isKern] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/isTextAlignment.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/isTextAlignment.st new file mode 100644 index 0000000..9dc6e55 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/isTextAlignment.st @@ -0,0 +1,4 @@ +testing +isTextAlignment + + ^ self attributes anySatisfy: [:each | each isTextAlignment] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/isTextColor.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/isTextColor.st new file mode 100644 index 0000000..c9437e8 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/isTextColor.st @@ -0,0 +1,4 @@ +testing +isTextColor + + ^ self flatten anySatisfy: [:each | each isKindOf: TextColor] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/isTextIndent.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/isTextIndent.st new file mode 100644 index 0000000..4a22a54 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/isTextIndent.st @@ -0,0 +1,4 @@ +testing +isTextIndent + + ^ self attributes anySatisfy: [:each | each isTextIndent] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/mayActOnClick.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/mayActOnClick.st new file mode 100644 index 0000000..ab16295 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/mayActOnClick.st @@ -0,0 +1,4 @@ +testing +mayActOnClick + + ^ self attributes anySatisfy: [:each | each mayActOnClick] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/openFontChooser.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/openFontChooser.st deleted file mode 100644 index 4204500..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/openFontChooser.st +++ /dev/null @@ -1,8 +0,0 @@ -font -openFontChooser - - FontChooserTool - openWithWindowTitle: 'FontChooser' - for: self - setSelector: #font: - getSelector: #getFont \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/resetFont.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/resetFont.st deleted file mode 100644 index 66925aa..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/resetFont.st +++ /dev/null @@ -1,4 +0,0 @@ -font -resetFont - - self font: nil \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json b/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json index 420877c..0370c15 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json @@ -11,26 +11,33 @@ "indented" : "kh 6/18/2020 22:54", "indented:" : "kh 6/18/2020 22:53", "italic" : "kh 6/18/2020 20:25", + "list:" : "kh 6/19/2020 10:02", "new:" : "kh 6/18/2020 22:36", - "new:with:" : "kh 6/18/2020 21:15", + "new:with:" : "kh 6/19/2020 09:46", "struckOut" : "kh 6/18/2020 22:23", "underlined" : "kh 6/18/2020 20:25" }, "instance" : { "=" : "lh 7/24/2019 20:24", "actOnClickFor:" : "kh 6/18/2020 14:45", "add:" : "kh 6/18/2020 20:16", + "amount" : "kh 6/19/2020 10:45", "attributes" : "kh 6/18/2020 14:14", "attributes:" : "kh 6/18/2020 14:15", - "emphasisCode" : "kh 6/18/2020 14:58", + "couldDeriveFromPrettyPrinting" : "kh 6/19/2020 10:34", + "emphasisCode" : "kh 6/19/2020 10:28", "emphasizeScanner:" : "kh 6/18/2020 14:31", + "flatten" : "kh 6/19/2020 10:26", "hash" : "lh 7/24/2019 20:47", "includes:" : "kh 6/18/2020 20:54", "initialize" : "kh 6/18/2020 21:00", + "isKern" : "kh 6/19/2020 10:11", + "isTextAlignment" : "kh 6/19/2020 10:11", + "isTextColor" : "kh 6/19/2020 11:31", + "isTextIndent" : "kh 6/19/2020 10:10", "isTextStructure" : "ls 5/29/2019 17:41", + "mayActOnClick" : "kh 6/19/2020 10:10", "mayBeExtended" : "kh 6/19/2020 00:52", - "openFontChooser" : "ls 7/24/2019 21:22", "printOn:" : "ls 7/3/2019 17:32", "remove:" : "kh 6/18/2020 22:38", - "resetFont" : "ls 7/24/2019 21:23", "structureIdentifier" : "ls 5/29/2019 17:41", "structureIdentifier:" : "AG 5/29/2019 18:33" } } diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/combinedTextStructure.st b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/combinedTextStructure.st index 8ab055a..6c0de56 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/combinedTextStructure.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/combinedTextStructure.st @@ -1,4 +1,8 @@ utilities combinedTextStructure - ^ TextStructure newWith: #test withStyles: #(#bold #italic #underlined #struckOut) asSet \ No newline at end of file + ^ TextStructure new: #test with: + {TextStructure bold. + TextStructure italic. + TextStructure underlined. + TextStructure struckOut} \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/listLevel.st b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/listLevel.st new file mode 100644 index 0000000..2d4d55f --- /dev/null +++ b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/listLevel.st @@ -0,0 +1,4 @@ +utilities +listLevel + + ^ 1 \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/listTextStructure.st b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/listTextStructure.st index 1436fca..3351e87 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/listTextStructure.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/listTextStructure.st @@ -1,5 +1,5 @@ utilities listTextStructure - ^ TextStructure newWith: #list withStyles: self listTextStructureStyles + ^ TextStructure new: #list with: {TextStructure list: self listLevel} \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS64IndentedStructureIsRendered.st b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS64IndentedStructureIsRendered.st index c211110..0a898db 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS64IndentedStructureIsRendered.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/testUS64IndentedStructureIsRendered.st @@ -4,4 +4,4 @@ testUS64IndentedStructureIsRendered self enterStringOntoTextField: 'test'. self assert: ((self editorText indentationAmountAt: (1 to: self editorText size)) = 0). self editorText addAttribute: self listTextStructure from: 1 to: self editorText size. - self assert: ((self editorText indentationAmountAt: (1 to: self editorText size)) = self listTextStructure amount) \ No newline at end of file + self assert: ((self editorText indentationAmountAt: (1 to: self editorText size)) = self listLevel) \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/methodProperties.json index 3e96dc2..a1b44c8 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/methodProperties.json +++ b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/methodProperties.json @@ -4,12 +4,13 @@ "instance" : { "boldIsSelectedInList" : "MB 7/24/2019 18:54", "combinedEmphasisCode" : "MB 5/29/2019 22:04", - "combinedTextStructure" : "tok 6/8/2020 12:06", + "combinedTextStructure" : "kh 6/19/2020 09:47", "ctrlShiftButtonCode" : "tok 6/13/2020 16:24", "demoText" : "tok 6/13/2020 12:11", "emphasisCodeNoStyle" : "AG 6/5/2019 18:56", "firstStructureIsSelectedInList" : " 6/18/2020 19:16:32", - "listTextStructure" : "tok 6/12/2020 12:12", + "listLevel" : "kh 6/19/2020 10:04", + "listTextStructure" : "kh 6/19/2020 10:05", "listTextStructureStyles" : "tok 6/12/2020 12:12", "menu" : "ls 6/18/2019 16:37", "selectOptionBold" : "lh 7/24/2019 21:31", @@ -26,6 +27,6 @@ "testUS61StructureShortcutIsAppliedToNextText" : "tok 6/13/2020 16:27", "testUS61StructureShortcutTogglesStructureEndOfText" : "tok 6/13/2020 16:25", "testUS61StructureShortcutTogglesStructureSelectedText" : "tok 6/13/2020 16:26", - "testUS64IndentedStructureIsRendered" : "tok 6/1/2020 13:35", + "testUS64IndentedStructureIsRendered" : "kh 6/19/2020 10:04", "textHasCombinedStyle" : "AG 7/25/2019 13:22", "textHasNoStyle" : "AG 7/25/2019 13:22" } } diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/boldTextStructure.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/boldTextStructure.st index 4cccee7..7bbf37b 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/boldTextStructure.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/boldTextStructure.st @@ -1,8 +1,4 @@ utilities boldTextStructure - - | boldStructure | - boldStructure := TextStructure newWith: #test withStyles: self boldSet. - boldStructure updateStyles: self boldSet. - ^ boldStructure \ No newline at end of file + ^ TextStructure bold \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/methodProperties.json index 28cba58..6a3cc0d 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/methodProperties.json +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/methodProperties.json @@ -5,7 +5,7 @@ "activateHeading" : "ls 6/21/2019 16:34", "addMoreText" : "lh 6/5/2019 18:17", "boldSet" : "lh 6/5/2019 21:59", - "boldTextStructure" : "tok 6/8/2020 12:06", + "boldTextStructure" : "kh 6/19/2020 09:56", "caretPosition" : "ls 6/21/2019 16:34", "caretPosition:" : "ls 6/21/2019 16:34", "emphasisCodeBold" : "lh 6/5/2019 18:20", diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/methodProperties.json index 6865ecc..41feee0 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/methodProperties.json +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/methodProperties.json @@ -15,7 +15,7 @@ "symbolAt:" : "lh 7/3/2019 22:46", "testUS32CheckAllStylesAreAvailable" : "tok 6/1/2020 13:12", "testUS43PreviewTextfieldExists" : "ls 6/6/2019 00:27", - "testUS43PreviewTextfieldHasSelectedStructureApplied" : "lh 7/24/2019 17:50", + "testUS43PreviewTextfieldHasSelectedStructureApplied" : "kh 6/19/2020 10:46", "testUS58StructurePriorityCanBeDecreased" : "lh 7/24/2019 20:07", "testUS58StructurePriorityCanBeIncreased" : "lh 7/24/2019 20:07", "testUS58StructureWithHighestPriorityWins" : "ls 7/25/2019 12:53", diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTestCase.class/instance/textHasColor..st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTestCase.class/instance/textHasColor..st index bdde4e7..160444b 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTestCase.class/instance/textHasColor..st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTestCase.class/instance/textHasColor..st @@ -1,7 +1,9 @@ tests textHasColor: aColor - ^ (self textRuns copyFrom: 0 to: self editorText size) + ^ self textRuns allSatisfy: [:attributes | attributes - anySatisfy: [:attribute | attribute isTextStructure - and: [attribute color = aColor]]] \ No newline at end of file + anySatisfy: [:attribute | (attribute isTextStructure + ifTrue: [attribute flatten] + ifFalse: [Set newFrom: attribute]) anySatisfy: [:each | + (each isKindOf: TextColor) and: [each color == aColor]]]] \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTestCase.class/instance/textHasFont..st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTestCase.class/instance/textHasFont..st new file mode 100644 index 0000000..90fab42 --- /dev/null +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTestCase.class/instance/textHasFont..st @@ -0,0 +1,9 @@ +tests +textHasFont: aFont + + ^ self textRuns + allSatisfy: [:attributes | attributes + anySatisfy: [:attribute | (attribute isTextStructure + ifTrue: [attribute flatten] + ifFalse: [Set newFrom: attribute]) anySatisfy: [:each | + (each isKindOf: TextFontReference) and: [each font == aFont]]]] \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTestCase.class/instance/textHasFontSize..st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTestCase.class/instance/textHasFontSize..st new file mode 100644 index 0000000..af9327a --- /dev/null +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTestCase.class/instance/textHasFontSize..st @@ -0,0 +1,9 @@ +tests +textHasFontSize: aNumber + + ^ self textRuns + allSatisfy: [:attributes | attributes + anySatisfy: [:attribute | (attribute isTextStructure + ifTrue: [attribute flatten] + ifFalse: [Set newFrom: attribute]) anySatisfy: [:each | + (each isKindOf: TextFontReference) and: [each font pointSize == aNumber]]]] \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTestCase.class/instance/textHasNoColor.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTestCase.class/instance/textHasNoColor.st new file mode 100644 index 0000000..aaf67f9 --- /dev/null +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTestCase.class/instance/textHasNoColor.st @@ -0,0 +1,8 @@ +tests +textHasNoColor + + ^ self textRuns + allSatisfy: [:attributes | attributes + noneSatisfy: [:attribute | attribute isTextStructure + ifTrue: [attribute isTextColor] + ifFalse: [attribute isKindOf: TextColor]]] \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTestCase.class/instance/textHasNoFont.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTestCase.class/instance/textHasNoFont.st new file mode 100644 index 0000000..261f167 --- /dev/null +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTestCase.class/instance/textHasNoFont.st @@ -0,0 +1,8 @@ +tests +textHasNoFont + + ^ self textRuns + allSatisfy: [:attributes | attributes + noneSatisfy: [:attribute | attribute isTextStructure + ifTrue: [attribute isTextColor] + ifFalse: [attribute isKindOf: TextFontReference]]] \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTestCase.class/instance/textRuns.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTestCase.class/instance/textRuns.st index d477953..9f87237 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTestCase.class/instance/textRuns.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTestCase.class/instance/textRuns.st @@ -1,4 +1,4 @@ -tests +accessing textRuns ^ self editorText runs \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTestCase.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTestCase.class/methodProperties.json index a7826bd..0254c98 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTestCase.class/methodProperties.json +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTestCase.class/methodProperties.json @@ -9,5 +9,9 @@ "structureEditor:" : "ls 6/6/2019 00:24", "structureEditorView" : "ls 6/6/2019 00:24", "tearDown" : "ls 6/6/2019 00:21", - "textHasColor:" : "ls 7/25/2019 12:55", + "textHasColor:" : "kh 6/19/2020 11:47", + "textHasFont:" : "kh 6/19/2020 11:49", + "textHasFontSize:" : "kh 6/19/2020 11:49", + "textHasNoColor" : "kh 6/19/2020 11:55", + "textHasNoFont" : "kh 6/19/2020 11:55", "textRuns" : "lh 7/24/2019 17:07" } } diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testUS41ColorCanBeReset.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testUS41ColorCanBeReset.st index f9cf321..2e87f75 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testUS41ColorCanBeReset.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testUS41ColorCanBeReset.st @@ -6,7 +6,7 @@ testUS41ColorCanBeReset enterStringOntoTextField: 'test'; addColoredStructureToText; setGreenColor; - deny: (self textHasColor: TextStructure defaultColor). + deny: (self textHasColor: self structureEditor defaultColor). resetColorButton := self structureEditorView findByLabel: 'Reset color'. resetColorButton click. diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testUS42FontCanBeReset.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testUS42FontCanBeReset.st index 2f0dcda..711cb68 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testUS42FontCanBeReset.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/testUS42FontCanBeReset.st @@ -6,7 +6,7 @@ testUS42FontCanBeReset enterStringOntoTextField: 'test'; addFontStructureToText; setFont: self fontAtlanta22; - deny: (self textHasFont: TextStructure defaultFont). + deny: (self textHasFont: self structureEditor defaultFont). resetFontButton := self structureEditorView findByLabel: 'Reset font'. resetFontButton click. diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/textHasFont..st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/textHasFont..st deleted file mode 100644 index f1f83f8..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/textHasFont..st +++ /dev/null @@ -1,7 +0,0 @@ -utilities -textHasFont: aFont - - ^ self textRuns - allSatisfy: [:attributes | attributes - anySatisfy: [:attribute | attribute isTextStructure - and: [attribute font = aFont]]] \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/textHasFontSize..st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/textHasFontSize..st deleted file mode 100644 index dd00394..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/textHasFontSize..st +++ /dev/null @@ -1,7 +0,0 @@ -utilities -textHasFontSize: aNumber - - ^ self textRuns - allSatisfy: [:attributes | attributes - anySatisfy: [:attribute | attribute isTextStructure - and: [attribute font pointSize = aNumber]]] \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/textHasNoColor.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/textHasNoColor.st deleted file mode 100644 index 2f5cd95..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/textHasNoColor.st +++ /dev/null @@ -1,4 +0,0 @@ -utilities -textHasNoColor - - ^ self textHasColor: nil \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/textHasNoFont.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/textHasNoFont.st deleted file mode 100644 index 4cecdcd..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/textHasNoFont.st +++ /dev/null @@ -1,4 +0,0 @@ -utilities -textHasNoFont - - ^ self textHasFont: nil \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/methodProperties.json index 769ef6a..3f0ec2f 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/methodProperties.json +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/methodProperties.json @@ -29,12 +29,8 @@ "testUS29AddNewStructure" : "ls 6/18/2019 16:22", "testUS29DisplayAllStructures" : "ls 6/18/2019 16:22", "testUS29RemoveNewStructure" : "ls 6/18/2019 16:22", - "testUS41ColorCanBeReset" : "MB 7/24/2019 23:56", + "testUS41ColorCanBeReset" : "kh 6/19/2020 11:24", "testUS41ColorIsAssignedToStructure" : "AG 6/21/2019 13:59", - "testUS42FontCanBeReset" : "MB 7/24/2019 23:56", + "testUS42FontCanBeReset" : "kh 6/19/2020 11:32", "testUS42FontIsAppliedToStructure" : "lh 6/26/2019 21:24", - "testUS42FontSizeCanBeAssigned" : "lh 6/26/2019 21:23", - "textHasFont:" : "MB 7/24/2019 19:23", - "textHasFontSize:" : "MB 7/24/2019 19:24", - "textHasNoColor" : "MB 6/26/2019 17:50", - "textHasNoFont" : "lh 6/26/2019 19:14" } } + "testUS42FontSizeCanBeAssigned" : "lh 6/26/2019 21:23" } } diff --git a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testGetFontReturnsFont.st b/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testGetFontReturnsFont.st deleted file mode 100644 index 04b59b5..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testGetFontReturnsFont.st +++ /dev/null @@ -1,8 +0,0 @@ -unit-tests -testGetFontReturnsFont - - | textStructure font | - textStructure := self listTextStructure. - font := (StrikeFont createDejaVuDark: 9). - textStructure font: font. - self assert: textStructure getFont equals: font \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testOriginalColorReturnsColorIfNotNil.st b/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testOriginalColorReturnsColorIfNotNil.st deleted file mode 100644 index 46877a1..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testOriginalColorReturnsColorIfNotNil.st +++ /dev/null @@ -1,9 +0,0 @@ -unit-tests -testOriginalColorReturnsColorIfNotNil - - | textStructure color | - textStructure := self listTextStructure. - color := Color red. - textStructure setColor: color. - - self assert: textStructure originalColor equals: color \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testOriginalColorReturnsDefaultClassColorIfNil.st b/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testOriginalColorReturnsDefaultClassColorIfNil.st deleted file mode 100644 index c4272c7..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testOriginalColorReturnsDefaultClassColorIfNil.st +++ /dev/null @@ -1,8 +0,0 @@ -unit-tests -testOriginalColorReturnsDefaultClassColorIfNil - - | textStructure | - textStructure := self listTextStructure. - textStructure setColor: nil. - - self assert: textStructure originalColor equals: TextStructure defaultColor \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testStyleSetReturnsActiveStyles.st b/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testStyleSetReturnsActiveStyles.st deleted file mode 100644 index 21c2085..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testStyleSetReturnsActiveStyles.st +++ /dev/null @@ -1,7 +0,0 @@ -unit-tests -testStyleSetReturnsActiveStyles - - | textStructure | - textStructure := self listTextStructure. - - self assert: textStructure styleSet equals: self listTextStructureStyles \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/methodProperties.json index 1d3fb52..42bf9ae 100644 --- a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/methodProperties.json +++ b/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/methodProperties.json @@ -5,8 +5,4 @@ "listTextStructure" : "tok 6/12/2020 13:13", "listTextStructureStyles" : "tok 6/12/2020 13:13", "nullTextStructure" : "tok 6/12/2020 13:12", - "testGetFontReturnsFont" : "tok 6/13/2020 11:02", - "testNullTextStructurestructureIdentifierIsNull" : "tok 6/13/2020 11:01", - "testOriginalColorReturnsColorIfNotNil" : "tok 6/13/2020 11:02", - "testOriginalColorReturnsDefaultClassColorIfNil" : "tok 6/13/2020 11:02", - "testStyleSetReturnsActiveStyles" : "tok 6/13/2020 11:02" } } + "testNullTextStructurestructureIdentifierIsNull" : "tok 6/13/2020 11:01" } } From 2af808c79321df763ee9b2517517e132eed0dd6c Mon Sep 17 00:00:00 2001 From: Konrad Hanff Date: Fri, 19 Jun 2020 17:53:14 +0200 Subject: [PATCH 06/12] Not extendable attributes work now and text can be made a clickable hyperlink --- .../ExtendableText.class/README.md | 0 .../instance/mayBeExtended.st | 4 -- .../methodProperties.json | 5 --- .../instance/at.ifAbsent..st | 4 -- .../methodProperties.json | 1 - .../class/commonStyles.st | 2 +- .../class/initialBoldStructure.st | 2 +- .../class/initialFootnoteStructure.st | 2 +- .../class/initialHeading1Structure.st | 2 +- .../class/initialHeading2Structure.st | 2 +- .../class/initialHeading3Structure.st | 2 +- .../class/initialItalicStructure.st | 2 +- .../class/initialListStructure.st | 2 +- .../class/initialTextStructures.st | 3 +- .../class/initialURLStructure.st | 6 +++ .../class/initialUnderlinedStructure.st | 2 +- .../instance/addAttribute.from.to..st | 3 ++ .../instance/initializeStructure..st | 3 +- .../initializeStructure.withEmphasis..st | 4 -- .../instance/removeStructure..st | 2 +- .../instance/stylesForStructure..st | 8 ---- .../instance/symbolToStructure..st | 2 +- ...tTextStructure..st => textStructureAt..st} | 2 +- .../instance/updateStyle.withEmphasis..st | 5 --- .../methodProperties.json | 34 ++++++++------- .../instance/makeTextURLFrom..st | 2 +- .../RichTextEditor.class/instance/pasteURL.st | 2 +- .../methodProperties.json | 4 +- .../instance/allAttributeSymbols.st | 4 ++ .../instance/allAttributes.st | 4 -- ...uteAt.put..st => attributeAt.activate..st} | 5 ++- .../instance/attributeSymbolAt..st | 4 ++ .../instance/buildStyleFieldWith..st | 6 +-- .../instance/getAttributeAt..st | 4 -- .../instance/isActiveAttributeAt..st | 4 ++ .../instance/removeFont.st | 4 +- .../instance/selectedStructure.st | 2 +- .../methodProperties.json | 13 +++--- .../TextExtendability.class/README.md | 1 + .../TextExtendability.class/class/no.st | 4 ++ .../TextExtendability.class/class/yes.st | 4 ++ .../instance/mayBeExtended..st | 4 ++ .../instance/mayBeExtended.st | 4 ++ .../methodProperties.json | 7 ++++ .../properties.json | 11 ++--- .../class/allAttributes.st | 5 ++- .../class/autohyperlink.st | 8 ++++ .../TextStructure.class/class/bold.st | 2 +- .../TextStructure.class/class/color..st | 2 +- .../TextStructure.class/class/extendable.st | 4 -- .../TextStructure.class/class/font..st | 2 +- .../TextStructure.class/class/hyperlink..st | 4 ++ .../TextStructure.class/class/indented..st | 2 +- .../TextStructure.class/class/italic.st | 2 +- .../TextStructure.class/class/list..st | 2 +- .../class/{new.with..st => new.from..st} | 2 +- .../class/notExtendable.st | 4 ++ .../class/predefinedAttributeFor..st | 6 +++ .../TextStructure.class/class/struckOut.st | 2 +- .../TextStructure.class/class/underlined.st | 2 +- .../TextStructure.class/instance/add..st | 2 + .../TextStructure.class/instance/addAll..st | 4 ++ .../TextStructure.class/instance/amount.st | 1 + .../instance/attributes..st | 4 +- .../instance/emphasisCode.st | 2 +- .../instance/initialize.st | 4 +- .../instance/mayBeExtended.st | 2 +- .../TextStructure.class/instance/preAdd..st | 6 +++ .../instance/preAddHook..st | 4 ++ .../instance/preAddHook.st | 4 ++ .../TextStructure.class/methodProperties.json | 41 +++++++++++-------- .../TextStructure.class/properties.json | 3 +- .../instance/boldIsListed.st | 2 +- .../instance/boldStructure.st | 5 +++ .../instance/boldStructureSymbol.st | 2 +- .../instance/structureIsListed.st | 4 ++ .../methodProperties.json | 8 ++-- .../instance/combinedTextStructure.st | 2 +- .../instance/listTextStructure.st | 2 +- .../methodProperties.json | 4 +- .../instance/boldSet.st | 4 -- .../instance/extendableBoldSet.st | 4 -- .../instance/extendableBoldTextStructure.st | 8 ---- .../instance/flattenTextAttributes..st | 8 ++++ .../instance/textHasTextAttribute..st | 8 ++-- .../methodProperties.json | 6 +-- .../testUS32CheckAllStylesAreAvailable.st | 2 +- .../methodProperties.json | 2 +- .../instance/exampleTextStructure.st | 4 ++ .../testNullTextStructureCantAddAttributes.st | 8 ++++ ...stNullTextStructureCantRemoveAttributes.st | 10 +++++ ...cturestructureIdentifierCanNotBeChanged.st | 7 ++++ .../methodProperties.json | 4 ++ 93 files changed, 255 insertions(+), 172 deletions(-) delete mode 100644 packages/RichTextEditing-Core.package/ExtendableText.class/README.md delete mode 100644 packages/RichTextEditing-Core.package/ExtendableText.class/instance/mayBeExtended.st delete mode 100644 packages/RichTextEditing-Core.package/ExtendableText.class/methodProperties.json delete mode 100644 packages/RichTextEditing-Core.package/NullTextStructure.class/instance/at.ifAbsent..st create mode 100644 packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialURLStructure.st delete mode 100644 packages/RichTextEditing-Core.package/RichTextDocument.class/instance/initializeStructure.withEmphasis..st delete mode 100644 packages/RichTextEditing-Core.package/RichTextDocument.class/instance/stylesForStructure..st rename packages/RichTextEditing-Core.package/RichTextDocument.class/instance/{getTextStructure..st => textStructureAt..st} (60%) delete mode 100644 packages/RichTextEditing-Core.package/RichTextDocument.class/instance/updateStyle.withEmphasis..st create mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/allAttributeSymbols.st delete mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/allAttributes.st rename packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/{setAttributeAt.put..st => attributeAt.activate..st} (53%) create mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/attributeSymbolAt..st delete mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/getAttributeAt..st create mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/isActiveAttributeAt..st create mode 100644 packages/RichTextEditing-Core.package/TextExtendability.class/README.md create mode 100644 packages/RichTextEditing-Core.package/TextExtendability.class/class/no.st create mode 100644 packages/RichTextEditing-Core.package/TextExtendability.class/class/yes.st create mode 100644 packages/RichTextEditing-Core.package/TextExtendability.class/instance/mayBeExtended..st create mode 100644 packages/RichTextEditing-Core.package/TextExtendability.class/instance/mayBeExtended.st create mode 100644 packages/RichTextEditing-Core.package/TextExtendability.class/methodProperties.json rename packages/RichTextEditing-Core.package/{ExtendableText.class => TextExtendability.class}/properties.json (53%) create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/autohyperlink.st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/extendable.st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/hyperlink..st rename packages/RichTextEditing-Core.package/TextStructure.class/class/{new.with..st => new.from..st} (71%) create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/notExtendable.st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/predefinedAttributeFor..st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/addAll..st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/preAdd..st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/preAddHook..st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/instance/preAddHook.st create mode 100644 packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/boldStructure.st create mode 100644 packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/structureIsListed.st delete mode 100644 packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/boldSet.st delete mode 100644 packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/extendableBoldSet.st delete mode 100644 packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/extendableBoldTextStructure.st create mode 100644 packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/flattenTextAttributes..st create mode 100644 packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/exampleTextStructure.st create mode 100644 packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testNullTextStructureCantAddAttributes.st create mode 100644 packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testNullTextStructureCantRemoveAttributes.st create mode 100644 packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testNullTextStructurestructureIdentifierCanNotBeChanged.st diff --git a/packages/RichTextEditing-Core.package/ExtendableText.class/README.md b/packages/RichTextEditing-Core.package/ExtendableText.class/README.md deleted file mode 100644 index e69de29..0000000 diff --git a/packages/RichTextEditing-Core.package/ExtendableText.class/instance/mayBeExtended.st b/packages/RichTextEditing-Core.package/ExtendableText.class/instance/mayBeExtended.st deleted file mode 100644 index da8bb71..0000000 --- a/packages/RichTextEditing-Core.package/ExtendableText.class/instance/mayBeExtended.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -mayBeExtended - - ^ true \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/ExtendableText.class/methodProperties.json b/packages/RichTextEditing-Core.package/ExtendableText.class/methodProperties.json deleted file mode 100644 index d234355..0000000 --- a/packages/RichTextEditing-Core.package/ExtendableText.class/methodProperties.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "mayBeExtended" : "kh 6/18/2020 16:48" } } diff --git a/packages/RichTextEditing-Core.package/NullTextStructure.class/instance/at.ifAbsent..st b/packages/RichTextEditing-Core.package/NullTextStructure.class/instance/at.ifAbsent..st deleted file mode 100644 index 6c23226..0000000 --- a/packages/RichTextEditing-Core.package/NullTextStructure.class/instance/at.ifAbsent..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -at: aSymbol ifAbsent: aBlock - - ^ NullTextStructure new \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/NullTextStructure.class/methodProperties.json b/packages/RichTextEditing-Core.package/NullTextStructure.class/methodProperties.json index 3a847aa..a1b4013 100644 --- a/packages/RichTextEditing-Core.package/NullTextStructure.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/NullTextStructure.class/methodProperties.json @@ -3,7 +3,6 @@ "warningText" : "tok 6/12/2020 12:41" }, "instance" : { "add:" : "kh 6/18/2020 21:24", - "at:ifAbsent:" : "kh 6/18/2020 21:25", "includes:" : "kh 6/18/2020 21:25", "noCurrentStructureWarning" : "tok 6/12/2020 12:41", "openColorPicker" : "ls 7/24/2019 21:54", diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/commonStyles.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/commonStyles.st index d9b4cbb..6b3b0d6 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/commonStyles.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/commonStyles.st @@ -1,4 +1,4 @@ constants commonStyles - ^ {TextStructure extendable} asSet \ No newline at end of file + ^ {} asSet \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialBoldStructure.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialBoldStructure.st index 88a77af..f4899ac 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialBoldStructure.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialBoldStructure.st @@ -3,4 +3,4 @@ initialBoldStructure ^ TextStructure new: #bold - with: (self commonStyles union: {TextStructure bold}) \ No newline at end of file + from: (self commonStyles union: {TextStructure bold}) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialFootnoteStructure.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialFootnoteStructure.st index a8ee04d..ca974f5 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialFootnoteStructure.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialFootnoteStructure.st @@ -3,4 +3,4 @@ initialFootnoteStructure ^ TextStructure new: #footnote - with: (self commonStyles union: {TextStructure font: (StrikeFont createDejaVuDark: 9)}) \ No newline at end of file + from: (self commonStyles union: {TextStructure font: (StrikeFont createDejaVuDark: 9)}) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading1Structure.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading1Structure.st index c895970..197ceb7 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading1Structure.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading1Structure.st @@ -3,6 +3,6 @@ initialHeading1Structure ^ TextStructure new: #heading1 - with: (self commonStyles union: + from: (self commonStyles union: {TextStructure font: (StrikeFont createDejaVuDark: 20). TextStructure bold}) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading2Structure.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading2Structure.st index 80da390..72307e4 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading2Structure.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading2Structure.st @@ -3,6 +3,6 @@ initialHeading2Structure ^ TextStructure new: #heading2 - with: (self commonStyles union: + from: (self commonStyles union: {TextStructure font: (StrikeFont createDejaVuDark: 17). TextStructure bold}) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading3Structure.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading3Structure.st index 41c89cc..9123e1d 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading3Structure.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading3Structure.st @@ -3,6 +3,6 @@ initialHeading3Structure ^ TextStructure new: #heading3 - with: (self commonStyles union: + from: (self commonStyles union: {TextStructure font: (StrikeFont createDejaVuDark: 14). TextStructure bold}) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialItalicStructure.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialItalicStructure.st index d425107..885320c 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialItalicStructure.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialItalicStructure.st @@ -3,4 +3,4 @@ initialItalicStructure ^ TextStructure new: #italic - with: (self commonStyles union: {TextStructure italic}) \ No newline at end of file + from: (self commonStyles union: {TextStructure italic}) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialListStructure.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialListStructure.st index 9324c28..4600a5c 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialListStructure.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialListStructure.st @@ -3,4 +3,4 @@ initialListStructure ^ TextStructure new: #list - with: (self commonStyles union: {TextStructure indented}) \ No newline at end of file + from: (self commonStyles union: {TextStructure indented}) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialTextStructures.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialTextStructures.st index 5e1b3d4..ac03634 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialTextStructures.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialTextStructures.st @@ -8,4 +8,5 @@ initialTextStructures self initialHeading2Structure. self initialHeading3Structure. self initialFootnoteStructure. - self initialListStructure} asOrderedCollection \ No newline at end of file + self initialListStructure. + self initialURLStructure} asOrderedCollection \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialURLStructure.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialURLStructure.st new file mode 100644 index 0000000..99ec8ff --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialURLStructure.st @@ -0,0 +1,6 @@ +initial structures +initialURLStructure + + ^ TextStructure + new: #url + from: {TextStructure autohyperlink. TextStructure underlined. TextStructure notExtendable} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialUnderlinedStructure.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialUnderlinedStructure.st index 1490605..2244628 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialUnderlinedStructure.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialUnderlinedStructure.st @@ -3,4 +3,4 @@ initialUnderlinedStructure ^ TextStructure new: #underlined - with: (self commonStyles union: {TextStructure underlined}) \ No newline at end of file + from: (self commonStyles union: {TextStructure underlined}) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/addAttribute.from.to..st b/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/addAttribute.from.to..st index a727583..82519e5 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/addAttribute.from.to..st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/addAttribute.from.to..st @@ -1,6 +1,9 @@ text structures addAttribute: aTextAttribute from: startInteger to: stopInteger + aTextAttribute isTextStructure + ifTrue: [aTextAttribute preAdd: (self text copyFrom: startInteger to: stopInteger)]. + self text addAttribute: aTextAttribute from: startInteger to: stopInteger. self sortRunsByPriority; diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/initializeStructure..st b/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/initializeStructure..st index 7267169..12d3d9d 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/initializeStructure..st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/initializeStructure..st @@ -1,5 +1,4 @@ text structures initializeStructure: aSymbol - "self initializeStructure: aSymbol withEmphasis: self class defaultStyles" - self textStructures add: (TextStructure new: aSymbol with: self class defaultStyles) \ No newline at end of file + self textStructures add: (TextStructure new: aSymbol from: self class defaultStyles) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/initializeStructure.withEmphasis..st b/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/initializeStructure.withEmphasis..st deleted file mode 100644 index cb72eeb..0000000 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/initializeStructure.withEmphasis..st +++ /dev/null @@ -1,4 +0,0 @@ -text structures -initializeStructure: aSymbol withEmphasis: aSet - - self textStructures add: (TextStructure newWith: aSymbol withStyles: aSet) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/removeStructure..st b/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/removeStructure..st index 5beebe2..e980404 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/removeStructure..st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/removeStructure..st @@ -1,7 +1,7 @@ text structures removeStructure: aSymbol - self textStructures remove: (self symbolToStructure: aSymbol) ifAbsent: []. + self textStructures remove: (self symbolToStructure: aSymbol). self textChanged; structuresChanged \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/stylesForStructure..st b/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/stylesForStructure..st deleted file mode 100644 index dbb3698..0000000 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/stylesForStructure..st +++ /dev/null @@ -1,8 +0,0 @@ -text structures -stylesForStructure: aSymbol - - | structure | - structure := (self symbolToStructure: aSymbol). - structure ifNil: [^ Set new]. - - ^ structure styleSet \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/symbolToStructure..st b/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/symbolToStructure..st index bf2b006..c0d00c4 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/symbolToStructure..st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/symbolToStructure..st @@ -3,4 +3,4 @@ symbolToStructure: aSymbol ^ self textStructures detect: [:each | each structureIdentifier = aSymbol] - ifNone: [nil] \ No newline at end of file + ifNone: [NullTextStructure new] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/getTextStructure..st b/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/textStructureAt..st similarity index 60% rename from packages/RichTextEditing-Core.package/RichTextDocument.class/instance/getTextStructure..st rename to packages/RichTextEditing-Core.package/RichTextDocument.class/instance/textStructureAt..st index ccc3a90..bc2dbce 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/getTextStructure..st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/textStructureAt..st @@ -1,5 +1,5 @@ text structures -getTextStructure: aSymbol +textStructureAt: aSymbol ^ self textStructures detect: [:each | each structureIdentifier = aSymbol] ifNone: [^ NullTextStructure new] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/updateStyle.withEmphasis..st b/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/updateStyle.withEmphasis..st deleted file mode 100644 index 849fe70..0000000 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/updateStyle.withEmphasis..st +++ /dev/null @@ -1,5 +0,0 @@ -text structures -updateStyle: aSymbol withEmphasis: aSet - - (self symbolToStructure: aSymbol) updateStyles: aSet. - self textChanged \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextDocument.class/methodProperties.json index 98417c0..499f223 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/methodProperties.json @@ -1,51 +1,49 @@ { "class" : { - "commonStyles" : "kh 6/18/2020 21:39", + "commonStyles" : "kh 6/19/2020 17:26", "defaultStyles" : "kh 6/18/2020 22:35", "editorClass" : "ls 6/26/2019 17:33", "fromText:withStructures:" : "ls 6/26/2019 17:31", - "initialBoldStructure" : "kh 6/19/2020 00:28", - "initialFootnoteStructure" : "kh 6/19/2020 00:29", - "initialHeading1Structure" : "kh 6/19/2020 00:30", - "initialHeading2Structure" : "kh 6/19/2020 00:31", - "initialHeading3Structure" : "kh 6/19/2020 00:31", - "initialItalicStructure" : "kh 6/19/2020 00:28", - "initialListStructure" : "kh 6/19/2020 00:32", - "initialTextStructures" : "kh 6/19/2020 00:34", - "initialUnderlinedStructure" : "kh 6/18/2020 21:39" }, + "initialBoldStructure" : "kh 6/19/2020 12:24", + "initialFootnoteStructure" : "kh 6/19/2020 12:24", + "initialHeading1Structure" : "kh 6/19/2020 12:29", + "initialHeading2Structure" : "kh 6/19/2020 12:24", + "initialHeading3Structure" : "kh 6/19/2020 12:24", + "initialItalicStructure" : "kh 6/19/2020 12:24", + "initialListStructure" : "kh 6/19/2020 12:24", + "initialTextStructures" : "kh 6/19/2020 12:37", + "initialURLStructure" : "kh 6/19/2020 17:28", + "initialUnderlinedStructure" : "kh 6/19/2020 12:24" }, "instance" : { - "addAttribute:from:to:" : "AG 7/25/2019 13:08", + "addAttribute:from:to:" : "kh 6/19/2020 12:35", "charcount" : "frc 5/25/2020 16:02", "charcountExcept:" : "frc 6/13/2020 11:15", "copy:" : "MB 7/3/2019 18:58", "createNewStructure:" : "ls 7/24/2019 15:24", "emptyChars" : "frc 6/1/2020 13:43", - "getTextStructure:" : "kh 6/18/2020 21:18", "hasStructure:forText:from:to:" : "AG 7/25/2019 13:20", "initialize" : "ls 7/24/2019 15:10", - "initializeStructure:" : "kh 6/18/2020 22:37", - "initializeStructure:withEmphasis:" : "tok 6/8/2020 12:06", + "initializeStructure:" : "kh 6/19/2020 12:28", "initializeStructures" : "ls 7/24/2019 15:12", "isUnsavedDocument" : "OS 6/14/2020 18:19", "name" : "ls 6/26/2019 17:28", "name:" : "MB 7/3/2019 19:29", "openEditor" : "lh 7/24/2019 21:27", "openInEditor" : "ls 7/24/2019 20:14", - "removeStructure:" : "kh 6/18/2020 22:49", + "removeStructure:" : "kh 6/19/2020 16:33", "removeTextAttribute:from:to:" : "MB 7/24/2019 20:40", "sortRunsByPriority" : "JEH 5/20/2020 10:28", "structuresChanged" : "ls 7/24/2019 14:46", - "stylesForStructure:" : "AG 7/25/2019 13:30", - "symbolToStructure:" : "ls 7/24/2019 14:24", + "symbolToStructure:" : "kh 6/19/2020 16:36", "text" : "ls 6/26/2019 17:28", "text:" : "MB 7/3/2019 19:29", "textChanged" : "ls 7/24/2019 14:41", "textRuns" : "lh 7/24/2019 17:14", + "textStructureAt:" : "kh 6/19/2020 15:00", "textStructureSymbols" : "ls 7/24/2019 14:25", "textStructures" : "ls 6/26/2019 17:28", "textStructures:" : "MB 7/3/2019 19:29", "textStructuresDo:" : "ls 7/24/2019 21:29", "timeLastSaved" : "OS 6/14/2020 11:16", "timeLastSaved:" : "OS 6/15/2020 12:22", - "updateStyle:withEmphasis:" : "ls 6/26/2019 22:44", "wordcount" : "frc 6/1/2020 13:46" } } diff --git a/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/makeTextURLFrom..st b/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/makeTextURLFrom..st index af3d2df..f931188 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/makeTextURLFrom..st +++ b/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/makeTextURLFrom..st @@ -2,5 +2,5 @@ pasting makeTextURLFrom: aString ^ aString asText - addAttribute: (TextURL new url: aString); + addAttribute: (TextStructure hyperlink: aString); addAttribute: (TextEmphasis underlined) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/pasteURL.st b/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/pasteURL.st index cba3595..66eb13e 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/pasteURL.st +++ b/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/pasteURL.st @@ -2,5 +2,5 @@ pasting pasteURL self - replaceSelectionWith: (self makeTextURLFrom: self clipboardText asString); + replaceSelectionWith: (self makeTextURLFrom: self clipboardText); selectAt: self pointIndex \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextEditor.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextEditor.class/methodProperties.json index 9142f94..90e6f94 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditor.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/RichTextEditor.class/methodProperties.json @@ -17,10 +17,10 @@ "isStructureShortcut:" : "OS 6/12/2020 12:09", "isValidCharacter:" : "tok 6/13/2020 12:04", "keyStroke:" : "OS 6/12/2020 12:09", - "makeTextURLFrom:" : "kh 6/15/2020 10:39", + "makeTextURLFrom:" : "kh 6/19/2020 13:13", "mouseDown:" : "OS 6/1/2020 00:56", "paste" : "kh 6/15/2020 13:32", - "pasteURL" : "kh 6/15/2020 10:39", + "pasteURL" : "kh 6/19/2020 13:10", "setEmphasisHere" : "6/1/2020 14:03:21", "specialCharacters" : "tok 6/13/2020 12:14", "storeSelectionInParagraph" : "lh 7/24/2019 21:51", diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/allAttributeSymbols.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/allAttributeSymbols.st new file mode 100644 index 0000000..a8da1cb --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/allAttributeSymbols.st @@ -0,0 +1,4 @@ +text attributes +allAttributeSymbols + + ^ self class allAttributes \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/allAttributes.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/allAttributes.st deleted file mode 100644 index 4b313d4..0000000 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/allAttributes.st +++ /dev/null @@ -1,4 +0,0 @@ -text attributes -allAttributes - - ^ self class allAttributes \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setAttributeAt.put..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/attributeAt.activate..st similarity index 53% rename from packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setAttributeAt.put..st rename to packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/attributeAt.activate..st index 80a9c43..3c443a2 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setAttributeAt.put..st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/attributeAt.activate..st @@ -1,9 +1,10 @@ text attributes -setAttributeAt: anIndex put: aBoolean +attributeAt: anIndex activate: aBoolean | target targetTextStructure | target := self selectedStructure. - targetTextStructure := (TextStructure perform: (self allAttributes at: anIndex)). + targetTextStructure := (TextStructure predefinedAttributeFor: + (self attributeSymbolAt: anIndex)). aBoolean ifTrue: [ target add: targetTextStructure] ifFalse: [ target remove: targetTextStructure]. diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/attributeSymbolAt..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/attributeSymbolAt..st new file mode 100644 index 0000000..0d7634e --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/attributeSymbolAt..st @@ -0,0 +1,4 @@ +text attributes +attributeSymbolAt: anIndex + + ^ self allAttributeSymbols at: anIndex \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildStyleFieldWith..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildStyleFieldWith..st index e9f01a6..19ab84c 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildStyleFieldWith..st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildStyleFieldWith..st @@ -5,7 +5,7 @@ buildStyleFieldWith: aBuilder name: 'styleField'; model: self; frame: (0.5 @ 0 corner: 1 @ 0.45); - list: #allAttributes; - getSelectionList: #getAttributeAt:; - setSelectionList: #setAttributeAt:put:; + list: #allAttributeSymbols; + getSelectionList: #isActiveAttributeAt:; + setSelectionList: #attributeAt:activate:; yourself \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/getAttributeAt..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/getAttributeAt..st deleted file mode 100644 index 9e1cd44..0000000 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/getAttributeAt..st +++ /dev/null @@ -1,4 +0,0 @@ -text attributes -getAttributeAt: anIndex - - ^ self selectedStructure includes: (TextStructure new: (self allAttributes at: anIndex)) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/isActiveAttributeAt..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/isActiveAttributeAt..st new file mode 100644 index 0000000..2205b64 --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/isActiveAttributeAt..st @@ -0,0 +1,4 @@ +text attributes +isActiveAttributeAt: anIndex + + ^ self selectedStructure includes: (TextStructure new: (self attributeSymbolAt: anIndex)) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/removeFont.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/removeFont.st index add83bf..202c188 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/removeFont.st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/removeFont.st @@ -1,6 +1,4 @@ text font removeFont - self currentStructure remove: (TextStructure font) - - \ No newline at end of file + self currentStructure remove: (TextStructure font) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStructure.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStructure.st index f1df228..6db45c4 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStructure.st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStructure.st @@ -1,4 +1,4 @@ text attributes selectedStructure - ^ self document getTextStructure: self currentStructureSymbol \ No newline at end of file + ^ self document textStructureAt: self currentStructureSymbol \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json index bdcb596..9639303 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json @@ -6,7 +6,9 @@ "addColor:" : "kh 6/18/2020 23:15", "addFont:" : "kh 6/18/2020 23:36", "addNewStructure" : "ls 7/24/2019 17:06", - "allAttributes" : "kh 6/18/2020 22:13", + "allAttributeSymbols" : "kh 6/19/2020 16:10", + "attributeAt:activate:" : "kh 6/19/2020 16:20", + "attributeSymbolAt:" : "kh 6/19/2020 16:14", "buildAddStructureButtonWith:" : "lh 7/3/2019 17:26", "buildColorButtonWith:" : "kh 6/18/2020 23:06", "buildColorResetButtonWith:" : "lh 6/26/2019 18:40", @@ -16,7 +18,7 @@ "buildIncreasePriorityButtonWith:" : "lh 7/3/2019 17:25", "buildRemoveStructureButtonWith:" : "lh 7/3/2019 17:26", "buildStructureFieldWith:" : "kh 6/19/2020 10:47", - "buildStyleFieldWith:" : "kh 6/18/2020 22:17", + "buildStyleFieldWith:" : "kh 6/19/2020 16:12", "buildTextPreviewFieldWith:" : "lh 6/26/2019 18:41", "buildWith:" : "lh 7/3/2019 17:24", "chooseStructureToRemove" : "ls 7/24/2019 17:26", @@ -30,10 +32,10 @@ "defaultFont" : "kh 6/18/2020 23:35", "document" : "ls 7/24/2019 16:49", "document:" : "ls 7/24/2019 16:49", - "getAttributeAt:" : "kh 6/18/2020 22:12", "increasePriority" : "ls 7/24/2019 22:36", "initialize" : "kh 6/18/2020 22:04", "initializeLoremIpsum" : "lh 7/24/2019 16:16", + "isActiveAttributeAt:" : "kh 6/19/2020 16:15", "lastStructureSymbol" : "AG 7/25/2019 10:43", "lastStructureSymbol:" : "AG 7/25/2019 10:43", "loremIpsum" : "ls 6/5/2019 22:07", @@ -43,12 +45,11 @@ "openColorPicker" : "kh 6/18/2020 23:08", "openFontChooser" : "kh 6/18/2020 23:35", "removeColor" : "kh 6/18/2020 23:15", - "removeFont" : "kh 6/18/2020 23:36", + "removeFont" : "kh 6/19/2020 15:10", "removeStructure" : "kh 6/19/2020 10:47", "resetColor" : "kh 6/18/2020 23:48", "resetFont" : "kh 6/18/2020 23:49", - "selectedStructure" : "kh 6/19/2020 10:47", - "setAttributeAt:put:" : "kh 6/18/2020 22:12", + "selectedStructure" : "kh 6/19/2020 15:00", "setColor:" : "kh 6/18/2020 23:15", "setFont:" : "kh 6/18/2020 23:37", "textStructures" : "ls 7/24/2019 16:55", diff --git a/packages/RichTextEditing-Core.package/TextExtendability.class/README.md b/packages/RichTextEditing-Core.package/TextExtendability.class/README.md new file mode 100644 index 0000000..44084b4 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextExtendability.class/README.md @@ -0,0 +1 @@ +I am a TextAtribute and my sole porpose is the be extendable or not. This only makes sense when I am a Component of a TextStructure. diff --git a/packages/RichTextEditing-Core.package/TextExtendability.class/class/no.st b/packages/RichTextEditing-Core.package/TextExtendability.class/class/no.st new file mode 100644 index 0000000..f337d8a --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextExtendability.class/class/no.st @@ -0,0 +1,4 @@ +instance creation +no + + ^ self new mayBeExtended: false \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextExtendability.class/class/yes.st b/packages/RichTextEditing-Core.package/TextExtendability.class/class/yes.st new file mode 100644 index 0000000..866bf45 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextExtendability.class/class/yes.st @@ -0,0 +1,4 @@ +instance creation +yes + + ^ self new mayBeExtended: true \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextExtendability.class/instance/mayBeExtended..st b/packages/RichTextEditing-Core.package/TextExtendability.class/instance/mayBeExtended..st new file mode 100644 index 0000000..abf0d18 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextExtendability.class/instance/mayBeExtended..st @@ -0,0 +1,4 @@ +testing +mayBeExtended: aBoolean + + mayBeExtended := aBoolean \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextExtendability.class/instance/mayBeExtended.st b/packages/RichTextEditing-Core.package/TextExtendability.class/instance/mayBeExtended.st new file mode 100644 index 0000000..aaf666c --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextExtendability.class/instance/mayBeExtended.st @@ -0,0 +1,4 @@ +testing +mayBeExtended + + ^ mayBeExtended \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextExtendability.class/methodProperties.json b/packages/RichTextEditing-Core.package/TextExtendability.class/methodProperties.json new file mode 100644 index 0000000..a223b0e --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextExtendability.class/methodProperties.json @@ -0,0 +1,7 @@ +{ + "class" : { + "no" : "kh 6/19/2020 17:22", + "yes" : "kh 6/19/2020 17:21" }, + "instance" : { + "mayBeExtended" : "kh 6/19/2020 17:20", + "mayBeExtended:" : "kh 6/19/2020 17:20" } } diff --git a/packages/RichTextEditing-Core.package/ExtendableText.class/properties.json b/packages/RichTextEditing-Core.package/TextExtendability.class/properties.json similarity index 53% rename from packages/RichTextEditing-Core.package/ExtendableText.class/properties.json rename to packages/RichTextEditing-Core.package/TextExtendability.class/properties.json index dd4c4db..9f38096 100644 --- a/packages/RichTextEditing-Core.package/ExtendableText.class/properties.json +++ b/packages/RichTextEditing-Core.package/TextExtendability.class/properties.json @@ -4,15 +4,10 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "kh 6/19/2020 17:51", "instvars" : [ - "structureIdentifier", - "color", - "font", - "styleSet", - "stylesActivated", - "attributes" ], - "name" : "ExtendableText", + "mayBeExtended" ], + "name" : "TextExtendability", "pools" : [ ], "super" : "TextAttribute", diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/allAttributes.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/allAttributes.st index 15d254f..af7f4ae 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/allAttributes.st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/allAttributes.st @@ -5,5 +5,6 @@ allAttributes self italic. self underlined. self struckOut. - self extendable. - self indented} \ No newline at end of file + self indented. + self notExtendable. + self autohyperlink} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/autohyperlink.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/autohyperlink.st new file mode 100644 index 0000000..8239d58 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/autohyperlink.st @@ -0,0 +1,8 @@ +predefined +autohyperlink + + | structure | + structure:= self new: #hyperlink from: {TextURL new url: 'https://example.com'}. + structure preAddHook: [:text | + structure attributes: (TextStructure hyperlink: text asString) attributes]. + ^ structure \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/bold.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/bold.st index efa30f6..02b75d7 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/bold.st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/bold.st @@ -1,4 +1,4 @@ predefined bold - ^ self new: #bold with: {TextEmphasis bold} \ No newline at end of file + ^ self new: #bold from: {TextEmphasis bold} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/color..st b/packages/RichTextEditing-Core.package/TextStructure.class/class/color..st index 82829cd..64c20c4 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/color..st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/color..st @@ -1,4 +1,4 @@ predefined color: aColor - ^ self new: #color with: {TextColor color: aColor} \ No newline at end of file + ^ self new: #color from: {TextColor color: aColor} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/extendable.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/extendable.st deleted file mode 100644 index aebdb82..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/extendable.st +++ /dev/null @@ -1,4 +0,0 @@ -predefined -extendable - - ^ self new: #extendable with: {ExtendableText new} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/font..st b/packages/RichTextEditing-Core.package/TextStructure.class/class/font..st index 0bc5c99..9c75f6d 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/font..st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/font..st @@ -1,4 +1,4 @@ predefined font: aFont - ^ self new: #font with: {TextFontReference toFont: aFont} \ No newline at end of file + ^ self new: #font from: {TextFontReference toFont: aFont} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/hyperlink..st b/packages/RichTextEditing-Core.package/TextStructure.class/class/hyperlink..st new file mode 100644 index 0000000..ad1ed76 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/hyperlink..st @@ -0,0 +1,4 @@ +predefined +hyperlink: url + + ^ self new: #hyperlink from: {TextURL new url: url}. \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/indented..st b/packages/RichTextEditing-Core.package/TextStructure.class/class/indented..st index 1d0ab84..760dace 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/indented..st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/indented..st @@ -1,4 +1,4 @@ predefined indented: amount - ^ self new: #indented with: {TextIndent amount: amount} \ No newline at end of file + ^ self new: #indented from: {TextIndent amount: amount} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/italic.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/italic.st index 55826bc..bb3c173 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/italic.st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/italic.st @@ -1,4 +1,4 @@ predefined italic - ^ self new: #italic with: {TextEmphasis italic} \ No newline at end of file + ^ self new: #italic from: {TextEmphasis italic} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/list..st b/packages/RichTextEditing-Core.package/TextStructure.class/class/list..st index 352e497..9253c3a 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/list..st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/list..st @@ -1,4 +1,4 @@ predefined list: level - ^ self new: #list with: {TextIndent amount: level} \ No newline at end of file + ^ self new: #list from: {TextIndent amount: level} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/new.with..st b/packages/RichTextEditing-Core.package/TextStructure.class/class/new.from..st similarity index 71% rename from packages/RichTextEditing-Core.package/TextStructure.class/class/new.with..st rename to packages/RichTextEditing-Core.package/TextStructure.class/class/new.from..st index bc02383..3ba5ac5 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/new.with..st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/new.from..st @@ -1,5 +1,5 @@ instance creation -new: aSymbol with: aCollection +new: aSymbol from: aCollection | instance | instance := self new: aSymbol. diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/notExtendable.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/notExtendable.st new file mode 100644 index 0000000..88632b6 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/notExtendable.st @@ -0,0 +1,4 @@ +predefined +notExtendable + + ^ self new: #notExtendable from: {TextExtendability no} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/predefinedAttributeFor..st b/packages/RichTextEditing-Core.package/TextStructure.class/class/predefinedAttributeFor..st new file mode 100644 index 0000000..41d89ac --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/predefinedAttributeFor..st @@ -0,0 +1,6 @@ +predefined +predefinedAttributeFor: aSymbol + + ^ self allAttributes + detect: [:each |each structureIdentifier = aSymbol] + ifNone: [NullTextStructure new] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/struckOut.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/struckOut.st index 6d552a5..98e9068 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/struckOut.st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/struckOut.st @@ -1,4 +1,4 @@ predefined struckOut - ^ self new: #struckOut with: {TextEmphasis struckOut} \ No newline at end of file + ^ self new: #struckOut from: {TextEmphasis struckOut} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/underlined.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/underlined.st index 24a5444..f05895b 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/underlined.st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/underlined.st @@ -1,4 +1,4 @@ predefined underlined - ^ self new: #underlined with: {TextEmphasis underlined} \ No newline at end of file + ^ self new: #underlined from: {TextEmphasis underlined} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/add..st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/add..st index e971f73..234a3fb 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/add..st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/add..st @@ -1,4 +1,6 @@ adding add: aTextAttribute + (self attributes includes: aTextAttribute) + ifTrue: [self remove: aTextAttribute]. self attributes add: aTextAttribute \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/addAll..st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/addAll..st new file mode 100644 index 0000000..3e6df98 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/addAll..st @@ -0,0 +1,4 @@ +adding +addAll: aCollection + + aCollection do: [:each | self add: each] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/amount.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/amount.st index 29160d4..97267e2 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/amount.st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/amount.st @@ -1,5 +1,6 @@ accessing amount +"The amount of tabs for indentation. Needed for Text>>#indentationAmountAt:" ^ self flatten detect: [:each | each isTextIndent and: [each isTextStructure not]] ifFound: [:textIndent | textIndent amount] diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/attributes..st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/attributes..st index edcc7c3..cea971e 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/attributes..st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/attributes..st @@ -1,4 +1,4 @@ accessing -attributes: aCollecion +attributes: aCollection - attributes := aCollecion \ No newline at end of file + attributes := aCollection asSet \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/emphasisCode.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/emphasisCode.st index ca96d9e..1444e50 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/emphasisCode.st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/emphasisCode.st @@ -1,4 +1,4 @@ accessing emphasisCode - ^ self attributes fold: [:acc :each | acc bitOr: each emphasisCode] \ No newline at end of file + ^ self attributes inject: 0 into: [:acc :each | acc bitOr: each emphasisCode] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/initialize.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/initialize.st index 8b554c1..94e70a2 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/initialize.st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/initialize.st @@ -2,4 +2,6 @@ initialize-release initialize super initialize. - self attributes: Set new \ No newline at end of file + self + attributes: Set new; + preAddHook: [:text | ] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/mayBeExtended.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/mayBeExtended.st index 842a160..13c4bf9 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/mayBeExtended.st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/mayBeExtended.st @@ -1,4 +1,4 @@ testing mayBeExtended - ^ self attributes anySatisfy: [:each | each mayBeExtended] \ No newline at end of file + ^ self attributes allSatisfy: [:each | each mayBeExtended] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/preAdd..st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/preAdd..st new file mode 100644 index 0000000..6bac309 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/preAdd..st @@ -0,0 +1,6 @@ +hooks +preAdd: aText + + (self attributes select: [:each | each isTextStructure]) + do: [:each | each preAdd: aText]. + self preAddHook value: aText \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/preAddHook..st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/preAddHook..st new file mode 100644 index 0000000..3d1462f --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/preAddHook..st @@ -0,0 +1,4 @@ +hooks +preAddHook: aBlock + + preAddHook := aBlock \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/preAddHook.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/preAddHook.st new file mode 100644 index 0000000..98ddde1 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/preAddHook.st @@ -0,0 +1,4 @@ +hooks +preAddHook + + ^ preAddHook \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json b/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json index 0370c15..4a8865b 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json @@ -1,42 +1,49 @@ { "class" : { "allAttributeIdentifiers" : "kh 6/18/2020 20:44", - "allAttributes" : "kh 6/18/2020 22:25", - "bold" : "kh 6/18/2020 20:25", + "allAttributes" : "kh 6/19/2020 17:26", + "autohyperlink" : "kh 6/19/2020 17:12", + "bold" : "kh 6/19/2020 12:25", "color" : "kh 6/18/2020 22:52", - "color:" : "kh 6/18/2020 22:51", - "extendable" : "kh 6/18/2020 21:38", + "color:" : "kh 6/19/2020 12:25", "font" : "kh 6/18/2020 23:23", - "font:" : "kh 6/18/2020 23:30", + "font:" : "kh 6/19/2020 12:25", + "hyperlink:" : "kh 6/19/2020 17:06", "indented" : "kh 6/18/2020 22:54", - "indented:" : "kh 6/18/2020 22:53", - "italic" : "kh 6/18/2020 20:25", - "list:" : "kh 6/19/2020 10:02", + "indented:" : "kh 6/19/2020 12:25", + "italic" : "kh 6/19/2020 12:25", + "list:" : "kh 6/19/2020 12:25", "new:" : "kh 6/18/2020 22:36", - "new:with:" : "kh 6/19/2020 09:46", - "struckOut" : "kh 6/18/2020 22:23", - "underlined" : "kh 6/18/2020 20:25" }, + "new:from:" : "kh 6/19/2020 12:24", + "notExtendable" : "kh 6/19/2020 17:26", + "predefinedAttributeFor:" : "kh 6/19/2020 16:20", + "struckOut" : "kh 6/19/2020 12:25", + "underlined" : "kh 6/19/2020 12:25" }, "instance" : { "=" : "lh 7/24/2019 20:24", "actOnClickFor:" : "kh 6/18/2020 14:45", - "add:" : "kh 6/18/2020 20:16", - "amount" : "kh 6/19/2020 10:45", + "add:" : "kh 6/19/2020 12:12", + "addAll:" : "kh 6/19/2020 12:07", + "amount" : "kh 6/19/2020 15:13", "attributes" : "kh 6/18/2020 14:14", - "attributes:" : "kh 6/18/2020 14:15", + "attributes:" : "kh 6/19/2020 15:17", "couldDeriveFromPrettyPrinting" : "kh 6/19/2020 10:34", - "emphasisCode" : "kh 6/19/2020 10:28", + "emphasisCode" : "kh 6/19/2020 16:57", "emphasizeScanner:" : "kh 6/18/2020 14:31", "flatten" : "kh 6/19/2020 10:26", "hash" : "lh 7/24/2019 20:47", "includes:" : "kh 6/18/2020 20:54", - "initialize" : "kh 6/18/2020 21:00", + "initialize" : "kh 6/19/2020 12:18", "isKern" : "kh 6/19/2020 10:11", "isTextAlignment" : "kh 6/19/2020 10:11", "isTextColor" : "kh 6/19/2020 11:31", "isTextIndent" : "kh 6/19/2020 10:10", "isTextStructure" : "ls 5/29/2019 17:41", "mayActOnClick" : "kh 6/19/2020 10:10", - "mayBeExtended" : "kh 6/19/2020 00:52", + "mayBeExtended" : "kh 6/19/2020 12:54", + "preAdd:" : "kh 6/19/2020 12:20", + "preAddHook" : "kh 6/19/2020 12:38", + "preAddHook:" : "kh 6/19/2020 12:14", "printOn:" : "ls 7/3/2019 17:32", "remove:" : "kh 6/18/2020 22:38", "structureIdentifier" : "ls 5/29/2019 17:41", diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/properties.json b/packages/RichTextEditing-Core.package/TextStructure.class/properties.json index 5b441e6..8748c6a 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/properties.json +++ b/packages/RichTextEditing-Core.package/TextStructure.class/properties.json @@ -7,7 +7,8 @@ "commentStamp" : "kh 6/19/2020 00:49", "instvars" : [ "structureIdentifier", - "attributes" ], + "attributes", + "preAddHook" ], "name" : "TextStructure", "pools" : [ ], diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/boldIsListed.st b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/boldIsListed.st index 6f9325e..f9821a7 100644 --- a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/boldIsListed.st +++ b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/boldIsListed.st @@ -1,4 +1,4 @@ utilities boldIsListed - ^ self editorModel textStructureSymbols includes: self boldStructureSymbol \ No newline at end of file + ^ self editorModel textStructures includes: self boldStructure \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/boldStructure.st b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/boldStructure.st new file mode 100644 index 0000000..9ff9567 --- /dev/null +++ b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/boldStructure.st @@ -0,0 +1,5 @@ +utilities +boldStructure + + ^ TextStructure bold + \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/boldStructureSymbol.st b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/boldStructureSymbol.st index 9dbd78d..735d228 100644 --- a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/boldStructureSymbol.st +++ b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/boldStructureSymbol.st @@ -1,5 +1,5 @@ utilities boldStructureSymbol - ^ #bold + ^ TextStructure bold structureIdentifier \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/structureIsListed.st b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/structureIsListed.st new file mode 100644 index 0000000..0a8cd0c --- /dev/null +++ b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/structureIsListed.st @@ -0,0 +1,4 @@ +utilities +structureIsListed + + ^ self editorModel textStructures includes: self structure \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/methodProperties.json index 952dd4c..fa4184f 100644 --- a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/methodProperties.json +++ b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/methodProperties.json @@ -2,8 +2,9 @@ "class" : { "lastStoredRun" : "frc 6/12/2020 19:59" }, "instance" : { - "boldIsListed" : "ls 7/3/2019 21:42", - "boldStructureSymbol" : "ls 7/3/2019 21:38", + "boldIsListed" : "kh 6/19/2020 16:32", + "boldStructure" : "kh 6/19/2020 16:28", + "boldStructureSymbol" : "kh 6/19/2020 16:37", "document" : "ls 7/24/2019 17:30", "editorHasSameTargetAsCurrent:" : "ls 7/3/2019 19:05", "openEditorWithTargetDocument" : "ls 7/3/2019 18:43", @@ -11,6 +12,7 @@ "saveName" : "MB 6/12/2019 18:08", "saveTextInImageAndOpenNewEditor" : "ls 7/3/2019 21:42", "setUp" : "JEH 5/31/2020 14:55", + "structureIsListed" : "kh 6/19/2020 16:31", "structureSymbol" : "ls 7/3/2019 21:38", "structureSymbolIsListed" : "ls 7/3/2019 21:42", "targetDocument" : "ls 7/3/2019 18:43", @@ -19,7 +21,7 @@ "targetIdentity:" : "ls 7/3/2019 18:14", "targetIdentityIsPreserved" : "ls 7/3/2019 18:43", "testDocumentCanOpenEditor" : "frc 6/13/2020 11:10", - "testUS38changesToTextStructuresAreTextBound" : "ls 7/3/2019 21:41", + "testUS38changesToTextStructuresAreTextBound" : "kh 6/19/2020 16:39", "testUS38textStructuresAreLoadedInWithText" : "ls 7/3/2019 21:43", "testUS57ButtonToInspectDocumentExists" : "ls 7/3/2019 17:59", "testUS57SaveActionPreservesTargetDocumentIdentity" : "MB 7/25/2019 11:41", diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/combinedTextStructure.st b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/combinedTextStructure.st index 6c0de56..4a87f04 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/combinedTextStructure.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/combinedTextStructure.st @@ -1,7 +1,7 @@ utilities combinedTextStructure - ^ TextStructure new: #test with: + ^ TextStructure new: #test from: {TextStructure bold. TextStructure italic. TextStructure underlined. diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/listTextStructure.st b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/listTextStructure.st index 3351e87..3071570 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/listTextStructure.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/listTextStructure.st @@ -1,5 +1,5 @@ utilities listTextStructure - ^ TextStructure new: #list with: {TextStructure list: self listLevel} + ^ TextStructure new: #list from: {TextStructure list: self listLevel} \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/methodProperties.json index a1b44c8..547e258 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/methodProperties.json +++ b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/methodProperties.json @@ -4,13 +4,13 @@ "instance" : { "boldIsSelectedInList" : "MB 7/24/2019 18:54", "combinedEmphasisCode" : "MB 5/29/2019 22:04", - "combinedTextStructure" : "kh 6/19/2020 09:47", + "combinedTextStructure" : "kh 6/19/2020 12:25", "ctrlShiftButtonCode" : "tok 6/13/2020 16:24", "demoText" : "tok 6/13/2020 12:11", "emphasisCodeNoStyle" : "AG 6/5/2019 18:56", "firstStructureIsSelectedInList" : " 6/18/2020 19:16:32", "listLevel" : "kh 6/19/2020 10:04", - "listTextStructure" : "kh 6/19/2020 10:05", + "listTextStructure" : "kh 6/19/2020 12:25", "listTextStructureStyles" : "tok 6/12/2020 12:12", "menu" : "ls 6/18/2019 16:37", "selectOptionBold" : "lh 7/24/2019 21:31", diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/boldSet.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/boldSet.st deleted file mode 100644 index 45b5935..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/boldSet.st +++ /dev/null @@ -1,4 +0,0 @@ -constants -boldSet - - ^ #(#bold) asSet \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/extendableBoldSet.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/extendableBoldSet.st deleted file mode 100644 index 203eebd..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/extendableBoldSet.st +++ /dev/null @@ -1,4 +0,0 @@ -constants -extendableBoldSet - - ^ #(#extendable #bold) asSet \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/extendableBoldTextStructure.st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/extendableBoldTextStructure.st deleted file mode 100644 index 3893bed..0000000 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/extendableBoldTextStructure.st +++ /dev/null @@ -1,8 +0,0 @@ -utilities -extendableBoldTextStructure - - | extendableBoldStructure | - extendableBoldStructure := TextStructure newWith: #test withStyles: self extendableBoldSet. - extendableBoldStructure updateStyles: self extendableBoldSet. - - ^ extendableBoldStructure \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/flattenTextAttributes..st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/flattenTextAttributes..st new file mode 100644 index 0000000..c833244 --- /dev/null +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/flattenTextAttributes..st @@ -0,0 +1,8 @@ +utilities +flattenTextAttributes: aCollection + + ^ aCollection inject: OrderedCollection new into: [:acc :each | + acc union: + (each isTextStructure + ifTrue: [each flatten] + ifFalse: [each asOrderedCollection])] \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/textHasTextAttribute..st b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/textHasTextAttribute..st index d8dd260..a80c6b0 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/textHasTextAttribute..st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/instance/textHasTextAttribute..st @@ -1,7 +1,7 @@ utilities textHasTextAttribute: aTextAttributeClass - ^ (1 to: self editorText size) allSatisfy: [:index | - ((self editorText attributesAt: index) collect: [:each | - each class]) - includes: aTextAttributeClass] \ No newline at end of file + ^ ((1 to: self editorText size) allSatisfy: [:index | + ((self flattenTextAttributes: (self editorText attributesAt: index)) + collect: [:each | each class]) + includes: aTextAttributeClass]) \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/methodProperties.json index 6a3cc0d..0d5bd72 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/methodProperties.json +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTextTests.class/methodProperties.json @@ -4,7 +4,6 @@ "instance" : { "activateHeading" : "ls 6/21/2019 16:34", "addMoreText" : "lh 6/5/2019 18:17", - "boldSet" : "lh 6/5/2019 21:59", "boldTextStructure" : "kh 6/19/2020 09:56", "caretPosition" : "ls 6/21/2019 16:34", "caretPosition:" : "ls 6/21/2019 16:34", @@ -12,8 +11,7 @@ "enterCharacter:times:" : "ls 6/21/2019 17:12", "enterNothingInSaveDialog" : "ls 5/10/2019 01:37", "enterSaveNameInDialog:" : "MB 7/24/2019 23:45", - "extendableBoldSet" : "lh 6/5/2019 22:06", - "extendableBoldTextStructure" : "tok 6/8/2020 12:06", + "flattenTextAttributes:" : "kh 6/19/2020 17:03", "headingIsAddedToWrittenText" : "JEH 6/14/2020 14:00", "headingTextStructureIndex" : "ls 6/26/2019 22:25", "leftArrowKey" : "MB 6/19/2019 18:08", @@ -48,7 +46,7 @@ "testUS69LinkGetsPasted" : "kh 6/15/2020 20:13", "testUS69NormalTextDoesNotConvertToClickableLink" : "kh 6/15/2020 20:08", "testUS69PastedLinkConvertsToClickableLink" : "kh 6/15/2020 20:16", - "textHasTextAttribute:" : "kh 6/15/2020 20:10", + "textHasTextAttribute:" : "kh 6/19/2020 17:07", "textHasTextEmphasis:" : "kh 6/15/2020 20:10", "textIsBold" : "kh 6/15/2020 20:04", "textIsLink" : "kh 6/15/2020 20:10", diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/testUS32CheckAllStylesAreAvailable.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/testUS32CheckAllStylesAreAvailable.st index 46565ed..d2c9397 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/testUS32CheckAllStylesAreAvailable.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/testUS32CheckAllStylesAreAvailable.st @@ -3,7 +3,7 @@ testUS32CheckAllStylesAreAvailable | styleList essentialStyles | styleList := self structureEditorView findByClass: PluggableListMorphOfMany. - essentialStyles := {#bold . #italic . #underlined . #struckOut . #extendable} asSet. + essentialStyles := {#bold . #italic . #underlined . #struckOut . #notExtendable} asSet. self assert: (essentialStyles allSatisfy: [:each | styleList list asSet includes: each]) \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/methodProperties.json index 41feee0..37daea5 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/methodProperties.json +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/methodProperties.json @@ -13,7 +13,7 @@ "secondIndex" : "lh 7/24/2019 20:06", "setStructureAt:toColor:" : "lh 7/24/2019 19:00", "symbolAt:" : "lh 7/3/2019 22:46", - "testUS32CheckAllStylesAreAvailable" : "tok 6/1/2020 13:12", + "testUS32CheckAllStylesAreAvailable" : "kh 6/19/2020 17:31", "testUS43PreviewTextfieldExists" : "ls 6/6/2019 00:27", "testUS43PreviewTextfieldHasSelectedStructureApplied" : "kh 6/19/2020 10:46", "testUS58StructurePriorityCanBeDecreased" : "lh 7/24/2019 20:07", diff --git a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/exampleTextStructure.st b/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/exampleTextStructure.st new file mode 100644 index 0000000..12cf248 --- /dev/null +++ b/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/exampleTextStructure.st @@ -0,0 +1,4 @@ +utilities +exampleTextStructure + + ^ TextStructure new: #example \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testNullTextStructureCantAddAttributes.st b/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testNullTextStructureCantAddAttributes.st new file mode 100644 index 0000000..a50e2b2 --- /dev/null +++ b/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testNullTextStructureCantAddAttributes.st @@ -0,0 +1,8 @@ +unit-tests +testNullTextStructureCantAddAttributes + + | textStructure | + textStructure := self nullTextStructure. + textStructure add: self exampleTextStructure. + + self assert: textStructure attributes size = 0 \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testNullTextStructureCantRemoveAttributes.st b/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testNullTextStructureCantRemoveAttributes.st new file mode 100644 index 0000000..ecfa20f --- /dev/null +++ b/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testNullTextStructureCantRemoveAttributes.st @@ -0,0 +1,10 @@ +unit-tests +testNullTextStructureCantRemoveAttributes + + | textStructure | + textStructure := self nullTextStructure. + textStructure + attributes: {self exampleTextStructure}; + remove: self exampleTextStructure. + + self assert: textStructure attributes size = 1 \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testNullTextStructurestructureIdentifierCanNotBeChanged.st b/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testNullTextStructurestructureIdentifierCanNotBeChanged.st new file mode 100644 index 0000000..a45e0c1 --- /dev/null +++ b/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testNullTextStructurestructureIdentifierCanNotBeChanged.st @@ -0,0 +1,7 @@ +unit-tests +testNullTextStructurestructureIdentifierCanNotBeChanged + + | textStructure | + textStructure := self nullTextStructure structureIdentifier: #test. + + self assert: textStructure structureIdentifier equals: #null \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/methodProperties.json index 42bf9ae..a13deec 100644 --- a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/methodProperties.json +++ b/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/methodProperties.json @@ -2,7 +2,11 @@ "class" : { }, "instance" : { + "exampleTextStructure" : "kh 6/19/2020 17:41", "listTextStructure" : "tok 6/12/2020 13:13", "listTextStructureStyles" : "tok 6/12/2020 13:13", "nullTextStructure" : "tok 6/12/2020 13:12", + "testNullTextStructureCantAddAttributes" : "kh 6/19/2020 17:41", + "testNullTextStructureCantRemoveAttributes" : "kh 6/19/2020 17:42", + "testNullTextStructurestructureIdentifierCanNotBeChanged" : "kh 6/19/2020 17:43", "testNullTextStructurestructureIdentifierIsNull" : "tok 6/13/2020 11:01" } } From a7fefec98ae909c7c2b8ad2b097169affc3b4cc8 Mon Sep 17 00:00:00 2001 From: Konrad Hanff Date: Fri, 19 Jun 2020 18:12:15 +0200 Subject: [PATCH 07/12] Rename methods with formerly confusing names --- .../instance/resetColor.st | 4 ---- .../instance/resetColorOfCurrentStructure.st | 4 ++++ .../instance/resetFont.st | 4 ---- .../instance/resetFontOfCurrentStructure.st | 4 ++++ .../methodProperties.json | 4 ++-- .../instance/addColor..st | 4 ---- .../instance/addColorToCurrentStructure..st | 4 ++++ ...Font..st => addFontToCurrentStructure..st} | 2 +- .../instance/buildColorResetButtonWith..st | 2 +- .../instance/buildFontResetButtonWith..st | 2 +- .../instance/openColorPicker.st | 2 +- .../instance/openFontChooser.st | 2 +- .../instance/removeColor.st | 4 ---- .../removeColorFromCurrentStructure.st | 4 ++++ .../instance/removeFont.st | 4 ---- .../removeFontFromCurrentStructure.st | 4 ++++ .../instance/resetColor.st | 6 ----- .../instance/resetColorOfCurrentStructure.st | 6 +++++ .../instance/resetFont.st | 6 ----- .../instance/resetFontOfCurrentStructure.st | 6 +++++ .../instance/setColor..st | 7 ------ .../instance/setColorOfCurrentStructure..st | 7 ++++++ .../instance/setFont..st | 7 ------ .../instance/setFontOfCurrentStructure..st | 7 ++++++ .../methodProperties.json | 24 +++++++++---------- .../instance/setStructureAt.toColor..st | 2 +- .../methodProperties.json | 2 +- .../instance/setFont..st | 2 +- .../instance/setGreenColor.st | 2 +- .../methodProperties.json | 10 ++++---- 30 files changed, 74 insertions(+), 74 deletions(-) delete mode 100644 packages/RichTextEditing-Core.package/NullTextStructure.class/instance/resetColor.st create mode 100644 packages/RichTextEditing-Core.package/NullTextStructure.class/instance/resetColorOfCurrentStructure.st delete mode 100644 packages/RichTextEditing-Core.package/NullTextStructure.class/instance/resetFont.st create mode 100644 packages/RichTextEditing-Core.package/NullTextStructure.class/instance/resetFontOfCurrentStructure.st delete mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addColor..st create mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addColorToCurrentStructure..st rename packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/{addFont..st => addFontToCurrentStructure..st} (67%) delete mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/removeColor.st create mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/removeColorFromCurrentStructure.st delete mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/removeFont.st create mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/removeFontFromCurrentStructure.st delete mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/resetColor.st create mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/resetColorOfCurrentStructure.st delete mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/resetFont.st create mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/resetFontOfCurrentStructure.st delete mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setColor..st create mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setColorOfCurrentStructure..st delete mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setFont..st create mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setFontOfCurrentStructure..st diff --git a/packages/RichTextEditing-Core.package/NullTextStructure.class/instance/resetColor.st b/packages/RichTextEditing-Core.package/NullTextStructure.class/instance/resetColor.st deleted file mode 100644 index 8acf107..0000000 --- a/packages/RichTextEditing-Core.package/NullTextStructure.class/instance/resetColor.st +++ /dev/null @@ -1,4 +0,0 @@ -color -resetColor - - self noCurrentStructureWarning \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/NullTextStructure.class/instance/resetColorOfCurrentStructure.st b/packages/RichTextEditing-Core.package/NullTextStructure.class/instance/resetColorOfCurrentStructure.st new file mode 100644 index 0000000..5d1f15d --- /dev/null +++ b/packages/RichTextEditing-Core.package/NullTextStructure.class/instance/resetColorOfCurrentStructure.st @@ -0,0 +1,4 @@ +color +resetColorOfCurrentStructure + + self noCurrentStructureWarning \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/NullTextStructure.class/instance/resetFont.st b/packages/RichTextEditing-Core.package/NullTextStructure.class/instance/resetFont.st deleted file mode 100644 index ec99f1b..0000000 --- a/packages/RichTextEditing-Core.package/NullTextStructure.class/instance/resetFont.st +++ /dev/null @@ -1,4 +0,0 @@ -font -resetFont - - self noCurrentStructureWarning \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/NullTextStructure.class/instance/resetFontOfCurrentStructure.st b/packages/RichTextEditing-Core.package/NullTextStructure.class/instance/resetFontOfCurrentStructure.st new file mode 100644 index 0000000..f84dcac --- /dev/null +++ b/packages/RichTextEditing-Core.package/NullTextStructure.class/instance/resetFontOfCurrentStructure.st @@ -0,0 +1,4 @@ +font +resetFontOfCurrentStructure + + self noCurrentStructureWarning \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/NullTextStructure.class/methodProperties.json b/packages/RichTextEditing-Core.package/NullTextStructure.class/methodProperties.json index a1b4013..0e01bde 100644 --- a/packages/RichTextEditing-Core.package/NullTextStructure.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/NullTextStructure.class/methodProperties.json @@ -8,7 +8,7 @@ "openColorPicker" : "ls 7/24/2019 21:54", "openFontChooser" : "ls 7/24/2019 21:22", "remove:" : "kh 6/18/2020 21:24", - "resetColor" : "ls 7/24/2019 21:57", - "resetFont" : "ls 7/24/2019 21:23", + "resetColorOfCurrentStructure" : "kh 6/19/2020 18:05", + "resetFontOfCurrentStructure" : "kh 6/19/2020 18:07", "structureIdentifier" : "ls 7/24/2019 22:17", "structureIdentifier:" : "kh 6/18/2020 21:57" } } diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addColor..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addColor..st deleted file mode 100644 index 1b22585..0000000 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addColor..st +++ /dev/null @@ -1,4 +0,0 @@ -text coloring -addColor: aColor - - self currentStructure add: (TextStructure color: aColor) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addColorToCurrentStructure..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addColorToCurrentStructure..st new file mode 100644 index 0000000..6b40830 --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addColorToCurrentStructure..st @@ -0,0 +1,4 @@ +text coloring +addColorToCurrentStructure: aColor + + self currentStructure add: (TextStructure color: aColor) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addFont..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addFontToCurrentStructure..st similarity index 67% rename from packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addFont..st rename to packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addFontToCurrentStructure..st index 90384f4..f7d4611 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addFont..st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addFontToCurrentStructure..st @@ -1,5 +1,5 @@ text font -addFont: aFont +addFontToCurrentStructure: aFont self currentStructure add: (TextStructure font: aFont) diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildColorResetButtonWith..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildColorResetButtonWith..st index 2152e4c..f1687ac 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildColorResetButtonWith..st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildColorResetButtonWith..st @@ -5,5 +5,5 @@ buildColorResetButtonWith: aBuilder model: self; frame: (0.75 @ 0.55 corner: 1 @ 0.65); label: 'Reset color'; - action: #resetColor; + action: #resetColorOfCurrentStructure; yourself \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildFontResetButtonWith..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildFontResetButtonWith..st index b161078..0fc83a2 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildFontResetButtonWith..st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildFontResetButtonWith..st @@ -5,5 +5,5 @@ buildFontResetButtonWith: aBuilder model: self; frame: (0.75 @ 0.45 corner: 1 @ 0.55); label: 'Reset font'; - action: #resetFont; + action: #resetFontOfCurrentStructure; yourself \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/openColorPicker.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/openColorPicker.st index 4f8c1e3..cb21ef1 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/openColorPicker.st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/openColorPicker.st @@ -4,4 +4,4 @@ openColorPicker (NewColorPickerMorph on: self originalColor: self defaultColor - setColorSelector: #setColor:) openInWorld \ No newline at end of file + setColorSelector: #setColorOfCurrentStructure:) openInWorld \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/openFontChooser.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/openFontChooser.st index 9b29061..cb38791 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/openFontChooser.st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/openFontChooser.st @@ -4,7 +4,7 @@ openFontChooser FontChooserTool openWithWindowTitle: 'FontChooser' for: self - setSelector: #setFont: + setSelector: #setFontOfCurrentStructure: getSelector: #defaultFont \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/removeColor.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/removeColor.st deleted file mode 100644 index 8288f63..0000000 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/removeColor.st +++ /dev/null @@ -1,4 +0,0 @@ -text coloring -removeColor - - self currentStructure remove: (TextStructure color) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/removeColorFromCurrentStructure.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/removeColorFromCurrentStructure.st new file mode 100644 index 0000000..c5c4757 --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/removeColorFromCurrentStructure.st @@ -0,0 +1,4 @@ +text coloring +removeColorFromCurrentStructure + + self currentStructure remove: (TextStructure color) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/removeFont.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/removeFont.st deleted file mode 100644 index 202c188..0000000 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/removeFont.st +++ /dev/null @@ -1,4 +0,0 @@ -text font -removeFont - - self currentStructure remove: (TextStructure font) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/removeFontFromCurrentStructure.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/removeFontFromCurrentStructure.st new file mode 100644 index 0000000..8f0ede9 --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/removeFontFromCurrentStructure.st @@ -0,0 +1,4 @@ +text font +removeFontFromCurrentStructure + + self currentStructure remove: (TextStructure font) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/resetColor.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/resetColor.st deleted file mode 100644 index c8b06f0..0000000 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/resetColor.st +++ /dev/null @@ -1,6 +0,0 @@ -text coloring -resetColor - - self - removeColor; - updateLoremIpsum \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/resetColorOfCurrentStructure.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/resetColorOfCurrentStructure.st new file mode 100644 index 0000000..e6043f1 --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/resetColorOfCurrentStructure.st @@ -0,0 +1,6 @@ +text coloring +resetColorOfCurrentStructure + + self + removeColorFromCurrentStructure; + updateLoremIpsum \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/resetFont.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/resetFont.st deleted file mode 100644 index d6e5d74..0000000 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/resetFont.st +++ /dev/null @@ -1,6 +0,0 @@ -text font -resetFont - - self - removeFont; - updateLoremIpsum \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/resetFontOfCurrentStructure.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/resetFontOfCurrentStructure.st new file mode 100644 index 0000000..36dc6e4 --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/resetFontOfCurrentStructure.st @@ -0,0 +1,6 @@ +text font +resetFontOfCurrentStructure + + self + removeFontFromCurrentStructure; + updateLoremIpsum \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setColor..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setColor..st deleted file mode 100644 index 8e20927..0000000 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setColor..st +++ /dev/null @@ -1,7 +0,0 @@ -text coloring -setColor: aColor - - self - removeColor; - addColor: aColor; - updateLoremIpsum \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setColorOfCurrentStructure..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setColorOfCurrentStructure..st new file mode 100644 index 0000000..85afe51 --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setColorOfCurrentStructure..st @@ -0,0 +1,7 @@ +text coloring +setColorOfCurrentStructure: aColor + + self + removeColorFromCurrentStructure; + addColorToCurrentStructure: aColor; + updateLoremIpsum \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setFont..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setFont..st deleted file mode 100644 index 25b7eec..0000000 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setFont..st +++ /dev/null @@ -1,7 +0,0 @@ -text font -setFont: aFont - - self - removeFont; - addFont: aFont; - updateLoremIpsum \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setFontOfCurrentStructure..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setFontOfCurrentStructure..st new file mode 100644 index 0000000..828a1ce --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setFontOfCurrentStructure..st @@ -0,0 +1,7 @@ +text font +setFontOfCurrentStructure: aFont + + self + removeFontFromCurrentStructure; + addFontToCurrentStructure: aFont; + updateLoremIpsum \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json index 9639303..adeb8b9 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json @@ -3,18 +3,18 @@ "allAttributes" : "kh 6/18/2020 22:14", "openWith:" : "AG 7/25/2019 13:15" }, "instance" : { - "addColor:" : "kh 6/18/2020 23:15", - "addFont:" : "kh 6/18/2020 23:36", + "addColorToCurrentStructure:" : "kh 6/19/2020 18:04", + "addFontToCurrentStructure:" : "kh 6/19/2020 18:07", "addNewStructure" : "ls 7/24/2019 17:06", "allAttributeSymbols" : "kh 6/19/2020 16:10", "attributeAt:activate:" : "kh 6/19/2020 16:20", "attributeSymbolAt:" : "kh 6/19/2020 16:14", "buildAddStructureButtonWith:" : "lh 7/3/2019 17:26", "buildColorButtonWith:" : "kh 6/18/2020 23:06", - "buildColorResetButtonWith:" : "lh 6/26/2019 18:40", + "buildColorResetButtonWith:" : "kh 6/19/2020 18:05", "buildDecreasePriorityButtonWith:" : "lh 7/3/2019 17:26", "buildFontButtonWith:" : "kh 6/18/2020 23:38", - "buildFontResetButtonWith:" : "lh 6/26/2019 18:40", + "buildFontResetButtonWith:" : "kh 6/19/2020 18:07", "buildIncreasePriorityButtonWith:" : "lh 7/3/2019 17:25", "buildRemoveStructureButtonWith:" : "lh 7/3/2019 17:26", "buildStructureFieldWith:" : "kh 6/19/2020 10:47", @@ -42,16 +42,16 @@ "loremIpsum:" : "ls 6/5/2019 22:07", "loremIpsumDefault" : "lh 7/24/2019 16:16", "newNullTextStructure" : "kh 6/18/2020 22:07", - "openColorPicker" : "kh 6/18/2020 23:08", - "openFontChooser" : "kh 6/18/2020 23:35", - "removeColor" : "kh 6/18/2020 23:15", - "removeFont" : "kh 6/19/2020 15:10", + "openColorPicker" : "kh 6/19/2020 18:05", + "openFontChooser" : "kh 6/19/2020 18:08", + "removeColorFromCurrentStructure" : "kh 6/19/2020 18:04", + "removeFontFromCurrentStructure" : "kh 6/19/2020 18:07", "removeStructure" : "kh 6/19/2020 10:47", - "resetColor" : "kh 6/18/2020 23:48", - "resetFont" : "kh 6/18/2020 23:49", + "resetColorOfCurrentStructure" : "kh 6/19/2020 18:05", + "resetFontOfCurrentStructure" : "kh 6/19/2020 18:07", "selectedStructure" : "kh 6/19/2020 15:00", - "setColor:" : "kh 6/18/2020 23:15", - "setFont:" : "kh 6/18/2020 23:37", + "setColorOfCurrentStructure:" : "kh 6/19/2020 18:05", + "setFontOfCurrentStructure:" : "kh 6/19/2020 18:08", "textStructures" : "ls 7/24/2019 16:55", "update:" : "ls 7/24/2019 21:57", "updateLoremIpsum" : "kh 6/19/2020 10:47", diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/setStructureAt.toColor..st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/setStructureAt.toColor..st index def9c6e..50c0c4f 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/setStructureAt.toColor..st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/setStructureAt.toColor..st @@ -3,4 +3,4 @@ setStructureAt: anInteger toColor: aColor self structureEditor currentStructureSymbol: (self symbolAt: anInteger); - setColor: aColor \ No newline at end of file + setColorOfCurrentStructure: aColor \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/methodProperties.json index 37daea5..39e24f7 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/methodProperties.json +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/methodProperties.json @@ -11,7 +11,7 @@ "previewText" : "lh 7/24/2019 17:48", "removeAttributeAt:" : "lh 7/24/2019 16:19", "secondIndex" : "lh 7/24/2019 20:06", - "setStructureAt:toColor:" : "lh 7/24/2019 19:00", + "setStructureAt:toColor:" : "kh 6/19/2020 18:05", "symbolAt:" : "lh 7/3/2019 22:46", "testUS32CheckAllStylesAreAvailable" : "kh 6/19/2020 17:31", "testUS43PreviewTextfieldExists" : "ls 6/6/2019 00:27", diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/setFont..st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/setFont..st index 9c0f5f4..ebf2757 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/setFont..st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/setFont..st @@ -1,4 +1,4 @@ utilities setFont: aFont - self structureEditor setFont: aFont \ No newline at end of file + self structureEditor setFontOfCurrentStructure: aFont \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/setGreenColor.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/setGreenColor.st index d525909..7b1c910 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/setGreenColor.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/setGreenColor.st @@ -1,4 +1,4 @@ utilities setGreenColor - self structureEditor setColor: Color green \ No newline at end of file + self structureEditor setColorOfCurrentStructure: Color green \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/methodProperties.json index 3f0ec2f..09992e5 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/methodProperties.json +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/methodProperties.json @@ -19,8 +19,8 @@ "oldStructures:" : "ls 5/31/2019 15:06", "removeAllTextStructures" : "ls 7/24/2019 17:32", "restoreTextStructures" : "ls 7/24/2019 17:32", - "setFont:" : "lh 6/26/2019 21:20", - "setGreenColor" : "AG 6/21/2019 13:56", + "setFont:" : "kh 6/19/2020 18:08", + "setGreenColor" : "kh 6/19/2020 18:06", "setUp" : "ls 7/24/2019 17:32", "structureIsDisplayed:" : "ls 6/18/2019 16:27", "structureIsNotDisplayed:" : "AG 6/18/2019 16:00", @@ -31,6 +31,6 @@ "testUS29RemoveNewStructure" : "ls 6/18/2019 16:22", "testUS41ColorCanBeReset" : "kh 6/19/2020 11:24", "testUS41ColorIsAssignedToStructure" : "AG 6/21/2019 13:59", - "testUS42FontCanBeReset" : "kh 6/19/2020 11:32", - "testUS42FontIsAppliedToStructure" : "lh 6/26/2019 21:24", - "testUS42FontSizeCanBeAssigned" : "lh 6/26/2019 21:23" } } + "testUS42FontCanBeReset" : "kh 6/19/2020 18:10", + "testUS42FontIsAppliedToStructure" : "kh 6/19/2020 18:10", + "testUS42FontSizeCanBeAssigned" : "kh 6/19/2020 18:10" } } From 77695bbdd7d2ad7e8c17efe7143a7ca2c8fe7962 Mon Sep 17 00:00:00 2001 From: Konrad Hanff Date: Sun, 21 Jun 2020 15:54:33 +0200 Subject: [PATCH 08/12] Minor improvements (mainly in naming) --- .../instance/removeStructure..st | 2 +- .../instance/symbolToStructure..st | 6 ----- .../methodProperties.json | 3 +-- .../class/toggleAutocompletion.st | 4 ---- .../instance/addExtendableStructures.st | 2 +- .../instance/infoText.st | 7 ++++++ .../instance/showInfo.st | 6 +---- .../instance/symbolToStructure..st | 4 ---- .../instance/textStructureAt..st | 4 ++++ .../methodProperties.json | 8 +++---- .../class/allAttributes.st | 3 +-- .../instance/addColorToCurrentStructure..st | 4 ---- .../instance/addFontToCurrentStructure..st | 6 ----- .../instance/attributeAt.activate..st | 2 +- .../instance/colorOfCurrentStructure..st | 6 +++++ .../instance/currentStructure.st | 4 +--- .../instance/fontOfCurrentStructure..st | 6 +++++ .../instance/isActiveAttributeAt..st | 2 +- .../instance/openColorPicker.st | 2 +- .../instance/openFontChooser.st | 6 ++--- .../replaceColorOfCurrentStructure..st | 4 ++++ .../replaceFontOfCurrentStructure..st | 4 ++++ .../instance/selectedStructure.st | 4 ---- .../instance/setColorOfCurrentStructure..st | 7 ------ .../instance/setFontOfCurrentStructure..st | 7 ------ .../instance/updateLoremIpsum.st | 2 +- .../methodProperties.json | 23 +++++++++---------- .../TextStructure.class/README.md | 2 +- .../TextStructure.class/class/new..st | 5 +--- .../TextStructure.class/class/new.from..st | 6 +---- .../class/predefinedAttributeFor..st | 2 +- .../instance/preAddHook..st | 2 +- .../instance/preAddHook.st | 2 +- .../TextStructure.class/methodProperties.json | 10 ++++---- .../TextStructure.class/properties.json | 2 +- .../instance/boldStructure.st | 3 +-- .../methodProperties.json | 2 +- .../instance/addAttributeAt..st | 2 +- .../instance/removeAttributeAt..st | 2 +- .../instance/setStructureAt.toColor..st | 2 +- .../methodProperties.json | 6 ++--- .../instance/addColoredStructureToText.st | 2 +- .../instance/addFontStructureToText.st | 2 +- .../instance/setFont..st | 2 +- .../instance/setGreenColor.st | 2 +- .../methodProperties.json | 8 +++---- .../testNullTextStructureCantAddAttributes.st | 3 +-- ...stNullTextStructureCantRemoveAttributes.st | 6 ++--- .../methodProperties.json | 4 ++-- 49 files changed, 92 insertions(+), 123 deletions(-) delete mode 100644 packages/RichTextEditing-Core.package/RichTextDocument.class/instance/symbolToStructure..st delete mode 100644 packages/RichTextEditing-Core.package/RichTextEditorModel.class/class/toggleAutocompletion.st create mode 100644 packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/infoText.st delete mode 100644 packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/symbolToStructure..st create mode 100644 packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/textStructureAt..st delete mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addColorToCurrentStructure..st delete mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addFontToCurrentStructure..st create mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/colorOfCurrentStructure..st create mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/fontOfCurrentStructure..st create mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/replaceColorOfCurrentStructure..st create mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/replaceFontOfCurrentStructure..st delete mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStructure.st delete mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setColorOfCurrentStructure..st delete mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setFontOfCurrentStructure..st diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/removeStructure..st b/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/removeStructure..st index e980404..c8c61b9 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/removeStructure..st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/removeStructure..st @@ -1,7 +1,7 @@ text structures removeStructure: aSymbol - self textStructures remove: (self symbolToStructure: aSymbol). + self textStructures remove: (self textStructureAt: aSymbol). self textChanged; structuresChanged \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/symbolToStructure..st b/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/symbolToStructure..st deleted file mode 100644 index c0d00c4..0000000 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/symbolToStructure..st +++ /dev/null @@ -1,6 +0,0 @@ -text structures -symbolToStructure: aSymbol - - ^ self textStructures detect: [:each | - each structureIdentifier = aSymbol] - ifNone: [NullTextStructure new] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextDocument.class/methodProperties.json index 499f223..da2354f 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/methodProperties.json @@ -30,11 +30,10 @@ "name:" : "MB 7/3/2019 19:29", "openEditor" : "lh 7/24/2019 21:27", "openInEditor" : "ls 7/24/2019 20:14", - "removeStructure:" : "kh 6/19/2020 16:33", + "removeStructure:" : "kh 6/21/2020 10:03", "removeTextAttribute:from:to:" : "MB 7/24/2019 20:40", "sortRunsByPriority" : "JEH 5/20/2020 10:28", "structuresChanged" : "ls 7/24/2019 14:46", - "symbolToStructure:" : "kh 6/19/2020 16:36", "text" : "ls 6/26/2019 17:28", "text:" : "MB 7/3/2019 19:29", "textChanged" : "ls 7/24/2019 14:41", diff --git a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/class/toggleAutocompletion.st b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/class/toggleAutocompletion.st deleted file mode 100644 index e0aa66b..0000000 --- a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/class/toggleAutocompletion.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -toggleAutocompletion - - self autocompletion: self autocompletion not \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/addExtendableStructures.st b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/addExtendableStructures.st index 7a6a60a..daa83f6 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/addExtendableStructures.st +++ b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/addExtendableStructures.st @@ -2,5 +2,5 @@ text structure addExtendableStructures (self currentStructures - collect: [:each | self symbolToStructure: each] + collect: [:each | self textStructureAt: each] thenSelect: [:each | each mayBeExtended]) do: [:each | self addAttribute: each] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/infoText.st b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/infoText.st new file mode 100644 index 0000000..65da146 --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/infoText.st @@ -0,0 +1,7 @@ +document information +infoText + + ^ 'Word count: ', self bufferDocument wordcount, + String crlf, 'Total characters: ', (self bufferDocument charcountExcept: #()), + String crlf, 'Non-blank characters: ', self bufferDocument charcount + \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/showInfo.st b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/showInfo.st index f7ce9b1..bb596af 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/showInfo.st +++ b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/showInfo.st @@ -1,8 +1,4 @@ document information showInfo - | window infoText| - infoText := 'Word count: ', self bufferDocument wordcount. - infoText := infoText , String crlf, 'Total characters: ', (self bufferDocument charcountExcept: #()). - infoText := infoText, String crlf, 'Non-blank characters: ', self bufferDocument charcount. - window := UserDialogBoxMorph inform: infoText title: self label \ No newline at end of file + UserDialogBoxMorph inform: (self infoText) title: self label \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/symbolToStructure..st b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/symbolToStructure..st deleted file mode 100644 index b10ede6..0000000 --- a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/symbolToStructure..st +++ /dev/null @@ -1,4 +0,0 @@ -text structure -symbolToStructure: aSymbol - - ^ self bufferDocument symbolToStructure: aSymbol \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/textStructureAt..st b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/textStructureAt..st new file mode 100644 index 0000000..76f4b69 --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/instance/textStructureAt..st @@ -0,0 +1,4 @@ +text structure +textStructureAt: aSymbol + + ^ self bufferDocument textStructureAt: aSymbol \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/methodProperties.json index 12cdbbc..ca0041d 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditorModel.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/RichTextEditorModel.class/methodProperties.json @@ -7,11 +7,10 @@ "open" : "ls 7/24/2019 20:00", "openWith:" : "AG 7/25/2019 13:12", "saverClass" : "ls 5/8/2019 20:28", - "toggleAutocompletion" : "kh 5/18/2020 13:54", "yellowButtonMenuItems" : "tok 5/31/2020 20:54" }, "instance" : { "addAttribute:" : "ls 7/24/2019 20:26", - "addExtendableStructures" : "kh 6/19/2020 00:51", + "addExtendableStructures" : "kh 6/21/2020 10:03", "applyCurrentStructures" : "OS 6/3/2020 22:35", "bufferDocument" : "ls 6/26/2019 17:45", "bufferDocument:" : "ls 7/24/2019 20:57", @@ -53,6 +52,7 @@ "hasStructure:between:to:" : "6/1/2020 14:03:21", "hasUnacceptedEdits" : "ls 5/9/2019 10:34", "help" : "kh 5/25/2020 16:35", + "infoText" : "kh 6/20/2020 21:11", "initialize" : "ls 7/24/2019 15:10", "initializeDocuments" : "lh 7/24/2019 22:37", "inspectDocument" : "ls 6/26/2019 18:57", @@ -95,10 +95,9 @@ "setLabel:" : "lh 7/24/2019 17:21", "setText:" : "AG 5/29/2019 18:35", "setTextFromView" : "ls 7/24/2019 20:27", - "showInfo" : "frc 5/19/2020 22:52", + "showInfo" : "kh 6/20/2020 21:10", "structureSelectionAt:put:" : "OS 6/4/2020 00:04", "structuresChanged" : "ls 6/26/2019 23:03", - "symbolToStructure:" : "ls 7/24/2019 14:24", "targetDocument" : "ls 6/26/2019 18:10", "targetDocument:" : "lh 7/24/2019 20:23", "text" : "ls 6/26/2019 17:59", @@ -106,6 +105,7 @@ "textChanged" : "frc 5/25/2020 15:22", "textEditorClass" : "lh 7/24/2019 15:09", "textMorph" : "ls 7/24/2019 21:06", + "textStructureAt:" : "kh 6/21/2020 15:39", "textStructureSymbols" : "ls 7/24/2019 14:25", "textStructures" : "ls 6/26/2019 22:09", "textStructures:" : "ls 6/26/2019 22:09", diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/class/allAttributes.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/class/allAttributes.st index ce07ee2..ade0c35 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/class/allAttributes.st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/class/allAttributes.st @@ -1,5 +1,4 @@ constants allAttributes - ^ TextStructure allAttributeIdentifiers - \ No newline at end of file + ^ TextStructure allAttributeIdentifiers \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addColorToCurrentStructure..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addColorToCurrentStructure..st deleted file mode 100644 index 6b40830..0000000 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addColorToCurrentStructure..st +++ /dev/null @@ -1,4 +0,0 @@ -text coloring -addColorToCurrentStructure: aColor - - self currentStructure add: (TextStructure color: aColor) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addFontToCurrentStructure..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addFontToCurrentStructure..st deleted file mode 100644 index f7d4611..0000000 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addFontToCurrentStructure..st +++ /dev/null @@ -1,6 +0,0 @@ -text font -addFontToCurrentStructure: aFont - - self currentStructure add: (TextStructure font: aFont) - - \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/attributeAt.activate..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/attributeAt.activate..st index 3c443a2..8086816 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/attributeAt.activate..st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/attributeAt.activate..st @@ -2,7 +2,7 @@ text attributes attributeAt: anIndex activate: aBoolean | target targetTextStructure | - target := self selectedStructure. + target := self currentStructure. targetTextStructure := (TextStructure predefinedAttributeFor: (self attributeSymbolAt: anIndex)). aBoolean diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/colorOfCurrentStructure..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/colorOfCurrentStructure..st new file mode 100644 index 0000000..4103f9a --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/colorOfCurrentStructure..st @@ -0,0 +1,6 @@ +text coloring +colorOfCurrentStructure: aColor + + self + replaceColorOfCurrentStructure: aColor; + updateLoremIpsum \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentStructure.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentStructure.st index 664a0cd..11a7d50 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentStructure.st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/currentStructure.st @@ -1,6 +1,4 @@ text structures currentStructure - self currentStructureSymbol ifNil: [^ self newNullTextStructure]. - - ^ self document symbolToStructure: self currentStructureSymbol \ No newline at end of file + ^ self document textStructureAt: self currentStructureSymbol \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/fontOfCurrentStructure..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/fontOfCurrentStructure..st new file mode 100644 index 0000000..9ce288b --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/fontOfCurrentStructure..st @@ -0,0 +1,6 @@ +text font +fontOfCurrentStructure: aFont + + self + replaceFontOfCurrentStructure: aFont; + updateLoremIpsum \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/isActiveAttributeAt..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/isActiveAttributeAt..st index 2205b64..5f2c5dc 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/isActiveAttributeAt..st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/isActiveAttributeAt..st @@ -1,4 +1,4 @@ text attributes isActiveAttributeAt: anIndex - ^ self selectedStructure includes: (TextStructure new: (self attributeSymbolAt: anIndex)) \ No newline at end of file + ^ self currentStructure includes: (TextStructure new: (self attributeSymbolAt: anIndex)) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/openColorPicker.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/openColorPicker.st index cb21ef1..b8a6fd8 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/openColorPicker.st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/openColorPicker.st @@ -4,4 +4,4 @@ openColorPicker (NewColorPickerMorph on: self originalColor: self defaultColor - setColorSelector: #setColorOfCurrentStructure:) openInWorld \ No newline at end of file + setColorSelector: #colorOfCurrentStructure:) openInWorld \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/openFontChooser.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/openFontChooser.st index cb38791..e99a470 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/openFontChooser.st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/openFontChooser.st @@ -4,7 +4,5 @@ openFontChooser FontChooserTool openWithWindowTitle: 'FontChooser' for: self - setSelector: #setFontOfCurrentStructure: - getSelector: #defaultFont - - \ No newline at end of file + setSelector: #fontOfCurrentStructure: + getSelector: #defaultFont \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/replaceColorOfCurrentStructure..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/replaceColorOfCurrentStructure..st new file mode 100644 index 0000000..283c316 --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/replaceColorOfCurrentStructure..st @@ -0,0 +1,4 @@ +text coloring +replaceColorOfCurrentStructure: aColor + + self currentStructure add: (TextStructure color: aColor) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/replaceFontOfCurrentStructure..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/replaceFontOfCurrentStructure..st new file mode 100644 index 0000000..109112a --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/replaceFontOfCurrentStructure..st @@ -0,0 +1,4 @@ +text font +replaceFontOfCurrentStructure: aFont + + self currentStructure add: (TextStructure font: aFont) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStructure.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStructure.st deleted file mode 100644 index 6db45c4..0000000 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/selectedStructure.st +++ /dev/null @@ -1,4 +0,0 @@ -text attributes -selectedStructure - - ^ self document textStructureAt: self currentStructureSymbol \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setColorOfCurrentStructure..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setColorOfCurrentStructure..st deleted file mode 100644 index 85afe51..0000000 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setColorOfCurrentStructure..st +++ /dev/null @@ -1,7 +0,0 @@ -text coloring -setColorOfCurrentStructure: aColor - - self - removeColorFromCurrentStructure; - addColorToCurrentStructure: aColor; - updateLoremIpsum \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setFontOfCurrentStructure..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setFontOfCurrentStructure..st deleted file mode 100644 index 828a1ce..0000000 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/setFontOfCurrentStructure..st +++ /dev/null @@ -1,7 +0,0 @@ -text font -setFontOfCurrentStructure: aFont - - self - removeFontFromCurrentStructure; - addFontToCurrentStructure: aFont; - updateLoremIpsum \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/updateLoremIpsum.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/updateLoremIpsum.st index 2e05246..f9ac698 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/updateLoremIpsum.st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/updateLoremIpsum.st @@ -3,7 +3,7 @@ updateLoremIpsum self lastStructureSymbol ifNotNil: [ self loremIpsum removeAttribute: - (self document symbolToStructure: self lastStructureSymbol) from: 1 to: self loremIpsum size]. + (self document textStructureAt: self lastStructureSymbol) from: 1 to: self loremIpsum size]. self currentStructureSymbol ifNotNil: [ self loremIpsum addAttribute: self currentStructure from: 1 to: self loremIpsum size]. diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json index adeb8b9..75296a0 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json @@ -1,13 +1,11 @@ { "class" : { - "allAttributes" : "kh 6/18/2020 22:14", + "allAttributes" : "kh 6/21/2020 10:06", "openWith:" : "AG 7/25/2019 13:15" }, "instance" : { - "addColorToCurrentStructure:" : "kh 6/19/2020 18:04", - "addFontToCurrentStructure:" : "kh 6/19/2020 18:07", "addNewStructure" : "ls 7/24/2019 17:06", "allAttributeSymbols" : "kh 6/19/2020 16:10", - "attributeAt:activate:" : "kh 6/19/2020 16:20", + "attributeAt:activate:" : "kh 6/21/2020 11:22", "attributeSymbolAt:" : "kh 6/19/2020 16:14", "buildAddStructureButtonWith:" : "lh 7/3/2019 17:26", "buildColorButtonWith:" : "kh 6/18/2020 23:06", @@ -22,9 +20,10 @@ "buildTextPreviewFieldWith:" : "lh 6/26/2019 18:41", "buildWith:" : "lh 7/3/2019 17:24", "chooseStructureToRemove" : "ls 7/24/2019 17:26", + "colorOfCurrentStructure:" : "kh 6/21/2020 15:46", "copyTextStructures" : "lh 7/24/2019 18:33", "currentPriority" : "kh 6/19/2020 10:46", - "currentStructure" : "kh 6/19/2020 10:47", + "currentStructure" : "kh 6/21/2020 11:22", "currentStructureSymbol" : "kh 6/19/2020 10:48", "currentStructureSymbol:" : "kh 6/19/2020 10:48", "decreasePriority" : "ls 7/24/2019 22:36", @@ -32,27 +31,27 @@ "defaultFont" : "kh 6/18/2020 23:35", "document" : "ls 7/24/2019 16:49", "document:" : "ls 7/24/2019 16:49", + "fontOfCurrentStructure:" : "kh 6/21/2020 15:45", "increasePriority" : "ls 7/24/2019 22:36", "initialize" : "kh 6/18/2020 22:04", "initializeLoremIpsum" : "lh 7/24/2019 16:16", - "isActiveAttributeAt:" : "kh 6/19/2020 16:15", + "isActiveAttributeAt:" : "kh 6/21/2020 11:22", "lastStructureSymbol" : "AG 7/25/2019 10:43", "lastStructureSymbol:" : "AG 7/25/2019 10:43", "loremIpsum" : "ls 6/5/2019 22:07", "loremIpsum:" : "ls 6/5/2019 22:07", "loremIpsumDefault" : "lh 7/24/2019 16:16", "newNullTextStructure" : "kh 6/18/2020 22:07", - "openColorPicker" : "kh 6/19/2020 18:05", - "openFontChooser" : "kh 6/19/2020 18:08", + "openColorPicker" : "kh 6/21/2020 15:41", + "openFontChooser" : "kh 6/21/2020 15:45", "removeColorFromCurrentStructure" : "kh 6/19/2020 18:04", "removeFontFromCurrentStructure" : "kh 6/19/2020 18:07", "removeStructure" : "kh 6/19/2020 10:47", + "replaceColorOfCurrentStructure:" : "kh 6/21/2020 15:43", + "replaceFontOfCurrentStructure:" : "kh 6/21/2020 15:45", "resetColorOfCurrentStructure" : "kh 6/19/2020 18:05", "resetFontOfCurrentStructure" : "kh 6/19/2020 18:07", - "selectedStructure" : "kh 6/19/2020 15:00", - "setColorOfCurrentStructure:" : "kh 6/19/2020 18:05", - "setFontOfCurrentStructure:" : "kh 6/19/2020 18:08", "textStructures" : "ls 7/24/2019 16:55", "update:" : "ls 7/24/2019 21:57", - "updateLoremIpsum" : "kh 6/19/2020 10:47", + "updateLoremIpsum" : "kh 6/21/2020 10:04", "updateStructures:" : "lh 7/25/2019 11:05" } } diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/README.md b/packages/RichTextEditing-Core.package/TextStructure.class/README.md index dcc26c5..191786f 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/README.md +++ b/packages/RichTextEditing-Core.package/TextStructure.class/README.md @@ -1,6 +1,6 @@ I am a TextStructure. You can add me to a text just like every other TextAttribute (e.g. Text>>addAttribute:). -I am a Composite, you can #add: an instance of me to another instance and the first one will have the attributes from all its children. The Leafs of this Tree should be TextAttributes that actually do something (e.g. TextEmphasis, TextColor, TextIndent, ...). Predefined Leafs are available on class side. They are wrapped in a TextStructure to be able to identify them by name (structureIdentifier). +I am a Composite, you can #add: an instance of me to another instance and the first one will have the attributes from all its children. The leafs of this tree should be TextAttributes that actually do something (e.g. TextEmphasis, TextColor, TextIndent, ...). Predefined Leafs are available on class side. They are wrapped in a TextStructure to be able to identify them by name (structureIdentifier). TextStructures in the class method #allAttributes are automatically displayed by the RichTextStructureEditor. If you set extendable to true and continue writing, the text will keep the current structure. diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/new..st b/packages/RichTextEditing-Core.package/TextStructure.class/class/new..st index bf6d262..f26f613 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/new..st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/new..st @@ -1,7 +1,4 @@ instance creation new: aSymbol - | instance | - instance := self new structureIdentifier: aSymbol. - - ^ instance \ No newline at end of file + ^ self new structureIdentifier: aSymbol \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/new.from..st b/packages/RichTextEditing-Core.package/TextStructure.class/class/new.from..st index 3ba5ac5..31da5b0 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/new.from..st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/new.from..st @@ -1,8 +1,4 @@ instance creation new: aSymbol from: aCollection - | instance | - instance := self new: aSymbol. - instance attributes: aCollection asSet. - - ^ instance \ No newline at end of file + ^ (self new: aSymbol) attributes: aCollection asSet. \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/predefinedAttributeFor..st b/packages/RichTextEditing-Core.package/TextStructure.class/class/predefinedAttributeFor..st index 41d89ac..df014bf 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/predefinedAttributeFor..st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/predefinedAttributeFor..st @@ -2,5 +2,5 @@ predefined predefinedAttributeFor: aSymbol ^ self allAttributes - detect: [:each |each structureIdentifier = aSymbol] + detect: [:each | each structureIdentifier = aSymbol] ifNone: [NullTextStructure new] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/preAddHook..st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/preAddHook..st index 3d1462f..023f0d2 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/preAddHook..st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/preAddHook..st @@ -1,4 +1,4 @@ -hooks +accessing preAddHook: aBlock preAddHook := aBlock \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/preAddHook.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/preAddHook.st index 98ddde1..2d13779 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/instance/preAddHook.st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/instance/preAddHook.st @@ -1,4 +1,4 @@ -hooks +accessing preAddHook ^ preAddHook \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json b/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json index 4a8865b..716a5a8 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json @@ -13,15 +13,15 @@ "indented:" : "kh 6/19/2020 12:25", "italic" : "kh 6/19/2020 12:25", "list:" : "kh 6/19/2020 12:25", - "new:" : "kh 6/18/2020 22:36", - "new:from:" : "kh 6/19/2020 12:24", + "new:" : "kh 6/21/2020 15:51", + "new:from:" : "kh 6/21/2020 15:51", "notExtendable" : "kh 6/19/2020 17:26", - "predefinedAttributeFor:" : "kh 6/19/2020 16:20", + "predefinedAttributeFor:" : "kh 6/21/2020 10:37", "struckOut" : "kh 6/19/2020 12:25", "underlined" : "kh 6/19/2020 12:25" }, "instance" : { "=" : "lh 7/24/2019 20:24", - "actOnClickFor:" : "kh 6/18/2020 14:45", + "actOnClickFor:" : "kh 6/21/2020 15:50", "add:" : "kh 6/19/2020 12:12", "addAll:" : "kh 6/19/2020 12:07", "amount" : "kh 6/19/2020 15:13", @@ -42,7 +42,7 @@ "mayActOnClick" : "kh 6/19/2020 10:10", "mayBeExtended" : "kh 6/19/2020 12:54", "preAdd:" : "kh 6/19/2020 12:20", - "preAddHook" : "kh 6/19/2020 12:38", + "preAddHook" : "kh 6/21/2020 15:49", "preAddHook:" : "kh 6/19/2020 12:14", "printOn:" : "ls 7/3/2019 17:32", "remove:" : "kh 6/18/2020 22:38", diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/properties.json b/packages/RichTextEditing-Core.package/TextStructure.class/properties.json index 8748c6a..30466ea 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/properties.json +++ b/packages/RichTextEditing-Core.package/TextStructure.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "kh 6/19/2020 00:49", + "commentStamp" : "kh 6/21/2020 10:08", "instvars" : [ "structureIdentifier", "attributes", diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/boldStructure.st b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/boldStructure.st index 9ff9567..87dcdb1 100644 --- a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/boldStructure.st +++ b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/instance/boldStructure.st @@ -1,5 +1,4 @@ utilities boldStructure - ^ TextStructure bold - \ No newline at end of file + ^ TextStructure bold \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/methodProperties.json index fa4184f..112d853 100644 --- a/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/methodProperties.json +++ b/packages/RichTextEditing-Tests.package/RichTextDocumentTests.class/methodProperties.json @@ -3,7 +3,7 @@ "lastStoredRun" : "frc 6/12/2020 19:59" }, "instance" : { "boldIsListed" : "kh 6/19/2020 16:32", - "boldStructure" : "kh 6/19/2020 16:28", + "boldStructure" : "kh 6/21/2020 11:10", "boldStructureSymbol" : "kh 6/19/2020 16:37", "document" : "ls 7/24/2019 17:30", "editorHasSameTargetAsCurrent:" : "ls 7/3/2019 19:05", diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/addAttributeAt..st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/addAttributeAt..st index 855b6b0..dccc611 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/addAttributeAt..st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/addAttributeAt..st @@ -1,4 +1,4 @@ utilities addAttributeAt: anInteger - ^ self editorText addAttribute: (self editorModel symbolToStructure: (self symbolAt: anInteger)) \ No newline at end of file + ^ self editorText addAttribute: (self editorModel textStructureAt: (self symbolAt: anInteger)) \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/removeAttributeAt..st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/removeAttributeAt..st index f737ece..8da2859 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/removeAttributeAt..st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/removeAttributeAt..st @@ -2,6 +2,6 @@ utilities removeAttributeAt: anInteger ^ self editorText - removeAttribute: (self editorModel symbolToStructure: (self symbolAt: anInteger)) + removeAttribute: (self editorModel textStructureAt: (self symbolAt: anInteger)) from: 1 to: self editorText size \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/setStructureAt.toColor..st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/setStructureAt.toColor..st index 50c0c4f..990f967 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/setStructureAt.toColor..st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/instance/setStructureAt.toColor..st @@ -3,4 +3,4 @@ setStructureAt: anInteger toColor: aColor self structureEditor currentStructureSymbol: (self symbolAt: anInteger); - setColorOfCurrentStructure: aColor \ No newline at end of file + colorOfCurrentStructure: aColor \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/methodProperties.json index 39e24f7..7f12027 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/methodProperties.json +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorStructureTests.class/methodProperties.json @@ -2,16 +2,16 @@ "class" : { "lastStoredRun" : "frc 6/12/2020 19:59" }, "instance" : { - "addAttributeAt:" : "lh 7/3/2019 22:49", + "addAttributeAt:" : "kh 6/21/2020 10:04", "bufferDocument" : "lh 7/3/2019 22:16", "firstIndex" : "lh 7/24/2019 20:06", "hasNoStructureForText:" : "lh 7/24/2019 17:46", "hasStructure:forText:" : "lh 7/24/2019 17:41", "initialTextStructures" : "lh 7/3/2019 22:25", "previewText" : "lh 7/24/2019 17:48", - "removeAttributeAt:" : "lh 7/24/2019 16:19", + "removeAttributeAt:" : "kh 6/21/2020 10:04", "secondIndex" : "lh 7/24/2019 20:06", - "setStructureAt:toColor:" : "kh 6/19/2020 18:05", + "setStructureAt:toColor:" : "kh 6/21/2020 15:41", "symbolAt:" : "lh 7/3/2019 22:46", "testUS32CheckAllStylesAreAvailable" : "kh 6/19/2020 17:31", "testUS43PreviewTextfieldExists" : "ls 6/6/2019 00:27", diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/addColoredStructureToText.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/addColoredStructureToText.st index b62a04c..ecaa98c 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/addColoredStructureToText.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/addColoredStructureToText.st @@ -3,4 +3,4 @@ addColoredStructureToText self editorModel createNewStructure: self coloredStructureSymbol. self structureEditor currentStructureSymbol: self coloredStructureSymbol. - self editorText addAttribute: (self editorModel symbolToStructure: self coloredStructureSymbol) \ No newline at end of file + self editorText addAttribute: (self editorModel textStructureAt: self coloredStructureSymbol) \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/addFontStructureToText.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/addFontStructureToText.st index 1469d93..2f81ce7 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/addFontStructureToText.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/addFontStructureToText.st @@ -3,4 +3,4 @@ addFontStructureToText self editorModel createNewStructure: self fontStructureSymbol. self structureEditor currentStructureSymbol: self fontStructureSymbol. - self editorText addAttribute: (self editorModel symbolToStructure: self fontStructureSymbol) \ No newline at end of file + self editorText addAttribute: (self editorModel textStructureAt: self fontStructureSymbol) \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/setFont..st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/setFont..st index ebf2757..d457aec 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/setFont..st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/setFont..st @@ -1,4 +1,4 @@ utilities setFont: aFont - self structureEditor setFontOfCurrentStructure: aFont \ No newline at end of file + self structureEditor fontOfCurrentStructure: aFont \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/setGreenColor.st b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/setGreenColor.st index 7b1c910..efe7ae8 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/setGreenColor.st +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/instance/setGreenColor.st @@ -1,4 +1,4 @@ utilities setGreenColor - self structureEditor setColorOfCurrentStructure: Color green \ No newline at end of file + self structureEditor colorOfCurrentStructure: Color green \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/methodProperties.json index 09992e5..7f1b6d2 100644 --- a/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/methodProperties.json +++ b/packages/RichTextEditing-Tests.package/RichTextStructureEditorTests.class/methodProperties.json @@ -2,8 +2,8 @@ "class" : { "lastStoredRun" : "frc 6/12/2020 19:59" }, "instance" : { - "addColoredStructureToText" : "AG 7/5/2019 22:03", - "addFontStructureToText" : "AG 7/5/2019 22:03", + "addColoredStructureToText" : "kh 6/21/2020 10:04", + "addFontStructureToText" : "kh 6/21/2020 10:04", "allStructuresAreDisplayed" : "AG 7/25/2019 13:24", "coloredStructureName" : "AG 6/21/2019 14:02", "coloredStructureSymbol" : "lh 6/26/2019 19:08", @@ -19,8 +19,8 @@ "oldStructures:" : "ls 5/31/2019 15:06", "removeAllTextStructures" : "ls 7/24/2019 17:32", "restoreTextStructures" : "ls 7/24/2019 17:32", - "setFont:" : "kh 6/19/2020 18:08", - "setGreenColor" : "kh 6/19/2020 18:06", + "setFont:" : "kh 6/21/2020 15:45", + "setGreenColor" : "kh 6/21/2020 15:41", "setUp" : "ls 7/24/2019 17:32", "structureIsDisplayed:" : "ls 6/18/2019 16:27", "structureIsNotDisplayed:" : "AG 6/18/2019 16:00", diff --git a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testNullTextStructureCantAddAttributes.st b/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testNullTextStructureCantAddAttributes.st index a50e2b2..98a3829 100644 --- a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testNullTextStructureCantAddAttributes.st +++ b/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testNullTextStructureCantAddAttributes.st @@ -2,7 +2,6 @@ unit-tests testNullTextStructureCantAddAttributes | textStructure | - textStructure := self nullTextStructure. - textStructure add: self exampleTextStructure. + textStructure := self nullTextStructure add: self exampleTextStructure. self assert: textStructure attributes size = 0 \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testNullTextStructureCantRemoveAttributes.st b/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testNullTextStructureCantRemoveAttributes.st index ecfa20f..badc436 100644 --- a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testNullTextStructureCantRemoveAttributes.st +++ b/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/instance/testNullTextStructureCantRemoveAttributes.st @@ -2,9 +2,9 @@ unit-tests testNullTextStructureCantRemoveAttributes | textStructure | - textStructure := self nullTextStructure. - textStructure + textStructure := self nullTextStructure attributes: {self exampleTextStructure}; - remove: self exampleTextStructure. + remove: self exampleTextStructure; + yourself. self assert: textStructure attributes size = 1 \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/methodProperties.json index a13deec..bd64aa8 100644 --- a/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/methodProperties.json +++ b/packages/RichTextEditing-Tests.package/RichTextTextStructureTests.class/methodProperties.json @@ -6,7 +6,7 @@ "listTextStructure" : "tok 6/12/2020 13:13", "listTextStructureStyles" : "tok 6/12/2020 13:13", "nullTextStructure" : "tok 6/12/2020 13:12", - "testNullTextStructureCantAddAttributes" : "kh 6/19/2020 17:41", - "testNullTextStructureCantRemoveAttributes" : "kh 6/19/2020 17:42", + "testNullTextStructureCantAddAttributes" : "kh 6/21/2020 11:16", + "testNullTextStructureCantRemoveAttributes" : "kh 6/21/2020 11:19", "testNullTextStructurestructureIdentifierCanNotBeChanged" : "kh 6/19/2020 17:43", "testNullTextStructurestructureIdentifierIsNull" : "tok 6/13/2020 11:01" } } From 5d68808ff4310a8ca3492aee57235a3a8da0171d Mon Sep 17 00:00:00 2001 From: Konrad Hanff Date: Sun, 21 Jun 2020 16:25:00 +0200 Subject: [PATCH 09/12] Remove distinction between attribute and structure in method names --- .../class/allAttributes.st | 4 ---- .../class/allStructureIdentifiers.st | 4 ++++ .../instance/allAttributeSymbols.st | 4 ---- .../instance/allStructureIdentifiers.st | 4 ++++ .../instance/attributeSymbolAt..st | 4 ---- .../instance/buildStyleFieldWith..st | 6 +++--- .../instance/isActiveAttributeAt..st | 4 ---- .../instance/isActiveStructureAt..st | 4 ++++ ...ibuteAt.activate..st => structureAt.activate..st} | 6 +++--- .../instance/structureIdentifierAt..st | 4 ++++ .../methodProperties.json | 12 ++++++------ .../class/allAttributeIdentifiers.st | 4 ---- .../class/{allAttributes.st => allTextStructures.st} | 2 +- .../TextStructure.class/class/autohyperlink.st | 4 ++-- .../class/predefinedAttributeFor..st | 6 ------ .../class/predefinedStructureFor..st | 6 ++++++ .../TextStructure.class/methodProperties.json | 7 +++---- 17 files changed, 40 insertions(+), 45 deletions(-) delete mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/class/allAttributes.st create mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/class/allStructureIdentifiers.st delete mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/allAttributeSymbols.st create mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/allStructureIdentifiers.st delete mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/attributeSymbolAt..st delete mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/isActiveAttributeAt..st create mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/isActiveStructureAt..st rename packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/{attributeAt.activate..st => structureAt.activate..st} (52%) create mode 100644 packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/structureIdentifierAt..st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/allAttributeIdentifiers.st rename packages/RichTextEditing-Core.package/TextStructure.class/class/{allAttributes.st => allTextStructures.st} (74%) delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/predefinedAttributeFor..st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/predefinedStructureFor..st diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/class/allAttributes.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/class/allAttributes.st deleted file mode 100644 index ade0c35..0000000 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/class/allAttributes.st +++ /dev/null @@ -1,4 +0,0 @@ -constants -allAttributes - - ^ TextStructure allAttributeIdentifiers \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/class/allStructureIdentifiers.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/class/allStructureIdentifiers.st new file mode 100644 index 0000000..8f27d20 --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/class/allStructureIdentifiers.st @@ -0,0 +1,4 @@ +constants +allStructureIdentifiers + + ^ TextStructure allTextStructures collect: [:each | each structureIdentifier] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/allAttributeSymbols.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/allAttributeSymbols.st deleted file mode 100644 index a8da1cb..0000000 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/allAttributeSymbols.st +++ /dev/null @@ -1,4 +0,0 @@ -text attributes -allAttributeSymbols - - ^ self class allAttributes \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/allStructureIdentifiers.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/allStructureIdentifiers.st new file mode 100644 index 0000000..3ab6af0 --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/allStructureIdentifiers.st @@ -0,0 +1,4 @@ +text attributes +allStructureIdentifiers + + ^ self class allStructureIdentifiers \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/attributeSymbolAt..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/attributeSymbolAt..st deleted file mode 100644 index 0d7634e..0000000 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/attributeSymbolAt..st +++ /dev/null @@ -1,4 +0,0 @@ -text attributes -attributeSymbolAt: anIndex - - ^ self allAttributeSymbols at: anIndex \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildStyleFieldWith..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildStyleFieldWith..st index 19ab84c..6db1cea 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildStyleFieldWith..st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/buildStyleFieldWith..st @@ -5,7 +5,7 @@ buildStyleFieldWith: aBuilder name: 'styleField'; model: self; frame: (0.5 @ 0 corner: 1 @ 0.45); - list: #allAttributeSymbols; - getSelectionList: #isActiveAttributeAt:; - setSelectionList: #attributeAt:activate:; + list: #allStructureIdentifiers; + getSelectionList: #isActiveStructureAt:; + setSelectionList: #structureAt:activate:; yourself \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/isActiveAttributeAt..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/isActiveAttributeAt..st deleted file mode 100644 index 5f2c5dc..0000000 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/isActiveAttributeAt..st +++ /dev/null @@ -1,4 +0,0 @@ -text attributes -isActiveAttributeAt: anIndex - - ^ self currentStructure includes: (TextStructure new: (self attributeSymbolAt: anIndex)) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/isActiveStructureAt..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/isActiveStructureAt..st new file mode 100644 index 0000000..fae76aa --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/isActiveStructureAt..st @@ -0,0 +1,4 @@ +text attributes +isActiveStructureAt: anIndex + + ^ self currentStructure includes: (TextStructure new: (self structureIdentifierAt: anIndex)) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/attributeAt.activate..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/structureAt.activate..st similarity index 52% rename from packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/attributeAt.activate..st rename to packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/structureAt.activate..st index 8086816..ad8029f 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/attributeAt.activate..st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/structureAt.activate..st @@ -1,10 +1,10 @@ text attributes -attributeAt: anIndex activate: aBoolean +structureAt: anIndex activate: aBoolean | target targetTextStructure | target := self currentStructure. - targetTextStructure := (TextStructure predefinedAttributeFor: - (self attributeSymbolAt: anIndex)). + targetTextStructure := (TextStructure predefinedStructureFor: + (self structureIdentifierAt: anIndex)). aBoolean ifTrue: [ target add: targetTextStructure] ifFalse: [ target remove: targetTextStructure]. diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/structureIdentifierAt..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/structureIdentifierAt..st new file mode 100644 index 0000000..9462a9b --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/structureIdentifierAt..st @@ -0,0 +1,4 @@ +text attributes +structureIdentifierAt: anIndex + + ^ self allStructureIdentifiers at: anIndex \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json index 75296a0..e78751d 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json @@ -1,12 +1,10 @@ { "class" : { - "allAttributes" : "kh 6/21/2020 10:06", + "allStructureIdentifiers" : "kh 6/21/2020 16:22", "openWith:" : "AG 7/25/2019 13:15" }, "instance" : { "addNewStructure" : "ls 7/24/2019 17:06", - "allAttributeSymbols" : "kh 6/19/2020 16:10", - "attributeAt:activate:" : "kh 6/21/2020 11:22", - "attributeSymbolAt:" : "kh 6/19/2020 16:14", + "allStructureIdentifiers" : "kh 6/21/2020 16:17", "buildAddStructureButtonWith:" : "lh 7/3/2019 17:26", "buildColorButtonWith:" : "kh 6/18/2020 23:06", "buildColorResetButtonWith:" : "kh 6/19/2020 18:05", @@ -16,7 +14,7 @@ "buildIncreasePriorityButtonWith:" : "lh 7/3/2019 17:25", "buildRemoveStructureButtonWith:" : "lh 7/3/2019 17:26", "buildStructureFieldWith:" : "kh 6/19/2020 10:47", - "buildStyleFieldWith:" : "kh 6/19/2020 16:12", + "buildStyleFieldWith:" : "kh 6/21/2020 16:20", "buildTextPreviewFieldWith:" : "lh 6/26/2019 18:41", "buildWith:" : "lh 7/3/2019 17:24", "chooseStructureToRemove" : "ls 7/24/2019 17:26", @@ -35,7 +33,7 @@ "increasePriority" : "ls 7/24/2019 22:36", "initialize" : "kh 6/18/2020 22:04", "initializeLoremIpsum" : "lh 7/24/2019 16:16", - "isActiveAttributeAt:" : "kh 6/21/2020 11:22", + "isActiveStructureAt:" : "kh 6/21/2020 16:19", "lastStructureSymbol" : "AG 7/25/2019 10:43", "lastStructureSymbol:" : "AG 7/25/2019 10:43", "loremIpsum" : "ls 6/5/2019 22:07", @@ -51,6 +49,8 @@ "replaceFontOfCurrentStructure:" : "kh 6/21/2020 15:45", "resetColorOfCurrentStructure" : "kh 6/19/2020 18:05", "resetFontOfCurrentStructure" : "kh 6/19/2020 18:07", + "structureAt:activate:" : "kh 6/21/2020 16:19", + "structureIdentifierAt:" : "kh 6/21/2020 16:18", "textStructures" : "ls 7/24/2019 16:55", "update:" : "ls 7/24/2019 21:57", "updateLoremIpsum" : "kh 6/21/2020 10:04", diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/allAttributeIdentifiers.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/allAttributeIdentifiers.st deleted file mode 100644 index 4a1f67b..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/allAttributeIdentifiers.st +++ /dev/null @@ -1,4 +0,0 @@ -predefined -allAttributeIdentifiers - - ^ self allAttributes collect: [:each | each structureIdentifier] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/allAttributes.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/allTextStructures.st similarity index 74% rename from packages/RichTextEditing-Core.package/TextStructure.class/class/allAttributes.st rename to packages/RichTextEditing-Core.package/TextStructure.class/class/allTextStructures.st index af7f4ae..d9b89e9 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/allAttributes.st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/allTextStructures.st @@ -1,5 +1,5 @@ predefined -allAttributes +allTextStructures ^ {self bold. self italic. diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/autohyperlink.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/autohyperlink.st index 8239d58..fe12baa 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/autohyperlink.st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/autohyperlink.st @@ -2,7 +2,7 @@ predefined autohyperlink | structure | - structure:= self new: #hyperlink from: {TextURL new url: 'https://example.com'}. + structure:= self new: #hyperlink from: {TextStructure hyperlink: 'https://example.com'}. structure preAddHook: [:text | - structure attributes: (TextStructure hyperlink: text asString) attributes]. + structure add: (TextStructure hyperlink: text asString)]. ^ structure \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/predefinedAttributeFor..st b/packages/RichTextEditing-Core.package/TextStructure.class/class/predefinedAttributeFor..st deleted file mode 100644 index df014bf..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/predefinedAttributeFor..st +++ /dev/null @@ -1,6 +0,0 @@ -predefined -predefinedAttributeFor: aSymbol - - ^ self allAttributes - detect: [:each | each structureIdentifier = aSymbol] - ifNone: [NullTextStructure new] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/predefinedStructureFor..st b/packages/RichTextEditing-Core.package/TextStructure.class/class/predefinedStructureFor..st new file mode 100644 index 0000000..79d877d --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/predefinedStructureFor..st @@ -0,0 +1,6 @@ +predefined +predefinedStructureFor: aSymbol + + ^ self allTextStructures + detect: [:each | each structureIdentifier = aSymbol] + ifNone: [NullTextStructure new] \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json b/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json index 716a5a8..914ae2f 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json @@ -1,8 +1,7 @@ { "class" : { - "allAttributeIdentifiers" : "kh 6/18/2020 20:44", - "allAttributes" : "kh 6/19/2020 17:26", - "autohyperlink" : "kh 6/19/2020 17:12", + "allTextStructures" : "kh 6/21/2020 16:10", + "autohyperlink" : "kh 6/21/2020 16:01", "bold" : "kh 6/19/2020 12:25", "color" : "kh 6/18/2020 22:52", "color:" : "kh 6/19/2020 12:25", @@ -16,7 +15,7 @@ "new:" : "kh 6/21/2020 15:51", "new:from:" : "kh 6/21/2020 15:51", "notExtendable" : "kh 6/19/2020 17:26", - "predefinedAttributeFor:" : "kh 6/21/2020 10:37", + "predefinedStructureFor:" : "kh 6/21/2020 16:11", "struckOut" : "kh 6/19/2020 12:25", "underlined" : "kh 6/19/2020 12:25" }, "instance" : { From 52541d446594cd007385e69241ff6df0a9d1c25c Mon Sep 17 00:00:00 2001 From: Konrad Hanff Date: Sun, 21 Jun 2020 17:05:38 +0200 Subject: [PATCH 10/12] Improve naming for TextStructure instance creation and something with commonStyles --- .../class/commonStructures.st | 4 ++++ .../class/commonStyles.st | 4 ---- .../class/defaultStyles.st | 4 ---- .../class/initialBoldStructure.st | 2 +- .../class/initialFootnoteStructure.st | 2 +- .../class/initialHeading1Structure.st | 4 +--- .../class/initialHeading2Structure.st | 4 +--- .../class/initialHeading3Structure.st | 4 +--- .../class/initialItalicStructure.st | 2 +- .../class/initialListStructure.st | 2 +- .../class/initialUnderlinedStructure.st | 2 +- .../instance/initializeStructure..st | 2 +- .../methodProperties.json | 21 +++++++++---------- .../instance/makeTextURLFrom..st | 2 +- .../methodProperties.json | 2 +- .../replaceColorOfCurrentStructure..st | 2 +- .../replaceFontOfCurrentStructure..st | 2 +- .../methodProperties.json | 4 ++-- .../TextExtendability.class/README.md | 2 +- .../TextExtendability.class/properties.json | 2 +- .../class/autohyperlink.st | 4 ++-- .../TextStructure.class/class/color..st | 4 ---- .../TextStructure.class/class/colorFrom..st | 4 ++++ .../TextStructure.class/class/font..st | 4 ---- .../TextStructure.class/class/fontFrom..st | 4 ++++ .../TextStructure.class/class/hyperlink..st | 4 ---- .../TextStructure.class/class/hyperlinkTo..st | 4 ++++ .../TextStructure.class/class/indented..st | 4 ---- .../TextStructure.class/class/indented.st | 2 +- .../TextStructure.class/class/indentedBy..st | 4 ++++ .../TextStructure.class/class/list..st | 4 ---- .../TextStructure.class/class/listOnLevel..st | 4 ++++ .../TextStructure.class/methodProperties.json | 14 ++++++------- .../instance/listTextStructure.st | 2 +- .../methodProperties.json | 2 +- .../methodProperties.json | 2 +- 36 files changed, 64 insertions(+), 75 deletions(-) create mode 100644 packages/RichTextEditing-Core.package/RichTextDocument.class/class/commonStructures.st delete mode 100644 packages/RichTextEditing-Core.package/RichTextDocument.class/class/commonStyles.st delete mode 100644 packages/RichTextEditing-Core.package/RichTextDocument.class/class/defaultStyles.st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/color..st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/colorFrom..st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/font..st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/fontFrom..st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/hyperlink..st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/hyperlinkTo..st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/indented..st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/indentedBy..st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/list..st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/listOnLevel..st diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/commonStructures.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/commonStructures.st new file mode 100644 index 0000000..aa2cb16 --- /dev/null +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/commonStructures.st @@ -0,0 +1,4 @@ +constants +commonStructures + + ^ {} asSet \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/commonStyles.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/commonStyles.st deleted file mode 100644 index 6b3b0d6..0000000 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/commonStyles.st +++ /dev/null @@ -1,4 +0,0 @@ -constants -commonStyles - - ^ {} asSet \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/defaultStyles.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/defaultStyles.st deleted file mode 100644 index 4df132a..0000000 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/defaultStyles.st +++ /dev/null @@ -1,4 +0,0 @@ -constants -defaultStyles - - ^ self commonStyles \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialBoldStructure.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialBoldStructure.st index f4899ac..9fbf94b 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialBoldStructure.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialBoldStructure.st @@ -3,4 +3,4 @@ initialBoldStructure ^ TextStructure new: #bold - from: (self commonStyles union: {TextStructure bold}) \ No newline at end of file + from: {TextStructure bold} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialFootnoteStructure.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialFootnoteStructure.st index ca974f5..83eef8d 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialFootnoteStructure.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialFootnoteStructure.st @@ -3,4 +3,4 @@ initialFootnoteStructure ^ TextStructure new: #footnote - from: (self commonStyles union: {TextStructure font: (StrikeFont createDejaVuDark: 9)}) \ No newline at end of file + from: {TextStructure fontFrom: (StrikeFont createDejaVuDark: 9)} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading1Structure.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading1Structure.st index 197ceb7..1a2f451 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading1Structure.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading1Structure.st @@ -3,6 +3,4 @@ initialHeading1Structure ^ TextStructure new: #heading1 - from: (self commonStyles union: - {TextStructure font: (StrikeFont createDejaVuDark: 20). - TextStructure bold}) \ No newline at end of file + from: {TextStructure fontFrom: (StrikeFont createDejaVuDark: 20). TextStructure bold} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading2Structure.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading2Structure.st index 72307e4..19a2f49 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading2Structure.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading2Structure.st @@ -3,6 +3,4 @@ initialHeading2Structure ^ TextStructure new: #heading2 - from: (self commonStyles union: - {TextStructure font: (StrikeFont createDejaVuDark: 17). - TextStructure bold}) \ No newline at end of file + from: {TextStructure fontFrom: (StrikeFont createDejaVuDark: 17). TextStructure bold} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading3Structure.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading3Structure.st index 9123e1d..8dcb887 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading3Structure.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading3Structure.st @@ -3,6 +3,4 @@ initialHeading3Structure ^ TextStructure new: #heading3 - from: (self commonStyles union: - {TextStructure font: (StrikeFont createDejaVuDark: 14). - TextStructure bold}) \ No newline at end of file + from: {TextStructure fontFrom: (StrikeFont createDejaVuDark: 14). TextStructure bold} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialItalicStructure.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialItalicStructure.st index 885320c..d774a22 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialItalicStructure.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialItalicStructure.st @@ -3,4 +3,4 @@ initialItalicStructure ^ TextStructure new: #italic - from: (self commonStyles union: {TextStructure italic}) \ No newline at end of file + from: {TextStructure italic} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialListStructure.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialListStructure.st index 4600a5c..d69de8b 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialListStructure.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialListStructure.st @@ -3,4 +3,4 @@ initialListStructure ^ TextStructure new: #list - from: (self commonStyles union: {TextStructure indented}) \ No newline at end of file + from: {TextStructure indented} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialUnderlinedStructure.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialUnderlinedStructure.st index 2244628..789b1be 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialUnderlinedStructure.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialUnderlinedStructure.st @@ -3,4 +3,4 @@ initialUnderlinedStructure ^ TextStructure new: #underlined - from: (self commonStyles union: {TextStructure underlined}) \ No newline at end of file + from: {TextStructure underlined} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/initializeStructure..st b/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/initializeStructure..st index 12d3d9d..f02662c 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/initializeStructure..st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/instance/initializeStructure..st @@ -1,4 +1,4 @@ text structures initializeStructure: aSymbol - self textStructures add: (TextStructure new: aSymbol from: self class defaultStyles) \ No newline at end of file + self textStructures add: (TextStructure new: aSymbol from: self class commonStructures) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextDocument.class/methodProperties.json index da2354f..9a294ca 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/methodProperties.json @@ -1,19 +1,18 @@ { "class" : { - "commonStyles" : "kh 6/19/2020 17:26", - "defaultStyles" : "kh 6/18/2020 22:35", + "commonStructures" : "kh 6/21/2020 17:03", "editorClass" : "ls 6/26/2019 17:33", "fromText:withStructures:" : "ls 6/26/2019 17:31", - "initialBoldStructure" : "kh 6/19/2020 12:24", - "initialFootnoteStructure" : "kh 6/19/2020 12:24", - "initialHeading1Structure" : "kh 6/19/2020 12:29", - "initialHeading2Structure" : "kh 6/19/2020 12:24", - "initialHeading3Structure" : "kh 6/19/2020 12:24", - "initialItalicStructure" : "kh 6/19/2020 12:24", - "initialListStructure" : "kh 6/19/2020 12:24", + "initialBoldStructure" : "kh 6/21/2020 16:43", + "initialFootnoteStructure" : "kh 6/21/2020 16:55", + "initialHeading1Structure" : "kh 6/21/2020 16:55", + "initialHeading2Structure" : "kh 6/21/2020 16:55", + "initialHeading3Structure" : "kh 6/21/2020 16:55", + "initialItalicStructure" : "kh 6/21/2020 16:44", + "initialListStructure" : "kh 6/21/2020 16:44", "initialTextStructures" : "kh 6/19/2020 12:37", "initialURLStructure" : "kh 6/19/2020 17:28", - "initialUnderlinedStructure" : "kh 6/19/2020 12:24" }, + "initialUnderlinedStructure" : "kh 6/21/2020 16:44" }, "instance" : { "addAttribute:from:to:" : "kh 6/19/2020 12:35", "charcount" : "frc 5/25/2020 16:02", @@ -23,7 +22,7 @@ "emptyChars" : "frc 6/1/2020 13:43", "hasStructure:forText:from:to:" : "AG 7/25/2019 13:20", "initialize" : "ls 7/24/2019 15:10", - "initializeStructure:" : "kh 6/19/2020 12:28", + "initializeStructure:" : "kh 6/21/2020 17:03", "initializeStructures" : "ls 7/24/2019 15:12", "isUnsavedDocument" : "OS 6/14/2020 18:19", "name" : "ls 6/26/2019 17:28", diff --git a/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/makeTextURLFrom..st b/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/makeTextURLFrom..st index f931188..4b6a543 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/makeTextURLFrom..st +++ b/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/makeTextURLFrom..st @@ -2,5 +2,5 @@ pasting makeTextURLFrom: aString ^ aString asText - addAttribute: (TextStructure hyperlink: aString); + addAttribute: (TextStructure hyperlinkTo: aString); addAttribute: (TextEmphasis underlined) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextEditor.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextEditor.class/methodProperties.json index 90e6f94..9d081fc 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditor.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/RichTextEditor.class/methodProperties.json @@ -17,7 +17,7 @@ "isStructureShortcut:" : "OS 6/12/2020 12:09", "isValidCharacter:" : "tok 6/13/2020 12:04", "keyStroke:" : "OS 6/12/2020 12:09", - "makeTextURLFrom:" : "kh 6/19/2020 13:13", + "makeTextURLFrom:" : "kh 6/21/2020 16:56", "mouseDown:" : "OS 6/1/2020 00:56", "paste" : "kh 6/15/2020 13:32", "pasteURL" : "kh 6/19/2020 13:10", diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/replaceColorOfCurrentStructure..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/replaceColorOfCurrentStructure..st index 283c316..2978e4d 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/replaceColorOfCurrentStructure..st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/replaceColorOfCurrentStructure..st @@ -1,4 +1,4 @@ text coloring replaceColorOfCurrentStructure: aColor - self currentStructure add: (TextStructure color: aColor) \ No newline at end of file + self currentStructure add: (TextStructure colorFrom: aColor) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/replaceFontOfCurrentStructure..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/replaceFontOfCurrentStructure..st index 109112a..ff2588b 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/replaceFontOfCurrentStructure..st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/replaceFontOfCurrentStructure..st @@ -1,4 +1,4 @@ text font replaceFontOfCurrentStructure: aFont - self currentStructure add: (TextStructure font: aFont) \ No newline at end of file + self currentStructure add: (TextStructure fontFrom: aFont) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json index e78751d..3973ff3 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json @@ -45,8 +45,8 @@ "removeColorFromCurrentStructure" : "kh 6/19/2020 18:04", "removeFontFromCurrentStructure" : "kh 6/19/2020 18:07", "removeStructure" : "kh 6/19/2020 10:47", - "replaceColorOfCurrentStructure:" : "kh 6/21/2020 15:43", - "replaceFontOfCurrentStructure:" : "kh 6/21/2020 15:45", + "replaceColorOfCurrentStructure:" : "kh 6/21/2020 16:54", + "replaceFontOfCurrentStructure:" : "kh 6/21/2020 16:55", "resetColorOfCurrentStructure" : "kh 6/19/2020 18:05", "resetFontOfCurrentStructure" : "kh 6/19/2020 18:07", "structureAt:activate:" : "kh 6/21/2020 16:19", diff --git a/packages/RichTextEditing-Core.package/TextExtendability.class/README.md b/packages/RichTextEditing-Core.package/TextExtendability.class/README.md index 44084b4..63ac490 100644 --- a/packages/RichTextEditing-Core.package/TextExtendability.class/README.md +++ b/packages/RichTextEditing-Core.package/TextExtendability.class/README.md @@ -1 +1 @@ -I am a TextAtribute and my sole porpose is the be extendable or not. This only makes sense when I am a Component of a TextStructure. +I am a TextAtribute and my sole purpose is the be extendable or not. This only makes sense when I am a Component of a TextStructure. diff --git a/packages/RichTextEditing-Core.package/TextExtendability.class/properties.json b/packages/RichTextEditing-Core.package/TextExtendability.class/properties.json index 9f38096..2a93d23 100644 --- a/packages/RichTextEditing-Core.package/TextExtendability.class/properties.json +++ b/packages/RichTextEditing-Core.package/TextExtendability.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "kh 6/19/2020 17:51", + "commentStamp" : "kh 6/21/2020 16:41", "instvars" : [ "mayBeExtended" ], "name" : "TextExtendability", diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/autohyperlink.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/autohyperlink.st index fe12baa..d9fc3a6 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/autohyperlink.st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/autohyperlink.st @@ -2,7 +2,7 @@ predefined autohyperlink | structure | - structure:= self new: #hyperlink from: {TextStructure hyperlink: 'https://example.com'}. + structure:= self new: #hyperlink from: {TextStructure hyperlinkTo: 'https://example.com'}. structure preAddHook: [:text | - structure add: (TextStructure hyperlink: text asString)]. + structure add: (TextStructure hyperlinkTo: text asString)]. ^ structure \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/color..st b/packages/RichTextEditing-Core.package/TextStructure.class/class/color..st deleted file mode 100644 index 64c20c4..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/color..st +++ /dev/null @@ -1,4 +0,0 @@ -predefined -color: aColor - - ^ self new: #color from: {TextColor color: aColor} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/colorFrom..st b/packages/RichTextEditing-Core.package/TextStructure.class/class/colorFrom..st new file mode 100644 index 0000000..b46522f --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/colorFrom..st @@ -0,0 +1,4 @@ +predefined +colorFrom: aColor + + ^ self new: #color from: {TextColor color: aColor} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/font..st b/packages/RichTextEditing-Core.package/TextStructure.class/class/font..st deleted file mode 100644 index 9c75f6d..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/font..st +++ /dev/null @@ -1,4 +0,0 @@ -predefined -font: aFont - - ^ self new: #font from: {TextFontReference toFont: aFont} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/fontFrom..st b/packages/RichTextEditing-Core.package/TextStructure.class/class/fontFrom..st new file mode 100644 index 0000000..74a46c0 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/fontFrom..st @@ -0,0 +1,4 @@ +predefined +fontFrom: aFont + + ^ self new: #font from: {TextFontReference toFont: aFont} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/hyperlink..st b/packages/RichTextEditing-Core.package/TextStructure.class/class/hyperlink..st deleted file mode 100644 index ad1ed76..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/hyperlink..st +++ /dev/null @@ -1,4 +0,0 @@ -predefined -hyperlink: url - - ^ self new: #hyperlink from: {TextURL new url: url}. \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/hyperlinkTo..st b/packages/RichTextEditing-Core.package/TextStructure.class/class/hyperlinkTo..st new file mode 100644 index 0000000..5a000a9 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/hyperlinkTo..st @@ -0,0 +1,4 @@ +predefined +hyperlinkTo: url + + ^ self new: #hyperlink from: {TextURL new url: url}. \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/indented..st b/packages/RichTextEditing-Core.package/TextStructure.class/class/indented..st deleted file mode 100644 index 760dace..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/indented..st +++ /dev/null @@ -1,4 +0,0 @@ -predefined -indented: amount - - ^ self new: #indented from: {TextIndent amount: amount} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/indented.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/indented.st index a918f39..edc4cba 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/indented.st +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/indented.st @@ -1,4 +1,4 @@ predefined indented - ^ self indented: 1 \ No newline at end of file + ^ self indentedBy: 1 \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/indentedBy..st b/packages/RichTextEditing-Core.package/TextStructure.class/class/indentedBy..st new file mode 100644 index 0000000..4f2edc0 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/indentedBy..st @@ -0,0 +1,4 @@ +predefined +indentedBy: amount + + ^ self new: #indented from: {TextIndent amount: amount} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/list..st b/packages/RichTextEditing-Core.package/TextStructure.class/class/list..st deleted file mode 100644 index 9253c3a..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/list..st +++ /dev/null @@ -1,4 +0,0 @@ -predefined -list: level - - ^ self new: #list from: {TextIndent amount: level} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/listOnLevel..st b/packages/RichTextEditing-Core.package/TextStructure.class/class/listOnLevel..st new file mode 100644 index 0000000..4297cb4 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/listOnLevel..st @@ -0,0 +1,4 @@ +predefined +listOnLevel: level + + ^ self new: #list from: {TextIndent amount: level} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json b/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json index 914ae2f..fafeced 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json @@ -1,17 +1,17 @@ { "class" : { "allTextStructures" : "kh 6/21/2020 16:10", - "autohyperlink" : "kh 6/21/2020 16:01", + "autohyperlink" : "kh 6/21/2020 16:56", "bold" : "kh 6/19/2020 12:25", "color" : "kh 6/18/2020 22:52", - "color:" : "kh 6/19/2020 12:25", + "colorFrom:" : "kh 6/21/2020 16:53", "font" : "kh 6/18/2020 23:23", - "font:" : "kh 6/19/2020 12:25", - "hyperlink:" : "kh 6/19/2020 17:06", - "indented" : "kh 6/18/2020 22:54", - "indented:" : "kh 6/19/2020 12:25", + "fontFrom:" : "kh 6/21/2020 16:55", + "hyperlinkTo:" : "kh 6/21/2020 16:56", + "indented" : "kh 6/21/2020 16:58", + "indentedBy:" : "kh 6/21/2020 16:58", "italic" : "kh 6/19/2020 12:25", - "list:" : "kh 6/19/2020 12:25", + "listOnLevel:" : "kh 6/21/2020 16:58", "new:" : "kh 6/21/2020 15:51", "new:from:" : "kh 6/21/2020 15:51", "notExtendable" : "kh 6/19/2020 17:26", diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/listTextStructure.st b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/listTextStructure.st index 3071570..ae9041e 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/listTextStructure.st +++ b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/instance/listTextStructure.st @@ -1,5 +1,5 @@ utilities listTextStructure - ^ TextStructure new: #list from: {TextStructure list: self listLevel} + ^ TextStructure new: #list from: {TextStructure listOnLevel: self listLevel} \ No newline at end of file diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/methodProperties.json index 547e258..237f819 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/methodProperties.json +++ b/packages/RichTextEditing-Tests.package/RichTextEditorStructureTests.class/methodProperties.json @@ -10,7 +10,7 @@ "emphasisCodeNoStyle" : "AG 6/5/2019 18:56", "firstStructureIsSelectedInList" : " 6/18/2020 19:16:32", "listLevel" : "kh 6/19/2020 10:04", - "listTextStructure" : "kh 6/19/2020 12:25", + "listTextStructure" : "kh 6/21/2020 16:58", "listTextStructureStyles" : "tok 6/12/2020 12:12", "menu" : "ls 6/18/2019 16:37", "selectOptionBold" : "lh 7/24/2019 21:31", diff --git a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/methodProperties.json b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/methodProperties.json index 5c019c0..e36d691 100644 --- a/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/methodProperties.json +++ b/packages/RichTextEditing-Tests.package/RichTextEditorTests.class/methodProperties.json @@ -29,7 +29,7 @@ "shiftButtonCode" : "MB 5/15/2019 21:06", "simulateKeyboardEventWithButtons:andKeyValue:" : "lh 7/24/2019 18:30", "testInspectDocument" : "frc 6/13/2020 11:08", - "testTextSizeReturnsCorrectSize" : " 6/18/2020 19:16:32", + "testTextSizeReturnsCorrectSize" : "6/18/2020 19:16:32", "testUS04loadButtonExists" : "AG 5/22/2019 18:38", "testUS04loadedTextIsInsertedIntoEditor" : "JEH 6/14/2020 18:13", "testUS04saveAsButtonExists" : "SR 5/22/2019 21:07", From 4ce5a51e9dd090380fe4404ac88be9524bbb4134 Mon Sep 17 00:00:00 2001 From: Konrad Hanff Date: Thu, 25 Jun 2020 16:00:45 +0200 Subject: [PATCH 11/12] Minor improvements --- .../class/initialFootnoteStructure.st | 2 +- .../class/initialHeading1Structure.st | 2 +- .../class/initialHeading2Structure.st | 2 +- .../class/initialHeading3Structure.st | 2 +- .../RichTextDocument.class/methodProperties.json | 8 ++++---- .../instance/replaceColorOfCurrentStructure..st | 2 +- .../instance/replaceFontOfCurrentStructure..st | 2 +- .../RichTextStructureEditor.class/methodProperties.json | 4 ++-- .../TextExtendability.class/instance/mayBeExtended..st | 2 +- .../TextExtendability.class/instance/mayBeExtended.st | 2 +- .../TextStructure.class/class/colorFrom..st | 4 ---- .../TextStructure.class/class/fontFrom..st | 4 ---- .../TextStructure.class/class/fromColor..st | 4 ++++ .../TextStructure.class/class/fromFont..st | 4 ++++ .../TextStructure.class/methodProperties.json | 4 ++-- 15 files changed, 24 insertions(+), 24 deletions(-) delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/colorFrom..st delete mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/fontFrom..st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/fromColor..st create mode 100644 packages/RichTextEditing-Core.package/TextStructure.class/class/fromFont..st diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialFootnoteStructure.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialFootnoteStructure.st index 83eef8d..6ee23a8 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialFootnoteStructure.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialFootnoteStructure.st @@ -3,4 +3,4 @@ initialFootnoteStructure ^ TextStructure new: #footnote - from: {TextStructure fontFrom: (StrikeFont createDejaVuDark: 9)} \ No newline at end of file + from: {TextStructure fromFont: (StrikeFont createDejaVuDark: 9)} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading1Structure.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading1Structure.st index 1a2f451..b8b2bbb 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading1Structure.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading1Structure.st @@ -3,4 +3,4 @@ initialHeading1Structure ^ TextStructure new: #heading1 - from: {TextStructure fontFrom: (StrikeFont createDejaVuDark: 20). TextStructure bold} \ No newline at end of file + from: {TextStructure fromFont: (StrikeFont createDejaVuDark: 20). TextStructure bold} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading2Structure.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading2Structure.st index 19a2f49..0cd5f1d 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading2Structure.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading2Structure.st @@ -3,4 +3,4 @@ initialHeading2Structure ^ TextStructure new: #heading2 - from: {TextStructure fontFrom: (StrikeFont createDejaVuDark: 17). TextStructure bold} \ No newline at end of file + from: {TextStructure fromFont: (StrikeFont createDejaVuDark: 17). TextStructure bold} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading3Structure.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading3Structure.st index 8dcb887..7884cdb 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading3Structure.st +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading3Structure.st @@ -3,4 +3,4 @@ initialHeading3Structure ^ TextStructure new: #heading3 - from: {TextStructure fontFrom: (StrikeFont createDejaVuDark: 14). TextStructure bold} \ No newline at end of file + from: {TextStructure fromFont: (StrikeFont createDejaVuDark: 14). TextStructure bold} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextDocument.class/methodProperties.json index 9a294ca..0836693 100644 --- a/packages/RichTextEditing-Core.package/RichTextDocument.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/RichTextDocument.class/methodProperties.json @@ -4,10 +4,10 @@ "editorClass" : "ls 6/26/2019 17:33", "fromText:withStructures:" : "ls 6/26/2019 17:31", "initialBoldStructure" : "kh 6/21/2020 16:43", - "initialFootnoteStructure" : "kh 6/21/2020 16:55", - "initialHeading1Structure" : "kh 6/21/2020 16:55", - "initialHeading2Structure" : "kh 6/21/2020 16:55", - "initialHeading3Structure" : "kh 6/21/2020 16:55", + "initialFootnoteStructure" : "kh 6/25/2020 13:57", + "initialHeading1Structure" : "kh 6/25/2020 13:57", + "initialHeading2Structure" : "kh 6/25/2020 13:57", + "initialHeading3Structure" : "kh 6/25/2020 13:57", "initialItalicStructure" : "kh 6/21/2020 16:44", "initialListStructure" : "kh 6/21/2020 16:44", "initialTextStructures" : "kh 6/19/2020 12:37", diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/replaceColorOfCurrentStructure..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/replaceColorOfCurrentStructure..st index 2978e4d..1dfd829 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/replaceColorOfCurrentStructure..st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/replaceColorOfCurrentStructure..st @@ -1,4 +1,4 @@ text coloring replaceColorOfCurrentStructure: aColor - self currentStructure add: (TextStructure colorFrom: aColor) \ No newline at end of file + self currentStructure add: (TextStructure fromColor: aColor) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/replaceFontOfCurrentStructure..st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/replaceFontOfCurrentStructure..st index ff2588b..dfdd859 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/replaceFontOfCurrentStructure..st +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/replaceFontOfCurrentStructure..st @@ -1,4 +1,4 @@ text font replaceFontOfCurrentStructure: aFont - self currentStructure add: (TextStructure fontFrom: aFont) \ No newline at end of file + self currentStructure add: (TextStructure fromFont: aFont) \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json index 3973ff3..478dc9a 100644 --- a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json @@ -45,8 +45,8 @@ "removeColorFromCurrentStructure" : "kh 6/19/2020 18:04", "removeFontFromCurrentStructure" : "kh 6/19/2020 18:07", "removeStructure" : "kh 6/19/2020 10:47", - "replaceColorOfCurrentStructure:" : "kh 6/21/2020 16:54", - "replaceFontOfCurrentStructure:" : "kh 6/21/2020 16:55", + "replaceColorOfCurrentStructure:" : "kh 6/25/2020 13:57", + "replaceFontOfCurrentStructure:" : "kh 6/25/2020 13:57", "resetColorOfCurrentStructure" : "kh 6/19/2020 18:05", "resetFontOfCurrentStructure" : "kh 6/19/2020 18:07", "structureAt:activate:" : "kh 6/21/2020 16:19", diff --git a/packages/RichTextEditing-Core.package/TextExtendability.class/instance/mayBeExtended..st b/packages/RichTextEditing-Core.package/TextExtendability.class/instance/mayBeExtended..st index abf0d18..4488ef1 100644 --- a/packages/RichTextEditing-Core.package/TextExtendability.class/instance/mayBeExtended..st +++ b/packages/RichTextEditing-Core.package/TextExtendability.class/instance/mayBeExtended..st @@ -1,4 +1,4 @@ -testing +accessing mayBeExtended: aBoolean mayBeExtended := aBoolean \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextExtendability.class/instance/mayBeExtended.st b/packages/RichTextEditing-Core.package/TextExtendability.class/instance/mayBeExtended.st index aaf666c..74e78ba 100644 --- a/packages/RichTextEditing-Core.package/TextExtendability.class/instance/mayBeExtended.st +++ b/packages/RichTextEditing-Core.package/TextExtendability.class/instance/mayBeExtended.st @@ -1,4 +1,4 @@ -testing +accessing mayBeExtended ^ mayBeExtended \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/colorFrom..st b/packages/RichTextEditing-Core.package/TextStructure.class/class/colorFrom..st deleted file mode 100644 index b46522f..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/colorFrom..st +++ /dev/null @@ -1,4 +0,0 @@ -predefined -colorFrom: aColor - - ^ self new: #color from: {TextColor color: aColor} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/fontFrom..st b/packages/RichTextEditing-Core.package/TextStructure.class/class/fontFrom..st deleted file mode 100644 index 74a46c0..0000000 --- a/packages/RichTextEditing-Core.package/TextStructure.class/class/fontFrom..st +++ /dev/null @@ -1,4 +0,0 @@ -predefined -fontFrom: aFont - - ^ self new: #font from: {TextFontReference toFont: aFont} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/fromColor..st b/packages/RichTextEditing-Core.package/TextStructure.class/class/fromColor..st new file mode 100644 index 0000000..0a3e670 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/fromColor..st @@ -0,0 +1,4 @@ +predefined +fromColor: aColor + + ^ self new: #color from: {TextColor color: aColor} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/fromFont..st b/packages/RichTextEditing-Core.package/TextStructure.class/class/fromFont..st new file mode 100644 index 0000000..a9dbae7 --- /dev/null +++ b/packages/RichTextEditing-Core.package/TextStructure.class/class/fromFont..st @@ -0,0 +1,4 @@ +predefined +fromFont: aFont + + ^ self new: #font from: {TextFontReference toFont: aFont} \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json b/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json index fafeced..5fb5920 100644 --- a/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/TextStructure.class/methodProperties.json @@ -4,9 +4,9 @@ "autohyperlink" : "kh 6/21/2020 16:56", "bold" : "kh 6/19/2020 12:25", "color" : "kh 6/18/2020 22:52", - "colorFrom:" : "kh 6/21/2020 16:53", "font" : "kh 6/18/2020 23:23", - "fontFrom:" : "kh 6/21/2020 16:55", + "fromColor:" : "kh 6/25/2020 13:57", + "fromFont:" : "kh 6/25/2020 13:57", "hyperlinkTo:" : "kh 6/21/2020 16:56", "indented" : "kh 6/21/2020 16:58", "indentedBy:" : "kh 6/21/2020 16:58", From ce492c5340fa105516f8af42b47ca32be052c5d8 Mon Sep 17 00:00:00 2001 From: frcroth Date: Fri, 3 Jul 2020 09:35:02 +0200 Subject: [PATCH 12/12] Fix pasted urls not working --- .../RichTextEditor.class/instance/pasteURL.st | 2 +- .../RichTextEditor.class/methodProperties.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/pasteURL.st b/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/pasteURL.st index 66eb13e..cba3595 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/pasteURL.st +++ b/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/pasteURL.st @@ -2,5 +2,5 @@ pasting pasteURL self - replaceSelectionWith: (self makeTextURLFrom: self clipboardText); + replaceSelectionWith: (self makeTextURLFrom: self clipboardText asString); selectAt: self pointIndex \ No newline at end of file diff --git a/packages/RichTextEditing-Core.package/RichTextEditor.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextEditor.class/methodProperties.json index 9d081fc..2759a80 100644 --- a/packages/RichTextEditing-Core.package/RichTextEditor.class/methodProperties.json +++ b/packages/RichTextEditing-Core.package/RichTextEditor.class/methodProperties.json @@ -17,10 +17,10 @@ "isStructureShortcut:" : "OS 6/12/2020 12:09", "isValidCharacter:" : "tok 6/13/2020 12:04", "keyStroke:" : "OS 6/12/2020 12:09", - "makeTextURLFrom:" : "kh 6/21/2020 16:56", + "makeTextURLFrom:" : "frc 7/3/2020 09:13", "mouseDown:" : "OS 6/1/2020 00:56", "paste" : "kh 6/15/2020 13:32", - "pasteURL" : "kh 6/19/2020 13:10", + "pasteURL" : "frc 7/3/2020 09:13", "setEmphasisHere" : "6/1/2020 14:03:21", "specialCharacters" : "tok 6/13/2020 12:14", "storeSelectionInParagraph" : "lh 7/24/2019 21:51",