Merge branch 'dev' into US84

hpi-swa-teaching · Jun 15, 2020 · 35e9405 · 35e9405
2 parents d4d0fb8 + f352676
commit 35e9405
Show file tree

Hide file tree

Showing 75 changed files with 217 additions and 188 deletions.
diff --git 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
 
-	^ {#extendable} asSet
+	^ {TextStructure extendableStyle} asSet
diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialBoldStructure.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialBoldStructure.st
@@ -1,4 +1,6 @@
 constants
 initialBoldStructure
 
-	^ TextStructure newWith: #bold withEmphasis: (self defaultStyles union: {#bold})
+	^ TextStructure 
+			newWith: #bold
+			withStyles: (self defaultStyles union: {TextStructure boldStyle})
diff --git a/...ges/RichTextEditing-Core.package/RichTextDocument.class/class/initialFootnoteStructure.st b/...ges/RichTextEditing-Core.package/RichTextDocument.class/class/initialFootnoteStructure.st
@@ -3,5 +3,5 @@ initialFootnoteStructure
 
 	^ (TextStructure 
 			newWith: #footnote
-			withEmphasis: self defaultStyles)
+			withStyles: self defaultStyles)
 		font: (StrikeFont createDejaVuDark: 9)
diff --git a/...ges/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading1Structure.st b/...ges/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading1Structure.st
@@ -3,5 +3,5 @@ initialHeading1Structure
 
 	^ (TextStructure 
 			newWith: #heading1
-			withEmphasis: (self defaultStyles union: {#bold}))
+			withStyles: (self defaultStyles union: {TextStructure boldStyle}))
 		font: (StrikeFont createDejaVuDark: 20)
diff --git a/...ges/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading2Structure.st b/...ges/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading2Structure.st
@@ -3,5 +3,5 @@ initialHeading2Structure
 
 	^ (TextStructure 
 			newWith: #heading2
-			withEmphasis: (self defaultStyles union: {#bold}))
+			withStyles: (self defaultStyles union: {TextStructure boldStyle}))
 		font: (StrikeFont createDejaVuDark: 17)
diff --git a/...ges/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading3Structure.st b/...ges/RichTextEditing-Core.package/RichTextDocument.class/class/initialHeading3Structure.st
@@ -3,5 +3,5 @@ initialHeading3Structure
 
 	^ (TextStructure 
 			newWith: #heading3
-			withEmphasis: (self defaultStyles union: {#bold}))
+			withStyles: (self defaultStyles union: {TextStructure boldStyle}))
 		font: (StrikeFont createDejaVuDark: 14)
diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialItalicStructure.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialItalicStructure.st
@@ -1,4 +1,6 @@
 constants
 initialItalicStructure
 
-	^ TextStructure newWith: #italic withEmphasis: (self defaultStyles union: {#italic})
+	^ TextStructure
+			newWith: #italic
+			withStyles: (self defaultStyles union: {TextStructure italicStyle})
diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialListStructure.st b/packages/RichTextEditing-Core.package/RichTextDocument.class/class/initialListStructure.st
@@ -1,4 +1,6 @@
 constants
 initialListStructure
 
-	^ TextStructure newWith: #list withEmphasis: (self defaultStyles union: {#indented})
+	^ TextStructure
+			newWith: #list
+			withStyles: (self defaultStyles union: {TextStructure indentedStyle})
diff --git a/...s/RichTextEditing-Core.package/RichTextDocument.class/class/initialUnderlinedStructure.st b/...s/RichTextEditing-Core.package/RichTextDocument.class/class/initialUnderlinedStructure.st
@@ -3,4 +3,4 @@ initialUnderlinedStructure
 
 	^ TextStructure 
 			newWith: #underlined 
-			withEmphasis: (self defaultStyles union: {#underlined})
+			withStyles: (self defaultStyles union: {TextStructure underlinedStyle})
diff --git a/...Editing-Core.package/RichTextDocument.class/instance/initializeStructure.withEmphasis..st b/...Editing-Core.package/RichTextDocument.class/instance/initializeStructure.withEmphasis..st
@@ -1,4 +1,4 @@
 text structures
 initializeStructure: aSymbol withEmphasis: aSet
 
-	self textStructures add: (TextStructure newWith: aSymbol withEmphasis: aSet)
+	self textStructures add: (TextStructure newWith: aSymbol withStyles: aSet)
diff --git a/packages/RichTextEditing-Core.package/RichTextDocument.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextDocument.class/methodProperties.json
@@ -1,17 +1,17 @@
 {
 	"class" : {
-		"defaultStyles" : "ls 6/26/2019 22:02",
+		"defaultStyles" : "tok 6/8/2020 12:21",
 		"editorClass" : "ls 6/26/2019 17:33",
 		"fromText:withStructures:" : "ls 6/26/2019 17:31",
-		"initialBoldStructure" : "tok 5/22/2020 12:32",
-		"initialFootnoteStructure" : "tok 5/22/2020 13:17",
-		"initialHeading1Structure" : "tok 5/22/2020 13:17",
-		"initialHeading2Structure" : "tok 5/22/2020 13:18",
-		"initialHeading3Structure" : "tok 5/22/2020 13:18",
-		"initialItalicStructure" : "tok 5/22/2020 12:32",
-		"initialListStructure" : "tok 5/31/2020 21:15",
+		"initialBoldStructure" : "tok 6/8/2020 12:22",
+		"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",
+		"initialListStructure" : "tok 6/8/2020 12:22",
 		"initialTextStructures" : "tok 5/31/2020 21:15",
-		"initialUnderlinedStructure" : "tok 5/22/2020 12:33" },
+		"initialUnderlinedStructure" : "tok 6/8/2020 12:23" },
 	"instance" : {
 		"addAttribute:from:to:" : "AG 7/25/2019 13:08",
 		"charcount" : "frc 5/25/2020 16:02",
@@ -22,7 +22,7 @@
 		"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:withEmphasis:" : "ls 6/26/2019 22:07",
+		"initializeStructure:withEmphasis:" : "tok 6/8/2020 12:06",
 		"initializeStructures" : "ls 7/24/2019 15:12",
 		"name" : "ls 6/26/2019 17:28",
 		"name:" : "MB 7/3/2019 19:29",

diff --git a/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/isNewCharacter..st b/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/isNewCharacter..st
@@ -4,9 +4,6 @@ isNewCharacter: aKeyboardEvent
 	| character value |
 	character := aKeyboardEvent keyCharacter.
 	value := aKeyboardEvent keyValue.
-
-	^ aKeyboardEvent controlKeyPressed not and: (aKeyboardEvent commandKeyPressed not) and:
-		[character isAlphaNumeric or: [
-		character isSpecial] or: [
-		value = self spaceValue] or: [
-		value = self returnValue]]
+	^ aKeyboardEvent controlKeyPressed not 
+			and: (aKeyboardEvent commandKeyPressed not) 
+			and: [self isValidCharacter: character]
diff --git a/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/isSpecialCharacter..st b/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/isSpecialCharacter..st
@@ -0,0 +1,4 @@
+input events
+isSpecialCharacter: aCharacter
+
+	^ aCharacter isSpecial or: [self specialCharacters includes: aCharacter]
diff --git a/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/isStructureShortcut..st b/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/isStructureShortcut..st
@@ -0,0 +1,6 @@
+input events
+isStructureShortcut: aKeyboardEvent
+
+	 ^aKeyboardEvent controlKeyPressed and: [
+		aKeyboardEvent shiftPressed] and: [
+		self class structureKeymap includes: aKeyboardEvent keyCharacter]
diff --git a/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/isValidCharacter..st b/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/isValidCharacter..st
@@ -0,0 +1,6 @@
+input events
+isValidCharacter: aCharacter
+
+	^ aCharacter isAlphaNumeric 
+			or: [self isSpecialCharacter: aCharacter]
+			or: [Character separators includes: aCharacter]
diff --git a/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/keyStroke..st b/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/keyStroke..st
@@ -5,7 +5,8 @@ keyStroke: aKeyboardEvent
 	returnValue := super keyStroke: aKeyboardEvent.
 	(self isNewCharacter: aKeyboardEvent)
 		ifTrue: [self model applyCurrentStructures].
-	self model unbufferStructures.
+	(self isStructureShortcut: aKeyboardEvent) ifFalse: 
+		[self model unbufferStructures].
 	(self isCtrlA: aKeyboardEvent)
 		ifTrue: [self selectAll].	
 	self model precedingStructuresChanged.

diff --git a/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/returnValue.st b/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/returnValue.st
diff --git a/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/spaceValue.st b/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/spaceValue.st
diff --git a/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/specialCharacters.st b/packages/RichTextEditing-Core.package/RichTextEditor.class/instance/specialCharacters.st
@@ -0,0 +1,4 @@
+constants
+specialCharacters
+
+	^ '.$#^()_{}[]"`~:;''@%'
diff --git a/...RichTextEditing-Core.package/RichTextEditor.class/instance/toggleStructureSelectionAt..st b/...RichTextEditing-Core.package/RichTextEditor.class/instance/toggleStructureSelectionAt..st
@@ -1,4 +1,4 @@
-as yet unclassified
+input events
 toggleStructureSelectionAt: aKeyboardEvent
 
 	| keyCode |

diff --git a/packages/RichTextEditing-Core.package/RichTextEditor.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextEditor.class/methodProperties.json
@@ -10,12 +10,14 @@
 		"crWithIndent:" : "lh 7/24/2019 22:30",
 		"getParagraphCharacter" : "LM 5/26/2019 22:52",
 		"isCtrlA:" : "lh 7/24/2019 16:59",
-		"isNewCharacter:" : "OS 6/1/2020 00:19",
-		"keyStroke:" : "OS 6/1/2020 00:20",
+		"isNewCharacter:" : "tok 6/13/2020 12:03",
+		"isSpecialCharacter:" : "OS 6/12/2020 12:03",
+		"isStructureShortcut:" : "OS 6/12/2020 12:09",
+		"isValidCharacter:" : "tok 6/13/2020 12:04",
+		"keyStroke:" : "OS 6/12/2020 12:09",
 		"mouseDown:" : "OS 6/1/2020 00:56",
-		"returnValue" : "ls 6/19/2019 19:14",
 		"setEmphasisHere" : "6/1/2020 14:03:21",
-		"spaceValue" : "AG 6/22/2019 11:51",
+		"specialCharacters" : "tok 6/13/2020 12:14",
 		"storeSelectionInParagraph" : "lh 7/24/2019 21:51",
 		"textSize" : "lh 6/26/2019 22:16",
 		"toggleStructureSelectionAt:" : "tok 5/18/2020 13:40" } }
diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/class/textStyles.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/class/textStyles.st
@@ -1,10 +1,5 @@
 constants
 textStyles
 
-	^ {#bold .  
-		#italic . 
-		#underlined . 
-		#struckOut .
-		#extendable . 
-		#indented} asOrderedCollection
+	^ TextStructure availableStyles asOrderedCollection
 
diff --git a/...chTextEditing-Core.package/RichTextStructureEditor.class/instance/newNullTextStructure.st b/...chTextEditing-Core.package/RichTextStructureEditor.class/instance/newNullTextStructure.st
@@ -1,4 +1,4 @@
 initialize-release
 newNullTextStructure
 
-	^ NullTextStructure newWith: #null withEmphasis: Set new
+	^ NullTextStructure newWith: #null withStyles: Set new
diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json
@@ -1,7 +1,7 @@
 {
 	"class" : {
 		"openWith:" : "AG 7/25/2019 13:15",
-		"textStyles" : "tok 5/28/2020 10:19" },
+		"textStyles" : "tok 6/8/2020 12:26" },
 	"instance" : {
 		"addColor" : "ls 7/24/2019 21:51",
 		"addFont" : "ls 7/24/2019 21:16",
@@ -36,7 +36,7 @@
 		"loremIpsum" : "ls 6/5/2019 22:07",
 		"loremIpsum:" : "ls 6/5/2019 22:07",
 		"loremIpsumDefault" : "lh 7/24/2019 16:16",
-		"newNullTextStructure" : "ls 7/24/2019 20:18",
+		"newNullTextStructure" : "tok 6/8/2020 12:06",
 		"removeStructure" : "lh 7/24/2019 20:16",
 		"resetColor" : "ls 7/24/2019 21:57",
 		"resetFont" : "ls 7/24/2019 21:24",

diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/README.md b/packages/RichTextEditing-Core.package/TextStructure.class/README.md
@@ -1,14 +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.
 
 My instance variables are: 
 structureIdentifier - aSymbol
-bold - aBoolean
-italic - aBoolean
-underlined - aBoolean
-struckOut - aBoolean
-extendable - aBoolean
 color - aColor
 font - aFont (e.g. StrikeFont)
-styleSet - aSet 
+styleSet - aSet
+stylesActived - aSet
diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/availableStyles.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/availableStyles.st
@@ -0,0 +1,5 @@
+constants
+availableStyles
+
+	^ {self boldStyle .self italicStyle . self underlinedStyle .
+	self struckOutStyle . self extendableStyle . self indentedStyle}
diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/boldStyle.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/boldStyle.st
@@ -0,0 +1,4 @@
+constants
+boldStyle
+
+	^ #bold
diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/extendableStyle.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/extendableStyle.st
@@ -0,0 +1,4 @@
+constants
+extendableStyle
+
+	^ #extendable
diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/indentedStyle.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/indentedStyle.st
@@ -0,0 +1,4 @@
+constants
+indentedStyle
+
+	^ #indented
diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/italicStyle.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/italicStyle.st
@@ -0,0 +1,4 @@
+constants
+italicStyle
+
+	^ #italic
diff --git a/...ture.class/class/newWith.withEmphasis..st → ...ucture.class/class/newWith.withStyles..st b/...ture.class/class/newWith.withEmphasis..st → ...ucture.class/class/newWith.withStyles..st
@@ -1,5 +1,5 @@
 instance creation
-newWith: aSymbol withEmphasis: aSet
+newWith: aSymbol withStyles: aSet
 
 	| instance | 
 	instance := self new structureIdentifier: aSymbol.

diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/struckOutStyle.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/struckOutStyle.st
@@ -0,0 +1,4 @@
+constants
+struckOutStyle
+
+	^ #struckOut
diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/class/underlinedStyle.st b/packages/RichTextEditing-Core.package/TextStructure.class/class/underlinedStyle.st
@@ -0,0 +1,4 @@
+constants
+underlinedStyle
+
+	^ #underlined
diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/initialize.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/initialize.st
@@ -3,11 +3,6 @@ initialize
 
 	super initialize.
 	self 
-		unsetBold; 
-		unsetItalic; 
-		unsetUnderlined; 
-		unsetStruckOut; 
-		unsetExtendable;
-		unsetIndented; 
+		initializeStyles;
 		color: nil;
 		font: nil
diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/initializeStyles.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/initializeStyles.st
@@ -0,0 +1,5 @@
+initialize-release
+initializeStyles
+
+	self stylesActivated: Dictionary new.
+	self class availableStyles do: [:style | self stylesActivated at: style put: false]
diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/isBold.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/isBold.st
@@ -1,4 +1,4 @@
 testing
 isBold
 
-	^ bold
+	^ self stylesActivated at: self class boldStyle
diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/isExtendable.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/isExtendable.st
@@ -1,4 +1,4 @@
 testing
 isExtendable
 
-	^ extendable
+	^ self stylesActivated at: self class extendableStyle
diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/isIndented.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/isIndented.st
@@ -1,4 +1,4 @@
 testing
 isIndented
 
-	^ indented
+	^ self stylesActivated at: self class indentedStyle
diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/isItalic.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/isItalic.st
@@ -1,4 +1,4 @@
 testing
 isItalic
 
-	^ italic
+	^ self stylesActivated at: self class italicStyle
diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/isStruckOut.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/isStruckOut.st
@@ -1,4 +1,4 @@
 testing
 isStruckOut
 
-	^ struckOut
+	^ self stylesActivated at: self class struckOutStyle
diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/isTextIndent.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/isTextIndent.st
@@ -1,4 +1,4 @@
 testing
 isTextIndent
 
-	^ indented
+	^ self isIndented
diff --git a/packages/RichTextEditing-Core.package/TextStructure.class/instance/isUnderlined.st b/packages/RichTextEditing-Core.package/TextStructure.class/instance/isUnderlined.st
@@ -1,4 +1,4 @@
 testing
 isUnderlined
 
-	^ underlined
+	^ self stylesActivated at: self class underlinedStyle