From fe626d71e74dec5acff04db5366d98534d171d87 Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Thu, 20 Oct 2022 11:23:28 +0200
Subject: [PATCH 01/40] intermediate

---
 src/Microdown/MicAbstractDelimiter.class.st |  34 ++++
 src/Microdown/MicInlineParser2.class.st     | 186 ++++++++++++++++++++
 src/Microdown/MicInlineParserToken.class.st |  48 +++++
 src/Microdown/String.extension.st           |  10 ++
 4 files changed, 278 insertions(+)
 create mode 100644 src/Microdown/MicInlineParser2.class.st
 create mode 100644 src/Microdown/MicInlineParserToken.class.st

diff --git a/src/Microdown/MicAbstractDelimiter.class.st b/src/Microdown/MicAbstractDelimiter.class.st
index a011d0f0..2849d6e3 100644
--- a/src/Microdown/MicAbstractDelimiter.class.st
+++ b/src/Microdown/MicAbstractDelimiter.class.st
@@ -32,6 +32,25 @@ MicAbstractDelimiter class >> allActive [
 	^ self allSubclasses select: [ :subclass | subclass isActive ]
 ]
 
+{ #category : #'as yet unclassified' }
+MicAbstractDelimiter class >> allRegex [
+	^ ((self allActive collect: [ :del | |str| 
+		str := WriteStream on: ''. 
+		(del associatedInlineBlock 
+			ifNil: [true] ifNotNil: [:block | block isEvaluated])
+			ifTrue: [ 
+				del markup do: [:char| str nextPut: $\;nextPut: char] ]
+			ifFalse: [
+				del markup do: [:char| str nextPut: $\;nextPut: char].
+				del associatedInlineBlock new closingDelimiter in: [ :other |
+					str nextPutAll: (self regExNot: other).
+					other do: [:char| str nextPut: $\;nextPut: char].
+					 ]
+				]. 
+		str contents]) joinUsing: '|') asRegex
+	
+]
+
 { #category : #accessing }
 MicAbstractDelimiter class >> associatedInlineBlock [
 	^ self subclassResponsibility
@@ -83,6 +102,21 @@ MicAbstractDelimiter class >> markup [
 	^ self subclassResponsibility 
 ]
 
+{ #category : #'as yet unclassified' }
+MicAbstractDelimiter class >> regExNot: markup [
+	"return a regular expression (string), which is recognizing anything but markup"
+	| str prefix|
+	str := WriteStream on: ''.
+	str nextPut: $(.
+	prefix := ''.
+	1 to: markup size do: [ :idx |
+		str nextPutAll: prefix; nextPut: $[;nextPut: $^; nextPut: (markup at: idx); nextPut: $].
+		prefix := '|', (markup copyFrom: 1 to: idx) escapeAll.
+		 ].
+	str nextPut: $);nextPut: $*.
+	^ str contents
+]
+
 { #category : #accessing }
 MicAbstractDelimiter class >> size [
 	^ self markup size
diff --git a/src/Microdown/MicInlineParser2.class.st b/src/Microdown/MicInlineParser2.class.st
new file mode 100644
index 00000000..14107a07
--- /dev/null
+++ b/src/Microdown/MicInlineParser2.class.st
@@ -0,0 +1,186 @@
+Class {
+	#name : #MicInlineParser2,
+	#superclass : #Object,
+	#instVars : [
+		'delimiterRegEx',
+		'delimiterDictionary'
+	],
+	#pools : [
+		'MicMicrodownSharedPool'
+	],
+	#category : #'Microdown-Parser'
+}
+
+{ #category : #'escape character' }
+MicInlineParser2 class >> escapeDecode: aString [
+	"I convert all encoded chars back to their original (without the leading escape character)"
+	"My sister method escapeEncode encodes into the format I decode from"
+	| inStream outStream char special |
+	aString ifEmpty: [ ^aString ].
+	special := [ :c | c asInteger between: self magicCharacter  and: self magicCharacter + 65536 ].
+	inStream := ReadStream on: aString.
+	outStream := WriteStream on: String new.
+	[ inStream atEnd ] whileFalse: [ 
+		char := inStream next.
+		(special value: char)
+			ifTrue: [ char := (char asInteger - self magicCharacter ) asCharacter  ].
+		outStream nextPut: char
+	].
+	^ outStream contents
+	
+]
+
+{ #category : #'escape character' }
+MicInlineParser2 class >> escapeEncode: aString [
+	"I convert all escaped characters (eg '\`' or '\\') into special characters which are not used in Microdown"
+	"My sister method escapeDecode reverts back"
+	| inStream outStream char |
+	aString size <= 1 ifTrue: [ ^aString ].
+	inStream := ReadStream on: aString.
+	outStream := WriteStream on: String new.
+	[ inStream atEnd ] whileFalse: [ 
+		char := inStream next.
+		(char = $\ and: [ inStream atEnd not ]) 
+			ifTrue: [ char := (inStream next asInteger + self magicCharacter) asCharacter  ].
+		outStream nextPut: char
+	].
+	^ outStream contents
+	
+]
+
+{ #category : #'escape character' }
+MicInlineParser2 class >> escapeReescape: aString except: keep [
+	"I convert all encoded back to escaped chars, except the characters in keep"
+	"My sister method escapeEncode encodes into the format I decode from"
+	| inStream outStream char |
+	aString ifEmpty: [ ^aString ].
+	inStream := ReadStream on: aString.
+	outStream := WriteStream on: String new.
+	[ inStream atEnd ] whileFalse: [ 
+		char := inStream next.
+		(char asInteger between: self magicCharacter  and: self magicCharacter + 65536)
+			ifTrue: [ 
+				char := (char asInteger - self magicCharacter ) asCharacter.  
+				(keep includes: char) ifFalse: [outStream nextPut: $\]] .
+		outStream nextPut: char
+	].
+	^ outStream contents
+	
+]
+
+{ #category : #'escape character' }
+MicInlineParser2 class >> magicCharacter [
+	"All escaped characters are moved out of range. 
+	The unicode range Private Use Area is used, 
+	see https://en.wikipedia.org/wiki/Private_Use_Areas "
+	^ 16r100000 "Private Use Area-B"
+]
+
+{ #category : #parsing }
+MicInlineParser2 >> compactRaws: tokenStream [
+	"compact tokenStream so raw/unevaluated is single tokens"
+	
+	
+]
+
+{ #category : #'as yet unclassified' }
+MicInlineParser2 >> createInlineBlock: token [
+	"token is an opening delimiter"
+	| closer |
+	closer := (delimiterDictionary at: token) associatedInlineBlock closingDelimiter
+	
+	
+]
+
+{ #category : #'as yet unclassified' }
+MicInlineParser2 >> createInlineBlock: openingDelimiter inStream: aReadStream [ 
+	| pos closer bodyStream newBlock|
+	pos := aReadStream position.
+	closer := openingDelimiter associatedInlineBlock new closingDelimiter.
+	(self skipTo: closer inStream: aReadStream)
+		ifFalse: [ 
+			aReadStream position: pos.
+			^ self createTextBlock: openingDelimiter markup].
+	bodyStream := ReadStream 
+		on: aReadStream contents
+		from: pos
+		to: aReadStream position - 1.
+	newBlock := openingDelimiter associatedInlineBlock new
+		substring: (aReadStream contents copyFrom: pos to: aReadStream position -1);
+		children: (self eagerParse: bodyStream ).
+	^ newBlock 
+	
+	
+]
+
+{ #category : #'as yet unclassified' }
+MicInlineParser2 >> createTextBlock: token [
+	^ MicTextBlock new
+		substring: token;
+		children: #()
+]
+
+{ #category : #'as yet unclassified' }
+MicInlineParser2 >> eagerParse: tokenStream [
+	"return an array of blocks from parsing tokenStream"
+	| children child |
+	children := OrderedCollection new.
+	[ tokenStream atEnd ]
+		whileFalse: [ | token delType |
+			token := tokenStream next.
+			delType := delimiterDictionary at: token ifAbsent: [ nil ].
+			child := (delType
+				ifNil: [ self createTextBlock: token ]
+				ifNotNil: [ 
+					delType isOpener 
+						ifTrue: [self createInlineBlock: delType inStream: tokenStream]
+						ifFalse: [ self createTextBlock: token] ]).
+			children add: child.
+		].
+	^ children
+]
+
+{ #category : #'as yet unclassified' }
+MicInlineParser2 >> initialize [
+	delimiterRegEx := MicAbstractDelimiter allRegex.
+	delimiterDictionary := (MicAbstractDelimiter allActive collect: [ :del | del markup -> del ]) asDictionary .
+]
+
+{ #category : #parsing }
+MicInlineParser2 >> parse: aString [
+	"I return an array of inline blocks"
+	| escapedStream  tokenStream |
+	escapedStream := self class escapeEncode: aString.
+	tokenStream := self tokenize: escapedStream.
+	^ self eagerParse: tokenStream 
+]
+
+{ #category : #'as yet unclassified' }
+MicInlineParser2 >> skipTo: closer inStream: tokenStream [
+	"skip tokenStream to closer, ignore closers in non-evaluated. return true if we found it"
+	| startPos|
+	startPos := tokenStream position.
+	[ tokenStream atEnd]
+		whileFalse: [ | token|
+			token := tokenStream next.
+			token = closer ifTrue: [ ^true ]
+			 ].
+	^ false
+	
+]
+
+{ #category : #parsing }
+MicInlineParser2 >> tokenize: escapedStream [
+	| splits tokens from|
+	splits := delimiterRegEx matchingRangesIn: escapedStream.
+	tokens := OrderedCollection new.
+	from := 1.
+	splits do: [ :delMatch |
+		tokens add: (escapedStream copyFrom: from to: delMatch first - 1).
+		tokens add: (escapedStream copyFrom: delMatch first to: delMatch last).
+		from := delMatch last + 1
+		 ].
+	from <= escapedStream size ifTrue: [ tokens add: (escapedStream copyFrom: from to: escapedStream size) ].
+	^ ReadStream on: tokens
+	
+]
diff --git a/src/Microdown/MicInlineParserToken.class.st b/src/Microdown/MicInlineParserToken.class.st
new file mode 100644
index 00000000..4f371cf3
--- /dev/null
+++ b/src/Microdown/MicInlineParserToken.class.st
@@ -0,0 +1,48 @@
+Class {
+	#name : #MicInlineParserToken,
+	#superclass : #Object,
+	#instVars : [
+		'string',
+		'delimiter'
+	],
+	#pools : [
+		'MicMicrodownSharedPool'
+	],
+	#category : #'Microdown-Parser'
+}
+
+{ #category : #'instance creation' }
+MicInlineParserToken class >> on: aString [ 
+	^ self new
+		string: aString;
+		delimiter: 88
+]
+
+{ #category : #accessing }
+MicInlineParserToken >> delimiter [
+
+	^ delimiter
+]
+
+{ #category : #accessing }
+MicInlineParserToken >> delimiter: anObject [
+
+	delimiter := anObject
+]
+
+{ #category : #'instance creation' }
+MicInlineParserToken >> on: aString [
+	
+]
+
+{ #category : #accessing }
+MicInlineParserToken >> string [
+
+	^ string
+]
+
+{ #category : #accessing }
+MicInlineParserToken >> string: anObject [
+
+	string := anObject
+]
diff --git a/src/Microdown/String.extension.st b/src/Microdown/String.extension.st
index 8c8aebf2..0713e3a5 100644
--- a/src/Microdown/String.extension.st
+++ b/src/Microdown/String.extension.st
@@ -5,6 +5,16 @@ String >> asMicResourceReference [
 	^ MicResourceReference fromUri: self
 ]
 
+{ #category : #'*Microdown' }
+String >> escapeAll [
+	| escaped |
+	escaped := String new: self size * 2.
+	1 to: self size do: [ :idx | 
+		escaped at: idx*2-1 put: $\. 
+		escaped at: idx*2 put: (self at: idx)].
+	^ escaped
+]
+
 { #category : #'*Microdown' }
 String >> resolveDocument: document [
 	^ self asMicResourceReference resolveDocument: document.

From 2b9cf9767726577a13200c0843634b56a560a968 Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Thu, 20 Oct 2022 12:42:30 +0200
Subject: [PATCH 02/40] inline parser go 1

---
 src/Microdown/MicAbstractDelimiter.class.st |  5 ++
 src/Microdown/MicInlineParser2.class.st     | 96 +++++++++++++--------
 2 files changed, 65 insertions(+), 36 deletions(-)

diff --git a/src/Microdown/MicAbstractDelimiter.class.st b/src/Microdown/MicAbstractDelimiter.class.st
index 2849d6e3..87814576 100644
--- a/src/Microdown/MicAbstractDelimiter.class.st
+++ b/src/Microdown/MicAbstractDelimiter.class.st
@@ -102,6 +102,11 @@ MicAbstractDelimiter class >> markup [
 	^ self subclassResponsibility 
 ]
 
+{ #category : #'as yet unclassified' }
+MicAbstractDelimiter class >> rawStyleOpeningMarkups [
+	^ self allActive select: [ :del | del isOpener and: [ del associatedInlineBlock isEvaluated not ] ]
+]
+
 { #category : #'as yet unclassified' }
 MicAbstractDelimiter class >> regExNot: markup [
 	"return a regular expression (string), which is recognizing anything but markup"
diff --git a/src/Microdown/MicInlineParser2.class.st b/src/Microdown/MicInlineParser2.class.st
index 14107a07..b8cff3fe 100644
--- a/src/Microdown/MicInlineParser2.class.st
+++ b/src/Microdown/MicInlineParser2.class.st
@@ -76,22 +76,6 @@ MicInlineParser2 class >> magicCharacter [
 	^ 16r100000 "Private Use Area-B"
 ]
 
-{ #category : #parsing }
-MicInlineParser2 >> compactRaws: tokenStream [
-	"compact tokenStream so raw/unevaluated is single tokens"
-	
-	
-]
-
-{ #category : #'as yet unclassified' }
-MicInlineParser2 >> createInlineBlock: token [
-	"token is an opening delimiter"
-	| closer |
-	closer := (delimiterDictionary at: token) associatedInlineBlock closingDelimiter
-	
-	
-]
-
 { #category : #'as yet unclassified' }
 MicInlineParser2 >> createInlineBlock: openingDelimiter inStream: aReadStream [ 
 	| pos closer bodyStream newBlock|
@@ -103,16 +87,33 @@ MicInlineParser2 >> createInlineBlock: openingDelimiter inStream: aReadStream [
 			^ self createTextBlock: openingDelimiter markup].
 	bodyStream := ReadStream 
 		on: aReadStream contents
-		from: pos
+		from: pos + 1
 		to: aReadStream position - 1.
 	newBlock := openingDelimiter associatedInlineBlock new
 		substring: (aReadStream contents copyFrom: pos to: aReadStream position -1);
-		children: (self eagerParse: bodyStream ).
+		children: (self parseChildrenIn: bodyStream ).
 	^ newBlock 
 	
 	
 ]
 
+{ #category : #'as yet unclassified' }
+MicInlineParser2 >> createRawStyleBlock: token [
+	| opener block substring|
+	opener := (MicAbstractDelimiter rawStyleOpeningMarkups)
+		detect: [ :o | token beginsWith: o markup]
+		ifNone: [ nil ].
+	opener ifNil: [ ^ self createTextBlock: token ].
+	block := opener associatedInlineBlock new.
+	substring := token 
+		copyFrom: opener markup size + 1 
+		to: token size - block closingDelimiter size.
+	^ block
+		substring: substring;
+		children: { self createTextBlock: substring }
+		
+]
+
 { #category : #'as yet unclassified' }
 MicInlineParser2 >> createTextBlock: token [
 	^ MicTextBlock new
@@ -121,7 +122,45 @@ MicInlineParser2 >> createTextBlock: token [
 ]
 
 { #category : #'as yet unclassified' }
-MicInlineParser2 >> eagerParse: tokenStream [
+MicInlineParser2 >> initialize [
+	delimiterRegEx := MicAbstractDelimiter allRegex.
+	delimiterDictionary := (MicAbstractDelimiter allActive collect: [ :del | del markup -> del ]) asDictionary .
+]
+
+{ #category : #'as yet unclassified' }
+MicInlineParser2 >> joinTextNodesOf: children [
+	"children might have several text blocks following each other - join them and remove empty Text blocks"
+	| outStream bufferText  |
+	outStream := WriteStream on: OrderedCollection new.
+	bufferText := nil.
+	children do: [ :child |
+		child class = MicTextBlock
+			ifTrue: [ bufferText 
+				ifNil: [ bufferText := child ]
+				ifNotNil: [ bufferText substring: (bufferText substring , child substring) ] ]
+			ifFalse: [ bufferText
+				ifNil: [ outStream nextPut: child ]
+				ifNotNil: [ 
+					bufferText substring ifNotEmpty: [outStream nextPut: bufferText].
+					outStream nextPut: child. bufferText := nil ]
+				 ]
+		 ].
+	(bufferText isNotNil and: [ bufferText substring isNotEmpty  ]) 
+		ifTrue: [ outStream nextPut: bufferText ].
+	 ^ outStream contents
+]
+
+{ #category : #parsing }
+MicInlineParser2 >> parse: aString [
+	"I return an array of inline blocks"
+	| escapedStream  tokenStream |
+	escapedStream := self class escapeEncode: aString.
+	tokenStream := self tokenize: escapedStream.
+	^ self parseChildrenIn: tokenStream 
+]
+
+{ #category : #'as yet unclassified' }
+MicInlineParser2 >> parseChildrenIn: tokenStream [
 	"return an array of blocks from parsing tokenStream"
 	| children child |
 	children := OrderedCollection new.
@@ -130,29 +169,14 @@ MicInlineParser2 >> eagerParse: tokenStream [
 			token := tokenStream next.
 			delType := delimiterDictionary at: token ifAbsent: [ nil ].
 			child := (delType
-				ifNil: [ self createTextBlock: token ]
+				ifNil: [ self createRawStyleBlock: token ]
 				ifNotNil: [ 
 					delType isOpener 
 						ifTrue: [self createInlineBlock: delType inStream: tokenStream]
 						ifFalse: [ self createTextBlock: token] ]).
 			children add: child.
 		].
-	^ children
-]
-
-{ #category : #'as yet unclassified' }
-MicInlineParser2 >> initialize [
-	delimiterRegEx := MicAbstractDelimiter allRegex.
-	delimiterDictionary := (MicAbstractDelimiter allActive collect: [ :del | del markup -> del ]) asDictionary .
-]
-
-{ #category : #parsing }
-MicInlineParser2 >> parse: aString [
-	"I return an array of inline blocks"
-	| escapedStream  tokenStream |
-	escapedStream := self class escapeEncode: aString.
-	tokenStream := self tokenize: escapedStream.
-	^ self eagerParse: tokenStream 
+	^ self joinTextNodesOf: children
 ]
 
 { #category : #'as yet unclassified' }

From bb3192677b6a5f37ece347925bcd500cb2bd50a6 Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Sat, 22 Oct 2022 17:59:38 +0200
Subject: [PATCH 03/40] added new inline delimiter class and other stuff

---
 .../MicInlineTokenStreamTest.class.st         |   8 ++
 src/Microdown/MicInlineDelimiter.class.st     | 101 ++++++++++++++++++
 src/Microdown/MicInlineParser2.class.st       |  29 ++---
 src/Microdown/MicInlineParserToken.class.st   |  48 ---------
 src/Microdown/MicInlineToken.class.st         |  43 ++++++++
 src/Microdown/MicInlineTokenStream.class.st   |  64 +++++++++++
 6 files changed, 223 insertions(+), 70 deletions(-)
 create mode 100644 src/Microdown-Tests/MicInlineTokenStreamTest.class.st
 create mode 100644 src/Microdown/MicInlineDelimiter.class.st
 delete mode 100644 src/Microdown/MicInlineParserToken.class.st
 create mode 100644 src/Microdown/MicInlineToken.class.st
 create mode 100644 src/Microdown/MicInlineTokenStream.class.st

diff --git a/src/Microdown-Tests/MicInlineTokenStreamTest.class.st b/src/Microdown-Tests/MicInlineTokenStreamTest.class.st
new file mode 100644
index 00000000..34cf8204
--- /dev/null
+++ b/src/Microdown-Tests/MicInlineTokenStreamTest.class.st
@@ -0,0 +1,8 @@
+"
+A MicInlineTokenStreamTest is a test class for testing the behavior of MicInlineTokenStream
+"
+Class {
+	#name : #MicInlineTokenStreamTest,
+	#superclass : #TestCase,
+	#category : #'Microdown-Tests-InlineParser'
+}
diff --git a/src/Microdown/MicInlineDelimiter.class.st b/src/Microdown/MicInlineDelimiter.class.st
new file mode 100644
index 00000000..5af7be84
--- /dev/null
+++ b/src/Microdown/MicInlineDelimiter.class.st
@@ -0,0 +1,101 @@
+"
+I am a class representing a inline delimiter (for example `**` for bold).
+
+My class side manages the set of delimiters. The delimiters are defined and set up in class side `initializeDelimiters`
+"
+Class {
+	#name : #MicInlineDelimiter,
+	#superclass : #Object,
+	#instVars : [
+		'markup',
+		'blockClass',
+		'closer',
+		'opener'
+	],
+	#classVars : [
+		'DelimiterMap'
+	],
+	#pools : [
+		'MicMicrodownSharedPool'
+	],
+	#category : #'Microdown-InlineParser'
+}
+
+{ #category : #initialization }
+MicInlineDelimiter class >> initialize [
+	<script>
+	DelimiterMap := Dictionary new.
+	self initializeDelimiters.
+]
+
+{ #category : #initialization }
+MicInlineDelimiter class >> initializeDelimiters [
+	self new markup: AnchorReferenceCloserMarkup; blockClass: MicAnchorReferenceBlock; opener: false; closer: true; addMe.
+	self new markup: AnchorReferenceOpenerMarkup; blockClass: MicAnchorReferenceBlock; opener: true; closer: false; addMe.
+	self new markup: AnnotationCloserMarkup; blockClass: MicAnnotationBlock; opener: false; closer: true; addMe.
+	self new markup: AnnotationOpenerMarkup; blockClass: MicAnnotationBlock; opener: true; closer: false; addMe.
+	self new markup: BoldMarkup; blockClass: MicBoldFormatBlock; opener: true; closer: true; addMe.
+	self new markup: FigureNameOpenerMarkup; blockClass: MicFigureBlock; opener: true; closer: false; addMe.
+	self new markup: ItalicMarkup; blockClass: MicItalicFormatBlock; opener: true; closer: true; addMe.
+	self new markup: MathMarkup; blockClass: MicMathInlineBlock; opener: true; closer: true; addMe.
+	self new markup: MonospaceMarkup; blockClass: MicMonospaceFormatBlock; opener: true; closer: true; addMe.
+	self new markup: RawCloserMarkup; blockClass: MicRawBlock; opener: false; closer: true; addMe.
+	self new markup: RawOpenerMarkup; blockClass: MicRawBlock; opener: true; closer: false; addMe.
+	self new markup: StrikeMarkup; blockClass: MicStrikeFormatBlock; opener: true; closer: true; addMe.
+	self new markup: LinkNameCloserMarkup; blockClass: nil; opener: false; closer: true; addMe.
+	self new markup: LinkNameOpenerMarkup; blockClass: MicLinkBlock; opener: true; closer: false; addMe.
+]
+
+{ #category : #adding }
+MicInlineDelimiter >> addMe [
+	"add me to the dictionary in my class"
+	DelimiterMap at: markup put: self
+]
+
+{ #category : #accessing }
+MicInlineDelimiter >> blockClass [
+
+	^ blockClass
+]
+
+{ #category : #accessing }
+MicInlineDelimiter >> blockClass: anObject [
+
+	blockClass := anObject
+]
+
+{ #category : #accessing }
+MicInlineDelimiter >> closer [
+
+	^ closer
+]
+
+{ #category : #accessing }
+MicInlineDelimiter >> closer: anObject [
+
+	closer := anObject
+]
+
+{ #category : #accessing }
+MicInlineDelimiter >> markup [
+
+	^ markup
+]
+
+{ #category : #accessing }
+MicInlineDelimiter >> markup: anObject [
+
+	markup := anObject
+]
+
+{ #category : #accessing }
+MicInlineDelimiter >> opener [
+
+	^ opener
+]
+
+{ #category : #accessing }
+MicInlineDelimiter >> opener: anObject [
+
+	opener := anObject
+]
diff --git a/src/Microdown/MicInlineParser2.class.st b/src/Microdown/MicInlineParser2.class.st
index b8cff3fe..28ed9e0f 100644
--- a/src/Microdown/MicInlineParser2.class.st
+++ b/src/Microdown/MicInlineParser2.class.st
@@ -1,14 +1,15 @@
+"
+I am a parser for paragraphs with substructure in Microdown.
+
+My only external method is `parse:`.
+"
 Class {
 	#name : #MicInlineParser2,
 	#superclass : #Object,
-	#instVars : [
-		'delimiterRegEx',
-		'delimiterDictionary'
-	],
 	#pools : [
 		'MicMicrodownSharedPool'
 	],
-	#category : #'Microdown-Parser'
+	#category : #'Microdown-InlineParser'
 }
 
 { #category : #'escape character' }
@@ -155,7 +156,7 @@ MicInlineParser2 >> parse: aString [
 	"I return an array of inline blocks"
 	| escapedStream  tokenStream |
 	escapedStream := self class escapeEncode: aString.
-	tokenStream := self tokenize: escapedStream.
+	tokenStream := MicInlineTokenStream on: escapedStream.
 	^ self parseChildrenIn: tokenStream 
 ]
 
@@ -192,19 +193,3 @@ MicInlineParser2 >> skipTo: closer inStream: tokenStream [
 	^ false
 	
 ]
-
-{ #category : #parsing }
-MicInlineParser2 >> tokenize: escapedStream [
-	| splits tokens from|
-	splits := delimiterRegEx matchingRangesIn: escapedStream.
-	tokens := OrderedCollection new.
-	from := 1.
-	splits do: [ :delMatch |
-		tokens add: (escapedStream copyFrom: from to: delMatch first - 1).
-		tokens add: (escapedStream copyFrom: delMatch first to: delMatch last).
-		from := delMatch last + 1
-		 ].
-	from <= escapedStream size ifTrue: [ tokens add: (escapedStream copyFrom: from to: escapedStream size) ].
-	^ ReadStream on: tokens
-	
-]
diff --git a/src/Microdown/MicInlineParserToken.class.st b/src/Microdown/MicInlineParserToken.class.st
deleted file mode 100644
index 4f371cf3..00000000
--- a/src/Microdown/MicInlineParserToken.class.st
+++ /dev/null
@@ -1,48 +0,0 @@
-Class {
-	#name : #MicInlineParserToken,
-	#superclass : #Object,
-	#instVars : [
-		'string',
-		'delimiter'
-	],
-	#pools : [
-		'MicMicrodownSharedPool'
-	],
-	#category : #'Microdown-Parser'
-}
-
-{ #category : #'instance creation' }
-MicInlineParserToken class >> on: aString [ 
-	^ self new
-		string: aString;
-		delimiter: 88
-]
-
-{ #category : #accessing }
-MicInlineParserToken >> delimiter [
-
-	^ delimiter
-]
-
-{ #category : #accessing }
-MicInlineParserToken >> delimiter: anObject [
-
-	delimiter := anObject
-]
-
-{ #category : #'instance creation' }
-MicInlineParserToken >> on: aString [
-	
-]
-
-{ #category : #accessing }
-MicInlineParserToken >> string [
-
-	^ string
-]
-
-{ #category : #accessing }
-MicInlineParserToken >> string: anObject [
-
-	string := anObject
-]
diff --git a/src/Microdown/MicInlineToken.class.st b/src/Microdown/MicInlineToken.class.st
new file mode 100644
index 00000000..d8d22e85
--- /dev/null
+++ b/src/Microdown/MicInlineToken.class.st
@@ -0,0 +1,43 @@
+"
+I am a token used in inline parsing of Microdown.
+I have two instance variables:
+
+- substring, which is the value of the token
+- delimiter, which is a reference to a subclass of MicAbstractDelimiter
+"
+Class {
+	#name : #MicInlineToken,
+	#superclass : #Object,
+	#instVars : [
+		'substring',
+		'delimiter'
+	],
+	#pools : [
+		'MicMicrodownSharedPool'
+	],
+	#category : #'Microdown-InlineParser'
+}
+
+{ #category : #accessing }
+MicInlineToken >> delimiter [
+
+	^ delimiter
+]
+
+{ #category : #accessing }
+MicInlineToken >> delimiter: anObject [
+
+	delimiter := anObject
+]
+
+{ #category : #accessing }
+MicInlineToken >> substring [
+
+	^ substring
+]
+
+{ #category : #accessing }
+MicInlineToken >> substring: anObject [
+
+	substring := anObject
+]
diff --git a/src/Microdown/MicInlineTokenStream.class.st b/src/Microdown/MicInlineTokenStream.class.st
new file mode 100644
index 00000000..975c711b
--- /dev/null
+++ b/src/Microdown/MicInlineTokenStream.class.st
@@ -0,0 +1,64 @@
+"
+I am a stream of tokens.
+I have some logic for assigning delimiter types to the tokens as I build them.
+"
+Class {
+	#name : #MicInlineTokenStream,
+	#superclass : #Object,
+	#instVars : [
+		'tokens',
+		'parser',
+		'delimiterDictionary'
+	],
+	#pools : [
+		'MicMicrodownSharedPool'
+	],
+	#category : #'Microdown-InlineParser'
+}
+
+{ #category : #'instance creation' }
+MicInlineTokenStream class >> on: escapedStream [
+	^ self new tokenize: escapedStream 
+]
+
+{ #category : #initialization }
+MicInlineTokenStream >> add: string [
+	"Transform into token, and add it"
+	| delimiter child |
+	delimiter := delimiterDictionary at: string ifAbsent: [ nil ].
+	child := delimiter
+		ifNil: [ self addRawOrText: delimiter ]
+		ifNotNil: [ self addDelimiter: delimiter ]
+]
+
+{ #category : #adding }
+MicInlineTokenStream >> addRawOrText: delimiter [
+	| opener token |
+	opener := (MicAbstractDelimiter rawStyleOpeningMarkups)
+		detect: [ :o | delimiter beginsWith: o markup]
+		ifNone: [ nil ].
+	token := MicInlineToken new 
+		substring: delimiter;
+		delimiter: opener.
+]
+
+{ #category : #initialization }
+MicInlineTokenStream >> initialize [
+	tokens := OrderedCollection new
+]
+
+{ #category : #parsing }
+MicInlineTokenStream >> tokenize: escapedStream [
+	| splits from|
+	splits := self delimiterRegEx matchingRangesIn: escapedStream.
+	tokens := OrderedCollection new.
+	from := 1.
+	splits do: [ :delMatch |
+		tokens add: (escapedStream copyFrom: from to: delMatch first - 1).
+		tokens add: (escapedStream copyFrom: delMatch first to: delMatch last).
+		from := delMatch last + 1
+		 ].
+	from <= escapedStream size ifTrue: [ tokens add: (escapedStream copyFrom: from to: escapedStream size) ].
+	^ ReadStream on: tokens
+	
+]

From 796a6a9254cafaf8aa125852b3ccc89b288fd213 Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Sat, 22 Oct 2022 18:09:08 +0200
Subject: [PATCH 04/40] interrim commit

---
 src/Microdown/MicInlineDelimiter.class.st | 37 +++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/src/Microdown/MicInlineDelimiter.class.st b/src/Microdown/MicInlineDelimiter.class.st
index 5af7be84..4b96334b 100644
--- a/src/Microdown/MicInlineDelimiter.class.st
+++ b/src/Microdown/MicInlineDelimiter.class.st
@@ -21,6 +21,12 @@ Class {
 	#category : #'Microdown-InlineParser'
 }
 
+{ #category : #accessing }
+MicInlineDelimiter class >> at: markup [
+	"return delimiter at markup, or nil"
+	^ DelimiterMap at: markup ifAbsent: [ nil ]
+]
+
 { #category : #initialization }
 MicInlineDelimiter class >> initialize [
 	<script>
@@ -46,6 +52,21 @@ MicInlineDelimiter class >> initializeDelimiters [
 	self new markup: LinkNameOpenerMarkup; blockClass: MicLinkBlock; opener: true; closer: false; addMe.
 ]
 
+{ #category : #'private utilities' }
+MicInlineDelimiter class >> regExNot: markup [
+	"return a regular expression (string), which is recognizing anything but markup"
+	| str prefix|
+	str := WriteStream on: ''.
+	str nextPut: $(.
+	prefix := ''.
+	1 to: markup size do: [ :idx |
+		str nextPutAll: prefix; nextPut: $[;nextPut: $^; nextPut: (markup at: idx); nextPut: $].
+		prefix := '|', (markup copyFrom: 1 to: idx) escapeAll.
+		 ].
+	str nextPut: $);nextPut: $*.
+	^ str contents
+]
+
 { #category : #adding }
 MicInlineDelimiter >> addMe [
 	"add me to the dictionary in my class"
@@ -88,6 +109,22 @@ MicInlineDelimiter >> markup: anObject [
 	markup := anObject
 ]
 
+{ #category : #'as yet unclassified' }
+MicInlineDelimiter >> markupAsRegEx [
+	| str |
+	str := WriteStream on: ''. 
+	blockClass isEvaluated
+		ifFalse: [ 
+				markup do: [:char| str nextPut: $\;nextPut: char].
+				blockClass closingDelimiter in: [ :other |
+					str nextPutAll: (self class regExNot: other).
+					other do: [:char| str nextPut: $\;nextPut: char].
+					 ]
+				 ]
+		ifTrue: [ markup do: [:char| str nextPut: $\;nextPut: char] ].
+	^ str contents
+]
+
 { #category : #accessing }
 MicInlineDelimiter >> opener [
 

From 70797b26350e2183404b4b7edb8283ba0f0634b1 Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Sun, 23 Oct 2022 08:53:46 +0200
Subject: [PATCH 05/40] interrim commit

---
 .../MicInlineDelimiterTest.class.st           | 44 +++++++++++
 .../MicInlineTokenStreamTest.class.st         | 15 ++++
 src/Microdown/MicAbstractDelimiter.class.st   |  4 +-
 .../MicAnchorReferenceBlock.class.st          | 22 ++++--
 src/Microdown/MicAnnotationBlock.class.st     | 18 ++++-
 src/Microdown/MicBoldFormatBlock.class.st     | 22 ++++--
 src/Microdown/MicFigureBlock.class.st         | 15 +++-
 src/Microdown/MicInlineBlockWithUrl.class.st  |  9 ++-
 src/Microdown/MicInlineDelimiter.class.st     | 75 ++++++++++++-------
 src/Microdown/MicInlineElement.class.st       |  9 ++-
 src/Microdown/MicInlineParser2.class.st       |  2 +-
 src/Microdown/MicInlineTokenStream.class.st   | 41 ++++++----
 src/Microdown/MicItalicFormatBlock.class.st   | 18 ++++-
 src/Microdown/MicLinkBlock.class.st           | 15 +++-
 src/Microdown/MicMathInlineBlock.class.st     | 18 ++++-
 src/Microdown/MicMicrodownSharedPool.class.st |  5 +-
 .../MicMonospaceFormatBlock.class.st          | 22 ++++--
 src/Microdown/MicRawBlock.class.st            | 18 ++++-
 src/Microdown/MicStrikeFormatBlock.class.st   | 18 ++++-
 19 files changed, 297 insertions(+), 93 deletions(-)
 create mode 100644 src/Microdown-Tests/MicInlineDelimiterTest.class.st

diff --git a/src/Microdown-Tests/MicInlineDelimiterTest.class.st b/src/Microdown-Tests/MicInlineDelimiterTest.class.st
new file mode 100644
index 00000000..4bd8ca90
--- /dev/null
+++ b/src/Microdown-Tests/MicInlineDelimiterTest.class.st
@@ -0,0 +1,44 @@
+Class {
+	#name : #MicInlineDelimiterTest,
+	#superclass : #TestCase,
+	#category : #'Microdown-Tests-InlineParser'
+}
+
+{ #category : #tests }
+MicInlineDelimiterTest >> testAddMe [
+	"The delimiter dictionary should not be empty"
+	self assert: MicInlineDelimiter all notEmpty.
+	"all should be rightly placed"
+	MicInlineDelimiter all do: [ :del |
+		self assert: (MicInlineDelimiter at: del markup) equals: del
+		 ].
+	"All instances should have registred"
+	MicInlineDelimiter allInstances do: [ :del | 
+		self assert: (MicInlineDelimiter at: del markup) equals: del
+		 ].
+]
+
+{ #category : #tests }
+MicInlineDelimiterTest >> testMarkupAsRegex [
+	"this test is only for evaluated delimiters"
+	(MicInlineDelimiter all select: #isEvaluated) do: [ :del | |regex|
+		regex := del markupAsRegex asRegex.
+		self assert: (regex matches: del markup  ).
+		self assert: (regex search: ('aaa', del markup) ).
+		self assert: (regex search: (del markup, 'aaa') ).
+		 ]
+]
+
+{ #category : #tests }
+MicInlineDelimiterTest >> testRegexNot [
+	|not|
+	not := (MicInlineDelimiter regexNot: 'ab').
+	"string should not contain any occourance of ab"
+	self assert: ('xxx' matchesRegex: not ). 
+	self assert: ('xax' matchesRegex: not ). 
+	self assert: ('xbx' matchesRegex: not ). 
+	self assert: ('axb' matchesRegex: not ). 
+	self deny: ('xab' matchesRegex: not ).
+	self deny: ('abx' matchesRegex: not ).
+	self deny: ('ab' matchesRegex: not ). 
+]
diff --git a/src/Microdown-Tests/MicInlineTokenStreamTest.class.st b/src/Microdown-Tests/MicInlineTokenStreamTest.class.st
index 34cf8204..79aec026 100644
--- a/src/Microdown-Tests/MicInlineTokenStreamTest.class.st
+++ b/src/Microdown-Tests/MicInlineTokenStreamTest.class.st
@@ -6,3 +6,18 @@ Class {
 	#superclass : #TestCase,
 	#category : #'Microdown-Tests-InlineParser'
 }
+
+{ #category : #tests }
+MicInlineTokenStreamTest >> testTokenize [
+	| tokens | 
+	tokens := MicInlineTokenStream on: ''.
+	self assert: tokens isEmpty
+]
+
+{ #category : #tests }
+MicInlineTokenStreamTest >> testTokenize_justText [
+	| tokens | 
+	tokens := (MicInlineTokenStream on: 'aaaa') contents.
+	self assert: tokens first substring equals: 'aaaa'.
+	self assert: tokens first delimiter equals: nil.
+]
diff --git a/src/Microdown/MicAbstractDelimiter.class.st b/src/Microdown/MicAbstractDelimiter.class.st
index 87814576..20648976 100644
--- a/src/Microdown/MicAbstractDelimiter.class.st
+++ b/src/Microdown/MicAbstractDelimiter.class.st
@@ -43,7 +43,7 @@ MicAbstractDelimiter class >> allRegex [
 			ifFalse: [
 				del markup do: [:char| str nextPut: $\;nextPut: char].
 				del associatedInlineBlock new closingDelimiter in: [ :other |
-					str nextPutAll: (self regExNot: other).
+					str nextPutAll: (self regexNot: other).
 					other do: [:char| str nextPut: $\;nextPut: char].
 					 ]
 				]. 
@@ -108,7 +108,7 @@ MicAbstractDelimiter class >> rawStyleOpeningMarkups [
 ]
 
 { #category : #'as yet unclassified' }
-MicAbstractDelimiter class >> regExNot: markup [
+MicAbstractDelimiter class >> regexNot: markup [
 	"return a regular expression (string), which is recognizing anything but markup"
 	| str prefix|
 	str := WriteStream on: ''.
diff --git a/src/Microdown/MicAnchorReferenceBlock.class.st b/src/Microdown/MicAnchorReferenceBlock.class.st
index 2cdca417..5c957f10 100644
--- a/src/Microdown/MicAnchorReferenceBlock.class.st
+++ b/src/Microdown/MicAnchorReferenceBlock.class.st
@@ -15,20 +15,31 @@ Class {
 	#category : #'Microdown-ModelInline'
 }
 
+{ #category : #accessing }
+MicAnchorReferenceBlock class >> closingDelimiter [
+
+ 	^ AnchorReferenceCloserMarkup
+]
+
 { #category : #testing }
 MicAnchorReferenceBlock class >> isEvaluated [
 	^ false
 ]
 
+{ #category : #accessing }
+MicAnchorReferenceBlock class >> openingDelimiter [
+
+ 	^ AnchorReferenceOpenerMarkup
+]
+
 { #category : #visiting }
 MicAnchorReferenceBlock >> accept: aVisitor [
  	^ aVisitor visitAnchorReference: self
 ]
 
-{ #category : #visiting }
+{ #category : #accessing }
 MicAnchorReferenceBlock >> closingDelimiter [
-
- 	^ AnchorReferenceCloserMarkup
+	^ self class closingDelimiter
 ]
 
 { #category : #initialization }
@@ -37,10 +48,9 @@ MicAnchorReferenceBlock >> kind [
 	^ #anchorReference
 ]
 
-{ #category : #visiting }
+{ #category : #accessing }
 MicAnchorReferenceBlock >> openingDelimiter [
-
- 	^ AnchorReferenceOpenerMarkup
+	^ self class openingDelimiter
 ]
 
 { #category : #accessing }
diff --git a/src/Microdown/MicAnnotationBlock.class.st b/src/Microdown/MicAnnotationBlock.class.st
index 9d892fec..483a2ac6 100644
--- a/src/Microdown/MicAnnotationBlock.class.st
+++ b/src/Microdown/MicAnnotationBlock.class.st
@@ -45,6 +45,12 @@ MicAnnotationBlock class >> buildMicroDownUsing: aBuilder withComment: aString [
 	self addDocumentDefinedAnnotations: aBuilder
 ]
 
+{ #category : #accessing }
+MicAnnotationBlock class >> closingDelimiter [
+
+ 	^ AnnotationCloserMarkup
+]
+
 { #category : #constructor }
 MicAnnotationBlock class >> from: aStartInteger to: anEndInteger withSubstring: aString withChildren: aChildren [
 
@@ -68,6 +74,12 @@ MicAnnotationBlock class >> from: aStartInteger to: anEndInteger withSubstring:
 		  yourself
 ]
 
+{ #category : #accessing }
+MicAnnotationBlock class >> openingDelimiter [
+
+ 	^ AnnotationOpenerMarkup
+]
+
 { #category : #accessing }
 MicAnnotationBlock class >> tag [
 	^ #empty
@@ -96,8 +108,7 @@ MicAnnotationBlock >> closeMe [
 
 { #category : #accessing }
 MicAnnotationBlock >> closingDelimiter [
-
- 	^ AnnotationCloserMarkup
+	^ self class closingDelimiter
 ]
 
 { #category : #accessing }
@@ -113,8 +124,7 @@ MicAnnotationBlock >> name [
 
 { #category : #accessing }
 MicAnnotationBlock >> openingDelimiter [
-
- 	^ AnnotationOpenerMarkup
+	^ self class openingDelimiter
 ]
 
 { #category : #accessing }
diff --git a/src/Microdown/MicBoldFormatBlock.class.st b/src/Microdown/MicBoldFormatBlock.class.st
index b11c9339..1d91a896 100644
--- a/src/Microdown/MicBoldFormatBlock.class.st
+++ b/src/Microdown/MicBoldFormatBlock.class.st
@@ -7,15 +7,26 @@ Class {
 	#category : #'Microdown-ModelInline'
 }
 
+{ #category : #accessing }
+MicBoldFormatBlock class >> closingDelimiter [
+
+ 	^ BoldMarkup
+]
+
+{ #category : #accessing }
+MicBoldFormatBlock class >> openingDelimiter [
+
+ 	^ BoldMarkup
+]
+
 { #category : #utilities }
 MicBoldFormatBlock >> accept: aVisitor [
 	^ aVisitor visitBold: self
 ]
 
-{ #category : #utilities }
+{ #category : #accessing }
 MicBoldFormatBlock >> closingDelimiter [
-
- 	^ BoldMarkup
+	^ self class closingDelimiter
 ]
 
 { #category : #utilities }
@@ -23,8 +34,7 @@ MicBoldFormatBlock >> kind [
 	^ #bold
 ]
 
-{ #category : #utilities }
+{ #category : #accessing }
 MicBoldFormatBlock >> openingDelimiter [
-
- 	^ BoldMarkup
+	^ self class openingDelimiter
 ]
diff --git a/src/Microdown/MicFigureBlock.class.st b/src/Microdown/MicFigureBlock.class.st
index 0367817e..53918a6f 100644
--- a/src/Microdown/MicFigureBlock.class.st
+++ b/src/Microdown/MicFigureBlock.class.st
@@ -16,6 +16,18 @@ Class {
 	#category : #'Microdown-ModelInline'
 }
 
+{ #category : #accessing }
+MicFigureBlock class >> closingDelimiter [
+
+ 	^ NameCloserUrlOpener
+]
+
+{ #category : #accessing }
+MicFigureBlock class >> openingDelimiter [
+
+ 	^ FigureNameOpenerMarkup
+]
+
 { #category : #converting }
 MicFigureBlock >> accept: aVisitor [
  	^ aVisitor visitFigure: self
@@ -97,8 +109,7 @@ MicFigureBlock >> kind [
 
 { #category : #accessing }
 MicFigureBlock >> openingDelimiter [
-
- 	^ FigureNameOpenerMarkup
+	^ self class openingDelimiter
 ]
 
 { #category : #accessing }
diff --git a/src/Microdown/MicInlineBlockWithUrl.class.st b/src/Microdown/MicInlineBlockWithUrl.class.st
index a19e3337..762f90ed 100644
--- a/src/Microdown/MicInlineBlockWithUrl.class.st
+++ b/src/Microdown/MicInlineBlockWithUrl.class.st
@@ -20,6 +20,12 @@ Class {
 	#category : #'Microdown-ModelInline'
 }
 
+{ #category : #accessing }
+MicInlineBlockWithUrl class >> closingDelimiter [
+
+ 	^ URLCloserMarkup
+]
+
 { #category : #private }
 MicInlineBlockWithUrl class >> fileStringWithoutHostFile: aString [
 	| localFileIndicator |
@@ -109,8 +115,7 @@ MicInlineBlockWithUrl >> captionElements: aCollection [
 
 { #category : #accessing }
 MicInlineBlockWithUrl >> closingDelimiter [
-
- 	^ URLCloserMarkup
+	^ self class closingDelimiter
 ]
 
 { #category : #accessing }
diff --git a/src/Microdown/MicInlineDelimiter.class.st b/src/Microdown/MicInlineDelimiter.class.st
index 4b96334b..7bedec8c 100644
--- a/src/Microdown/MicInlineDelimiter.class.st
+++ b/src/Microdown/MicInlineDelimiter.class.st
@@ -9,8 +9,7 @@ Class {
 	#instVars : [
 		'markup',
 		'blockClass',
-		'closer',
-		'opener'
+		'closer'
 	],
 	#classVars : [
 		'DelimiterMap'
@@ -21,12 +20,32 @@ Class {
 	#category : #'Microdown-InlineParser'
 }
 
+{ #category : #accessing }
+MicInlineDelimiter class >> all [
+	^ DelimiterMap values
+]
+
 { #category : #accessing }
 MicInlineDelimiter class >> at: markup [
 	"return delimiter at markup, or nil"
 	^ DelimiterMap at: markup ifAbsent: [ nil ]
 ]
 
+{ #category : #'private utilities' }
+MicInlineDelimiter class >> generateInitialization [
+	|tpl|
+	self flag: #removeLater.
+	tpl := '	self new markup: {1}; blockClass: {2}; closer: {3}; addMe.'. 
+	^ (MicAbstractDelimiter allActive 
+		collect: [ :cl | |markupName closer| 
+			markupName := ((cl class>> #markup) allLiterals detect: [ :lit |lit isClassVariable ]) name asString.
+			closer := cl isCloser ifFalse: [
+				((cl associatedInlineBlock class >> #closingDelimiter) 
+					allLiterals detect: [ :lit |lit isClassVariable ]) name asString] ifTrue: ['nil'].
+			tpl format: { markupName . cl associatedInlineBlock printString. closer} ]
+	) joinUsing: String cr.
+]
+
 { #category : #initialization }
 MicInlineDelimiter class >> initialize [
 	<script>
@@ -36,24 +55,23 @@ MicInlineDelimiter class >> initialize [
 
 { #category : #initialization }
 MicInlineDelimiter class >> initializeDelimiters [
-	self new markup: AnchorReferenceCloserMarkup; blockClass: MicAnchorReferenceBlock; opener: false; closer: true; addMe.
-	self new markup: AnchorReferenceOpenerMarkup; blockClass: MicAnchorReferenceBlock; opener: true; closer: false; addMe.
-	self new markup: AnnotationCloserMarkup; blockClass: MicAnnotationBlock; opener: false; closer: true; addMe.
-	self new markup: AnnotationOpenerMarkup; blockClass: MicAnnotationBlock; opener: true; closer: false; addMe.
-	self new markup: BoldMarkup; blockClass: MicBoldFormatBlock; opener: true; closer: true; addMe.
-	self new markup: FigureNameOpenerMarkup; blockClass: MicFigureBlock; opener: true; closer: false; addMe.
-	self new markup: ItalicMarkup; blockClass: MicItalicFormatBlock; opener: true; closer: true; addMe.
-	self new markup: MathMarkup; blockClass: MicMathInlineBlock; opener: true; closer: true; addMe.
-	self new markup: MonospaceMarkup; blockClass: MicMonospaceFormatBlock; opener: true; closer: true; addMe.
-	self new markup: RawCloserMarkup; blockClass: MicRawBlock; opener: false; closer: true; addMe.
-	self new markup: RawOpenerMarkup; blockClass: MicRawBlock; opener: true; closer: false; addMe.
-	self new markup: StrikeMarkup; blockClass: MicStrikeFormatBlock; opener: true; closer: true; addMe.
-	self new markup: LinkNameCloserMarkup; blockClass: nil; opener: false; closer: true; addMe.
-	self new markup: LinkNameOpenerMarkup; blockClass: MicLinkBlock; opener: true; closer: false; addMe.
+	self new markup: AnchorReferenceCloserMarkup; blockClass: MicAnchorReferenceBlock; closer: nil; addMe.
+	self new markup: AnchorReferenceOpenerMarkup; blockClass: MicAnchorReferenceBlock; closer: AnchorReferenceCloserMarkup; addMe.
+	self new markup: AnnotationCloserMarkup; blockClass: MicAnnotationBlock; closer: nil; addMe.
+	self new markup: AnnotationOpenerMarkup; blockClass: MicAnnotationBlock; closer: AnnotationCloserMarkup; addMe.
+	self new markup: BoldMarkup; blockClass: MicBoldFormatBlock; closer: nil; addMe.
+	self new markup: FigureNameOpenerMarkup; blockClass: MicFigureBlock; closer: NameCloserUrlOpener; addMe.
+	self new markup: ItalicMarkup; blockClass: MicItalicFormatBlock; closer: nil; addMe.
+	self new markup: MathMarkup; blockClass: MicMathInlineBlock; closer: nil; addMe.
+	self new markup: MonospaceMarkup; blockClass: MicMonospaceFormatBlock; closer: nil; addMe.
+	self new markup: RawCloserMarkup; blockClass: MicRawBlock; closer: nil; addMe.
+	self new markup: RawOpenerMarkup; blockClass: MicRawBlock; closer: RawCloserMarkup; addMe.
+	self new markup: StrikeMarkup; blockClass: MicStrikeFormatBlock; closer: nil; addMe.
+	self new markup: LinkNameOpenerMarkup; blockClass: MicLinkBlock; closer: NameCloserUrlOpener; addMe.
 ]
 
 { #category : #'private utilities' }
-MicInlineDelimiter class >> regExNot: markup [
+MicInlineDelimiter class >> regexNot: markup [
 	"return a regular expression (string), which is recognizing anything but markup"
 	| str prefix|
 	str := WriteStream on: ''.
@@ -97,6 +115,11 @@ MicInlineDelimiter >> closer: anObject [
 	closer := anObject
 ]
 
+{ #category : #testing }
+MicInlineDelimiter >> isEvaluated [
+	^ blockClass isEvaluated 
+]
+
 { #category : #accessing }
 MicInlineDelimiter >> markup [
 
@@ -110,14 +133,15 @@ MicInlineDelimiter >> markup: anObject [
 ]
 
 { #category : #'as yet unclassified' }
-MicInlineDelimiter >> markupAsRegEx [
+MicInlineDelimiter >> markupAsRegex [
+	"return a regex (as string) matching this delimiter"
 	| str |
 	str := WriteStream on: ''. 
 	blockClass isEvaluated
 		ifFalse: [ 
 				markup do: [:char| str nextPut: $\;nextPut: char].
 				blockClass closingDelimiter in: [ :other |
-					str nextPutAll: (self class regExNot: other).
+					str nextPutAll: (self class regexNot: other).
 					other do: [:char| str nextPut: $\;nextPut: char].
 					 ]
 				 ]
@@ -125,14 +149,7 @@ MicInlineDelimiter >> markupAsRegEx [
 	^ str contents
 ]
 
-{ #category : #accessing }
-MicInlineDelimiter >> opener [
-
-	^ opener
-]
-
-{ #category : #accessing }
-MicInlineDelimiter >> opener: anObject [
-
-	opener := anObject
+{ #category : #printing }
+MicInlineDelimiter >> printOn: stream [
+	stream << $« << markup << $»
 ]
diff --git a/src/Microdown/MicInlineElement.class.st b/src/Microdown/MicInlineElement.class.st
index 860b0fd1..2da6e606 100644
--- a/src/Microdown/MicInlineElement.class.st
+++ b/src/Microdown/MicInlineElement.class.st
@@ -43,6 +43,12 @@ MicInlineElement class >> isEvaluated [
 	^ true
 ]
 
+{ #category : #accessing }
+MicInlineElement class >> openingDelimiter [
+
+	self subclassResponsibility
+]
+
 { #category : #accessing }
 MicInlineElement >> children [
 	^ children
@@ -111,8 +117,7 @@ MicInlineElement >> literal [
 
 { #category : #accessing }
 MicInlineElement >> openingDelimiter [
-
-	self subclassResponsibility
+	^ self class openingDelimiter
 ]
 
 { #category : #accessing }
diff --git a/src/Microdown/MicInlineParser2.class.st b/src/Microdown/MicInlineParser2.class.st
index 28ed9e0f..dc05d336 100644
--- a/src/Microdown/MicInlineParser2.class.st
+++ b/src/Microdown/MicInlineParser2.class.st
@@ -168,7 +168,7 @@ MicInlineParser2 >> parseChildrenIn: tokenStream [
 	[ tokenStream atEnd ]
 		whileFalse: [ | token delType |
 			token := tokenStream next.
-			delType := delimiterDictionary at: token ifAbsent: [ nil ].
+			delType := token halt.
 			child := (delType
 				ifNil: [ self createRawStyleBlock: token ]
 				ifNotNil: [ 
diff --git a/src/Microdown/MicInlineTokenStream.class.st b/src/Microdown/MicInlineTokenStream.class.st
index 975c711b..e185d866 100644
--- a/src/Microdown/MicInlineTokenStream.class.st
+++ b/src/Microdown/MicInlineTokenStream.class.st
@@ -7,8 +7,7 @@ Class {
 	#superclass : #Object,
 	#instVars : [
 		'tokens',
-		'parser',
-		'delimiterDictionary'
+		'parser'
 	],
 	#pools : [
 		'MicMicrodownSharedPool'
@@ -16,6 +15,12 @@ Class {
 	#category : #'Microdown-InlineParser'
 }
 
+{ #category : #'as yet unclassified' }
+MicInlineTokenStream class >> allRegex [
+	^ ((MicInlineDelimiter all collect: #markupAsRegex) joinUsing: '|') asRegex
+	
+]
+
 { #category : #'instance creation' }
 MicInlineTokenStream class >> on: escapedStream [
 	^ self new tokenize: escapedStream 
@@ -24,22 +29,30 @@ MicInlineTokenStream class >> on: escapedStream [
 { #category : #initialization }
 MicInlineTokenStream >> add: string [
 	"Transform into token, and add it"
-	| delimiter child |
-	delimiter := delimiterDictionary at: string ifAbsent: [ nil ].
-	child := delimiter
-		ifNil: [ self addRawOrText: delimiter ]
+	| delimiter token |
+	delimiter := MicInlineDelimiter at: string.
+	delimiter
+		ifNil: [ self addRawOrText: string ]
 		ifNotNil: [ self addDelimiter: delimiter ]
 ]
 
 { #category : #adding }
-MicInlineTokenStream >> addRawOrText: delimiter [
+MicInlineTokenStream >> addDelimiter: matchedString [
+	tokens add: (MicInlineToken new 
+		substring: matchedString;
+		delimiter: (MicInlineDelimiter at: matchedString ))
+]
+
+{ #category : #adding }
+MicInlineTokenStream >> addRawOrText: matchedString [
 	| opener token |
-	opener := (MicAbstractDelimiter rawStyleOpeningMarkups)
-		detect: [ :o | delimiter beginsWith: o markup]
+	opener := (MicInlineDelimiter all reject: #isEvaluated)
+		detect: [ :o | matchedString beginsWith: o markup]
 		ifNone: [ nil ].
 	token := MicInlineToken new 
-		substring: delimiter;
+		substring: matchedString;
 		delimiter: opener.
+	tokens add: token
 ]
 
 { #category : #initialization }
@@ -50,15 +63,15 @@ MicInlineTokenStream >> initialize [
 { #category : #parsing }
 MicInlineTokenStream >> tokenize: escapedStream [
 	| splits from|
-	splits := self delimiterRegEx matchingRangesIn: escapedStream.
+	splits := self class allRegex matchingRangesIn: escapedStream.
 	tokens := OrderedCollection new.
 	from := 1.
 	splits do: [ :delMatch |
-		tokens add: (escapedStream copyFrom: from to: delMatch first - 1).
-		tokens add: (escapedStream copyFrom: delMatch first to: delMatch last).
+		self add: (escapedStream copyFrom: from to: delMatch first - 1).
+		self add: (escapedStream copyFrom: delMatch first to: delMatch last).
 		from := delMatch last + 1
 		 ].
-	from <= escapedStream size ifTrue: [ tokens add: (escapedStream copyFrom: from to: escapedStream size) ].
+	from <= escapedStream size ifTrue: [ self add: (escapedStream copyFrom: from to: escapedStream size) ].
 	^ ReadStream on: tokens
 	
 ]
diff --git a/src/Microdown/MicItalicFormatBlock.class.st b/src/Microdown/MicItalicFormatBlock.class.st
index 07d70eea..ef7a2aac 100644
--- a/src/Microdown/MicItalicFormatBlock.class.st
+++ b/src/Microdown/MicItalicFormatBlock.class.st
@@ -7,6 +7,18 @@ Class {
 	#category : #'Microdown-ModelInline'
 }
 
+{ #category : #accessing }
+MicItalicFormatBlock class >> closingDelimiter [
+
+ 	^ ItalicMarkup
+]
+
+{ #category : #accessing }
+MicItalicFormatBlock class >> openingDelimiter [
+
+ 	^ ItalicMarkup
+]
+
 { #category : #visiting }
 MicItalicFormatBlock >> accept: aVisitor [
 	^ aVisitor visitItalic: self
@@ -14,8 +26,7 @@ MicItalicFormatBlock >> accept: aVisitor [
 
 { #category : #accessing }
 MicItalicFormatBlock >> closingDelimiter [
-
- 	^ ItalicMarkup
+	^ self class closingDelimiter
 ]
 
 { #category : #accessing }
@@ -26,6 +37,5 @@ MicItalicFormatBlock >> kind [
 
 { #category : #accessing }
 MicItalicFormatBlock >> openingDelimiter [
-
- 	^ ItalicMarkup
+	^ self class openingDelimiter
 ]
diff --git a/src/Microdown/MicLinkBlock.class.st b/src/Microdown/MicLinkBlock.class.st
index 42ac3873..2f3d1a9c 100644
--- a/src/Microdown/MicLinkBlock.class.st
+++ b/src/Microdown/MicLinkBlock.class.st
@@ -7,6 +7,18 @@ Class {
 	#category : #'Microdown-ModelInline'
 }
 
+{ #category : #accessing }
+MicLinkBlock class >> closingDelimiter [
+
+ 	^ NameCloserUrlOpener
+]
+
+{ #category : #accessing }
+MicLinkBlock class >> openingDelimiter [
+
+ 	^ LinkNameOpenerMarkup
+]
+
 { #category : #visiting }
 MicLinkBlock >> accept: aVisitor [
 	^ aVisitor visitLink: self
@@ -45,6 +57,5 @@ MicLinkBlock >> kind [
 
 { #category : #accessing }
 MicLinkBlock >> openingDelimiter [
-
- 	^ LinkNameOpenerMarkup
+	^ self class openingDelimiter
 ]
diff --git a/src/Microdown/MicMathInlineBlock.class.st b/src/Microdown/MicMathInlineBlock.class.st
index 0d3772f7..99f42d65 100644
--- a/src/Microdown/MicMathInlineBlock.class.st
+++ b/src/Microdown/MicMathInlineBlock.class.st
@@ -30,11 +30,23 @@ Class {
 	#category : #'Microdown-ModelInline'
 }
 
+{ #category : #accessing }
+MicMathInlineBlock class >> closingDelimiter [
+
+ 	^ MathMarkup
+]
+
 { #category : #testing }
 MicMathInlineBlock class >> isEvaluated [
 	^ false
 ]
 
+{ #category : #accessing }
+MicMathInlineBlock class >> openingDelimiter [
+
+ 	^ MathMarkup
+]
+
 { #category : #visiting }
 MicMathInlineBlock >> accept: aVisitor [
 	^ aVisitor visitMathInline: self
@@ -47,8 +59,7 @@ MicMathInlineBlock >> cleanSubstring [
 
 { #category : #accessing }
 MicMathInlineBlock >> closingDelimiter [
-
- 	^ MathMarkup
+	^ self class closingDelimiter
 ]
 
 { #category : #accessing }
@@ -59,6 +70,5 @@ MicMathInlineBlock >> kind [
 
 { #category : #accessing }
 MicMathInlineBlock >> openingDelimiter [
-
- 	^ MathMarkup
+	^ self class openingDelimiter
 ]
diff --git a/src/Microdown/MicMicrodownSharedPool.class.st b/src/Microdown/MicMicrodownSharedPool.class.st
index 8d52688e..7642fbaf 100644
--- a/src/Microdown/MicMicrodownSharedPool.class.st
+++ b/src/Microdown/MicMicrodownSharedPool.class.st
@@ -33,6 +33,7 @@ Class {
 		'MetaDataClosingBlockMarkup',
 		'MetaDataOpeningBlockMarkup',
 		'MonospaceMarkup',
+		'NameCloserUrlOpener',
 		'OrderedListSemiMarkup',
 		'PreformattedMarkup',
 		'RawCloserMarkup',
@@ -94,7 +95,8 @@ MicMicrodownSharedPool class >> initialize [
 	RawOpenerMarkup := '{{'. 
 	StrikeMarkup := '~'. 
 	URLCloserMarkup := ')'. 
-	URLOpenerMarkup := '('. 
+	URLOpenerMarkup := '('.
+	NameCloserUrlOpener := ']('.
 
 	Delimiters := { AnchorReferenceCloserMarkup . 
 	AnchorReferenceOpenerMarkup .
@@ -106,6 +108,7 @@ MicMicrodownSharedPool class >> initialize [
 	LinkNameCloserMarkup .  
 	LinkNameOpenerMarkup .  
 	MathMarkup .
+	NameCloserUrlOpener.
 	MonospaceMarkup .  
 	RawCloserMarkup . 
 	RawOpenerMarkup .
diff --git a/src/Microdown/MicMonospaceFormatBlock.class.st b/src/Microdown/MicMonospaceFormatBlock.class.st
index 417388a2..0756315d 100644
--- a/src/Microdown/MicMonospaceFormatBlock.class.st
+++ b/src/Microdown/MicMonospaceFormatBlock.class.st
@@ -7,11 +7,23 @@ Class {
 	#category : #'Microdown-ModelInline'
 }
 
+{ #category : #accessing }
+MicMonospaceFormatBlock class >> closingDelimiter [
+
+ 	^ MonospaceMarkup
+]
+
 { #category : #testing }
 MicMonospaceFormatBlock class >> isEvaluated [
 	^ false
 ]
 
+{ #category : #accessing }
+MicMonospaceFormatBlock class >> openingDelimiter [
+
+ 	^ MonospaceMarkup
+]
+
 { #category : #visiting }
 MicMonospaceFormatBlock >> accept: aVisitor [
 	^ aVisitor visitMonospace: self
@@ -32,10 +44,9 @@ MicMonospaceFormatBlock >> closeMe [
 			self children: { text } ]
 ]
 
-{ #category : #internal }
+{ #category : #accessing }
 MicMonospaceFormatBlock >> closingDelimiter [
-
- 	^ MonospaceMarkup
+	^ self class closingDelimiter
 ]
 
 { #category : #accessing }
@@ -43,8 +54,7 @@ MicMonospaceFormatBlock >> kind [
 	^ #monospace
 ]
 
-{ #category : #internal }
+{ #category : #accessing }
 MicMonospaceFormatBlock >> openingDelimiter [
-
- 	^ MonospaceMarkup
+	^ self class openingDelimiter
 ]
diff --git a/src/Microdown/MicRawBlock.class.st b/src/Microdown/MicRawBlock.class.st
index 5071f62e..5aa704ac 100644
--- a/src/Microdown/MicRawBlock.class.st
+++ b/src/Microdown/MicRawBlock.class.st
@@ -11,11 +11,23 @@ Class {
 	#category : #'Microdown-ModelInline'
 }
 
+{ #category : #accessing }
+MicRawBlock class >> closingDelimiter [
+
+ 	^ RawCloserMarkup
+]
+
 { #category : #testing }
 MicRawBlock class >> isEvaluated [
 	^ false
 ]
 
+{ #category : #accessing }
+MicRawBlock class >> openingDelimiter [
+
+ 	^ RawOpenerMarkup
+]
+
 { #category : #visiting }
 MicRawBlock >> accept: aVisitor [
 	^ aVisitor visitRaw: self
@@ -28,8 +40,7 @@ MicRawBlock >> cleanSubstring [
 
 { #category : #accessing }
 MicRawBlock >> closingDelimiter [
-
- 	^ RawCloserMarkup
+	^ self class closingDelimiter
 ]
 
 { #category : #accessing }
@@ -40,6 +51,5 @@ MicRawBlock >> kind [
 
 { #category : #accessing }
 MicRawBlock >> openingDelimiter [
-
- 	^ RawOpenerMarkup
+	^ self class openingDelimiter
 ]
diff --git a/src/Microdown/MicStrikeFormatBlock.class.st b/src/Microdown/MicStrikeFormatBlock.class.st
index 83701efd..619dc885 100644
--- a/src/Microdown/MicStrikeFormatBlock.class.st
+++ b/src/Microdown/MicStrikeFormatBlock.class.st
@@ -7,6 +7,18 @@ Class {
 	#category : #'Microdown-ModelInline'
 }
 
+{ #category : #accessing }
+MicStrikeFormatBlock class >> closingDelimiter [
+
+ 	^ StrikeMarkup
+]
+
+{ #category : #accessing }
+MicStrikeFormatBlock class >> openingDelimiter [
+
+ 	^ StrikeMarkup
+]
+
 { #category : #visiting }
 MicStrikeFormatBlock >> accept: aVisitor [
 	^ aVisitor visitStrike: self
@@ -14,8 +26,7 @@ MicStrikeFormatBlock >> accept: aVisitor [
 
 { #category : #accessing }
 MicStrikeFormatBlock >> closingDelimiter [
-
- 	^ StrikeMarkup
+	^ self class closingDelimiter
 ]
 
 { #category : #accessing }
@@ -25,6 +36,5 @@ MicStrikeFormatBlock >> kind [
 
 { #category : #accessing }
 MicStrikeFormatBlock >> openingDelimiter [
-
- 	^ StrikeMarkup
+	^ self class openingDelimiter
 ]

From d8e3b2568bca6d187e4c25b074a59de16ec0e75d Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Mon, 24 Oct 2022 17:28:09 +0200
Subject: [PATCH 06/40] interrim

---
 .../MicInlineDelimiterTest.class.st           |   9 +
 .../MicInlineParser2Test.class.st             | 739 +++++++++++++++++
 .../MicInlineParserTest_old2.class.st         | 751 ++++++++++++++++++
 .../MicInlineTokenStreamTest.class.st         | 162 +++-
 .../MicAnchorReferenceBlock.class.st          |   9 +
 .../MicAnchorReferenceBlock2.class.st         |  21 +
 src/Microdown/MicAnnotationBlock2.class.st    |  37 +
 src/Microdown/MicBoldFormatBlock2.class.st    |  13 +
 src/Microdown/MicEvaluatedBlock2.class.st     |  18 +
 src/Microdown/MicFigureBlock2.class.st        |  61 ++
 src/Microdown/MicInlineBlockWithUrl.class.st  |   5 +
 src/Microdown/MicInlineBlockWithUrl2.class.st |  68 ++
 src/Microdown/MicInlineDelimiter.class.st     |  85 +-
 src/Microdown/MicInlineElement.class.st       |   9 +
 src/Microdown/MicInlineElement2.class.st      | 130 +++
 src/Microdown/MicInlineParser2.class.st       | 177 ++---
 src/Microdown/MicInlineToken.class.st         |  13 +
 src/Microdown/MicInlineTokenStream.class.st   | 111 ++-
 src/Microdown/MicItalicFormatBlock2.class.st  |  13 +
 src/Microdown/MicLinkBlock2.class.st          |   8 +
 src/Microdown/MicMathInlineBlock.class.st     |   9 +
 src/Microdown/MicMathInlineBlock2.class.st    |  31 +
 src/Microdown/MicMicrodownSharedPool.class.st |   2 +
 .../MicMonospaceFormatBlock.class.st          |  18 +
 .../MicMonospaceFormatBlock2.class.st         |  22 +
 src/Microdown/MicRawBlock.class.st            |   9 +
 src/Microdown/MicRawBlock2.class.st           |  12 +
 src/Microdown/MicStrikeFormatBlock2.class.st  |  13 +
 src/Microdown/MicTextBlock2.class.st          |  16 +
 src/Microdown/MicUnEvaluatedBlock2.class.st   |  18 +
 30 files changed, 2408 insertions(+), 181 deletions(-)
 create mode 100644 src/Microdown-Tests/MicInlineParser2Test.class.st
 create mode 100644 src/Microdown-Tests/MicInlineParserTest_old2.class.st
 create mode 100644 src/Microdown/MicAnchorReferenceBlock2.class.st
 create mode 100644 src/Microdown/MicAnnotationBlock2.class.st
 create mode 100644 src/Microdown/MicBoldFormatBlock2.class.st
 create mode 100644 src/Microdown/MicEvaluatedBlock2.class.st
 create mode 100644 src/Microdown/MicFigureBlock2.class.st
 create mode 100644 src/Microdown/MicInlineBlockWithUrl2.class.st
 create mode 100644 src/Microdown/MicInlineElement2.class.st
 create mode 100644 src/Microdown/MicItalicFormatBlock2.class.st
 create mode 100644 src/Microdown/MicLinkBlock2.class.st
 create mode 100644 src/Microdown/MicMathInlineBlock2.class.st
 create mode 100644 src/Microdown/MicMonospaceFormatBlock2.class.st
 create mode 100644 src/Microdown/MicRawBlock2.class.st
 create mode 100644 src/Microdown/MicStrikeFormatBlock2.class.st
 create mode 100644 src/Microdown/MicTextBlock2.class.st
 create mode 100644 src/Microdown/MicUnEvaluatedBlock2.class.st

diff --git a/src/Microdown-Tests/MicInlineDelimiterTest.class.st b/src/Microdown-Tests/MicInlineDelimiterTest.class.st
index 4bd8ca90..eb159c83 100644
--- a/src/Microdown-Tests/MicInlineDelimiterTest.class.st
+++ b/src/Microdown-Tests/MicInlineDelimiterTest.class.st
@@ -13,6 +13,7 @@ MicInlineDelimiterTest >> testAddMe [
 		self assert: (MicInlineDelimiter at: del markup) equals: del
 		 ].
 	"All instances should have registred"
+	Smalltalk garbageCollect.
 	MicInlineDelimiter allInstances do: [ :del | 
 		self assert: (MicInlineDelimiter at: del markup) equals: del
 		 ].
@@ -29,6 +30,14 @@ MicInlineDelimiterTest >> testMarkupAsRegex [
 		 ]
 ]
 
+{ #category : #tests }
+MicInlineDelimiterTest >> testRawEvaluatedConsistency [
+	"this test is only for evaluated delimiters"
+	(MicInlineDelimiter all select: #isOpener) do: [ :del |
+		self assert: (del isEvaluated ~= del isRawkind )
+		 ]
+]
+
 { #category : #tests }
 MicInlineDelimiterTest >> testRegexNot [
 	|not|
diff --git a/src/Microdown-Tests/MicInlineParser2Test.class.st b/src/Microdown-Tests/MicInlineParser2Test.class.st
new file mode 100644
index 00000000..06d75cfd
--- /dev/null
+++ b/src/Microdown-Tests/MicInlineParser2Test.class.st
@@ -0,0 +1,739 @@
+Class {
+	#name : #MicInlineParser2Test,
+	#superclass : #TestCase,
+	#pools : [
+		'MicMicrodownSharedPool'
+	],
+	#category : #'Microdown-Tests-InlineParser'
+}
+
+{ #category : #accessing }
+MicInlineParser2Test >> splitter [
+	^ MicInlineParser2 new
+]
+
+{ #category : #'tests - anchors' }
+MicInlineParser2Test >> testAnchorReference [
+
+	| res |
+	res := self splitter parse: 'abc*@anchorA@*def'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc)'. '[anchorA](anchorReference)'.
+		'Text(def)' }.
+	self assert: (res second isKindOf: MicAnchorReferenceBlock)
+]
+
+{ #category : #'tests - anchors' }
+MicInlineParser2Test >> testAnchorReferenceUnevaluated [
+
+	"When isEvaluated class method returns false, like anchor reference's case, inline inside shoudn't be evaluated"
+
+	| res |
+	res := self splitter parse: 'abc*@def**not bold**ghi@*xyz'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc)'. '[def**not bold**ghi](anchorReference)'.
+			'Text(xyz)' }
+]
+
+{ #category : #'tests - annotation' }
+MicInlineParser2Test >> testAnnotationWithParameters [
+
+	| res |
+	res := self splitter parse:
+		       'abc', AnnotationOpenerMarkup ,'an annotation|key=cite&label=42',AnnotationCloserMarkup,'def'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc)'. AnnotationOpenerMarkup,'an annotation|key=cite&label=42', AnnotationCloserMarkup.
+			'Text(def)' }.
+	self assert: (res second isKindOf: MicAnnotationBlock).
+	self assert: (res second arguments at: 'key') equals: 'cite'.
+	self assert: (res second arguments at: 'label') equals: '42'
+]
+
+{ #category : #'tests - annotation' }
+MicInlineParser2Test >> testAnnotationWithParametersWithBlank [
+
+	| res |
+	res := self splitter parse: 'abc', AnnotationOpenerMarkup,'an annotation|key=&label=42', AnnotationCloserMarkup,'def'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc)'. AnnotationOpenerMarkup ,'an annotation|key=&label=42', AnnotationCloserMarkup.
+			'Text(def)' }.
+	self assert: (res second isKindOf: MicAnnotationBlock).
+	self assert: (res second arguments at: 'key') equals: ''.
+	self assert: (res second arguments at: 'label') equals: '42'
+]
+
+{ #category : #'tests - formats' }
+MicInlineParser2Test >> testBold [
+
+	| res |
+	res := self splitter parse: 'abc**bold**def'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc)'. 'BoldFormat(Text(bold))'. 'Text(def)' }.
+	self assert: res second kind equals: #bold.
+
+	res := self splitter parse: 'abc** b old **def'.
+	self
+		assert: (res collect: [ :x | x printString ]) "#('Text(abc)' 'BoldFormat(Text( b old ))' 'Text(def)')"
+		equals: { 'Text(abc)'. 'BoldFormat(Text( b old ))'. 'Text(def)' }.
+	self assert: res second kind equals: #bold
+]
+
+{ #category : #tests }
+MicInlineParser2Test >> testCurlyBraceDoesNotLeadToProblem [
+	| mic |
+	mic := (self splitter parse:  ' jhkjhk { a }') first.
+	self assert: mic substring equals:  ' jhkjhk { a }'
+]
+
+{ #category : #'tests to make green again' }
+MicInlineParser2Test >> testEscapeCharacter [
+
+	"we should have just one escape"
+
+	| res |
+	res := self splitter parse: 'not \`mono\` here'.
+	self assert: (res collect: [ :x | x printString ]) equals: { 'Text(not `mono` here)' }
+]
+
+{ #category : #'tests - escape' }
+MicInlineParser2Test >> testEscapeCharacterAtBeginning [
+	"Test the escape \ in simple case (here, bold one)"
+
+	| res |
+	res := self splitter parse: '\**test**'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(**test**)' }
+]
+
+{ #category : #'tests - escape' }
+MicInlineParser2Test >> testEscapeCharacterInLinkName [
+	"Test the escape \ in link description"
+
+	| res |
+	res := self splitter parse: 'abc[\**test**](myURL)last'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc)'. '[**test**](myURL)'. 'Text(last)' }
+]
+
+{ #category : #'tests - escape' }
+MicInlineParser2Test >> testEscapeCharacterInNestedCase [
+	"Test the escape \ in case of nested formats"
+
+	| res |
+	res := self splitter parse: 'abc_\**not bold** italic_last'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: {'Text(abc)' . 'ItalicFormat(Text(**not bold** italic))' . 'Text(last)'}.
+]
+
+{ #category : #'tests - escape' }
+MicInlineParser2Test >> testEscapeCharacterInNestedLinkName [
+	"Test the escape \ in case of nested linknames"
+
+	| res |
+	res := self splitter parse: 'abc[\[nested\]](myURL)last'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc)'. '[[nested]](myURL)'. 'Text(last)' }
+]
+
+{ #category : #'tests to make green again' }
+MicInlineParser2Test >> testEscapeCharacterTwoConsecutive [
+	"we should have just one escape"
+
+	| res |
+	res := self splitter parse: '\\begin\\atend\\'.
+	self assert: (res collect: [ :x | x printString ]) equals: { 'Text(\begin\atend\)' }
+]
+
+{ #category : #'tests to make green again' }
+MicInlineParser2Test >> testEscapeCharacterWithNoCharacterAfter [
+
+	| res |
+	res := self splitter parse: '\'.
+	
+	self
+		assert: res first substring equals: '\'
+]
+
+{ #category : #tests }
+MicInlineParser2Test >> testEscapeEncode [
+	| roundTrip |
+	self assert: (MicInlineParser escapeEncode: '') equals: ''.
+	self assert: (MicInlineParser escapeEncode: 'abc') equals: 'abc'.
+	self assert: (MicInlineParser escapeEncode: 'abc\') equals: 'abc\'.
+	self assert: (MicInlineParser escapeEncode: '\') equals: '\'.
+	roundTrip := [ :str | MicInlineParser escapeDecode: (MicInlineParser escapeEncode: str) ].
+	self assert: (roundTrip value: 'aa\\bb') equals: 'aa\bb'.
+	self assert: (roundTrip value: '\aa\\bb') equals: 'aa\bb'.
+	self assert: (roundTrip value: 'aa\`bb') equals: 'aa`bb'.
+	self assert: (roundTrip value: 'aa\@b@b') equals: 'aa@b@b'.
+	self assert: (roundTrip value: '\\') equals: '\'.
+]
+
+{ #category : #'tests - formats' }
+MicInlineParser2Test >> testEscapeMonospace [
+	"When isEvaluated class method returns false, like monospace's case, inline inside shoudn't be evaluated"
+
+	| res |
+	res := self splitter parse: 'abc`\`monospace\``efg'.
+	self
+		assert: res second substring equals: '`monospace`'.
+	self assert: res second class equals: MicMonospaceFormatBlock
+]
+
+{ #category : #tests }
+MicInlineParser2Test >> testEscapeReEscape [
+	| roundTrip |
+	roundTrip := [ :str :keep | 
+		MicInlineParser escapeReescape: (MicInlineParser escapeEncode: str)  except:  keep ].
+	
+	self assert: (roundTrip value: '' value: 'aa') equals: ''.
+	self assert: (roundTrip value: 'abc' value: '') equals: 'abc'.
+	self assert: (roundTrip value: 'aa\\bb' value: '' ) equals: 'aa\\bb'.
+	self assert: (roundTrip value: '\aa\\bb' value: 'a') equals: 'aa\\bb'.
+]
+
+{ #category : #'tests - escape' }
+MicInlineParser2Test >> testEscapeTripleBold [
+	"Test the escape \ in case of nested formats"
+
+	| res |
+	res := self splitter parse:  'c\***bo**la'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: {'Text(c*)' . 'BoldFormat(Text(bo))' . 'Text(la)'}.
+]
+
+{ #category : #'tests - various' }
+MicInlineParser2Test >> testExclamationMark [
+
+	"Test that 'bla!bla' is ok, and not a failed image, same goes for '![goo]no parenthesis'"
+
+	| res |
+	res := self splitter parse: 'bla!bla'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(bla!bla)' }.
+	res := self splitter parse: '![goo]no parenthesis'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(![goo]no parenthesis)' }
+]
+
+{ #category : #'tests - figure' }
+MicInlineParser2Test >> testFigure [
+	"Test the image annotation ![AltText](url)"
+
+	| res |
+	res := self splitter parse:
+		       'abc![AltText](my_directory/image.png)last'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc)'. '![AltText](my_directory/image.png)'.
+			'Text(last)' }.
+	self assert: (res second isKindOf: MicFigureBlock).
+	self assert: (res second reference  isKindOf: MicResourceReference)
+	
+]
+
+{ #category : #'tests - figure' }
+MicInlineParser2Test >> testFigureWithBracketInsteadOfParentheses [
+	"Test the image annotation ![AltText](url)"
+
+	| res |
+	res := self splitter parse:
+		       'abc![AltText][my_directory/image.png]last'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc![AltText][my_directory/image.png]last)' }
+]
+
+{ #category : #'tests - figure' }
+MicInlineParser2Test >> testFigureWithParameters [
+
+	"Test the image annotation ![AltText](url)"
+
+	| res |
+	res := self splitter parse:
+		       'abc![AltText](my_directory/image.png label=42&width=90)last'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals:
+			{ 'Text(abc)'. '![AltText](my_directory/image.png label=42&width=90)'.
+			'Text(last)' }.
+	self assert: (res second isKindOf: MicFigureBlock).
+	self assert: (res second reference isKindOf: MicResourceReference).
+	self assert: (res second arguments at: 'label') equals: '42'.
+	self assert: (res second arguments at: 'width') equals: '90'
+]
+
+{ #category : #'tests - figure' }
+MicInlineParser2Test >> testFigureWithParametersWithBlank [
+
+	"Test the image annotation ![AltText](url)"
+
+	| res |
+	res := self splitter parse:
+		       'abc![AltText](my_directory/image.png label=&width=90)last'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals:
+			{ 'Text(abc)'. '![AltText](my_directory/image.png label=&width=90)'.
+			'Text(last)' }.
+	self assert: (res second isKindOf: MicFigureBlock).
+	self assert: (res second reference isKindOf: MicResourceReference).
+	self assert: (res second arguments at: 'label') equals: ''.
+	self assert: (res second arguments at: 'width') equals: '90'
+]
+
+{ #category : #'tests - figure' }
+MicInlineParser2Test >> testFigureWithParenthesesInsteadOfBracket [
+	"Test the image annotation ![AltText](url)"
+
+	| res |
+	res := self splitter parse:
+		       'abc!(AltText)(my_directory/image.png)last'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc!(AltText)(my_directory/image.png)last)' }
+]
+
+{ #category : #'tests - formats' }
+MicInlineParser2Test >> testItalic [
+
+	| res |
+	res := self splitter parse: 'abc_italics_def'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc)'. 'ItalicFormat(Text(italics))'. 'Text(def)' }.
+
+	res := self splitter parse: 'abc_ ita lics _def'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc)'. 'ItalicFormat(Text( ita lics ))'. 'Text(def)' }
+]
+
+{ #category : #'tests - formats' }
+MicInlineParser2Test >> testItalicNestedInBold [
+
+	| res |
+	res := self splitter parse: 'abc**bold_italic_bold**xyz'.
+	self
+		assert: (res collect: [ :x | x printString ]) 
+		equals: { 'Text(abc)'. 'BoldFormat(Text(bold) ItalicFormat(Text(italic)) Text(bold))'.
+			'Text(xyz)' }
+]
+
+{ #category : #'tests - formats' }
+MicInlineParser2Test >> testItalicNestedInBoldWithSpace [
+
+	| res |
+	res := self splitter parse: 'abc**x_y_z**cba'.
+	self
+		assert: (res collect: [ :x | x printString ]) 
+		equals: { 'Text(abc)'. 'BoldFormat(Text(x) ItalicFormat(Text(y)) Text(z))'. 'Text(cba)' }
+]
+
+{ #category : #'tests - math' }
+MicInlineParser2Test >> testMath [
+
+	| res |
+	res := self splitter parse: 'abc$	V_i = C_0 - C_3	$def'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc)'. '[	V_i = C_0 - C_3	](math)'.
+		'Text(def)' }.
+	self assert: (res second isKindOf: MicMathInlineBlock)
+]
+
+{ #category : #'tests - math' }
+MicInlineParser2Test >> testMath2 [
+
+	| res |
+	res := self splitter parse: 'abc$math env$def'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc)'. '[math env](math)'. 'Text(def)' }
+]
+
+{ #category : #'tests - math' }
+MicInlineParser2Test >> testMathshouldBeUnevaluated [
+
+	"When isEvaluated class method returns false, like math's case, inline inside shoudn't be evaluated"
+
+	| res |
+	res := self splitter parse: 'abc$def**not bold**ghi$xyz'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc)'. '[def**not bold**ghi](math)'.
+		'Text(xyz)' }
+]
+
+{ #category : #'tests - formats' }
+MicInlineParser2Test >> testMonospace [
+
+	| res |
+	res := self splitter parse: 'ab`block`de'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(ab)'. 'MonospaceFormat(Text(block))'. 'Text(de)' }
+]
+
+{ #category : #'tests - formats' }
+MicInlineParser2Test >> testMonospaceDoesNotTreatNestedElements [
+
+	| res |
+	res := self splitter parse: '`[* foo *])`'.
+	self assert: res first substring equals: '[* foo *])'
+]
+
+{ #category : #'tests - formats' }
+MicInlineParser2Test >> testMonospaceUnevaluated [
+	"When isEvaluated class method returns false, like monospace's case, inline inside shoudn't be evaluated"
+
+	| res |
+	res := self splitter parse: 'abc`def**not bold**ghi`xyz'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc)'. 'MonospaceFormat(Text(def**not bold**ghi))'.
+			'Text(xyz)' }.
+	self assert: res second class equals: MicMonospaceFormatBlock
+]
+
+{ #category : #'tests - formats' }
+MicInlineParser2Test >> testMultipleSequenceFormats [
+
+	"Test with multiple annotations"
+
+	| res |
+	res := self splitter parse: 'abc**abc**xyz`xyz`last'.
+	self
+		assert: (res collect: [ :x | x printString ]) "#('Text(abc)' 'BoldFormat(Text(abc))' 'Text(xyz)' 'MonospaceFormat(Text(xyz))' 'Text(last)')"
+		equals: { 'Text(abc)'. 'BoldFormat(Text(abc))'. 'Text(xyz)'. 'MonospaceFormat(Text(xyz))'.
+		'Text(last)' }
+]
+
+{ #category : #'tests - various' }
+MicInlineParser2Test >> testNoAnnotation [
+
+	| res |
+	res := self splitter parse: 'abc'.
+	self assert: res first printString equals: 'Text(abc)'.
+
+	res := self splitter parse: 'abc def gh'.
+	self assert: res first printString equals: 'Text(abc def gh)'
+]
+
+{ #category : #'tests - formats' }
+MicInlineParser2Test >> testOverlappingFormat [
+
+	| res |
+	res := self splitter parse: 'ab**boldstart_ boldend** italicEnd_de'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: #('Text(ab)' 'BoldFormat(Text(boldstart_ boldend))' 'Text( italicEnd_de)')
+]
+
+{ #category : #'tests - formats' }
+MicInlineParser2Test >> testOverlappingFormat2 [
+
+	| res |
+	res := self splitter parse: 'ab**boldstart_ boldend** _italicstart zz italicEnd_de'.
+	self
+		assert: (res collect: [ :x | x printString ]) ""
+		equals: #('Text(ab)' 'BoldFormat(Text(boldstart_ boldend))' 'Text( )' 'ItalicFormat(Text(italicstart zz italicEnd))' 'Text(de)')
+]
+
+{ #category : #'tests - various' }
+MicInlineParser2Test >> testParseEmptyText [
+
+	| res |
+	res := self splitter parse: ''.
+	self assert: res isEmpty
+]
+
+{ #category : #'tests - link' }
+MicInlineParser2Test >> testParseMissingStartURL [
+	"Test the link annotation [LinkText]url)"
+
+	| res |
+	res := self splitter parse: '[Pharo is cool])'.
+	self assert: res first class = MicTextBlock.
+]
+
+{ #category : #'tests - link' }
+MicInlineParser2Test >> testParseMissingStartURLInPresenceOfNestedFormat [
+	"Test the link annotation [LinkText]url) _*foo*_"
+
+	| res |
+	res := self splitter parse: '[LinkText]htt) 
+	_*foo*_'.
+	self assert: res first class = MicTextBlock.
+
+]
+
+{ #category : #'tests - link' }
+MicInlineParser2Test >> testParseShitInMiddleURL [
+	"Test the link annotation [Pharo is cool]khkjhjkh klhkjhkh (http://pharo.org)"
+
+	| res |
+	res := self splitter parse:
+		       '[Pharo is cool]khkjhjkh klhkjhkh (http://pharo.org)'.
+
+	self assert: res first class = MicTextBlock.
+	self assert: res size equals: 1
+]
+
+{ #category : #'tests - raw' }
+MicInlineParser2Test >> testRaw [
+
+	| res |
+	res := self splitter parse: 'abc{{someRaw}}def'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc)'. '[someRaw](raw)'. 'Text(def)' }
+]
+
+{ #category : #'tests - raw' }
+MicInlineParser2Test >> testRawUnevaluated [
+
+	"When isEvaluated class method returns false, like raw's case, inline inside shoudn't be evaluated"
+
+	| res |
+	res := self splitter parse: 'abc{{def**not bold**ghi}}xyz'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc)'. '[def**not bold**ghi](raw)'.
+		'Text(xyz)' }
+]
+
+{ #category : #'tests - formats' }
+MicInlineParser2Test >> testSequenceOfFormats [
+	"Test with multiple annotations"
+
+	| res |
+	res := self splitter parse: 'abc**abc**xyz`xyz`last'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc)'. 'BoldFormat(Text(abc))'. 'Text(xyz)'. 'MonospaceFormat(Text(xyz))'.
+		'Text(last)' }
+]
+
+{ #category : #'tests - annotation' }
+MicInlineParser2Test >> testSplitAnnotation [
+
+	| res |
+	res := self splitter parse:
+		       'abc',AnnotationOpenerMarkup,'type:value|key1=val1&key2=val2', AnnotationCloserMarkup, 'def'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc)'. AnnotationOpenerMarkup,'type:value|key1=val1&key2=val2',AnnotationCloserMarkup .
+			'Text(def)' }
+]
+
+{ #category : #'tests - annotation' }
+MicInlineParser2Test >> testSplitBlockAnnotation [
+
+	| res |
+	res := self splitter 
+		parse: 'abc', AnnotationOpenerMarkup ,'an annotation', AnnotationCloserMarkup ,'def'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc)'. AnnotationOpenerMarkup ,'an annotation',AnnotationCloserMarkup . 'Text(def)' }.
+	self assert: (res second isKindOf: MicAnnotationBlock)
+]
+
+{ #category : #'tests - link' }
+MicInlineParser2Test >> testSplitBlockLink [
+	"Test the link annotation [LinkText](url)"
+
+	| res |
+	res := self splitter parse: 'abc[LinkText](myURL)last'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc)'. '[LinkText](myURL)'. 'Text(last)' }.
+	self assert: (res second reference isKindOf: MicResourceReference)
+
+]
+
+{ #category : #'tests - link' }
+MicInlineParser2Test >> testSplitBlockLinkIncomplete [
+
+	| res |
+	res := self splitter parse: 'abc[LinkText]last'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc[LinkText]last)' }.
+	self assert: res first class equals: MicTextBlock
+]
+
+{ #category : #'tests - link' }
+MicInlineParser2Test >> testSplitBlockLinkInlineImage [
+
+	| res |
+	res := self splitter parse: 'abc[![alttext](imageurl)](url)last'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc)'. '[![alttext](imageurl)](url)'.
+			'Text(last)' }.
+
+]
+
+{ #category : #'tests - link' }
+MicInlineParser2Test >> testSplitBlockLinkWithBracketInsteadOfParentheses [
+
+	"Test the link annotation [LinkText](url)"
+
+	| res |
+	res := self splitter parse: 'abc[LinkText][myURL]last'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc[LinkText][myURL]last)' }
+]
+
+{ #category : #'tests - link' }
+MicInlineParser2Test >> testSplitBlockLinkWithParenthesesInsteadOfBracket [
+
+	"Test the link annotation [LinkText](url)"
+
+	| res |
+	res := self splitter parse: 'abc(LinkText)(myURL)last'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc(LinkText)(myURL)last)' }
+]
+
+{ #category : #'tests - formats' }
+MicInlineParser2Test >> testStrike [
+
+	| res |
+	res := self splitter parse: 'abc~strike~def'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc)'. 'StrikeFormat(Text(strike))'. 'Text(def)' }.
+	self assert: res second class equals: MicStrikeFormatBlock
+]
+
+{ #category : #'tests to make green again' }
+MicInlineParser2Test >> testTwoConsecutiveEscapeCharacter [
+
+	"we should have just one escape"
+
+	| res |
+	res := self splitter parse: '\\'.
+	self assert: (res collect: [ :x | x printString ]) equals: { 'Text(\)' }
+]
+
+{ #category : #'tests - annotation' }
+MicInlineParser2Test >> testUnclosedAnnotation [
+
+	| res |
+	res := self splitter parse: 'abc<?an annotation>def'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc<?an annotation>def)' }
+]
+
+{ #category : #'tests - formats' }
+MicInlineParser2Test >> testUnclosedBold [
+
+	| res |
+	res := self splitter parse: 'abc**xyz'.
+	self assert: res first printString equals: 'Text(abc**xyz)'
+]
+
+{ #category : #'tests - figure' }
+MicInlineParser2Test >> testUnclosedFigure [
+	"Test the image annotation ![AltText](url)"
+
+	| res |
+	res := self splitter parse: 'abc![AltText]last'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc![AltText]last)' }
+]
+
+{ #category : #'tests - math' }
+MicInlineParser2Test >> testUnclosedMath [
+
+	| res |
+	res := self splitter parse: 'abc$	V_i = C_0 - C_3	&def'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc$	V)'. 'ItalicFormat(Text(i = C))'. 'Text(0 - C_3	&def)' }
+]
+
+{ #category : #tests }
+MicInlineParser2Test >> testUnclosedOpeners [
+	| openers |
+	openers := MicAbstractDelimiter subclasses select: [ :d | d hasSubclasses not and: [d isOpener  ]] thenCollect: [ :d | d markup ].
+	openers do: [ :opener |
+		Microdown parse: 'foo', opener.
+		Microdown parse: opener,'bar'.
+		Microdown parse: 'foo',opener,'bar'.
+		 ]
+]
+
+{ #category : #'tests - math' }
+MicInlineParser2Test >> testUnclosedRaw [
+
+	| res |
+	res := self splitter parse: 'abc{{	V_i = C_0 - C_3	&def'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc{{	V)'. 'ItalicFormat(Text(i = C))'. 'Text(0 - C_3	&def)' }
+]
+
+{ #category : #'tests - formats' }
+MicInlineParser2Test >> testUnclosedStrike [
+
+	| res |
+	res := self splitter parse: 'abc~strikeédef'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc~strikeédef)' }
+]
+
+{ #category : #'tests - url' }
+MicInlineParser2Test >> testUrlObjectInUrlBlocks [
+
+	| res |
+	res := self splitter parse: 'abc[test](myURL)last'.
+	self assert: (res second reference isKindOf: MicResourceReference)
+
+]
+
+{ #category : #'tests to make green again' }
+MicInlineParser2Test >> testUrlObjectInUrlBlocks2 [
+
+	| res |
+	res := self splitter parse:
+		       'abc[pulse](https://github.com/Ducasse/NewTools-NewHelpBrowser/pulse#merged-pull-requests)last'.
+	self assert: (res second reference isKindOf: MicHTTPResourceReference ).
+	self assert: res second reference fullName equals: 'https://github.com/Ducasse/NewTools-NewHelpBrowser/pulse#merged-pull-requests'
+]
+
+{ #category : #tests }
+MicInlineParser2Test >> testWrappedElementOnBold [
+	| mic |
+	mic := (self splitter parse: '**bold**') first.
+	self assert: mic class equals: MicBoldFormatBlock.
+	self assert: mic substring equals: 'bold'
+]
+
+{ #category : #tests }
+MicInlineParser2Test >> testWrappedElementOnNested [
+	| mic |
+	mic := (self splitter parse: '**_italic_**') first.
+	self assert: mic wrappedElements first class equals: MicItalicFormatBlock.
+	self assert: mic wrappedElements first substring equals: 'italic'.
+	self flag: #fixeMe. "should check that we do not have empty mictext"
+]
diff --git a/src/Microdown-Tests/MicInlineParserTest_old2.class.st b/src/Microdown-Tests/MicInlineParserTest_old2.class.st
new file mode 100644
index 00000000..6a9ae100
--- /dev/null
+++ b/src/Microdown-Tests/MicInlineParserTest_old2.class.st
@@ -0,0 +1,751 @@
+Class {
+	#name : #'MicInlineParserTest_old2',
+	#superclass : #TestCase,
+	#pools : [
+		'MicMicrodownSharedPool'
+	],
+	#category : #'Microdown-Tests-InlineParser'
+}
+
+{ #category : #accessing }
+MicInlineParserTest_old2 >> splitter [
+	^ MicInlineParser2 new
+]
+
+{ #category : #'tests - anchors' }
+MicInlineParserTest_old2 >> testAnchorReference [
+
+	| res |
+	res := (self splitter parse: '*@foobar@*') first.
+	self assert: (res isKindOf: MicAnchorReferenceBlock2).
+	self assert: res substring equals: 'foobar'
+]
+
+{ #category : #'tests - anchors' }
+MicInlineParserTest_old2 >> testAnchorReferenceUnevaluated [
+
+	"When isEvaluated class method returns false, like anchor reference's case, inline inside shoudn't be evaluated"
+
+	| res |
+	res := (self splitter parse: '*@def**not bold**ghi@*') first.
+	self
+		assert: res substring equals: 'def**not bold**ghi'
+]
+
+{ #category : #'tests - annotation' }
+MicInlineParserTest_old2 >> testAnnotationWithParameters [
+
+	| res |
+	res := self splitter parse:
+		       'abc', AnnotationOpenerMarkup ,'foo|key=cite&label=42',AnnotationCloserMarkup,'def'.
+	self assert: (res second isKindOf: MicAnnotationBlock2).
+	self assert: (res second arguments at: 'key') equals: 'cite'.
+	self assert: (res second arguments at: 'label') equals: '42'
+]
+
+{ #category : #'tests - annotation' }
+MicInlineParserTest_old2 >> testAnnotationWithParametersWithBlank [
+
+	| res |
+	res := (self splitter parse: AnnotationOpenerMarkup,'an annotation|key=&label=42', AnnotationCloserMarkup) first.
+	self assert: (res isKindOf: MicAnnotationBlock2).
+	self assert: (res arguments at: 'key') equals: ''.
+	self assert: (res arguments at: 'label') equals: '42'
+]
+
+{ #category : #'tests - formats' }
+MicInlineParserTest_old2 >> testBold [
+
+	| res |
+	res := (self splitter parse: '**foobar**') first.
+	self
+		assert: (res isKindOf: MicBoldFormatBlock2);
+		assert: res children first substring equals: 'foobar'
+]
+
+{ #category : #'tests - formats' }
+MicInlineParserTest_old2 >> testBold_atLeft [
+
+	| res |
+	res := (self splitter parse: '**foobar**bbb') first.
+	self
+		assert: (res isKindOf: MicBoldFormatBlock2);
+		assert: res children first substring equals: 'foobar'.
+]
+
+{ #category : #'tests - formats' }
+MicInlineParserTest_old2 >> testBold_atRight [
+
+	| res |
+	res := (self splitter parse: 'aaa**foobar**') second.
+	self
+		assert: (res isKindOf: MicBoldFormatBlock2);
+		assert: res children first substring equals: 'foobar'.
+]
+
+{ #category : #'tests - formats' }
+MicInlineParserTest_old2 >> testBold_inContext [
+
+	| res |
+	res := (self splitter parse: 'aaa**foobar**bbb') second.
+	self
+		assert: (res isKindOf: MicBoldFormatBlock2);
+		assert: res children first substring equals: 'foobar'.
+]
+
+{ #category : #tests }
+MicInlineParserTest_old2 >> testChildrenElementOnNested [
+	| mic |
+	mic := (self splitter parse: '**_italic_**') first.
+	self assert: mic children first class equals: MicItalicFormatBlock2.
+	self assert: mic children first children first substring equals: 'italic'.
+]
+
+{ #category : #tests }
+MicInlineParserTest_old2 >> testCurlyBraceDoesNotLeadToProblem [
+	| mic |
+	mic := (self splitter parse:  ' jhkjhk { a }') first.
+	self assert: mic substring equals:  ' jhkjhk { a }'
+]
+
+{ #category : #'tests to make green again' }
+MicInlineParserTest_old2 >> testEscapeCharacter [
+
+	"we should have just one escape"
+
+	| res |
+	res := (self splitter parse: 'not \`mono\` here') first.
+	self assert: res substring equals: 'not `mono` here'
+]
+
+{ #category : #'tests - escape' }
+MicInlineParserTest_old2 >> testEscapeCharacterAtBeginning [
+	"Test the escape \ in simple case (here, bold one)"
+
+	| res |
+	res := (self splitter parse: '\**test**') first.
+	self
+		assert: res substring
+		equals: '**test**'
+]
+
+{ #category : #'tests - escape' }
+MicInlineParserTest_old2 >> testEscapeCharacterInLinkName [
+	"Test the escape \ in link description"
+
+	| res |
+	res := (self splitter parse: '[\**test**](myURL)') first.
+	self
+		assert: (res isKindOf: MicLinkBlock2);
+		assert: res children first substring equals: '**test**'
+	
+]
+
+{ #category : #'tests - escape' }
+MicInlineParserTest_old2 >> testEscapeCharacterInNestedCase [
+	"Test the escape \ in case of nested formats"
+
+	| res |
+	res := (self splitter parse: 'abc_\**not bold** italic_last') second.
+	self assert: (res isKindOf: MicItalicFormatBlock2 ).
+	self assert: (res children first isKindOf: MicTextBlock2 ).
+	self assert: res children first substring equals: '**not bold** italic'
+]
+
+{ #category : #'tests - escape' }
+MicInlineParserTest_old2 >> testEscapeCharacterInNestedLinkName [
+	"Test the escape \ in case of nested linknames"
+
+	| res |
+	res := (self splitter parse: 'abc[\[nested\]](myURL)last') second.
+	self
+		assert: (res children first substring)
+		equals: '[nested]'
+]
+
+{ #category : #'tests to make green again' }
+MicInlineParserTest_old2 >> testEscapeCharacterTwoConsecutive [
+	"we should have just one escape"
+
+	| res |
+	res := (self splitter parse: '\\begin\\atend\\') first.
+	self assert: res substring equals: '\begin\atend\'
+]
+
+{ #category : #'tests to make green again' }
+MicInlineParserTest_old2 >> testEscapeCharacterWithNoCharacterAfter [
+
+	| res |
+	res := self splitter parse: '\'.
+	
+	self
+		assert: res first substring equals: '\'
+]
+
+{ #category : #tests }
+MicInlineParserTest_old2 >> testEscapeEncode [
+	| roundTrip |
+	self assert: (MicInlineParser escapeEncode: '') equals: ''.
+	self assert: (MicInlineParser escapeEncode: 'abc') equals: 'abc'.
+	self assert: (MicInlineParser escapeEncode: 'abc\') equals: 'abc\'.
+	self assert: (MicInlineParser escapeEncode: '\') equals: '\'.
+	roundTrip := [ :str | MicInlineParser escapeDecode: (MicInlineParser escapeEncode: str) ].
+	self assert: (roundTrip value: 'aa\\bb') equals: 'aa\bb'.
+	self assert: (roundTrip value: '\aa\\bb') equals: 'aa\bb'.
+	self assert: (roundTrip value: 'aa\`bb') equals: 'aa`bb'.
+	self assert: (roundTrip value: 'aa\@b@b') equals: 'aa@b@b'.
+	self assert: (roundTrip value: '\\') equals: '\'.
+]
+
+{ #category : #'tests - formats' }
+MicInlineParserTest_old2 >> testEscapeMonospace [
+	"When isEvaluated class method returns false, like monospace's case, inline inside shoudn't be evaluated"
+
+	| res |
+	res := self splitter parse: 'abc`\`monospace\``efg'.
+	self
+		assert: res second substring equals: '`monospace`'.
+	self assert: res second class equals: MicMonospaceFormatBlock2
+]
+
+{ #category : #tests }
+MicInlineParserTest_old2 >> testEscapeReEscape [
+	| roundTrip |
+	roundTrip := [ :str :keep | 
+		MicInlineParser escapeReescape: (MicInlineParser escapeEncode: str)  except:  keep ].
+	
+	self assert: (roundTrip value: '' value: 'aa') equals: ''.
+	self assert: (roundTrip value: 'abc' value: '') equals: 'abc'.
+	self assert: (roundTrip value: 'aa\\bb' value: '' ) equals: 'aa\\bb'.
+	self assert: (roundTrip value: '\aa\\bb' value: 'a') equals: 'aa\\bb'.
+]
+
+{ #category : #'tests - escape' }
+MicInlineParserTest_old2 >> testEscapeTripleBold [
+	"Test the escape \ in case of nested formats"
+
+	| res |
+	res := self splitter parse:  'ccc\***bbb**aaa'.
+	self
+		assert: res first substring equals: 'ccc*';
+		assert: res second children first substring equals: 'bbb'.
+]
+
+{ #category : #'tests - various' }
+MicInlineParserTest_old2 >> testExclamationMark [
+
+	"Test that 'bla!bla' is ok, and not a failed image, same goes for '![goo]no parenthesis'"
+
+	| res |
+	res := (self splitter parse: 'bla!bla') first.
+	self
+		assert: res substring equals: 'bla!bla'.
+	res := (self splitter parse: '![goo]no parenthesis') first.
+	self
+		assert: res substring equals: '![goo]no parenthesis' 
+]
+
+{ #category : #'tests - figure' }
+MicInlineParserTest_old2 >> testFigure [
+	"Test the image annotation ![AltText](url)"
+
+	| res |
+	res := (self splitter parse:
+		       'abc![AltText](my_directory/image.png)last') second.
+	self assert: (res isKindOf: MicFigureBlock2).
+	self assert: res children first substring equals: 'AltText'.
+	self assert: res url equals: 'my_directory/image.png'.
+	self assert: (res reference isKindOf: MicResourceReference)
+	
+]
+
+{ #category : #'tests - figure' }
+MicInlineParserTest_old2 >> testFigureWithBracketInsteadOfParentheses [
+	"Test the image annotation ![AltText](url)"
+
+	| res |
+	res := (self splitter parse: 'abc![AltText][my_directory/image.png]last') first.
+	self assert: res substring equals: 'abc![AltText][my_directory/image.png]last'
+]
+
+{ #category : #'tests - figure' }
+MicInlineParserTest_old2 >> testFigureWithParameters [
+
+	"Test the image annotation ![AltText](url)"
+
+	| res |
+	res := self splitter parse:
+		       'abc![AltText](my_directory/image.png label=42&width=90)last'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals:
+			{ 'Text(abc)'. '![AltText](my_directory/image.png label=42&width=90)'.
+			'Text(last)' }.
+	self assert: (res second isKindOf: MicFigureBlock).
+	self assert: (res second reference isKindOf: MicResourceReference).
+	self assert: (res second arguments at: 'label') equals: '42'.
+	self assert: (res second arguments at: 'width') equals: '90'
+]
+
+{ #category : #'tests - figure' }
+MicInlineParserTest_old2 >> testFigureWithParametersWithBlank [
+
+	"Test the image annotation ![AltText](url)"
+
+	| res |
+	res := self splitter parse:
+		       'abc![AltText](my_directory/image.png label=&width=90)last'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals:
+			{ 'Text(abc)'. '![AltText](my_directory/image.png label=&width=90)'.
+			'Text(last)' }.
+	self assert: (res second isKindOf: MicFigureBlock).
+	self assert: (res second reference isKindOf: MicResourceReference).
+	self assert: (res second arguments at: 'label') equals: ''.
+	self assert: (res second arguments at: 'width') equals: '90'
+]
+
+{ #category : #'tests - figure' }
+MicInlineParserTest_old2 >> testFigureWithParenthesesInsteadOfBracket [
+	"Test the image annotation ![AltText](url)"
+
+	| res |
+	res := self splitter parse:
+		       'abc!(AltText)(my_directory/image.png)last'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc!(AltText)(my_directory/image.png)last)' }
+]
+
+{ #category : #'tests - formats' }
+MicInlineParserTest_old2 >> testItalic [
+
+	| res |
+	res := self splitter parse: 'abc_italics_def'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc)'. 'ItalicFormat(Text(italics))'. 'Text(def)' }.
+
+	res := self splitter parse: 'abc_ ita lics _def'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc)'. 'ItalicFormat(Text( ita lics ))'. 'Text(def)' }
+]
+
+{ #category : #'tests - formats' }
+MicInlineParserTest_old2 >> testItalicNestedInBold [
+
+	| res |
+	res := self splitter parse: 'abc**bold_italic_bold**xyz'.
+	self
+		assert: (res collect: [ :x | x printString ]) 
+		equals: { 'Text(abc)'. 'BoldFormat(Text(bold) ItalicFormat(Text(italic)) Text(bold))'.
+			'Text(xyz)' }
+]
+
+{ #category : #'tests - formats' }
+MicInlineParserTest_old2 >> testItalicNestedInBoldWithSpace [
+
+	| res |
+	res := self splitter parse: 'abc**x_y_z**cba'.
+	self
+		assert: (res collect: [ :x | x printString ]) 
+		equals: { 'Text(abc)'. 'BoldFormat(Text(x) ItalicFormat(Text(y)) Text(z))'. 'Text(cba)' }
+]
+
+{ #category : #'tests - math' }
+MicInlineParserTest_old2 >> testMath [
+
+	| res |
+	res := self splitter parse: 'abc$	V_i = C_0 - C_3	$def'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc)'. '[	V_i = C_0 - C_3	](math)'.
+		'Text(def)' }.
+	self assert: (res second isKindOf: MicMathInlineBlock)
+]
+
+{ #category : #'tests - math' }
+MicInlineParserTest_old2 >> testMath2 [
+
+	| res |
+	res := self splitter parse: 'abc$math env$def'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc)'. '[math env](math)'. 'Text(def)' }
+]
+
+{ #category : #'tests - math' }
+MicInlineParserTest_old2 >> testMathshouldBeUnevaluated [
+
+	"When isEvaluated class method returns false, like math's case, inline inside shoudn't be evaluated"
+
+	| res |
+	res := self splitter parse: 'abc$def**not bold**ghi$xyz'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc)'. '[def**not bold**ghi](math)'.
+		'Text(xyz)' }
+]
+
+{ #category : #'tests - formats' }
+MicInlineParserTest_old2 >> testMonospace [
+
+	| res |
+	res := self splitter parse: 'ab`block`de'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(ab)'. 'MonospaceFormat(block)'. 'Text(de)' }
+]
+
+{ #category : #'tests - formats' }
+MicInlineParserTest_old2 >> testMonospaceDoesNotTreatNestedElements [
+
+	| res |
+	res := self splitter parse: '`[* foo *])`'.
+	self assert: res first substring equals: '[* foo *])'
+]
+
+{ #category : #'tests - formats' }
+MicInlineParserTest_old2 >> testMonospaceUnevaluated [
+	"When isEvaluated class method returns false, like monospace's case, inline inside shoudn't be evaluated"
+
+	| res |
+	res := self splitter parse: 'abc`def**not bold**ghi`xyz'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc)'. 'MonospaceFormat(def**not bold**ghi)'.
+			'Text(xyz)' }.
+	self assert: res second class equals: MicMonospaceFormatBlock
+]
+
+{ #category : #'tests - formats' }
+MicInlineParserTest_old2 >> testMultipleSequenceFormats [
+
+	"Test with multiple annotations"
+
+	| res |
+	res := self splitter parse: 'abc**abc**xyz`xyz`last'.
+	self
+		assert: (res collect: [ :x | x printString ]) "#('Text(abc)' 'BoldFormat(Text(abc))' 'Text(xyz)' 'MonospaceFormat(Text(xyz))' 'Text(last)')"
+		equals: { 'Text(abc)'. 'BoldFormat(Text(abc))'. 'Text(xyz)'. 'MonospaceFormat(xyz)'.
+		'Text(last)' }
+]
+
+{ #category : #'tests - various' }
+MicInlineParserTest_old2 >> testNoAnnotation [
+
+	| res |
+	res := self splitter parse: 'abc'.
+	self assert: res first printString equals: 'Text(abc)'.
+
+	res := self splitter parse: 'abc def gh'.
+	self assert: res first printString equals: 'Text(abc def gh)'
+]
+
+{ #category : #'tests - formats' }
+MicInlineParserTest_old2 >> testOverlappingFormat [
+
+	| res |
+	res := self splitter parse: 'ab**boldstart_ boldend** italicEnd_de'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: #('Text(ab)' 'BoldFormat(Text(boldstart_ boldend))' 'Text( italicEnd_de)')
+]
+
+{ #category : #'tests - formats' }
+MicInlineParserTest_old2 >> testOverlappingFormat2 [
+
+	| res |
+	res := self splitter parse: 'ab**boldstart_ boldend** _italicstart zz italicEnd_de'.
+	self
+		assert: (res collect: [ :x | x printString ]) ""
+		equals: #('Text(ab)' 'BoldFormat(Text(boldstart_ boldend))' 'Text( )' 'ItalicFormat(Text(italicstart zz italicEnd))' 'Text(de)')
+]
+
+{ #category : #'tests - various' }
+MicInlineParserTest_old2 >> testParseEmptyText [
+
+	| res |
+	res := self splitter parse: ''.
+	self assert: res isEmpty
+]
+
+{ #category : #'tests - link' }
+MicInlineParserTest_old2 >> testParseMissingStartURL [
+	"Test the link annotation [LinkText]url)"
+
+	| res |
+	res := self splitter parse: '[Pharo is cool])'.
+	self assert: res first class = MicTextBlock.
+]
+
+{ #category : #'tests - link' }
+MicInlineParserTest_old2 >> testParseMissingStartURLInPresenceOfNestedFormat [
+	"Test the link annotation [LinkText]url) _*foo*_"
+
+	| res |
+	res := self splitter parse: '[LinkText]htt) 
+	_*foo*_'.
+	self assert: res first class = MicTextBlock.
+
+]
+
+{ #category : #'tests - link' }
+MicInlineParserTest_old2 >> testParseShitInMiddleURL [
+	"Test the link annotation [Pharo is cool]khkjhjkh klhkjhkh (http://pharo.org)"
+
+	| res |
+	res := self splitter parse:
+		       '[Pharo is cool]khkjhjkh klhkjhkh (http://pharo.org)'.
+
+	self assert: res first class = MicTextBlock.
+	self assert: res size equals: 1
+]
+
+{ #category : #'tests - raw' }
+MicInlineParserTest_old2 >> testRaw [
+
+	| res |
+	res := self splitter parse: 'abc{{someRaw}}def'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc)'. '[someRaw](raw)'. 'Text(def)' }
+]
+
+{ #category : #'tests - raw' }
+MicInlineParserTest_old2 >> testRawUnevaluated [
+
+	"When isEvaluated class method returns false, like raw's case, inline inside shoudn't be evaluated"
+
+	| res |
+	res := self splitter parse: 'abc{{def**not bold**ghi}}xyz'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc)'. '[def**not bold**ghi](raw)'.
+		'Text(xyz)' }
+]
+
+{ #category : #'tests - formats' }
+MicInlineParserTest_old2 >> testSequenceOfFormats [
+	"Test with multiple annotations"
+
+	| res |
+	res := self splitter parse: 'abc**abc**xyz`xyz`last'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc)'. 'BoldFormat(Text(abc))'. 'Text(xyz)'. 'MonospaceFormat(xyz)'.
+		'Text(last)' }
+]
+
+{ #category : #'tests - annotation' }
+MicInlineParserTest_old2 >> testSplitAnnotation [
+
+	| res |
+	res := self splitter parse:
+		       'abc',AnnotationOpenerMarkup,'type:value|key1=val1&key2=val2', AnnotationCloserMarkup, 'def'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc)'. AnnotationOpenerMarkup,'type:value|key1=val1&key2=val2',AnnotationCloserMarkup .
+			'Text(def)' }
+]
+
+{ #category : #'tests - annotation' }
+MicInlineParserTest_old2 >> testSplitBlockAnnotation [
+
+	| res |
+	res := self splitter 
+		parse: 'abc', AnnotationOpenerMarkup ,'an annotation', AnnotationCloserMarkup ,'def'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc)'. AnnotationOpenerMarkup ,'an annotation',AnnotationCloserMarkup . 'Text(def)' }.
+	self assert: (res second isKindOf: MicAnnotationBlock)
+]
+
+{ #category : #'tests - link' }
+MicInlineParserTest_old2 >> testSplitBlockLink [
+	"Test the link annotation [LinkText](url)"
+
+	| res |
+	res := self splitter parse: 'abc[LinkText](myURL)last'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc)'. '[LinkText](myURL)'. 'Text(last)' }.
+	self assert: (res second reference isKindOf: MicResourceReference)
+
+]
+
+{ #category : #'tests - link' }
+MicInlineParserTest_old2 >> testSplitBlockLinkIncomplete [
+
+	| res |
+	res := self splitter parse: 'abc[LinkText]last'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc[LinkText]last)' }.
+	self assert: res first class equals: MicTextBlock
+]
+
+{ #category : #'tests - link' }
+MicInlineParserTest_old2 >> testSplitBlockLinkInlineImage [
+
+	| res |
+	res := self splitter parse: 'abc[![alttext](imageurl)](url)last'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc)'. '[![alttext](imageurl)](url)'.
+			'Text(last)' }.
+
+]
+
+{ #category : #'tests - link' }
+MicInlineParserTest_old2 >> testSplitBlockLinkWithBracketInsteadOfParentheses [
+
+	"Test the link annotation [LinkText](url)"
+
+	| res |
+	res := self splitter parse: 'abc[LinkText][myURL]last'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc[LinkText][myURL]last)' }
+]
+
+{ #category : #'tests - link' }
+MicInlineParserTest_old2 >> testSplitBlockLinkWithParenthesesInsteadOfBracket [
+
+	"Test the link annotation [LinkText](url)"
+
+	| res |
+	res := self splitter parse: 'abc(LinkText)(myURL)last'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc(LinkText)(myURL)last)' }
+]
+
+{ #category : #'tests - formats' }
+MicInlineParserTest_old2 >> testStrike [
+
+	| res |
+	res := self splitter parse: 'abc~strike~def'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc)'. 'StrikeFormat(Text(strike))'. 'Text(def)' }.
+	self assert: res second class equals: MicStrikeFormatBlock
+]
+
+{ #category : #'tests to make green again' }
+MicInlineParserTest_old2 >> testTwoConsecutiveEscapeCharacter [
+
+	"we should have just one escape"
+
+	| res |
+	res := self splitter parse: '\\'.
+	self assert: (res collect: [ :x | x printString ]) equals: { 'Text(\)' }
+]
+
+{ #category : #'tests - annotation' }
+MicInlineParserTest_old2 >> testUnclosedAnnotation [
+
+	| res |
+	res := self splitter parse: 'abc<?an annotation>def'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc<?an annotation>def)' }
+]
+
+{ #category : #'tests - formats' }
+MicInlineParserTest_old2 >> testUnclosedBold [
+
+	| res |
+	res := self splitter parse: 'abc**xyz'.
+	self assert: res first printString equals: 'Text(abc**xyz)'
+]
+
+{ #category : #'tests - figure' }
+MicInlineParserTest_old2 >> testUnclosedFigure [
+	"Test the image annotation ![AltText](url)"
+
+	| res |
+	res := self splitter parse: 'abc![AltText]last'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc![AltText]last)' }
+]
+
+{ #category : #'tests - math' }
+MicInlineParserTest_old2 >> testUnclosedMath [
+
+	| res |
+	res := self splitter parse: 'abc$	V_i = C_0 - C_3	&def'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc$	V)'. 'ItalicFormat(Text(i = C))'. 'Text(0 - C_3	&def)' }
+]
+
+{ #category : #tests }
+MicInlineParserTest_old2 >> testUnclosedOpeners [
+	| openers |
+	openers := MicAbstractDelimiter subclasses select: [ :d | d hasSubclasses not and: [d isOpener  ]] thenCollect: [ :d | d markup ].
+	openers do: [ :opener |
+		Microdown parse: 'foo', opener.
+		Microdown parse: opener,'bar'.
+		Microdown parse: 'foo',opener,'bar'.
+		 ]
+]
+
+{ #category : #'tests - math' }
+MicInlineParserTest_old2 >> testUnclosedRaw [
+
+	| res |
+	res := self splitter parse: 'abc{{	V_i = C_0 - C_3	&def'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc{{	V)'. 'ItalicFormat(Text(i = C))'. 'Text(0 - C_3	&def)' }
+]
+
+{ #category : #'tests - formats' }
+MicInlineParserTest_old2 >> testUnclosedStrike [
+
+	| res |
+	res := self splitter parse: 'abc~strikeédef'.
+	self
+		assert: (res collect: [ :x | x printString ])
+		equals: { 'Text(abc~strikeédef)' }
+]
+
+{ #category : #'tests - url' }
+MicInlineParserTest_old2 >> testUrlObjectInUrlBlocks [
+
+	| res |
+	res := self splitter parse: 'abc[test](myURL)last'.
+	self assert: (res second reference isKindOf: MicResourceReference)
+
+]
+
+{ #category : #'tests to make green again' }
+MicInlineParserTest_old2 >> testUrlObjectInUrlBlocks2 [
+
+	| res |
+	res := self splitter parse:
+		       'abc[pulse](https://github.com/Ducasse/NewTools-NewHelpBrowser/pulse#merged-pull-requests)last'.
+	self assert: (res second reference isKindOf: MicHTTPResourceReference ).
+	self assert: res second reference fullName equals: 'https://github.com/Ducasse/NewTools-NewHelpBrowser/pulse#merged-pull-requests'
+]
+
+{ #category : #tests }
+MicInlineParserTest_old2 >> testWrappedElementOnBold [
+	| mic |
+	mic := (self splitter parse: '**bold**') first.
+	self assert: mic class equals: MicBoldFormatBlock.
+	self assert: mic children first substring equals: 'bold'
+]
+
+{ #category : #tests }
+MicInlineParserTest_old2 >> testWrappedElementOnNested [
+	| mic |
+	mic := (self splitter parse: '**_italic_**') first.
+	self assert: mic wrappedElements first class equals: MicItalicFormatBlock.
+	self assert: mic wrappedElements first substring equals: 'italic'.
+	self flag: #fixeMe. "should check that we do not have empty mictext"
+]
diff --git a/src/Microdown-Tests/MicInlineTokenStreamTest.class.st b/src/Microdown-Tests/MicInlineTokenStreamTest.class.st
index 79aec026..d3fdf5a7 100644
--- a/src/Microdown-Tests/MicInlineTokenStreamTest.class.st
+++ b/src/Microdown-Tests/MicInlineTokenStreamTest.class.st
@@ -4,9 +4,60 @@ A MicInlineTokenStreamTest is a test class for testing the behavior of MicInline
 Class {
 	#name : #MicInlineTokenStreamTest,
 	#superclass : #TestCase,
+	#pools : [
+		'MicMicrodownSharedPool'
+	],
 	#category : #'Microdown-Tests-InlineParser'
 }
 
+{ #category : #tests }
+MicInlineTokenStreamTest >> testBackslash [
+	| src tokens |
+	src := 'aa\xbb'.
+	tokens := (MicInlineTokenStream on: src) contents.
+	self assert: tokens first substring equals: 'aaxbb'
+]
+
+{ #category : #tests }
+MicInlineTokenStreamTest >> testBackslash_AnchorReference [
+	| src tokens |
+	src := 'aa*@oo\xoo\@oo`@*bb'.
+	tokens := (MicInlineTokenStream on: src) contents.
+	self assert: tokens second substring equals: '*@oo\xoo@oo`@*'
+]
+
+{ #category : #tests }
+MicInlineTokenStreamTest >> testBackslash_InFormattedElements [
+	| src tokens |
+	src := 'aa**oo\xoo**bb'.
+	tokens := (MicInlineTokenStream on: src) contents.
+	self assert: tokens third substring equals: 'ooxoo'
+]
+
+{ #category : #tests }
+MicInlineTokenStreamTest >> testBackslash_InMath [
+	| src tokens |
+	src := 'aa$oo\xoo\$oo$bb'.
+	tokens := (MicInlineTokenStream on: src) contents.
+	self assert: tokens second substring equals: '$oo\xoo$oo$'
+]
+
+{ #category : #tests }
+MicInlineTokenStreamTest >> testBackslash_InMonospace [
+	| src tokens |
+	src := 'aa`oo\xoo\`oo`$bb'.
+	tokens := (MicInlineTokenStream on: src) contents.
+	self assert: tokens second substring equals: '`oo\xoo`oo`'
+]
+
+{ #category : #tests }
+MicInlineTokenStreamTest >> testBackslash_InRaw [
+	| src tokens |
+	src := 'aa{{oo\xoo\}oo`}}bb'.
+	tokens := (MicInlineTokenStream on: src) contents.
+	self assert: tokens second substring equals: '{{oo\xoo}oo`}}'
+]
+
 { #category : #tests }
 MicInlineTokenStreamTest >> testTokenize [
 	| tokens | 
@@ -15,9 +66,116 @@ MicInlineTokenStreamTest >> testTokenize [
 ]
 
 { #category : #tests }
-MicInlineTokenStreamTest >> testTokenize_justText [
+MicInlineTokenStreamTest >> testTokenize_Annotation [
+	| tokens | 
+	tokens := (MicInlineTokenStream on: 'aa',AnnotationOpenerMarkup ,'bbb', AnnotationCloserMarkup) contents.
+	self assert: tokens second substring equals: (AnnotationOpenerMarkup ,'bbb', AnnotationCloserMarkup).
+	self assert: tokens second delimiter equals: (MicInlineDelimiter at: AnnotationOpenerMarkup)
+]
+
+{ #category : #tests }
+MicInlineTokenStreamTest >> testTokenize_FigureWithURL [
+	| tokens | 
+	"anchors are not evaluated, but bodied directly"
+	tokens := (MicInlineTokenStream on: 'aa',FigureNameOpenerMarkup  ,'bbb', NameCloserUrlOpener ,'ccc', URLCloserMarkup) contents.
+	self assert: tokens second substring equals: FigureNameOpenerMarkup.
+	self assert: tokens second delimiter equals: (MicInlineDelimiter at: FigureNameOpenerMarkup).
+	self assert: tokens fourth substring equals: (NameCloserUrlOpener ,'ccc', URLCloserMarkup).
+	self assert: tokens fourth delimiter equals: (MicInlineDelimiter at: NameCloserUrlOpener).
+	
+]
+
+{ #category : #tests }
+MicInlineTokenStreamTest >> testTokenize_Text [
 	| tokens | 
 	tokens := (MicInlineTokenStream on: 'aaaa') contents.
 	self assert: tokens first substring equals: 'aaaa'.
-	self assert: tokens first delimiter equals: nil.
+	self assert: tokens first delimiter markup equals: FixiousTextDelimiter.
+]
+
+{ #category : #tests }
+MicInlineTokenStreamTest >> testTokenize_UrlPart [
+	| tokens | 
+	"anchors are not evaluated, but bodied directly"
+	tokens := (MicInlineTokenStream on: 'aa',NameCloserUrlOpener ,'bbb', URLCloserMarkup) contents.
+	self assert: tokens second substring equals: (NameCloserUrlOpener ,'bbb', URLCloserMarkup).
+	self assert: tokens second delimiter equals: (MicInlineDelimiter at: NameCloserUrlOpener)
+]
+
+{ #category : #tests }
+MicInlineTokenStreamTest >> testTokenize_anchorRefs [
+	| tokens | 
+	"anchors are not evaluated, but bodied directly"
+	tokens := (MicInlineTokenStream on: 'aa',AnchorReferenceOpenerMarkup ,'bbb', AnchorReferenceCloserMarkup) contents.
+	self assert: tokens second substring equals: (AnchorReferenceOpenerMarkup,'bbb', AnchorReferenceCloserMarkup).
+	self assert: tokens second delimiter equals: (MicInlineDelimiter at: AnchorReferenceOpenerMarkup).
+]
+
+{ #category : #tests }
+MicInlineTokenStreamTest >> testTokenize_bold [
+	| tokens | 
+	tokens := (MicInlineTokenStream on: 'aa',BoldMarkup ,'bbb') contents.
+	self assert: tokens second substring equals: BoldMarkup.
+	self assert: tokens second delimiter equals: (MicInlineDelimiter at: BoldMarkup).
+]
+
+{ #category : #tests }
+MicInlineTokenStreamTest >> testTokenize_figureName [
+	| tokens | 
+	"anchors are not evaluated, but bodied directly"
+	tokens := (MicInlineTokenStream on: 'aa',FigureNameOpenerMarkup ,'bbb', NameCloserUrlOpener) contents.
+	self assert: tokens second substring equals: FigureNameOpenerMarkup.
+	self assert: tokens second delimiter equals: (MicInlineDelimiter at: FigureNameOpenerMarkup)
+]
+
+{ #category : #tests }
+MicInlineTokenStreamTest >> testTokenize_italic [
+	| tokens | 
+	tokens := (MicInlineTokenStream on: 'aa',ItalicMarkup ,'bbb') contents.
+	self assert: tokens second substring equals: ItalicMarkup.
+	self assert: tokens second delimiter equals: (MicInlineDelimiter at: ItalicMarkup).
+]
+
+{ #category : #tests }
+MicInlineTokenStreamTest >> testTokenize_linkName [
+	| tokens | 
+	"anchors are not evaluated, but bodied directly"
+	tokens := (MicInlineTokenStream on: 'aa',LinkNameOpenerMarkup ,'bbb', NameCloserUrlOpener) contents.
+	self assert: tokens second substring equals: LinkNameOpenerMarkup.
+	self assert: tokens second delimiter equals: (MicInlineDelimiter at: LinkNameOpenerMarkup)
+]
+
+{ #category : #tests }
+MicInlineTokenStreamTest >> testTokenize_math [
+	| tokens | 
+	"anchors are not evaluated, but bodied directly"
+	tokens := (MicInlineTokenStream on: 'aa', MathMarkup,'bbb', MathMarkup) contents.
+	self assert: tokens second substring equals: (MathMarkup,'bbb', MathMarkup).
+	self assert: tokens second delimiter equals: (MicInlineDelimiter at: MathMarkup).
+]
+
+{ #category : #tests }
+MicInlineTokenStreamTest >> testTokenize_monospace [
+	| tokens | 
+	"anchors are not evaluated, but bodied directly"
+	tokens := (MicInlineTokenStream on: 'aa',MonospaceMarkup ,'bbb', MonospaceMarkup) contents.
+	self assert: tokens second substring equals: (MonospaceMarkup,'bbb', MonospaceMarkup).
+	self assert: tokens second delimiter equals: (MicInlineDelimiter at: MonospaceMarkup).
+]
+
+{ #category : #tests }
+MicInlineTokenStreamTest >> testTokenize_raw [
+	| tokens | 
+	"anchors are not evaluated, but bodied directly"
+	tokens := (MicInlineTokenStream on: 'aa', RawOpenerMarkup ,'bbb', RawCloserMarkup) contents.
+	self assert: tokens second substring equals: (RawOpenerMarkup,'bbb', RawCloserMarkup).
+	self assert: tokens second delimiter equals: (MicInlineDelimiter at: RawOpenerMarkup).
+]
+
+{ #category : #tests }
+MicInlineTokenStreamTest >> testTokenize_strike [
+	| tokens | 
+	tokens := (MicInlineTokenStream on: 'aa',StrikeMarkup ,'bbb') contents.
+	self assert: tokens second substring equals: StrikeMarkup.
+	self assert: tokens second delimiter equals: (MicInlineDelimiter at: StrikeMarkup).
 ]
diff --git a/src/Microdown/MicAnchorReferenceBlock.class.st b/src/Microdown/MicAnchorReferenceBlock.class.st
index 5c957f10..fb01f5b2 100644
--- a/src/Microdown/MicAnchorReferenceBlock.class.st
+++ b/src/Microdown/MicAnchorReferenceBlock.class.st
@@ -32,6 +32,15 @@ MicAnchorReferenceBlock class >> openingDelimiter [
  	^ AnchorReferenceOpenerMarkup
 ]
 
+{ #category : #parsing }
+MicAnchorReferenceBlock class >> parse: delimiter stream: aTokenStream for: aParser [
+
+	^ aParser
+		  parseNonEvaluatedBlock: self
+		  token: delimiter
+		  stream: aTokenStream
+]
+
 { #category : #visiting }
 MicAnchorReferenceBlock >> accept: aVisitor [
  	^ aVisitor visitAnchorReference: self
diff --git a/src/Microdown/MicAnchorReferenceBlock2.class.st b/src/Microdown/MicAnchorReferenceBlock2.class.st
new file mode 100644
index 00000000..092ddd33
--- /dev/null
+++ b/src/Microdown/MicAnchorReferenceBlock2.class.st
@@ -0,0 +1,21 @@
+"
+I represent a reference to a section, figure, environment. I follow the pattern `*@`, label, `@*`
+
+```
+See *@fig1@*
+```
+
+"
+Class {
+	#name : #MicAnchorReferenceBlock2,
+	#superclass : #MicUnEvaluatedBlock2,
+	#instVars : [
+		'reference'
+	],
+	#category : #'Microdown-InlineParser'
+}
+
+{ #category : #visiting }
+MicAnchorReferenceBlock2 >> accept: aVisitor [
+ 	^ aVisitor visitAnchorReference: self
+]
diff --git a/src/Microdown/MicAnnotationBlock2.class.st b/src/Microdown/MicAnnotationBlock2.class.st
new file mode 100644
index 00000000..cb52eec3
--- /dev/null
+++ b/src/Microdown/MicAnnotationBlock2.class.st
@@ -0,0 +1,37 @@
+"
+I represent an annotation delimted by `{!` and `!}`: a tag with parameters.
+
+The following is a citation annotation with as parameters the name variable bound to the string 'Duca99a'.
+
+```text
+{!citation|name=Duca99a!}
+```
+
+```
+MicroDownParser parse: '{!citation|name=Duca99a!}'
+```
+"
+Class {
+	#name : #MicAnnotationBlock2,
+	#superclass : #MicUnEvaluatedBlock2,
+	#instVars : [
+		'arguments'
+	],
+	#category : #'Microdown-InlineParser'
+}
+
+{ #category : #visiting }
+MicAnnotationBlock2 >> accept: aVisitor [
+	^ aVisitor visitAnnotation: self
+]
+
+{ #category : #accessing }
+MicAnnotationBlock2 >> arguments [
+
+	^ arguments
+]
+
+{ #category : #visiting }
+MicAnnotationBlock2 >> closeMe [
+	arguments := MicArgumentList split: substring.
+]
diff --git a/src/Microdown/MicBoldFormatBlock2.class.st b/src/Microdown/MicBoldFormatBlock2.class.st
new file mode 100644
index 00000000..b7679e39
--- /dev/null
+++ b/src/Microdown/MicBoldFormatBlock2.class.st
@@ -0,0 +1,13 @@
+"
+I represent a bold text section. I'm delimited using `**` as in `**bold**` to obtain **bold**.
+"
+Class {
+	#name : #MicBoldFormatBlock2,
+	#superclass : #MicEvaluatedBlock2,
+	#category : #'Microdown-InlineParser'
+}
+
+{ #category : #visiting }
+MicBoldFormatBlock2 >> accept: aVisitor [
+	^ aVisitor visitBold: self
+]
diff --git a/src/Microdown/MicEvaluatedBlock2.class.st b/src/Microdown/MicEvaluatedBlock2.class.st
new file mode 100644
index 00000000..59fdd564
--- /dev/null
+++ b/src/Microdown/MicEvaluatedBlock2.class.st
@@ -0,0 +1,18 @@
+"
+I represent blocks with sub structure. Typically italics inside bold
+"
+Class {
+	#name : #MicEvaluatedBlock2,
+	#superclass : #MicInlineElement2,
+	#category : #'Microdown-InlineParser'
+}
+
+{ #category : #printing }
+MicEvaluatedBlock2 >> printOn: aStream [
+
+	self printWithoutConventions: aStream.
+	aStream nextPut: $(.
+	self children ifNotNil: [ children do: [ :each | each printOn: aStream ] 
+		separatedBy: [aStream nextPutAll: ' ']].
+	aStream nextPut: $)
+]
diff --git a/src/Microdown/MicFigureBlock2.class.st b/src/Microdown/MicFigureBlock2.class.st
new file mode 100644
index 00000000..2ee09194
--- /dev/null
+++ b/src/Microdown/MicFigureBlock2.class.st
@@ -0,0 +1,61 @@
+"
+I am a **figure**.
+
+My syntax is: `![Here is a nice caption.](https://files.pharo.org/media/logo/logo.png  ""anchor=figanchor&width=80"")`
+
+You should get the following picture: 
+![Here is a nice caption.](https://files.pharo.org/media/logo/logo.png ""anchor=figanchor&width=80"")
+
+I have a resources, i.e. an object referencing either a file (in relative or absolute manner) or an Url, that refers to a given image object.
+
+What is important to see is that there is a space between the url arguments and microdown arguments. 
+"
+Class {
+	#name : #MicFigureBlock2,
+	#superclass : #MicInlineBlockWithUrl2,
+	#instVars : [
+		'arguments',
+		'captionElements'
+	],
+	#category : #'Microdown-InlineParser'
+}
+
+{ #category : #accessing }
+MicFigureBlock2 >> arguments [
+
+	^ arguments
+]
+
+{ #category : #accessing }
+MicFigureBlock2 >> arguments: anObject [
+
+	arguments := anObject
+]
+
+{ #category : #visiting }
+MicFigureBlock2 >> closeMe [
+	"the link url - ![alt text](url) - url is allowed to have title in quotes
+	(url ""title"") "
+
+	| split title|
+	split := url splitOnFirst: Character space.
+	self reference: (MicResourceReference fromUri: split first).
+	title := (split second ifNil: [ '' ]) 
+		trimBoth: [:char | {$". Character space} includes: char].
+	self arguments: (MicArgumentList withString: title)
+]
+
+{ #category : #printing }
+MicFigureBlock2 >> printOn: aStream [
+ 		aStream nextPut: $!;
+ 			nextPut: $[;
+ 			nextPutAll: self caption;
+ 			nextPut: $];
+ 			nextPut: $(.
+		aStream nextPutAll: (
+			url
+				ifNotNil: [ url ] 
+				ifNil: [ String empty ]).		 
+		aStream nextPut: $).
+ 		
+]
diff --git a/src/Microdown/MicInlineBlockWithUrl.class.st b/src/Microdown/MicInlineBlockWithUrl.class.st
index 762f90ed..d13ab31d 100644
--- a/src/Microdown/MicInlineBlockWithUrl.class.st
+++ b/src/Microdown/MicInlineBlockWithUrl.class.st
@@ -67,6 +67,11 @@ MicInlineBlockWithUrl class >> from: aStartInteger to: anEndInteger withKind: aK
 	^ (self from: aStartInteger to: anEndInteger withKind: aKind withSubstring: aString withChildren: Array empty withURL: aURL)
 ]
 
+{ #category : #parsing }
+MicInlineBlockWithUrl class >> parse: token stream: aTokenStream for: aParser [
+	^ aParser parseNameUrlBlock: self from: aTokenStream token: token
+]
+
 { #category : #accessing }
 MicInlineBlockWithUrl >> argumentAt: aKey [
 
diff --git a/src/Microdown/MicInlineBlockWithUrl2.class.st b/src/Microdown/MicInlineBlockWithUrl2.class.st
new file mode 100644
index 00000000..203951dc
--- /dev/null
+++ b/src/Microdown/MicInlineBlockWithUrl2.class.st
@@ -0,0 +1,68 @@
+"
+My subclasses manage figures and links.
+
+```
+![Pharologo](https://files.pharo.org/media/logo/logo.png
+```
+
+![Pharologo](https://files.pharo.org/media/logo/logo.png)
+"
+Class {
+	#name : #MicInlineBlockWithUrl2,
+	#superclass : #MicInlineElement2,
+	#instVars : [
+		'url',
+		'reference'
+	],
+	#category : #'Microdown-InlineParser'
+}
+
+{ #category : #parsing }
+MicInlineBlockWithUrl2 class >> parse: token stream: aTokenStream for: aParser [
+	^ aParser parseNameUrlBlock: self from: aTokenStream token: token
+]
+
+{ #category : #accessing }
+MicInlineBlockWithUrl2 >> captionElements [ 
+	"caption is an old mistake for the part between the square brackets [caption](url)"
+	^ children
+]
+
+{ #category : #printing }
+MicInlineBlockWithUrl2 >> printOn: aStream [
+	| contents |
+	contents := children
+		            ifEmpty: [ self substring ]
+		            ifNotEmpty: [ self childrenPrintOn ].
+	aStream
+		nextPut: $[;
+		nextPutAll: contents;
+		nextPut: $];
+		nextPut: $(.
+		aStream nextPutAll: url. 
+	aStream nextPut: $)
+]
+
+{ #category : #accessing }
+MicInlineBlockWithUrl2 >> reference [
+
+	^ reference
+]
+
+{ #category : #accessing }
+MicInlineBlockWithUrl2 >> reference: anObject [
+
+	reference := anObject
+]
+
+{ #category : #accessing }
+MicInlineBlockWithUrl2 >> url [
+
+	^ url
+]
+
+{ #category : #accessing }
+MicInlineBlockWithUrl2 >> url: anObject [
+
+	url := anObject
+]
diff --git a/src/Microdown/MicInlineDelimiter.class.st b/src/Microdown/MicInlineDelimiter.class.st
index 7bedec8c..0dd8d7d0 100644
--- a/src/Microdown/MicInlineDelimiter.class.st
+++ b/src/Microdown/MicInlineDelimiter.class.st
@@ -25,27 +25,18 @@ MicInlineDelimiter class >> all [
 	^ DelimiterMap values
 ]
 
+{ #category : #'private utilities' }
+MicInlineDelimiter class >> allRegex [
+	^ ((MicInlineDelimiter all collect: #markupAsRegex) joinUsing: '|') asRegex
+	
+]
+
 { #category : #accessing }
 MicInlineDelimiter class >> at: markup [
 	"return delimiter at markup, or nil"
 	^ DelimiterMap at: markup ifAbsent: [ nil ]
 ]
 
-{ #category : #'private utilities' }
-MicInlineDelimiter class >> generateInitialization [
-	|tpl|
-	self flag: #removeLater.
-	tpl := '	self new markup: {1}; blockClass: {2}; closer: {3}; addMe.'. 
-	^ (MicAbstractDelimiter allActive 
-		collect: [ :cl | |markupName closer| 
-			markupName := ((cl class>> #markup) allLiterals detect: [ :lit |lit isClassVariable ]) name asString.
-			closer := cl isCloser ifFalse: [
-				((cl associatedInlineBlock class >> #closingDelimiter) 
-					allLiterals detect: [ :lit |lit isClassVariable ]) name asString] ifTrue: ['nil'].
-			tpl format: { markupName . cl associatedInlineBlock printString. closer} ]
-	) joinUsing: String cr.
-]
-
 { #category : #initialization }
 MicInlineDelimiter class >> initialize [
 	<script>
@@ -55,19 +46,28 @@ MicInlineDelimiter class >> initialize [
 
 { #category : #initialization }
 MicInlineDelimiter class >> initializeDelimiters [
-	self new markup: AnchorReferenceCloserMarkup; blockClass: MicAnchorReferenceBlock; closer: nil; addMe.
-	self new markup: AnchorReferenceOpenerMarkup; blockClass: MicAnchorReferenceBlock; closer: AnchorReferenceCloserMarkup; addMe.
-	self new markup: AnnotationCloserMarkup; blockClass: MicAnnotationBlock; closer: nil; addMe.
-	self new markup: AnnotationOpenerMarkup; blockClass: MicAnnotationBlock; closer: AnnotationCloserMarkup; addMe.
-	self new markup: BoldMarkup; blockClass: MicBoldFormatBlock; closer: nil; addMe.
-	self new markup: FigureNameOpenerMarkup; blockClass: MicFigureBlock; closer: NameCloserUrlOpener; addMe.
-	self new markup: ItalicMarkup; blockClass: MicItalicFormatBlock; closer: nil; addMe.
-	self new markup: MathMarkup; blockClass: MicMathInlineBlock; closer: nil; addMe.
-	self new markup: MonospaceMarkup; blockClass: MicMonospaceFormatBlock; closer: nil; addMe.
-	self new markup: RawCloserMarkup; blockClass: MicRawBlock; closer: nil; addMe.
-	self new markup: RawOpenerMarkup; blockClass: MicRawBlock; closer: RawCloserMarkup; addMe.
-	self new markup: StrikeMarkup; blockClass: MicStrikeFormatBlock; closer: nil; addMe.
-	self new markup: LinkNameOpenerMarkup; blockClass: MicLinkBlock; closer: NameCloserUrlOpener; addMe.
+	"The fixious text delimiter"
+	self new markup: FixiousTextDelimiter; blockClass: MicTextBlock2; closer: nil; addMe.
+	"formating"
+	self new markup: BoldMarkup; blockClass: MicBoldFormatBlock2; closer: BoldMarkup; addMe.
+	self new markup: ItalicMarkup; blockClass: MicItalicFormatBlock2; closer: ItalicMarkup; addMe.
+	self new markup: StrikeMarkup; blockClass: MicStrikeFormatBlock2; closer: StrikeMarkup; addMe.
+	"anchors & annotations"
+	self new markup: AnchorReferenceOpenerMarkup; blockClass: MicAnchorReferenceBlock2; closer: AnchorReferenceCloserMarkup; addMe.
+	self new markup: AnchorReferenceCloserMarkup; blockClass: nil; closer: nil; addMe.
+	self new markup: AnnotationCloserMarkup; blockClass: nil; closer: nil; addMe.
+	self new markup: AnnotationOpenerMarkup; blockClass: MicAnnotationBlock2; closer: AnnotationCloserMarkup; addMe.
+	"unevaluated"
+	self new markup: MathMarkup; blockClass: MicMathInlineBlock2; closer: MathMarkup; addMe.
+	self new markup: MonospaceMarkup; blockClass: MicMonospaceFormatBlock2; closer: MonospaceMarkup; addMe.
+	self new markup: RawOpenerMarkup; blockClass: MicRawBlock2; closer: RawCloserMarkup; addMe.
+	self new markup: RawCloserMarkup; blockClass: nil; closer: nil; addMe.
+	"Containing URLs"
+	self new markup: LinkNameOpenerMarkup; blockClass: MicLinkBlock2; closer: NameCloserUrlOpener; addMe.
+	self new markup: FigureNameOpenerMarkup; blockClass: MicFigureBlock2; closer: NameCloserUrlOpener; addMe.
+	self new markup: NameCloserUrlOpener; blockClass: MicRawBlock2 ; closer: URLCloserMarkup; addMe.
+	self new markup: URLCloserMarkup; blockClass: nil ; closer: nil; addMe
+		
 ]
 
 { #category : #'private utilities' }
@@ -117,7 +117,19 @@ MicInlineDelimiter >> closer: anObject [
 
 { #category : #testing }
 MicInlineDelimiter >> isEvaluated [
-	^ blockClass isEvaluated 
+	"I am an opener whose resultering block will need further inline parsing"
+	^ self isOpener and: [blockClass isEvaluated ]
+]
+
+{ #category : #testing }
+MicInlineDelimiter >> isOpener [
+	^ closer notNil or: [ markup = closer ]
+]
+
+{ #category : #testing }
+MicInlineDelimiter >> isRawkind [
+	"I am an opener whose resulting nodes body is not further parsed"
+	^ self isOpener and: [ blockClass isEvaluated not ]
 ]
 
 { #category : #accessing }
@@ -132,20 +144,17 @@ MicInlineDelimiter >> markup: anObject [
 	markup := anObject
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #accessing }
 MicInlineDelimiter >> markupAsRegex [
 	"return a regex (as string) matching this delimiter"
 	| str |
 	str := WriteStream on: ''. 
-	blockClass isEvaluated
-		ifFalse: [ 
+	self isRawkind
+		ifTrue: [ 
 				markup do: [:char| str nextPut: $\;nextPut: char].
-				blockClass closingDelimiter in: [ :other |
-					str nextPutAll: (self class regexNot: other).
-					other do: [:char| str nextPut: $\;nextPut: char].
-					 ]
-				 ]
-		ifTrue: [ markup do: [:char| str nextPut: $\;nextPut: char] ].
+				str nextPutAll: (self class regexNot: closer).
+				closer do: [:char| str nextPut: $\;nextPut: char]]
+		ifFalse: [ markup do: [:char| str nextPut: $\;nextPut: char] ].
 	^ str contents
 ]
 
diff --git a/src/Microdown/MicInlineElement.class.st b/src/Microdown/MicInlineElement.class.st
index 2da6e606..631afdbc 100644
--- a/src/Microdown/MicInlineElement.class.st
+++ b/src/Microdown/MicInlineElement.class.st
@@ -49,6 +49,15 @@ MicInlineElement class >> openingDelimiter [
 	self subclassResponsibility
 ]
 
+{ #category : #parsing }
+MicInlineElement class >> parse: token stream: aTokenStream for: aParser [
+
+	^ aParser
+		  parseEvaluatedBlock: self
+		  token: token
+		  stream: aTokenStream
+]
+
 { #category : #accessing }
 MicInlineElement >> children [
 	^ children
diff --git a/src/Microdown/MicInlineElement2.class.st b/src/Microdown/MicInlineElement2.class.st
new file mode 100644
index 00000000..e089ad24
--- /dev/null
+++ b/src/Microdown/MicInlineElement2.class.st
@@ -0,0 +1,130 @@
+"
+I am an inline block generated by inline splitter, to parse inline text.
+
+I am characterized by:
+- start & end: locations of my opener & closer delimiters in initial string
+- substring: concerned text (without delimiters so)
+- kind: my type, symbol which must be the same than my relative delimiter type (#basic for normal text)
+- children: array in case of nested inline blocks
+
+
+"
+Class {
+	#name : #MicInlineElement2,
+	#superclass : #MicElement,
+	#instVars : [
+		'substring',
+		'children'
+	],
+	#category : #'Microdown-InlineParser'
+}
+
+{ #category : #testing }
+MicInlineElement2 class >> isEvaluated [
+	^ true
+]
+
+{ #category : #parsing }
+MicInlineElement2 class >> parse: token stream: aTokenStream for: aParser [
+	^ aParser parseEvaluatedBlock: self token: token stream: aTokenStream
+]
+
+{ #category : #visiting }
+MicInlineElement2 >> accept: dummy [
+	"implemented in subclasses"
+]
+
+{ #category : #accessing }
+MicInlineElement2 >> children [
+
+	^ children
+]
+
+{ #category : #accessing }
+MicInlineElement2 >> children: anObject [
+
+	children := anObject
+]
+
+{ #category : #printing }
+MicInlineElement2 >> childrenPrintOn [
+	^ (children asString allButFirst: 9) allButLast
+]
+
+{ #category : #visiting }
+MicInlineElement2 >> closeMe [
+	"use for post parsing initialization"
+]
+
+{ #category : #initialization }
+MicInlineElement2 >> initialize [
+	children := #().
+	substring := ''
+]
+
+{ #category : #private }
+MicInlineElement2 >> inlineParserClass [
+
+	^ MicInlineParser2
+]
+
+{ #category : #accessing }
+MicInlineElement2 >> kind [
+	"return a small string name used for printing and testing"
+	^ { MicAnchorReferenceBlock2 -> #anchorReference.
+	MicMathInlineBlock2 -> #math.
+	MicRawBlock2 -> #raw.
+	MicTextBlock2 -> #basic.
+	MicBoldFormatBlock2 -> #bold.
+	MicItalicFormatBlock2 -> #italic.
+	MicMonospaceFormatBlock2 -> #monospace.
+	MicStrikeFormatBlock2 -> #strike.
+	MicFigureBlock2 -> #figure.
+	MicLinkBlock2 -> #linkName } asDictionary at: self
+]
+
+{ #category : #printing }
+MicInlineElement2 >> print: aString surroundedOn: aStream [
+
+	aStream 
+		nextPut: $(;
+		nextPutAll: aString;
+		nextPut: $) 
+
+]
+
+{ #category : #printing }
+MicInlineElement2 >> printOn: aStream [
+
+	| contents |
+	contents := children 
+		ifEmpty: [ self substring ] 
+		ifNotEmpty: [ self childrenPrintOn ].
+	aStream nextPut: $[;
+				nextPutAll: contents;
+				nextPut: $];
+				nextPut: $(;
+				nextPutAll: self kind;
+				nextPut: $) 
+
+]
+
+{ #category : #printing }
+MicInlineElement2 >> printWithoutConventions: aStream [
+	"Remove Mic and Block from the class."
+	
+	aStream nextPutAll: ((self class name allButFirst: 3) allButLast: 5).
+
+]
+
+{ #category : #accessing }
+MicInlineElement2 >> substring [
+
+	^ substring
+]
+
+{ #category : #accessing }
+MicInlineElement2 >> substring: anObject [
+
+	substring := anObject
+]
diff --git a/src/Microdown/MicInlineParser2.class.st b/src/Microdown/MicInlineParser2.class.st
index dc05d336..d02cf676 100644
--- a/src/Microdown/MicInlineParser2.class.st
+++ b/src/Microdown/MicInlineParser2.class.st
@@ -12,93 +12,17 @@ Class {
 	#category : #'Microdown-InlineParser'
 }
 
-{ #category : #'escape character' }
-MicInlineParser2 class >> escapeDecode: aString [
-	"I convert all encoded chars back to their original (without the leading escape character)"
-	"My sister method escapeEncode encodes into the format I decode from"
-	| inStream outStream char special |
-	aString ifEmpty: [ ^aString ].
-	special := [ :c | c asInteger between: self magicCharacter  and: self magicCharacter + 65536 ].
-	inStream := ReadStream on: aString.
-	outStream := WriteStream on: String new.
-	[ inStream atEnd ] whileFalse: [ 
-		char := inStream next.
-		(special value: char)
-			ifTrue: [ char := (char asInteger - self magicCharacter ) asCharacter  ].
-		outStream nextPut: char
-	].
-	^ outStream contents
-	
-]
-
-{ #category : #'escape character' }
-MicInlineParser2 class >> escapeEncode: aString [
-	"I convert all escaped characters (eg '\`' or '\\') into special characters which are not used in Microdown"
-	"My sister method escapeDecode reverts back"
-	| inStream outStream char |
-	aString size <= 1 ifTrue: [ ^aString ].
-	inStream := ReadStream on: aString.
-	outStream := WriteStream on: String new.
-	[ inStream atEnd ] whileFalse: [ 
-		char := inStream next.
-		(char = $\ and: [ inStream atEnd not ]) 
-			ifTrue: [ char := (inStream next asInteger + self magicCharacter) asCharacter  ].
-		outStream nextPut: char
-	].
-	^ outStream contents
-	
-]
-
-{ #category : #'escape character' }
-MicInlineParser2 class >> escapeReescape: aString except: keep [
-	"I convert all encoded back to escaped chars, except the characters in keep"
-	"My sister method escapeEncode encodes into the format I decode from"
-	| inStream outStream char |
-	aString ifEmpty: [ ^aString ].
-	inStream := ReadStream on: aString.
-	outStream := WriteStream on: String new.
-	[ inStream atEnd ] whileFalse: [ 
-		char := inStream next.
-		(char asInteger between: self magicCharacter  and: self magicCharacter + 65536)
-			ifTrue: [ 
-				char := (char asInteger - self magicCharacter ) asCharacter.  
-				(keep includes: char) ifFalse: [outStream nextPut: $\]] .
-		outStream nextPut: char
-	].
-	^ outStream contents
-	
-]
-
-{ #category : #'escape character' }
-MicInlineParser2 class >> magicCharacter [
-	"All escaped characters are moved out of range. 
-	The unicode range Private Use Area is used, 
-	see https://en.wikipedia.org/wiki/Private_Use_Areas "
-	^ 16r100000 "Private Use Area-B"
-]
-
-{ #category : #'as yet unclassified' }
-MicInlineParser2 >> createInlineBlock: openingDelimiter inStream: aReadStream [ 
-	| pos closer bodyStream newBlock|
-	pos := aReadStream position.
-	closer := openingDelimiter associatedInlineBlock new closingDelimiter.
-	(self skipTo: closer inStream: aReadStream)
-		ifFalse: [ 
-			aReadStream position: pos.
-			^ self createTextBlock: openingDelimiter markup].
-	bodyStream := ReadStream 
-		on: aReadStream contents
-		from: pos + 1
-		to: aReadStream position - 1.
-	newBlock := openingDelimiter associatedInlineBlock new
-		substring: (aReadStream contents copyFrom: pos to: aReadStream position -1);
-		children: (self parseChildrenIn: bodyStream ).
+{ #category : #'block creation' }
+MicInlineParser2 >> createInlineBlock: token inStream: aReadStream [ 
+	| blockClass newBlock|
+	blockClass := token delimiter blockClass.
+	newBlock := blockClass parse: token stream: aReadStream for: self.
 	^ newBlock 
 	
 	
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #'block creation' }
 MicInlineParser2 >> createRawStyleBlock: token [
 	| opener block substring|
 	opener := (MicAbstractDelimiter rawStyleOpeningMarkups)
@@ -115,27 +39,21 @@ MicInlineParser2 >> createRawStyleBlock: token [
 		
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #'block creation' }
 MicInlineParser2 >> createTextBlock: token [
-	^ MicTextBlock new
+	^ MicTextBlock2 new
 		substring: token;
 		children: #()
 ]
 
-{ #category : #'as yet unclassified' }
-MicInlineParser2 >> initialize [
-	delimiterRegEx := MicAbstractDelimiter allRegex.
-	delimiterDictionary := (MicAbstractDelimiter allActive collect: [ :del | del markup -> del ]) asDictionary .
-]
-
-{ #category : #'as yet unclassified' }
+{ #category : #'private parsing' }
 MicInlineParser2 >> joinTextNodesOf: children [
 	"children might have several text blocks following each other - join them and remove empty Text blocks"
 	| outStream bufferText  |
 	outStream := WriteStream on: OrderedCollection new.
 	bufferText := nil.
 	children do: [ :child |
-		child class = MicTextBlock
+		child class = MicTextBlock2
 			ifTrue: [ bufferText 
 				ifNil: [ bufferText := child ]
 				ifNotNil: [ bufferText substring: (bufferText substring , child substring) ] ]
@@ -154,42 +72,77 @@ MicInlineParser2 >> joinTextNodesOf: children [
 { #category : #parsing }
 MicInlineParser2 >> parse: aString [
 	"I return an array of inline blocks"
-	| escapedStream  tokenStream |
-	escapedStream := self class escapeEncode: aString.
-	tokenStream := MicInlineTokenStream on: escapedStream.
-	^ self parseChildrenIn: tokenStream 
+	| tokenStream |
+	tokenStream := MicInlineTokenStream on: aString.
+	^ (self parseChildrenIn: tokenStream) asArray 
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #'private parsing' }
 MicInlineParser2 >> parseChildrenIn: tokenStream [
 	"return an array of blocks from parsing tokenStream"
 	| children child |
 	children := OrderedCollection new.
 	[ tokenStream atEnd ]
-		whileFalse: [ | token delType |
+		whileFalse: [ | token |
 			token := tokenStream next.
-			delType := token halt.
-			child := (delType
-				ifNil: [ self createRawStyleBlock: token ]
-				ifNotNil: [ 
-					delType isOpener 
-						ifTrue: [self createInlineBlock: delType inStream: tokenStream]
-						ifFalse: [ self createTextBlock: token] ]).
+			child := token delimiter isOpener 
+				ifTrue: [self createInlineBlock: token inStream: tokenStream]
+				ifFalse: [ self createTextBlock: token substring].
 			children add: child.
 		].
 	^ self joinTextNodesOf: children
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #'private parsing' }
+MicInlineParser2 >> parseEvaluatedBlock: blockType token: token stream: tokenStream [
+	| skipRes |
+	skipRes := (self skipTo: token delimiter closer inStream: tokenStream).
+	skipRes ifNil: [ ^ self createTextBlock: token substring].
+	tokenStream next. "skip closer"
+	^ blockType new
+		children: (self parseChildrenIn: skipRes second );
+		closeMe
+]
+
+{ #category : #'private parsing' }
+MicInlineParser2 >> parseNameUrlBlock: blockType from: aTokenStream token: token [
+	| skipRes children urlToken|
+	skipRes := (self skipTo: token delimiter closer inStream: aTokenStream).
+	skipRes ifNil: [ ^ self createTextBlock: token substring].
+	children := self parseChildrenIn: skipRes second.
+	urlToken := aTokenStream next.
+	^ blockType new
+		children: children;
+		url: urlToken undelimitedSubstring;
+		closeMe.
+		
+	
+
+]
+
+{ #category : #'private parsing' }
+MicInlineParser2 >> parseNonEvaluatedBlock: blockClass token: token stream: aTokenStream [
+	^ blockClass new
+		substring: token undelimitedSubstring;
+		closeMe
+]
+
+{ #category : #'private parsing' }
 MicInlineParser2 >> skipTo: closer inStream: tokenStream [
-	"skip tokenStream to closer, ignore closers in non-evaluated. return true if we found it"
-	| startPos|
+	"skip tokenStream to closer, ignore closers in non-evaluated. if we find it return the accumulates text and a subtokenstream to read it from"
+	| startPos substringStream |
 	startPos := tokenStream position.
+	substringStream := WriteStream on: ''.
 	[ tokenStream atEnd]
 		whileFalse: [ | token|
-			token := tokenStream next.
-			token = closer ifTrue: [ ^true ]
-			 ].
-	^ false
+			token := tokenStream peek.
+			token delimiter markup = closer ifTrue: [ 
+				^ { substringStream contents.  
+					 ReadStream on: tokenStream contents from: startPos + 1 to: tokenStream position} ].
+			substringStream nextPutAll: token substring.
+			tokenStream next.
+			].
+	tokenStream position: startPos.
+	^ nil
 	
 ]
diff --git a/src/Microdown/MicInlineToken.class.st b/src/Microdown/MicInlineToken.class.st
index d8d22e85..9b88dcc1 100644
--- a/src/Microdown/MicInlineToken.class.st
+++ b/src/Microdown/MicInlineToken.class.st
@@ -30,6 +30,11 @@ MicInlineToken >> delimiter: anObject [
 	delimiter := anObject
 ]
 
+{ #category : #printing }
+MicInlineToken >> printOn: aStream [
+	aStream << delimiter printString << $( << substring << $)
+]
+
 { #category : #accessing }
 MicInlineToken >> substring [
 
@@ -41,3 +46,11 @@ MicInlineToken >> substring: anObject [
 
 	substring := anObject
 ]
+
+{ #category : #accessing }
+MicInlineToken >> undelimitedSubstring [
+	"assume I am a token for a unevaluated delimiter, containing raw body - remove my delimiters"
+	^substring 
+		copyFrom: delimiter markup size + 1 
+		to: (substring size - delimiter closer size)
+]
diff --git a/src/Microdown/MicInlineTokenStream.class.st b/src/Microdown/MicInlineTokenStream.class.st
index e185d866..a17bd401 100644
--- a/src/Microdown/MicInlineTokenStream.class.st
+++ b/src/Microdown/MicInlineTokenStream.class.st
@@ -15,43 +15,95 @@ Class {
 	#category : #'Microdown-InlineParser'
 }
 
-{ #category : #'as yet unclassified' }
-MicInlineTokenStream class >> allRegex [
-	^ ((MicInlineDelimiter all collect: #markupAsRegex) joinUsing: '|') asRegex
+{ #category : #'escape character' }
+MicInlineTokenStream class >> backslashDecode: aString [
+	"I convert all encoded chars back to their original (without the leading escape character)"
+	"My sister method escapeEncode encodes into the format I decode from"
+	| inStream outStream char special |
+	aString ifEmpty: [ ^aString ].
+	special := [ :c | c asInteger between: self magicCharacter  and: self magicCharacter + 65536 ].
+	inStream := ReadStream on: aString.
+	outStream := WriteStream on: String new.
+	[ inStream atEnd ] whileFalse: [ 
+		char := inStream next.
+		(special value: char)
+			ifTrue: [ char := (char asInteger - self magicCharacter ) asCharacter  ].
+		outStream nextPut: char
+	].
+	^ outStream contents
 	
 ]
 
+{ #category : #'escape character' }
+MicInlineTokenStream class >> backslashEncode: aString [
+	"I convert all escaped characters (eg '\`' or '\\') into special characters which are not used in Microdown"
+	"My sister method escapeDecode reverts back"
+	| inStream outStream char |
+	aString size <= 1 ifTrue: [ ^aString ].
+	inStream := ReadStream on: aString.
+	outStream := WriteStream on: String new.
+	[ inStream atEnd ] whileFalse: [ 
+		char := inStream next.
+		(char = $\ and: [ inStream atEnd not ]) 
+			ifTrue: [ char := (inStream next asInteger + self magicCharacter) asCharacter  ].
+		outStream nextPut: char
+	].
+	^ outStream contents
+	
+]
+
+{ #category : #'escape character' }
+MicInlineTokenStream class >> backslashReescape: aString except: keep [
+	"I convert all encoded back to escaped chars, except the characters in keep"
+	"My sister method escapeEncode encodes into the format I decode from"
+	| inStream outStream char |
+	aString ifEmpty: [ ^aString ].
+	inStream := ReadStream on: aString.
+	outStream := WriteStream on: String new.
+	[ inStream atEnd ] whileFalse: [ 
+		char := inStream next.
+		(char asInteger between: self magicCharacter  and: self magicCharacter + 65536)
+			ifTrue: [ 
+				char := (char asInteger - self magicCharacter ) asCharacter.  
+				(keep includes: char) ifFalse: [outStream nextPut: $\]] .
+		outStream nextPut: char
+	].
+	^ outStream contents
+	
+]
+
+{ #category : #'escape character' }
+MicInlineTokenStream class >> magicCharacter [
+	"All escaped characters are moved out of range. 
+	The unicode range Private Use Area is used, 
+	see https://en.wikipedia.org/wiki/Private_Use_Areas "
+	^ 16r100000 "Private Use Area-B"
+]
+
 { #category : #'instance creation' }
 MicInlineTokenStream class >> on: escapedStream [
 	^ self new tokenize: escapedStream 
 ]
 
-{ #category : #initialization }
-MicInlineTokenStream >> add: string [
-	"Transform into token, and add it"
-	| delimiter token |
-	delimiter := MicInlineDelimiter at: string.
-	delimiter
-		ifNil: [ self addRawOrText: string ]
-		ifNotNil: [ self addDelimiter: delimiter ]
-]
-
 { #category : #adding }
-MicInlineTokenStream >> addDelimiter: matchedString [
+MicInlineTokenStream >> addDelimiter: string [
+	| delimiter decodedString|
+	delimiter := (MicInlineDelimiter at: string)
+		ifNil: [ (MicInlineDelimiter all reject: #isEvaluated) detect: [ :o | string beginsWith: o markup] ].
+	decodedString := delimiter isRawkind 
+		ifTrue: [self class backslashReescape: string except: delimiter closer first asString]
+		ifFalse: [string].
 	tokens add: (MicInlineToken new 
-		substring: matchedString;
-		delimiter: (MicInlineDelimiter at: matchedString ))
+		substring: decodedString;
+		delimiter: delimiter)
 ]
 
 { #category : #adding }
-MicInlineTokenStream >> addRawOrText: matchedString [
-	| opener token |
-	opener := (MicInlineDelimiter all reject: #isEvaluated)
-		detect: [ :o | matchedString beginsWith: o markup]
-		ifNone: [ nil ].
+MicInlineTokenStream >> addText: matchedString [
+	| token |
 	token := MicInlineToken new 
-		substring: matchedString;
-		delimiter: opener.
+		substring: (self class backslashDecode: matchedString);
+		delimiter: (MicInlineDelimiter at: FixiousTextDelimiter).
 	tokens add: token
 ]
 
@@ -61,17 +113,18 @@ MicInlineTokenStream >> initialize [
 ]
 
 { #category : #parsing }
-MicInlineTokenStream >> tokenize: escapedStream [
-	| splits from|
-	splits := self class allRegex matchingRangesIn: escapedStream.
+MicInlineTokenStream >> tokenize: rawString [
+	| inlineString splits from|
+	inlineString := self class backslashEncode: rawString.
+	splits := MicInlineDelimiter allRegex matchingRangesIn: inlineString.
 	tokens := OrderedCollection new.
 	from := 1.
 	splits do: [ :delMatch |
-		self add: (escapedStream copyFrom: from to: delMatch first - 1).
-		self add: (escapedStream copyFrom: delMatch first to: delMatch last).
+		self addText: (inlineString copyFrom: from to: delMatch first - 1).
+		self addDelimiter: (inlineString copyFrom: delMatch first to: delMatch last).
 		from := delMatch last + 1
 		 ].
-	from <= escapedStream size ifTrue: [ self add: (escapedStream copyFrom: from to: escapedStream size) ].
+	from <= inlineString size ifTrue: [ self addText: (inlineString copyFrom: from to: inlineString size) ].
 	^ ReadStream on: tokens
 	
 ]
diff --git a/src/Microdown/MicItalicFormatBlock2.class.st b/src/Microdown/MicItalicFormatBlock2.class.st
new file mode 100644
index 00000000..3a37d67d
--- /dev/null
+++ b/src/Microdown/MicItalicFormatBlock2.class.st
@@ -0,0 +1,13 @@
+"
+I represent an italic text section. I'm delimited using `_` as in `_italic_` to obtain _italic_.
+"
+Class {
+	#name : #MicItalicFormatBlock2,
+	#superclass : #MicEvaluatedBlock2,
+	#category : #'Microdown-InlineParser'
+}
+
+{ #category : #visiting }
+MicItalicFormatBlock2 >> accept: aVisitor [
+	^ aVisitor visitItalic: self
+]
diff --git a/src/Microdown/MicLinkBlock2.class.st b/src/Microdown/MicLinkBlock2.class.st
new file mode 100644
index 00000000..81b87b98
--- /dev/null
+++ b/src/Microdown/MicLinkBlock2.class.st
@@ -0,0 +1,8 @@
+"
+I represent a reference in a text. For example `[http://pharo.org](http://pharo.org)` creates [http://pharo.org](http://pharo.org).
+"
+Class {
+	#name : #MicLinkBlock2,
+	#superclass : #MicInlineBlockWithUrl2,
+	#category : #'Microdown-InlineParser'
+}
diff --git a/src/Microdown/MicMathInlineBlock.class.st b/src/Microdown/MicMathInlineBlock.class.st
index 99f42d65..6f29b621 100644
--- a/src/Microdown/MicMathInlineBlock.class.st
+++ b/src/Microdown/MicMathInlineBlock.class.st
@@ -47,6 +47,15 @@ MicMathInlineBlock class >> openingDelimiter [
  	^ MathMarkup
 ]
 
+{ #category : #parsing }
+MicMathInlineBlock class >> parse: delimiter stream: aTokenStream for: aParser [
+
+	^ aParser
+		  parseNonEvaluatedBlock: self
+		  token: delimiter
+		  stream: aTokenStream
+]
+
 { #category : #visiting }
 MicMathInlineBlock >> accept: aVisitor [
 	^ aVisitor visitMathInline: self
diff --git a/src/Microdown/MicMathInlineBlock2.class.st b/src/Microdown/MicMathInlineBlock2.class.st
new file mode 100644
index 00000000..183fe322
--- /dev/null
+++ b/src/Microdown/MicMathInlineBlock2.class.st
@@ -0,0 +1,31 @@
+"
+Microdown supports in text math expression as in LaTeX using `$ 1 + 2 $`. Each exporter is then responsible to map the contents to the correct output. For PDF based on LaTeX mathInlineBlock can contain LaTeX, for HTML we expect the same using corresponding math library in JS.
+
+Here are several examples:
+
+#### Example 1
+Code: `$V_i = C_0 - C_3$`
+
+$V_i = C_0 - C_3$
+
+#### Example 2
+Code: `$a^2 + b^2 = c^2$`
+
+$a^2 + b^2 = c^2$
+
+#### Example 3
+Code: `$\sin(x) = \sum_{n=0}^{\infty} \frac{(-1)^{n}x^{2n+1}}{(2n+1)!}$`
+
+$\sin(x) = \sum_{n=0}^{\infty} \frac{(-1)^{n}x^{2n+1}}{(2n+1)!}$
+
+#### Example 4
+Code: `$f(a) = \frac{1}{2\pi i} \oint_{\gamma} \frac{f(z)}{z - a} dz$`
+
+$f(a) = \frac{1}{2\pi i} \oint_{\gamma} \frac{f(z)}{z - a} dz$
+
+"
+Class {
+	#name : #MicMathInlineBlock2,
+	#superclass : #MicUnEvaluatedBlock2,
+	#category : #'Microdown-InlineParser'
+}
diff --git a/src/Microdown/MicMicrodownSharedPool.class.st b/src/Microdown/MicMicrodownSharedPool.class.st
index 7642fbaf..036c7c6c 100644
--- a/src/Microdown/MicMicrodownSharedPool.class.st
+++ b/src/Microdown/MicMicrodownSharedPool.class.st
@@ -22,6 +22,7 @@ Class {
 		'EnvironmentClosingBlockMarkup',
 		'EnvironmentOpeningBlockMarkup',
 		'FigureNameOpenerMarkup',
+		'FixiousTextDelimiter',
 		'HeaderMarkup',
 		'HorizontalLineMarkup',
 		'ItalicMarkup',
@@ -97,6 +98,7 @@ MicMicrodownSharedPool class >> initialize [
 	URLCloserMarkup := ')'. 
 	URLOpenerMarkup := '('.
 	NameCloserUrlOpener := ']('.
+	FixiousTextDelimiter := 0 asCharacter asString.
 
 	Delimiters := { AnchorReferenceCloserMarkup . 
 	AnchorReferenceOpenerMarkup .
diff --git a/src/Microdown/MicMonospaceFormatBlock.class.st b/src/Microdown/MicMonospaceFormatBlock.class.st
index 0756315d..b56964b0 100644
--- a/src/Microdown/MicMonospaceFormatBlock.class.st
+++ b/src/Microdown/MicMonospaceFormatBlock.class.st
@@ -24,6 +24,15 @@ MicMonospaceFormatBlock class >> openingDelimiter [
  	^ MonospaceMarkup
 ]
 
+{ #category : #parsing }
+MicMonospaceFormatBlock class >> parse: delimiter stream: aTokenStream for: aParser [
+
+	^ aParser
+		  parseNonEvaluatedBlock: self
+		  token: delimiter
+		  stream: aTokenStream
+]
+
 { #category : #visiting }
 MicMonospaceFormatBlock >> accept: aVisitor [
 	^ aVisitor visitMonospace: self
@@ -58,3 +67,12 @@ MicMonospaceFormatBlock >> kind [
 MicMonospaceFormatBlock >> openingDelimiter [
 	^ self class openingDelimiter
 ]
+
+{ #category : #printing }
+MicMonospaceFormatBlock >> printOn: aStream [
+
+	self printWithoutConventions: aStream.
+	aStream nextPut: $(.
+	aStream nextPutAll: substring.
+	aStream nextPut: $)
+]
diff --git a/src/Microdown/MicMonospaceFormatBlock2.class.st b/src/Microdown/MicMonospaceFormatBlock2.class.st
new file mode 100644
index 00000000..df00c735
--- /dev/null
+++ b/src/Microdown/MicMonospaceFormatBlock2.class.st
@@ -0,0 +1,22 @@
+"
+I represent a monospaced text section. I'm delimited using `\`` as in `\`monospace\`` to obtain `monospace`.
+"
+Class {
+	#name : #MicMonospaceFormatBlock2,
+	#superclass : #MicUnEvaluatedBlock2,
+	#category : #'Microdown-InlineParser'
+}
+
+{ #category : #visiting }
+MicMonospaceFormatBlock2 >> accept: aVisitor [
+	^ aVisitor visitMonospace: self
+]
+
+{ #category : #printing }
+MicMonospaceFormatBlock2 >> printOn: aStream [
+
+	self printWithoutConventions: aStream.
+	aStream nextPut: $(.
+	aStream nextPutAll: substring.
+	aStream nextPut: $)
+]
diff --git a/src/Microdown/MicRawBlock.class.st b/src/Microdown/MicRawBlock.class.st
index 5aa704ac..10f771be 100644
--- a/src/Microdown/MicRawBlock.class.st
+++ b/src/Microdown/MicRawBlock.class.st
@@ -28,6 +28,15 @@ MicRawBlock class >> openingDelimiter [
  	^ RawOpenerMarkup
 ]
 
+{ #category : #parsing }
+MicRawBlock class >> parse: delimiter stream: aTokenStream for: aParser [
+
+	^ aParser
+		  parseNonEvaluatedBlock: self
+		  token: delimiter
+		  stream: aTokenStream
+]
+
 { #category : #visiting }
 MicRawBlock >> accept: aVisitor [
 	^ aVisitor visitRaw: self
diff --git a/src/Microdown/MicRawBlock2.class.st b/src/Microdown/MicRawBlock2.class.st
new file mode 100644
index 00000000..b95c0ce8
--- /dev/null
+++ b/src/Microdown/MicRawBlock2.class.st
@@ -0,0 +1,12 @@
+"
+Raw lets the user place anything (so don't use it).
+
+```
+{{ raw contents}}
+```
+"
+Class {
+	#name : #MicRawBlock2,
+	#superclass : #MicUnEvaluatedBlock2,
+	#category : #'Microdown-InlineParser'
+}
diff --git a/src/Microdown/MicStrikeFormatBlock2.class.st b/src/Microdown/MicStrikeFormatBlock2.class.st
new file mode 100644
index 00000000..12afe5ac
--- /dev/null
+++ b/src/Microdown/MicStrikeFormatBlock2.class.st
@@ -0,0 +1,13 @@
+"
+I represent a strike text section. I'm delimited using `~` as in `~strike~` to obtain ~strike~.
+"
+Class {
+	#name : #MicStrikeFormatBlock2,
+	#superclass : #MicEvaluatedBlock2,
+	#category : #'Microdown-InlineParser'
+}
+
+{ #category : #visiting }
+MicStrikeFormatBlock2 >> accept: aVisitor [
+	^ aVisitor visitStrike: self
+]
diff --git a/src/Microdown/MicTextBlock2.class.st b/src/Microdown/MicTextBlock2.class.st
new file mode 100644
index 00000000..285671e9
--- /dev/null
+++ b/src/Microdown/MicTextBlock2.class.st
@@ -0,0 +1,16 @@
+"
+I'm a special inline block representing the fact that there is not markup. 
+"
+Class {
+	#name : #MicTextBlock2,
+	#superclass : #MicUnEvaluatedBlock2,
+	#category : #'Microdown-InlineParser'
+}
+
+{ #category : #printing }
+MicTextBlock2 >> printOn: aStream [
+
+	self printWithoutConventions: aStream.
+	self print: self substring surroundedOn: aStream.
+
+]
diff --git a/src/Microdown/MicUnEvaluatedBlock2.class.st b/src/Microdown/MicUnEvaluatedBlock2.class.st
new file mode 100644
index 00000000..e7e73a05
--- /dev/null
+++ b/src/Microdown/MicUnEvaluatedBlock2.class.st
@@ -0,0 +1,18 @@
+"
+I represent blocks whose contents is not microdown markup as such.
+"
+Class {
+	#name : #MicUnEvaluatedBlock2,
+	#superclass : #MicInlineElement2,
+	#category : #'Microdown-InlineParser'
+}
+
+{ #category : #testing }
+MicUnEvaluatedBlock2 class >> isEvaluated [
+	^ false
+]
+
+{ #category : #parsing }
+MicUnEvaluatedBlock2 class >> parse: delimiter stream: aTokenStream for: aParser [
+	^ aParser parseNonEvaluatedBlock: self token: delimiter stream: aTokenStream
+]

From 28107cb9d807d2dd4f2455e7454413156409138c Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Tue, 25 Oct 2022 15:53:51 +0200
Subject: [PATCH 07/40] interrim commit

---
 .../MicInlineBlock2Test.class.st              |  22 +
 .../MicInlineParser2Test.class.st             | 874 +++++-------------
 .../MicInlineParserTest_old2.class.st         | 751 ---------------
 src/Microdown/MicEvaluatedBlock2.class.st     |  39 +-
 src/Microdown/MicFigureBlock2.class.st        |  26 +-
 src/Microdown/MicInlineBlock2.class.st        |  47 +
 src/Microdown/MicInlineBlockWithUrl2.class.st |  31 +-
 src/Microdown/MicInlineElement2.class.st      | 130 ---
 src/Microdown/MicInlineParser2.class.st       |  55 +-
 src/Microdown/MicLinkBlock2.class.st          |  11 +
 src/Microdown/MicMathInlineBlock2.class.st    |   5 +
 .../MicMonospaceFormatBlock.class.st          |   9 -
 .../MicMonospaceFormatBlock2.class.st         |  14 +-
 src/Microdown/MicRawBlock2.class.st           |   5 +
 src/Microdown/MicTextBlock2.class.st          |   9 +-
 src/Microdown/MicUnEvaluatedBlock2.class.st   |  23 +-
 16 files changed, 463 insertions(+), 1588 deletions(-)
 create mode 100644 src/Microdown-Tests/MicInlineBlock2Test.class.st
 delete mode 100644 src/Microdown-Tests/MicInlineParserTest_old2.class.st
 create mode 100644 src/Microdown/MicInlineBlock2.class.st
 delete mode 100644 src/Microdown/MicInlineElement2.class.st

diff --git a/src/Microdown-Tests/MicInlineBlock2Test.class.st b/src/Microdown-Tests/MicInlineBlock2Test.class.st
new file mode 100644
index 00000000..01fdc3a5
--- /dev/null
+++ b/src/Microdown-Tests/MicInlineBlock2Test.class.st
@@ -0,0 +1,22 @@
+Class {
+	#name : #MicInlineBlock2Test,
+	#superclass : #TestCase,
+	#pools : [
+		'MicMicrodownSharedPool'
+	],
+	#category : #'Microdown-Tests-InlineParser'
+}
+
+{ #category : #tests }
+MicInlineBlock2Test >> testAllTerminalNodesImplementsAccept [
+	(MicInlineBlock2 allSubclasses select: [ :cl | cl allSubclasses isEmpty ])
+		do: [ :class |  self assert: (class includesSelector: #accept:) ]
+	
+]
+
+{ #category : #tests }
+MicInlineBlock2Test >> testBlockName [
+	self assert: MicFigureBlock2 blockName equals: 'Figure'.
+	self assert: MicBoldFormatBlock2 blockName equals: 'Bold'
+	
+]
diff --git a/src/Microdown-Tests/MicInlineParser2Test.class.st b/src/Microdown-Tests/MicInlineParser2Test.class.st
index 06d75cfd..66cc2d99 100644
--- a/src/Microdown-Tests/MicInlineParser2Test.class.st
+++ b/src/Microdown-Tests/MicInlineParser2Test.class.st
@@ -7,733 +7,363 @@ Class {
 	#category : #'Microdown-Tests-InlineParser'
 }
 
-{ #category : #accessing }
-MicInlineParser2Test >> splitter [
-	^ MicInlineParser2 new
-]
-
-{ #category : #'tests - anchors' }
-MicInlineParser2Test >> testAnchorReference [
-
-	| res |
-	res := self splitter parse: 'abc*@anchorA@*def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. '[anchorA](anchorReference)'.
-		'Text(def)' }.
-	self assert: (res second isKindOf: MicAnchorReferenceBlock)
-]
-
-{ #category : #'tests - anchors' }
-MicInlineParser2Test >> testAnchorReferenceUnevaluated [
-
-	"When isEvaluated class method returns false, like anchor reference's case, inline inside shoudn't be evaluated"
-
-	| res |
-	res := self splitter parse: 'abc*@def**not bold**ghi@*xyz'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. '[def**not bold**ghi](anchorReference)'.
-			'Text(xyz)' }
-]
-
-{ #category : #'tests - annotation' }
-MicInlineParser2Test >> testAnnotationWithParameters [
-
-	| res |
-	res := self splitter parse:
-		       'abc', AnnotationOpenerMarkup ,'an annotation|key=cite&label=42',AnnotationCloserMarkup,'def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. AnnotationOpenerMarkup,'an annotation|key=cite&label=42', AnnotationCloserMarkup.
-			'Text(def)' }.
-	self assert: (res second isKindOf: MicAnnotationBlock).
-	self assert: (res second arguments at: 'key') equals: 'cite'.
-	self assert: (res second arguments at: 'label') equals: '42'
+{ #category : #'as yet unclassified' }
+MicInlineParser2Test class >> generateEvaluatedTests [
+	| template tests|
+	template := 'test{1}
+	"Auto generated by self class>>#generateEvaluatedTests"
+	| res |
+	res := ( self inlineParse:{2}) first.
+	self assert: res printString equals: ({3} new children: \{ MicTextBlock2 new substring: ''aaaa''\}) printString
+	'.
+	tests := { 
+		{ 'Bold'. (BoldMarkup, 'aaaa', BoldMarkup) printString. 'MicBoldFormatBlock2'}.
+		{ 'Italic'. (ItalicMarkup, 'aaaa', ItalicMarkup) printString. 'MicItalicFormatBlock2' }.
+		{ 'Strike'. (StrikeMarkup, 'aaaa', StrikeMarkup) printString. 'MicStrikeFormatBlock2'  }
+	 }.
+	^ tests do: [ :t | self compile: (template format: t ) classified: 'test generated']
+	
 ]
 
-{ #category : #'tests - annotation' }
-MicInlineParser2Test >> testAnnotationWithParametersWithBlank [
-
-	| res |
-	res := self splitter parse: 'abc', AnnotationOpenerMarkup,'an annotation|key=&label=42', AnnotationCloserMarkup,'def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. AnnotationOpenerMarkup ,'an annotation|key=&label=42', AnnotationCloserMarkup.
-			'Text(def)' }.
-	self assert: (res second isKindOf: MicAnnotationBlock).
-	self assert: (res second arguments at: 'key') equals: ''.
-	self assert: (res second arguments at: 'label') equals: '42'
+{ #category : #'as yet unclassified' }
+MicInlineParser2Test class >> generateEvaluatedTests_BackslashNotNested [
+	| template tests|
+	template := 'test{1}_BackslashNotNested
+	"Auto generated by self class>>#generateEvaluatedTests_BackslashNotNested"
+	| res |
+	res := ( self inlineParse:{2}) first.
+	self assert: res printString equals: ({3} new children: \{
+		MicTextBlock2 new substring: ''{4}'' \}) printString
+	'.
+	tests := { 
+		{ 'Bold'. (BoldMarkup, 'aa\',ItalicMarkup, 'bbbb', ItalicMarkup,'cc', BoldMarkup) printString. 
+				'MicBoldFormatBlock2'. 'aa',ItalicMarkup, 'bbbb', ItalicMarkup,'cc' }.
+		{ 'Italic'. (ItalicMarkup, 'aa\',StrikeMarkup , 'bbbb', StrikeMarkup ,'cc', ItalicMarkup) printString. 
+				'MicItalicFormatBlock2'. 'aa',StrikeMarkup , 'bbbb', StrikeMarkup ,'cc'  }.
+		{  'Strike'.(StrikeMarkup, 'aa\',BoldMarkup , 'bbbb', BoldMarkup,'cc', StrikeMarkup) printString. 
+			'MicStrikeFormatBlock2'. 'aa',BoldMarkup , 'bbbb', BoldMarkup,'cc' }
+	 }.
+	^ tests do: [ :t | self compile: (template format: t ) classified: 'test generated']
+	
 ]
 
-{ #category : #'tests - formats' }
-MicInlineParser2Test >> testBold [
-
-	| res |
-	res := self splitter parse: 'abc**bold**def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. 'BoldFormat(Text(bold))'. 'Text(def)' }.
-	self assert: res second kind equals: #bold.
-
-	res := self splitter parse: 'abc** b old **def'.
-	self
-		assert: (res collect: [ :x | x printString ]) "#('Text(abc)' 'BoldFormat(Text( b old ))' 'Text(def)')"
-		equals: { 'Text(abc)'. 'BoldFormat(Text( b old ))'. 'Text(def)' }.
-	self assert: res second kind equals: #bold
+{ #category : #'as yet unclassified' }
+MicInlineParser2Test class >> generateEvaluatedTests_Nested [
+	| template tests|
+	template := 'test{1}_Nested
+	"Auto generated by self class>>#generateEvaluatedTests_Nested"
+	| res |
+	res := ( self inlineParse:{2}) first.
+	self assert: res printString equals: ({3} new children: \{
+		MicTextBlock2 new substring: ''aa''.
+		{4} new children: \{ MicTextBlock2 new substring: ''bbbb''\}.
+		MicTextBlock2 new substring: ''cc''
+		\}) printString
+	'.
+	tests := { 
+		{ 'Bold'. (BoldMarkup, 'aa',(ItalicMarkup, 'bbbb', ItalicMarkup),'cc', BoldMarkup) printString. 
+				'MicBoldFormatBlock2'. 'MicItalicFormatBlock2' }.
+		{ 'Italic'. (ItalicMarkup, 'aa',(StrikeMarkup , 'bbbb', StrikeMarkup ),'cc', ItalicMarkup) printString. 
+				'MicItalicFormatBlock2'. 'MicStrikeFormatBlock2'  }.
+		{  'Strike'.(StrikeMarkup, 'aa',(BoldMarkup , 'bbbb', BoldMarkup),'cc', StrikeMarkup) printString. 
+			'MicStrikeFormatBlock2'. MicBoldFormatBlock2 }
+	 }.
+	^ tests do: [ :t | self compile: (template format: t ) classified: 'test generated']
+	
 ]
 
-{ #category : #tests }
-MicInlineParser2Test >> testCurlyBraceDoesNotLeadToProblem [
-	| mic |
-	mic := (self splitter parse:  ' jhkjhk { a }') first.
-	self assert: mic substring equals:  ' jhkjhk { a }'
+{ #category : #'as yet unclassified' }
+MicInlineParser2Test class >> generateEvaluatedTests_UnclompletedNested [
+	| template tests|
+	template := 'test{1}_BackslashNotNested
+	"Auto generated by self class>>#generateEvaluatedTests_UnclompletedNested"
+	| res |
+	res := ( self inlineParse:{2}) first.
+	self assert: res printString equals: ({3} new children: \{
+		MicTextBlock2 new substring: {4} \}) printString
+	'.
+	tests := { 
+		{ 'Bold'. (BoldMarkup, 'aa',ItalicMarkup, 'bbbbcc', BoldMarkup) printString. 
+				'MicBoldFormatBlock2'. ('aa',ItalicMarkup, 'bbbbcc') printString}.
+		{ 'Italic'. (ItalicMarkup, 'aa',StrikeMarkup , 'bbbbcc', ItalicMarkup) printString. 
+				'MicItalicFormatBlock2'. ('aa',StrikeMarkup , 'bbbbcc') printString}.
+		{  'Strike'.(StrikeMarkup, 'aa',BoldMarkup , 'bbbbcc', StrikeMarkup) printString. 
+			'MicStrikeFormatBlock2'. ('aa',BoldMarkup , 'bbbbcc') printString}
+	 }.
+	^ tests do: [ :t | self compile: (template format: t ) classified: 'test generated']
+	
 ]
 
-{ #category : #'tests to make green again' }
-MicInlineParser2Test >> testEscapeCharacter [
-
-	"we should have just one escape"
-
-	| res |
-	res := self splitter parse: 'not \`mono\` here'.
-	self assert: (res collect: [ :x | x printString ]) equals: { 'Text(not `mono` here)' }
+{ #category : #'as yet unclassified' }
+MicInlineParser2Test class >> generateUrlTests [
+	| template tests|
+	template := 'test{1}
+	"Auto generated by self class>>#generateUrlTests"
+	| res |
+	res := ( self inlineParse: {2}) first.
+	self assert: res printString equals: (
+		Mic{1}Block2 new 
+			children: \{ MicTextBlock2 new substring: ''aaaa''\}; url: ''bbb'' ) printString'.
+	tests := { 
+		{ 'Link'. (LinkNameOpenerMarkup, 'aaaa',NameCloserUrlOpener, 'bbb', URLCloserMarkup) printString}.
+		{ 'Figure'. (FigureNameOpenerMarkup, 'aaaa',NameCloserUrlOpener, 'bbb', URLCloserMarkup) printString}.
+	 }.
+	^ tests do: [ :t | self compile: (template format: t ) classified: 'test generated']
+	
 ]
 
-{ #category : #'tests - escape' }
-MicInlineParser2Test >> testEscapeCharacterAtBeginning [
-	"Test the escape \ in simple case (here, bold one)"
-
-	| res |
-	res := self splitter parse: '\**test**'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(**test**)' }
+{ #category : #'as yet unclassified' }
+MicInlineParser2Test class >> generateUrlTests_Refs [
+	| template tests|
+	template := 'test{1}_Refs
+	"Auto generated by self class>>#generateUrlTests_Refs"
+	| res |
+	res := ( self inlineParse: {2}) first.
+	self assert: res reference class equals: MicRelativeResourceReference.
+	self assert: res reference path equals: ''bbb'' '.
+	tests := { 
+		{ 'Link'. (LinkNameOpenerMarkup, 'aaaa',NameCloserUrlOpener, 'bbb', URLCloserMarkup) printString}.
+		{ 'Figure'. (FigureNameOpenerMarkup, 'aaaa',NameCloserUrlOpener, 'bbb', URLCloserMarkup) printString}.
+	 }.
+	^ tests do: [ :t | self compile: (template format: t ) classified: 'test generated']
+	
 ]
 
-{ #category : #'tests - escape' }
-MicInlineParser2Test >> testEscapeCharacterInLinkName [
-	"Test the escape \ in link description"
-
-	| res |
-	res := self splitter parse: 'abc[\**test**](myURL)last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. '[**test**](myURL)'. 'Text(last)' }
+{ #category : #public }
+MicInlineParser2Test >> inlineParse: string [
+	^ MicInlineParser2 parse: string
 ]
 
-{ #category : #'tests - escape' }
-MicInlineParser2Test >> testEscapeCharacterInNestedCase [
-	"Test the escape \ in case of nested formats"
-
+{ #category : #tests }
+MicInlineParser2Test >> testAnchor [
 	| res |
-	res := self splitter parse: 'abc_\**not bold** italic_last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: {'Text(abc)' . 'ItalicFormat(Text(**not bold** italic))' . 'Text(last)'}.
+	res := self inlineParse: (AnchorReferenceOpenerMarkup ,'bbbb', AnchorReferenceCloserMarkup ).
+	self assert: res first printString equals: 'AnchorReference(bbbb)'
 ]
 
-{ #category : #'tests - escape' }
-MicInlineParser2Test >> testEscapeCharacterInNestedLinkName [
-	"Test the escape \ in case of nested linknames"
-
+{ #category : #tests }
+MicInlineParser2Test >> testAnchor_backSlashed [
 	| res |
-	res := self splitter parse: 'abc[\[nested\]](myURL)last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. '[[nested]](myURL)'. 'Text(last)' }
+	res := self inlineParse: (AnchorReferenceOpenerMarkup ,'bb\xccc\', AnchorReferenceCloserMarkup,'cccbb', AnchorReferenceCloserMarkup ).
+	self assert: res first printString equals: 'AnchorReference(bb\xccc@*cccbb)'
 ]
 
-{ #category : #'tests to make green again' }
-MicInlineParser2Test >> testEscapeCharacterTwoConsecutive [
-	"we should have just one escape"
-
+{ #category : #tests }
+MicInlineParser2Test >> testAnchor_unevaluated [
 	| res |
-	res := self splitter parse: '\\begin\\atend\\'.
-	self assert: (res collect: [ :x | x printString ]) equals: { 'Text(\begin\atend\)' }
+	res := self inlineParse: (AnchorReferenceOpenerMarkup ,'bb**ccc**bb', AnchorReferenceCloserMarkup ).
+	self assert: res first printString equals: 'AnchorReference(bb**ccc**bb)'
 ]
 
-{ #category : #'tests to make green again' }
-MicInlineParser2Test >> testEscapeCharacterWithNoCharacterAfter [
-
+{ #category : #tests }
+MicInlineParser2Test >> testAnnotation [
 	| res |
-	res := self splitter parse: '\'.
-	
-	self
-		assert: res first substring equals: '\'
+	res := self inlineParse: (AnnotationOpenerMarkup  ,'bbbb', AnnotationCloserMarkup  ).
+	self assert: res first printString equals: 'Annotation(bbbb)'
 ]
 
 { #category : #tests }
-MicInlineParser2Test >> testEscapeEncode [
-	| roundTrip |
-	self assert: (MicInlineParser escapeEncode: '') equals: ''.
-	self assert: (MicInlineParser escapeEncode: 'abc') equals: 'abc'.
-	self assert: (MicInlineParser escapeEncode: 'abc\') equals: 'abc\'.
-	self assert: (MicInlineParser escapeEncode: '\') equals: '\'.
-	roundTrip := [ :str | MicInlineParser escapeDecode: (MicInlineParser escapeEncode: str) ].
-	self assert: (roundTrip value: 'aa\\bb') equals: 'aa\bb'.
-	self assert: (roundTrip value: '\aa\\bb') equals: 'aa\bb'.
-	self assert: (roundTrip value: 'aa\`bb') equals: 'aa`bb'.
-	self assert: (roundTrip value: 'aa\@b@b') equals: 'aa@b@b'.
-	self assert: (roundTrip value: '\\') equals: '\'.
-]
-
-{ #category : #'tests - formats' }
-MicInlineParser2Test >> testEscapeMonospace [
-	"When isEvaluated class method returns false, like monospace's case, inline inside shoudn't be evaluated"
-
+MicInlineParser2Test >> testAnnotation_backSlashed [
 	| res |
-	res := self splitter parse: 'abc`\`monospace\``efg'.
-	self
-		assert: res second substring equals: '`monospace`'.
-	self assert: res second class equals: MicMonospaceFormatBlock
+	res := self inlineParse: (AnnotationOpenerMarkup  ,'bb\xccc\', AnnotationCloserMarkup ,'cccbb', AnnotationCloserMarkup ).
+	self assert: res first printString equals: 'Annotation(bb\xccc!}cccbb)'
 ]
 
 { #category : #tests }
-MicInlineParser2Test >> testEscapeReEscape [
-	| roundTrip |
-	roundTrip := [ :str :keep | 
-		MicInlineParser escapeReescape: (MicInlineParser escapeEncode: str)  except:  keep ].
-	
-	self assert: (roundTrip value: '' value: 'aa') equals: ''.
-	self assert: (roundTrip value: 'abc' value: '') equals: 'abc'.
-	self assert: (roundTrip value: 'aa\\bb' value: '' ) equals: 'aa\\bb'.
-	self assert: (roundTrip value: '\aa\\bb' value: 'a') equals: 'aa\\bb'.
-]
-
-{ #category : #'tests - escape' }
-MicInlineParser2Test >> testEscapeTripleBold [
-	"Test the escape \ in case of nested formats"
-
+MicInlineParser2Test >> testAnnotation_unevaluated [
 	| res |
-	res := self splitter parse:  'c\***bo**la'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: {'Text(c*)' . 'BoldFormat(Text(bo))' . 'Text(la)'}.
+	res := self inlineParse: (AnnotationOpenerMarkup  ,'bb**ccc**bb', AnnotationCloserMarkup  ).
+	self assert: res first printString equals: 'Annotation(bb**ccc**bb)'
 ]
 
-{ #category : #'tests - various' }
-MicInlineParser2Test >> testExclamationMark [
-
-	"Test that 'bla!bla' is ok, and not a failed image, same goes for '![goo]no parenthesis'"
-
+{ #category : #'test generated' }
+MicInlineParser2Test >> testBold [
+	"Auto generated by self class>>#generateEvaluatedTests"
 	| res |
-	res := self splitter parse: 'bla!bla'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(bla!bla)' }.
-	res := self splitter parse: '![goo]no parenthesis'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(![goo]no parenthesis)' }
+	res := ( self inlineParse:'**aaaa**') first.
+	self assert: res printString equals: (MicBoldFormatBlock2 new children: { MicTextBlock2 new substring: 'aaaa'}) printString
+	
 ]
 
-{ #category : #'tests - figure' }
-MicInlineParser2Test >> testFigure [
-	"Test the image annotation ![AltText](url)"
-
+{ #category : #'test generated' }
+MicInlineParser2Test >> testBold_BackslashNotNested [
+	"Auto generated by self class>>#generateEvaluatedTests_UnclompletedNested"
 	| res |
-	res := self splitter parse:
-		       'abc![AltText](my_directory/image.png)last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. '![AltText](my_directory/image.png)'.
-			'Text(last)' }.
-	self assert: (res second isKindOf: MicFigureBlock).
-	self assert: (res second reference  isKindOf: MicResourceReference)
+	res := ( self inlineParse:'**aa_bbbbcc**') first.
+	self assert: res printString equals: (MicBoldFormatBlock2 new children: {
+		MicTextBlock2 new substring: 'aa_bbbbcc' }) printString
 	
 ]
 
-{ #category : #'tests - figure' }
-MicInlineParser2Test >> testFigureWithBracketInsteadOfParentheses [
-	"Test the image annotation ![AltText](url)"
-
+{ #category : #'test generated' }
+MicInlineParser2Test >> testBold_Nested [
+	"Auto generated by self class>>#generateEvaluatedTests"
 	| res |
-	res := self splitter parse:
-		       'abc![AltText][my_directory/image.png]last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc![AltText][my_directory/image.png]last)' }
+	res := ( self inlineParse:'**aa_bbbb_cc**') first.
+	self assert: res printString equals: (MicBoldFormatBlock2 new children: {
+		MicTextBlock2 new substring: 'aa'.
+		MicItalicFormatBlock2 new children: { MicTextBlock2 new substring: 'bbbb'}.
+		MicTextBlock2 new substring: 'cc'
+		}) printString
+	
 ]
 
-{ #category : #'tests - figure' }
-MicInlineParser2Test >> testFigureWithParameters [
-
-	"Test the image annotation ![AltText](url)"
-
+{ #category : #'test generated' }
+MicInlineParser2Test >> testFigure [
+	"Auto generated by self class>>#generateUrlTests"
 	| res |
-	res := self splitter parse:
-		       'abc![AltText](my_directory/image.png label=42&width=90)last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals:
-			{ 'Text(abc)'. '![AltText](my_directory/image.png label=42&width=90)'.
-			'Text(last)' }.
-	self assert: (res second isKindOf: MicFigureBlock).
-	self assert: (res second reference isKindOf: MicResourceReference).
-	self assert: (res second arguments at: 'label') equals: '42'.
-	self assert: (res second arguments at: 'width') equals: '90'
+	res := ( self inlineParse: '![aaaa](bbb)') first.
+	self assert: res printString equals: (
+		MicFigureBlock2 new 
+			children: { MicTextBlock2 new substring: 'aaaa'}; url: 'bbb' ) printString
 ]
 
-{ #category : #'tests - figure' }
-MicInlineParser2Test >> testFigureWithParametersWithBlank [
-
-	"Test the image annotation ![AltText](url)"
-
+{ #category : #'test generated' }
+MicInlineParser2Test >> testFigure_Refs [
+	"Auto generated by self class>>#generateUrlTests_Refs"
 	| res |
-	res := self splitter parse:
-		       'abc![AltText](my_directory/image.png label=&width=90)last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals:
-			{ 'Text(abc)'. '![AltText](my_directory/image.png label=&width=90)'.
-			'Text(last)' }.
-	self assert: (res second isKindOf: MicFigureBlock).
-	self assert: (res second reference isKindOf: MicResourceReference).
-	self assert: (res second arguments at: 'label') equals: ''.
-	self assert: (res second arguments at: 'width') equals: '90'
+	res := ( self inlineParse: '![aaaa](bbb)') first.
+	self assert: res reference class equals: MicRelativeResourceReference.
+	self assert: res reference path equals: 'bbb' 
 ]
 
-{ #category : #'tests - figure' }
-MicInlineParser2Test >> testFigureWithParenthesesInsteadOfBracket [
-	"Test the image annotation ![AltText](url)"
-
+{ #category : #'test generated' }
+MicInlineParser2Test >> testItalic [
+	"Auto generated by self class>>#generateEvaluatedTests"
 	| res |
-	res := self splitter parse:
-		       'abc!(AltText)(my_directory/image.png)last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc!(AltText)(my_directory/image.png)last)' }
+	res := ( self inlineParse:'_aaaa_') first.
+	self assert: res printString equals: (MicItalicFormatBlock2 new children: { MicTextBlock2 new substring: 'aaaa'}) printString
+	
 ]
 
-{ #category : #'tests - formats' }
-MicInlineParser2Test >> testItalic [
-
+{ #category : #'test generated' }
+MicInlineParser2Test >> testItalic_BackslashNotNested [
+	"Auto generated by self class>>#generateEvaluatedTests_UnclompletedNested"
 	| res |
-	res := self splitter parse: 'abc_italics_def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. 'ItalicFormat(Text(italics))'. 'Text(def)' }.
-
-	res := self splitter parse: 'abc_ ita lics _def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. 'ItalicFormat(Text( ita lics ))'. 'Text(def)' }
+	res := ( self inlineParse:'_aa~bbbbcc_') first.
+	self assert: res printString equals: (MicItalicFormatBlock2 new children: {
+		MicTextBlock2 new substring: 'aa~bbbbcc' }) printString
+	
 ]
 
-{ #category : #'tests - formats' }
-MicInlineParser2Test >> testItalicNestedInBold [
-
+{ #category : #'test generated' }
+MicInlineParser2Test >> testLink [
+	"Auto generated by self class>>#generateUrlTests"
 	| res |
-	res := self splitter parse: 'abc**bold_italic_bold**xyz'.
-	self
-		assert: (res collect: [ :x | x printString ]) 
-		equals: { 'Text(abc)'. 'BoldFormat(Text(bold) ItalicFormat(Text(italic)) Text(bold))'.
-			'Text(xyz)' }
+	res := ( self inlineParse: '[aaaa](bbb)') first.
+	self assert: res printString equals: (
+		MicLinkBlock2 new 
+			children: { MicTextBlock2 new substring: 'aaaa'}; url: 'bbb' ) printString
 ]
 
-{ #category : #'tests - formats' }
-MicInlineParser2Test >> testItalicNestedInBoldWithSpace [
-
+{ #category : #'test generated' }
+MicInlineParser2Test >> testLink_Refs [
+	"Auto generated by self class>>#generateUrlTests_Refs"
 	| res |
-	res := self splitter parse: 'abc**x_y_z**cba'.
-	self
-		assert: (res collect: [ :x | x printString ]) 
-		equals: { 'Text(abc)'. 'BoldFormat(Text(x) ItalicFormat(Text(y)) Text(z))'. 'Text(cba)' }
+	res := ( self inlineParse: '[aaaa](bbb)') first.
+	self assert: res reference class equals: MicRelativeResourceReference.
+	self assert: res reference path equals: 'bbb' 
 ]
 
-{ #category : #'tests - math' }
+{ #category : #tests }
 MicInlineParser2Test >> testMath [
-
 	| res |
-	res := self splitter parse: 'abc$	V_i = C_0 - C_3	$def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. '[	V_i = C_0 - C_3	](math)'.
-		'Text(def)' }.
-	self assert: (res second isKindOf: MicMathInlineBlock)
+	res := self inlineParse: (MathMarkup  ,'bbbb', MathMarkup).
+	self assert: res first printString equals: 'MathInline(bbbb)'
 ]
 
-{ #category : #'tests - math' }
-MicInlineParser2Test >> testMath2 [
-
+{ #category : #tests }
+MicInlineParser2Test >> testMath_backSlashed [
 	| res |
-	res := self splitter parse: 'abc$math env$def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. '[math env](math)'. 'Text(def)' }
+	res := self inlineParse: (MathMarkup, 'bb\xccc\', MathMarkup, 'cccbb', MathMarkup ).
+	self assert: res first printString equals: 'MathInline(bb\xccc$cccbb)'
 ]
 
-{ #category : #'tests - math' }
-MicInlineParser2Test >> testMathshouldBeUnevaluated [
-
-	"When isEvaluated class method returns false, like math's case, inline inside shoudn't be evaluated"
-
+{ #category : #tests }
+MicInlineParser2Test >> testMath_unevaluated [
 	| res |
-	res := self splitter parse: 'abc$def**not bold**ghi$xyz'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. '[def**not bold**ghi](math)'.
-		'Text(xyz)' }
+	res := self inlineParse: (MathMarkup  ,'bb**cccc**bb', MathMarkup).
+	self assert: res first printString equals: 'MathInline(bb**cccc**bb)'
 ]
 
-{ #category : #'tests - formats' }
+{ #category : #tests }
 MicInlineParser2Test >> testMonospace [
-
-	| res |
-	res := self splitter parse: 'ab`block`de'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(ab)'. 'MonospaceFormat(Text(block))'. 'Text(de)' }
-]
-
-{ #category : #'tests - formats' }
-MicInlineParser2Test >> testMonospaceDoesNotTreatNestedElements [
-
-	| res |
-	res := self splitter parse: '`[* foo *])`'.
-	self assert: res first substring equals: '[* foo *])'
-]
-
-{ #category : #'tests - formats' }
-MicInlineParser2Test >> testMonospaceUnevaluated [
-	"When isEvaluated class method returns false, like monospace's case, inline inside shoudn't be evaluated"
-
-	| res |
-	res := self splitter parse: 'abc`def**not bold**ghi`xyz'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. 'MonospaceFormat(Text(def**not bold**ghi))'.
-			'Text(xyz)' }.
-	self assert: res second class equals: MicMonospaceFormatBlock
-]
-
-{ #category : #'tests - formats' }
-MicInlineParser2Test >> testMultipleSequenceFormats [
-
-	"Test with multiple annotations"
-
-	| res |
-	res := self splitter parse: 'abc**abc**xyz`xyz`last'.
-	self
-		assert: (res collect: [ :x | x printString ]) "#('Text(abc)' 'BoldFormat(Text(abc))' 'Text(xyz)' 'MonospaceFormat(Text(xyz))' 'Text(last)')"
-		equals: { 'Text(abc)'. 'BoldFormat(Text(abc))'. 'Text(xyz)'. 'MonospaceFormat(Text(xyz))'.
-		'Text(last)' }
-]
-
-{ #category : #'tests - various' }
-MicInlineParser2Test >> testNoAnnotation [
-
-	| res |
-	res := self splitter parse: 'abc'.
-	self assert: res first printString equals: 'Text(abc)'.
-
-	res := self splitter parse: 'abc def gh'.
-	self assert: res first printString equals: 'Text(abc def gh)'
-]
-
-{ #category : #'tests - formats' }
-MicInlineParser2Test >> testOverlappingFormat [
-
-	| res |
-	res := self splitter parse: 'ab**boldstart_ boldend** italicEnd_de'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: #('Text(ab)' 'BoldFormat(Text(boldstart_ boldend))' 'Text( italicEnd_de)')
-]
-
-{ #category : #'tests - formats' }
-MicInlineParser2Test >> testOverlappingFormat2 [
-
 	| res |
-	res := self splitter parse: 'ab**boldstart_ boldend** _italicstart zz italicEnd_de'.
-	self
-		assert: (res collect: [ :x | x printString ]) ""
-		equals: #('Text(ab)' 'BoldFormat(Text(boldstart_ boldend))' 'Text( )' 'ItalicFormat(Text(italicstart zz italicEnd))' 'Text(de)')
+	res := self inlineParse: (MonospaceMarkup ,'bbbb', MonospaceMarkup).
+	self assert: res first printString equals: 'Monospace(bbbb)'
 ]
 
-{ #category : #'tests - various' }
-MicInlineParser2Test >> testParseEmptyText [
-
-	| res |
-	res := self splitter parse: ''.
-	self assert: res isEmpty
-]
-
-{ #category : #'tests - link' }
-MicInlineParser2Test >> testParseMissingStartURL [
-	"Test the link annotation [LinkText]url)"
-
-	| res |
-	res := self splitter parse: '[Pharo is cool])'.
-	self assert: res first class = MicTextBlock.
-]
-
-{ #category : #'tests - link' }
-MicInlineParser2Test >> testParseMissingStartURLInPresenceOfNestedFormat [
-	"Test the link annotation [LinkText]url) _*foo*_"
-
+{ #category : #tests }
+MicInlineParser2Test >> testMonospace_backSlashed [
 	| res |
-	res := self splitter parse: '[LinkText]htt) 
-	_*foo*_'.
-	self assert: res first class = MicTextBlock.
-
+	res := self inlineParse: (MonospaceMarkup, 'bb\xccc\', MonospaceMarkup, 'cccbb', MonospaceMarkup ).
+	self assert: res first printString equals: 'Monospace(bb\xccc`cccbb)'
 ]
 
-{ #category : #'tests - link' }
-MicInlineParser2Test >> testParseShitInMiddleURL [
-	"Test the link annotation [Pharo is cool]khkjhjkh klhkjhkh (http://pharo.org)"
-
+{ #category : #tests }
+MicInlineParser2Test >> testMonospace_unevaluated [
 	| res |
-	res := self splitter parse:
-		       '[Pharo is cool]khkjhjkh klhkjhkh (http://pharo.org)'.
-
-	self assert: res first class = MicTextBlock.
-	self assert: res size equals: 1
+	res := self inlineParse: (MonospaceMarkup ,'bb**cccc**bb', MonospaceMarkup).
+	self assert: res first printString equals: 'Monospace(bb**cccc**bb)'
 ]
 
-{ #category : #'tests - raw' }
+{ #category : #tests }
 MicInlineParser2Test >> testRaw [
-
-	| res |
-	res := self splitter parse: 'abc{{someRaw}}def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. '[someRaw](raw)'. 'Text(def)' }
-]
-
-{ #category : #'tests - raw' }
-MicInlineParser2Test >> testRawUnevaluated [
-
-	"When isEvaluated class method returns false, like raw's case, inline inside shoudn't be evaluated"
-
-	| res |
-	res := self splitter parse: 'abc{{def**not bold**ghi}}xyz'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. '[def**not bold**ghi](raw)'.
-		'Text(xyz)' }
-]
-
-{ #category : #'tests - formats' }
-MicInlineParser2Test >> testSequenceOfFormats [
-	"Test with multiple annotations"
-
 	| res |
-	res := self splitter parse: 'abc**abc**xyz`xyz`last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. 'BoldFormat(Text(abc))'. 'Text(xyz)'. 'MonospaceFormat(Text(xyz))'.
-		'Text(last)' }
+	res := self inlineParse: (RawOpenerMarkup ,'bbbb', RawCloserMarkup).
+	self assert: res first printString equals: 'Raw(bbbb)'
 ]
 
-{ #category : #'tests - annotation' }
-MicInlineParser2Test >> testSplitAnnotation [
-
-	| res |
-	res := self splitter parse:
-		       'abc',AnnotationOpenerMarkup,'type:value|key1=val1&key2=val2', AnnotationCloserMarkup, 'def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. AnnotationOpenerMarkup,'type:value|key1=val1&key2=val2',AnnotationCloserMarkup .
-			'Text(def)' }
-]
-
-{ #category : #'tests - annotation' }
-MicInlineParser2Test >> testSplitBlockAnnotation [
-
-	| res |
-	res := self splitter 
-		parse: 'abc', AnnotationOpenerMarkup ,'an annotation', AnnotationCloserMarkup ,'def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. AnnotationOpenerMarkup ,'an annotation',AnnotationCloserMarkup . 'Text(def)' }.
-	self assert: (res second isKindOf: MicAnnotationBlock)
-]
-
-{ #category : #'tests - link' }
-MicInlineParser2Test >> testSplitBlockLink [
-	"Test the link annotation [LinkText](url)"
-
-	| res |
-	res := self splitter parse: 'abc[LinkText](myURL)last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. '[LinkText](myURL)'. 'Text(last)' }.
-	self assert: (res second reference isKindOf: MicResourceReference)
-
-]
-
-{ #category : #'tests - link' }
-MicInlineParser2Test >> testSplitBlockLinkIncomplete [
-
-	| res |
-	res := self splitter parse: 'abc[LinkText]last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc[LinkText]last)' }.
-	self assert: res first class equals: MicTextBlock
-]
-
-{ #category : #'tests - link' }
-MicInlineParser2Test >> testSplitBlockLinkInlineImage [
-
-	| res |
-	res := self splitter parse: 'abc[![alttext](imageurl)](url)last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. '[![alttext](imageurl)](url)'.
-			'Text(last)' }.
-
-]
-
-{ #category : #'tests - link' }
-MicInlineParser2Test >> testSplitBlockLinkWithBracketInsteadOfParentheses [
-
-	"Test the link annotation [LinkText](url)"
-
+{ #category : #tests }
+MicInlineParser2Test >> testRaw_backSlashed [
 	| res |
-	res := self splitter parse: 'abc[LinkText][myURL]last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc[LinkText][myURL]last)' }
+	res := self inlineParse: (RawOpenerMarkup , 'bb\xccc\', RawCloserMarkup , 'cccbb', RawCloserMarkup ).
+	self assert: res first printString equals: 'Raw(bb\xccc}}cccbb)'
 ]
 
-{ #category : #'tests - link' }
-MicInlineParser2Test >> testSplitBlockLinkWithParenthesesInsteadOfBracket [
-
-	"Test the link annotation [LinkText](url)"
-
+{ #category : #tests }
+MicInlineParser2Test >> testRaw_unevaluated [
 	| res |
-	res := self splitter parse: 'abc(LinkText)(myURL)last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc(LinkText)(myURL)last)' }
+	res := self inlineParse: (RawOpenerMarkup ,'bb**cccc**bb', RawCloserMarkup).
+	self assert: res first printString equals: 'Raw(bb**cccc**bb)'
 ]
 
-{ #category : #'tests - formats' }
+{ #category : #'test generated' }
 MicInlineParser2Test >> testStrike [
-
+	"Auto generated by self class>>#generateEvaluatedTests"
 	| res |
-	res := self splitter parse: 'abc~strike~def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. 'StrikeFormat(Text(strike))'. 'Text(def)' }.
-	self assert: res second class equals: MicStrikeFormatBlock
-]
-
-{ #category : #'tests to make green again' }
-MicInlineParser2Test >> testTwoConsecutiveEscapeCharacter [
-
-	"we should have just one escape"
-
-	| res |
-	res := self splitter parse: '\\'.
-	self assert: (res collect: [ :x | x printString ]) equals: { 'Text(\)' }
-]
-
-{ #category : #'tests - annotation' }
-MicInlineParser2Test >> testUnclosedAnnotation [
-
-	| res |
-	res := self splitter parse: 'abc<?an annotation>def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc<?an annotation>def)' }
-]
-
-{ #category : #'tests - formats' }
-MicInlineParser2Test >> testUnclosedBold [
-
-	| res |
-	res := self splitter parse: 'abc**xyz'.
-	self assert: res first printString equals: 'Text(abc**xyz)'
-]
-
-{ #category : #'tests - figure' }
-MicInlineParser2Test >> testUnclosedFigure [
-	"Test the image annotation ![AltText](url)"
-
-	| res |
-	res := self splitter parse: 'abc![AltText]last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc![AltText]last)' }
+	res := ( self inlineParse:'~aaaa~') first.
+	self assert: res printString equals: (MicStrikeFormatBlock2 new children: { MicTextBlock2 new substring: 'aaaa'}) printString
+	
 ]
 
-{ #category : #'tests - math' }
-MicInlineParser2Test >> testUnclosedMath [
-
+{ #category : #'test generated' }
+MicInlineParser2Test >> testStrike_BackslashNotNested [
+	"Auto generated by self class>>#generateEvaluatedTests_UnclompletedNested"
 	| res |
-	res := self splitter parse: 'abc$	V_i = C_0 - C_3	&def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc$	V)'. 'ItalicFormat(Text(i = C))'. 'Text(0 - C_3	&def)' }
+	res := ( self inlineParse:'~aa**bbbbcc~') first.
+	self assert: res printString equals: (MicStrikeFormatBlock2 new children: {
+		MicTextBlock2 new substring: 'aa**bbbbcc' }) printString
+	
 ]
 
 { #category : #tests }
-MicInlineParser2Test >> testUnclosedOpeners [
-	| openers |
-	openers := MicAbstractDelimiter subclasses select: [ :d | d hasSubclasses not and: [d isOpener  ]] thenCollect: [ :d | d markup ].
-	openers do: [ :opener |
-		Microdown parse: 'foo', opener.
-		Microdown parse: opener,'bar'.
-		Microdown parse: 'foo',opener,'bar'.
-		 ]
-]
-
-{ #category : #'tests - math' }
-MicInlineParser2Test >> testUnclosedRaw [
-
-	| res |
-	res := self splitter parse: 'abc{{	V_i = C_0 - C_3	&def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc{{	V)'. 'ItalicFormat(Text(i = C))'. 'Text(0 - C_3	&def)' }
-]
-
-{ #category : #'tests - formats' }
-MicInlineParser2Test >> testUnclosedStrike [
-
-	| res |
-	res := self splitter parse: 'abc~strikeédef'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc~strikeédef)' }
-]
-
-{ #category : #'tests - url' }
-MicInlineParser2Test >> testUrlObjectInUrlBlocks [
-
-	| res |
-	res := self splitter parse: 'abc[test](myURL)last'.
-	self assert: (res second reference isKindOf: MicResourceReference)
-
-]
-
-{ #category : #'tests to make green again' }
-MicInlineParser2Test >> testUrlObjectInUrlBlocks2 [
-
+MicInlineParser2Test >> testText [
 	| res |
-	res := self splitter parse:
-		       'abc[pulse](https://github.com/Ducasse/NewTools-NewHelpBrowser/pulse#merged-pull-requests)last'.
-	self assert: (res second reference isKindOf: MicHTTPResourceReference ).
-	self assert: res second reference fullName equals: 'https://github.com/Ducasse/NewTools-NewHelpBrowser/pulse#merged-pull-requests'
+	res := self inlineParse: 'bbbb'.
+	self assert: res first printString equals: 'Text(bbbb)'
 ]
 
 { #category : #tests }
-MicInlineParser2Test >> testWrappedElementOnBold [
-	| mic |
-	mic := (self splitter parse: '**bold**') first.
-	self assert: mic class equals: MicBoldFormatBlock.
-	self assert: mic substring equals: 'bold'
+MicInlineParser2Test >> testText_backSlashed [
+	| res |
+	res := self inlineParse: 'bb\xbb'.
+	self assert: res first printString equals: 'Text(bbxbb)'
 ]
 
 { #category : #tests }
-MicInlineParser2Test >> testWrappedElementOnNested [
-	| mic |
-	mic := (self splitter parse: '**_italic_**') first.
-	self assert: mic wrappedElements first class equals: MicItalicFormatBlock.
-	self assert: mic wrappedElements first substring equals: 'italic'.
-	self flag: #fixeMe. "should check that we do not have empty mictext"
+MicInlineParser2Test >> testText_isEvaluated [
+	| res |
+	res := self inlineParse: 'bb**cccc**bb'.
+	self assert: res printString equals: 'an Array(Text(bb) Bold{ Text(cccc) } Text(bb))'
 ]
diff --git a/src/Microdown-Tests/MicInlineParserTest_old2.class.st b/src/Microdown-Tests/MicInlineParserTest_old2.class.st
deleted file mode 100644
index 6a9ae100..00000000
--- a/src/Microdown-Tests/MicInlineParserTest_old2.class.st
+++ /dev/null
@@ -1,751 +0,0 @@
-Class {
-	#name : #'MicInlineParserTest_old2',
-	#superclass : #TestCase,
-	#pools : [
-		'MicMicrodownSharedPool'
-	],
-	#category : #'Microdown-Tests-InlineParser'
-}
-
-{ #category : #accessing }
-MicInlineParserTest_old2 >> splitter [
-	^ MicInlineParser2 new
-]
-
-{ #category : #'tests - anchors' }
-MicInlineParserTest_old2 >> testAnchorReference [
-
-	| res |
-	res := (self splitter parse: '*@foobar@*') first.
-	self assert: (res isKindOf: MicAnchorReferenceBlock2).
-	self assert: res substring equals: 'foobar'
-]
-
-{ #category : #'tests - anchors' }
-MicInlineParserTest_old2 >> testAnchorReferenceUnevaluated [
-
-	"When isEvaluated class method returns false, like anchor reference's case, inline inside shoudn't be evaluated"
-
-	| res |
-	res := (self splitter parse: '*@def**not bold**ghi@*') first.
-	self
-		assert: res substring equals: 'def**not bold**ghi'
-]
-
-{ #category : #'tests - annotation' }
-MicInlineParserTest_old2 >> testAnnotationWithParameters [
-
-	| res |
-	res := self splitter parse:
-		       'abc', AnnotationOpenerMarkup ,'foo|key=cite&label=42',AnnotationCloserMarkup,'def'.
-	self assert: (res second isKindOf: MicAnnotationBlock2).
-	self assert: (res second arguments at: 'key') equals: 'cite'.
-	self assert: (res second arguments at: 'label') equals: '42'
-]
-
-{ #category : #'tests - annotation' }
-MicInlineParserTest_old2 >> testAnnotationWithParametersWithBlank [
-
-	| res |
-	res := (self splitter parse: AnnotationOpenerMarkup,'an annotation|key=&label=42', AnnotationCloserMarkup) first.
-	self assert: (res isKindOf: MicAnnotationBlock2).
-	self assert: (res arguments at: 'key') equals: ''.
-	self assert: (res arguments at: 'label') equals: '42'
-]
-
-{ #category : #'tests - formats' }
-MicInlineParserTest_old2 >> testBold [
-
-	| res |
-	res := (self splitter parse: '**foobar**') first.
-	self
-		assert: (res isKindOf: MicBoldFormatBlock2);
-		assert: res children first substring equals: 'foobar'
-]
-
-{ #category : #'tests - formats' }
-MicInlineParserTest_old2 >> testBold_atLeft [
-
-	| res |
-	res := (self splitter parse: '**foobar**bbb') first.
-	self
-		assert: (res isKindOf: MicBoldFormatBlock2);
-		assert: res children first substring equals: 'foobar'.
-]
-
-{ #category : #'tests - formats' }
-MicInlineParserTest_old2 >> testBold_atRight [
-
-	| res |
-	res := (self splitter parse: 'aaa**foobar**') second.
-	self
-		assert: (res isKindOf: MicBoldFormatBlock2);
-		assert: res children first substring equals: 'foobar'.
-]
-
-{ #category : #'tests - formats' }
-MicInlineParserTest_old2 >> testBold_inContext [
-
-	| res |
-	res := (self splitter parse: 'aaa**foobar**bbb') second.
-	self
-		assert: (res isKindOf: MicBoldFormatBlock2);
-		assert: res children first substring equals: 'foobar'.
-]
-
-{ #category : #tests }
-MicInlineParserTest_old2 >> testChildrenElementOnNested [
-	| mic |
-	mic := (self splitter parse: '**_italic_**') first.
-	self assert: mic children first class equals: MicItalicFormatBlock2.
-	self assert: mic children first children first substring equals: 'italic'.
-]
-
-{ #category : #tests }
-MicInlineParserTest_old2 >> testCurlyBraceDoesNotLeadToProblem [
-	| mic |
-	mic := (self splitter parse:  ' jhkjhk { a }') first.
-	self assert: mic substring equals:  ' jhkjhk { a }'
-]
-
-{ #category : #'tests to make green again' }
-MicInlineParserTest_old2 >> testEscapeCharacter [
-
-	"we should have just one escape"
-
-	| res |
-	res := (self splitter parse: 'not \`mono\` here') first.
-	self assert: res substring equals: 'not `mono` here'
-]
-
-{ #category : #'tests - escape' }
-MicInlineParserTest_old2 >> testEscapeCharacterAtBeginning [
-	"Test the escape \ in simple case (here, bold one)"
-
-	| res |
-	res := (self splitter parse: '\**test**') first.
-	self
-		assert: res substring
-		equals: '**test**'
-]
-
-{ #category : #'tests - escape' }
-MicInlineParserTest_old2 >> testEscapeCharacterInLinkName [
-	"Test the escape \ in link description"
-
-	| res |
-	res := (self splitter parse: '[\**test**](myURL)') first.
-	self
-		assert: (res isKindOf: MicLinkBlock2);
-		assert: res children first substring equals: '**test**'
-	
-]
-
-{ #category : #'tests - escape' }
-MicInlineParserTest_old2 >> testEscapeCharacterInNestedCase [
-	"Test the escape \ in case of nested formats"
-
-	| res |
-	res := (self splitter parse: 'abc_\**not bold** italic_last') second.
-	self assert: (res isKindOf: MicItalicFormatBlock2 ).
-	self assert: (res children first isKindOf: MicTextBlock2 ).
-	self assert: res children first substring equals: '**not bold** italic'
-]
-
-{ #category : #'tests - escape' }
-MicInlineParserTest_old2 >> testEscapeCharacterInNestedLinkName [
-	"Test the escape \ in case of nested linknames"
-
-	| res |
-	res := (self splitter parse: 'abc[\[nested\]](myURL)last') second.
-	self
-		assert: (res children first substring)
-		equals: '[nested]'
-]
-
-{ #category : #'tests to make green again' }
-MicInlineParserTest_old2 >> testEscapeCharacterTwoConsecutive [
-	"we should have just one escape"
-
-	| res |
-	res := (self splitter parse: '\\begin\\atend\\') first.
-	self assert: res substring equals: '\begin\atend\'
-]
-
-{ #category : #'tests to make green again' }
-MicInlineParserTest_old2 >> testEscapeCharacterWithNoCharacterAfter [
-
-	| res |
-	res := self splitter parse: '\'.
-	
-	self
-		assert: res first substring equals: '\'
-]
-
-{ #category : #tests }
-MicInlineParserTest_old2 >> testEscapeEncode [
-	| roundTrip |
-	self assert: (MicInlineParser escapeEncode: '') equals: ''.
-	self assert: (MicInlineParser escapeEncode: 'abc') equals: 'abc'.
-	self assert: (MicInlineParser escapeEncode: 'abc\') equals: 'abc\'.
-	self assert: (MicInlineParser escapeEncode: '\') equals: '\'.
-	roundTrip := [ :str | MicInlineParser escapeDecode: (MicInlineParser escapeEncode: str) ].
-	self assert: (roundTrip value: 'aa\\bb') equals: 'aa\bb'.
-	self assert: (roundTrip value: '\aa\\bb') equals: 'aa\bb'.
-	self assert: (roundTrip value: 'aa\`bb') equals: 'aa`bb'.
-	self assert: (roundTrip value: 'aa\@b@b') equals: 'aa@b@b'.
-	self assert: (roundTrip value: '\\') equals: '\'.
-]
-
-{ #category : #'tests - formats' }
-MicInlineParserTest_old2 >> testEscapeMonospace [
-	"When isEvaluated class method returns false, like monospace's case, inline inside shoudn't be evaluated"
-
-	| res |
-	res := self splitter parse: 'abc`\`monospace\``efg'.
-	self
-		assert: res second substring equals: '`monospace`'.
-	self assert: res second class equals: MicMonospaceFormatBlock2
-]
-
-{ #category : #tests }
-MicInlineParserTest_old2 >> testEscapeReEscape [
-	| roundTrip |
-	roundTrip := [ :str :keep | 
-		MicInlineParser escapeReescape: (MicInlineParser escapeEncode: str)  except:  keep ].
-	
-	self assert: (roundTrip value: '' value: 'aa') equals: ''.
-	self assert: (roundTrip value: 'abc' value: '') equals: 'abc'.
-	self assert: (roundTrip value: 'aa\\bb' value: '' ) equals: 'aa\\bb'.
-	self assert: (roundTrip value: '\aa\\bb' value: 'a') equals: 'aa\\bb'.
-]
-
-{ #category : #'tests - escape' }
-MicInlineParserTest_old2 >> testEscapeTripleBold [
-	"Test the escape \ in case of nested formats"
-
-	| res |
-	res := self splitter parse:  'ccc\***bbb**aaa'.
-	self
-		assert: res first substring equals: 'ccc*';
-		assert: res second children first substring equals: 'bbb'.
-]
-
-{ #category : #'tests - various' }
-MicInlineParserTest_old2 >> testExclamationMark [
-
-	"Test that 'bla!bla' is ok, and not a failed image, same goes for '![goo]no parenthesis'"
-
-	| res |
-	res := (self splitter parse: 'bla!bla') first.
-	self
-		assert: res substring equals: 'bla!bla'.
-	res := (self splitter parse: '![goo]no parenthesis') first.
-	self
-		assert: res substring equals: '![goo]no parenthesis' 
-]
-
-{ #category : #'tests - figure' }
-MicInlineParserTest_old2 >> testFigure [
-	"Test the image annotation ![AltText](url)"
-
-	| res |
-	res := (self splitter parse:
-		       'abc![AltText](my_directory/image.png)last') second.
-	self assert: (res isKindOf: MicFigureBlock2).
-	self assert: res children first substring equals: 'AltText'.
-	self assert: res url equals: 'my_directory/image.png'.
-	self assert: (res reference isKindOf: MicResourceReference)
-	
-]
-
-{ #category : #'tests - figure' }
-MicInlineParserTest_old2 >> testFigureWithBracketInsteadOfParentheses [
-	"Test the image annotation ![AltText](url)"
-
-	| res |
-	res := (self splitter parse: 'abc![AltText][my_directory/image.png]last') first.
-	self assert: res substring equals: 'abc![AltText][my_directory/image.png]last'
-]
-
-{ #category : #'tests - figure' }
-MicInlineParserTest_old2 >> testFigureWithParameters [
-
-	"Test the image annotation ![AltText](url)"
-
-	| res |
-	res := self splitter parse:
-		       'abc![AltText](my_directory/image.png label=42&width=90)last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals:
-			{ 'Text(abc)'. '![AltText](my_directory/image.png label=42&width=90)'.
-			'Text(last)' }.
-	self assert: (res second isKindOf: MicFigureBlock).
-	self assert: (res second reference isKindOf: MicResourceReference).
-	self assert: (res second arguments at: 'label') equals: '42'.
-	self assert: (res second arguments at: 'width') equals: '90'
-]
-
-{ #category : #'tests - figure' }
-MicInlineParserTest_old2 >> testFigureWithParametersWithBlank [
-
-	"Test the image annotation ![AltText](url)"
-
-	| res |
-	res := self splitter parse:
-		       'abc![AltText](my_directory/image.png label=&width=90)last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals:
-			{ 'Text(abc)'. '![AltText](my_directory/image.png label=&width=90)'.
-			'Text(last)' }.
-	self assert: (res second isKindOf: MicFigureBlock).
-	self assert: (res second reference isKindOf: MicResourceReference).
-	self assert: (res second arguments at: 'label') equals: ''.
-	self assert: (res second arguments at: 'width') equals: '90'
-]
-
-{ #category : #'tests - figure' }
-MicInlineParserTest_old2 >> testFigureWithParenthesesInsteadOfBracket [
-	"Test the image annotation ![AltText](url)"
-
-	| res |
-	res := self splitter parse:
-		       'abc!(AltText)(my_directory/image.png)last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc!(AltText)(my_directory/image.png)last)' }
-]
-
-{ #category : #'tests - formats' }
-MicInlineParserTest_old2 >> testItalic [
-
-	| res |
-	res := self splitter parse: 'abc_italics_def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. 'ItalicFormat(Text(italics))'. 'Text(def)' }.
-
-	res := self splitter parse: 'abc_ ita lics _def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. 'ItalicFormat(Text( ita lics ))'. 'Text(def)' }
-]
-
-{ #category : #'tests - formats' }
-MicInlineParserTest_old2 >> testItalicNestedInBold [
-
-	| res |
-	res := self splitter parse: 'abc**bold_italic_bold**xyz'.
-	self
-		assert: (res collect: [ :x | x printString ]) 
-		equals: { 'Text(abc)'. 'BoldFormat(Text(bold) ItalicFormat(Text(italic)) Text(bold))'.
-			'Text(xyz)' }
-]
-
-{ #category : #'tests - formats' }
-MicInlineParserTest_old2 >> testItalicNestedInBoldWithSpace [
-
-	| res |
-	res := self splitter parse: 'abc**x_y_z**cba'.
-	self
-		assert: (res collect: [ :x | x printString ]) 
-		equals: { 'Text(abc)'. 'BoldFormat(Text(x) ItalicFormat(Text(y)) Text(z))'. 'Text(cba)' }
-]
-
-{ #category : #'tests - math' }
-MicInlineParserTest_old2 >> testMath [
-
-	| res |
-	res := self splitter parse: 'abc$	V_i = C_0 - C_3	$def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. '[	V_i = C_0 - C_3	](math)'.
-		'Text(def)' }.
-	self assert: (res second isKindOf: MicMathInlineBlock)
-]
-
-{ #category : #'tests - math' }
-MicInlineParserTest_old2 >> testMath2 [
-
-	| res |
-	res := self splitter parse: 'abc$math env$def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. '[math env](math)'. 'Text(def)' }
-]
-
-{ #category : #'tests - math' }
-MicInlineParserTest_old2 >> testMathshouldBeUnevaluated [
-
-	"When isEvaluated class method returns false, like math's case, inline inside shoudn't be evaluated"
-
-	| res |
-	res := self splitter parse: 'abc$def**not bold**ghi$xyz'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. '[def**not bold**ghi](math)'.
-		'Text(xyz)' }
-]
-
-{ #category : #'tests - formats' }
-MicInlineParserTest_old2 >> testMonospace [
-
-	| res |
-	res := self splitter parse: 'ab`block`de'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(ab)'. 'MonospaceFormat(block)'. 'Text(de)' }
-]
-
-{ #category : #'tests - formats' }
-MicInlineParserTest_old2 >> testMonospaceDoesNotTreatNestedElements [
-
-	| res |
-	res := self splitter parse: '`[* foo *])`'.
-	self assert: res first substring equals: '[* foo *])'
-]
-
-{ #category : #'tests - formats' }
-MicInlineParserTest_old2 >> testMonospaceUnevaluated [
-	"When isEvaluated class method returns false, like monospace's case, inline inside shoudn't be evaluated"
-
-	| res |
-	res := self splitter parse: 'abc`def**not bold**ghi`xyz'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. 'MonospaceFormat(def**not bold**ghi)'.
-			'Text(xyz)' }.
-	self assert: res second class equals: MicMonospaceFormatBlock
-]
-
-{ #category : #'tests - formats' }
-MicInlineParserTest_old2 >> testMultipleSequenceFormats [
-
-	"Test with multiple annotations"
-
-	| res |
-	res := self splitter parse: 'abc**abc**xyz`xyz`last'.
-	self
-		assert: (res collect: [ :x | x printString ]) "#('Text(abc)' 'BoldFormat(Text(abc))' 'Text(xyz)' 'MonospaceFormat(Text(xyz))' 'Text(last)')"
-		equals: { 'Text(abc)'. 'BoldFormat(Text(abc))'. 'Text(xyz)'. 'MonospaceFormat(xyz)'.
-		'Text(last)' }
-]
-
-{ #category : #'tests - various' }
-MicInlineParserTest_old2 >> testNoAnnotation [
-
-	| res |
-	res := self splitter parse: 'abc'.
-	self assert: res first printString equals: 'Text(abc)'.
-
-	res := self splitter parse: 'abc def gh'.
-	self assert: res first printString equals: 'Text(abc def gh)'
-]
-
-{ #category : #'tests - formats' }
-MicInlineParserTest_old2 >> testOverlappingFormat [
-
-	| res |
-	res := self splitter parse: 'ab**boldstart_ boldend** italicEnd_de'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: #('Text(ab)' 'BoldFormat(Text(boldstart_ boldend))' 'Text( italicEnd_de)')
-]
-
-{ #category : #'tests - formats' }
-MicInlineParserTest_old2 >> testOverlappingFormat2 [
-
-	| res |
-	res := self splitter parse: 'ab**boldstart_ boldend** _italicstart zz italicEnd_de'.
-	self
-		assert: (res collect: [ :x | x printString ]) ""
-		equals: #('Text(ab)' 'BoldFormat(Text(boldstart_ boldend))' 'Text( )' 'ItalicFormat(Text(italicstart zz italicEnd))' 'Text(de)')
-]
-
-{ #category : #'tests - various' }
-MicInlineParserTest_old2 >> testParseEmptyText [
-
-	| res |
-	res := self splitter parse: ''.
-	self assert: res isEmpty
-]
-
-{ #category : #'tests - link' }
-MicInlineParserTest_old2 >> testParseMissingStartURL [
-	"Test the link annotation [LinkText]url)"
-
-	| res |
-	res := self splitter parse: '[Pharo is cool])'.
-	self assert: res first class = MicTextBlock.
-]
-
-{ #category : #'tests - link' }
-MicInlineParserTest_old2 >> testParseMissingStartURLInPresenceOfNestedFormat [
-	"Test the link annotation [LinkText]url) _*foo*_"
-
-	| res |
-	res := self splitter parse: '[LinkText]htt) 
-	_*foo*_'.
-	self assert: res first class = MicTextBlock.
-
-]
-
-{ #category : #'tests - link' }
-MicInlineParserTest_old2 >> testParseShitInMiddleURL [
-	"Test the link annotation [Pharo is cool]khkjhjkh klhkjhkh (http://pharo.org)"
-
-	| res |
-	res := self splitter parse:
-		       '[Pharo is cool]khkjhjkh klhkjhkh (http://pharo.org)'.
-
-	self assert: res first class = MicTextBlock.
-	self assert: res size equals: 1
-]
-
-{ #category : #'tests - raw' }
-MicInlineParserTest_old2 >> testRaw [
-
-	| res |
-	res := self splitter parse: 'abc{{someRaw}}def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. '[someRaw](raw)'. 'Text(def)' }
-]
-
-{ #category : #'tests - raw' }
-MicInlineParserTest_old2 >> testRawUnevaluated [
-
-	"When isEvaluated class method returns false, like raw's case, inline inside shoudn't be evaluated"
-
-	| res |
-	res := self splitter parse: 'abc{{def**not bold**ghi}}xyz'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. '[def**not bold**ghi](raw)'.
-		'Text(xyz)' }
-]
-
-{ #category : #'tests - formats' }
-MicInlineParserTest_old2 >> testSequenceOfFormats [
-	"Test with multiple annotations"
-
-	| res |
-	res := self splitter parse: 'abc**abc**xyz`xyz`last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. 'BoldFormat(Text(abc))'. 'Text(xyz)'. 'MonospaceFormat(xyz)'.
-		'Text(last)' }
-]
-
-{ #category : #'tests - annotation' }
-MicInlineParserTest_old2 >> testSplitAnnotation [
-
-	| res |
-	res := self splitter parse:
-		       'abc',AnnotationOpenerMarkup,'type:value|key1=val1&key2=val2', AnnotationCloserMarkup, 'def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. AnnotationOpenerMarkup,'type:value|key1=val1&key2=val2',AnnotationCloserMarkup .
-			'Text(def)' }
-]
-
-{ #category : #'tests - annotation' }
-MicInlineParserTest_old2 >> testSplitBlockAnnotation [
-
-	| res |
-	res := self splitter 
-		parse: 'abc', AnnotationOpenerMarkup ,'an annotation', AnnotationCloserMarkup ,'def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. AnnotationOpenerMarkup ,'an annotation',AnnotationCloserMarkup . 'Text(def)' }.
-	self assert: (res second isKindOf: MicAnnotationBlock)
-]
-
-{ #category : #'tests - link' }
-MicInlineParserTest_old2 >> testSplitBlockLink [
-	"Test the link annotation [LinkText](url)"
-
-	| res |
-	res := self splitter parse: 'abc[LinkText](myURL)last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. '[LinkText](myURL)'. 'Text(last)' }.
-	self assert: (res second reference isKindOf: MicResourceReference)
-
-]
-
-{ #category : #'tests - link' }
-MicInlineParserTest_old2 >> testSplitBlockLinkIncomplete [
-
-	| res |
-	res := self splitter parse: 'abc[LinkText]last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc[LinkText]last)' }.
-	self assert: res first class equals: MicTextBlock
-]
-
-{ #category : #'tests - link' }
-MicInlineParserTest_old2 >> testSplitBlockLinkInlineImage [
-
-	| res |
-	res := self splitter parse: 'abc[![alttext](imageurl)](url)last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. '[![alttext](imageurl)](url)'.
-			'Text(last)' }.
-
-]
-
-{ #category : #'tests - link' }
-MicInlineParserTest_old2 >> testSplitBlockLinkWithBracketInsteadOfParentheses [
-
-	"Test the link annotation [LinkText](url)"
-
-	| res |
-	res := self splitter parse: 'abc[LinkText][myURL]last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc[LinkText][myURL]last)' }
-]
-
-{ #category : #'tests - link' }
-MicInlineParserTest_old2 >> testSplitBlockLinkWithParenthesesInsteadOfBracket [
-
-	"Test the link annotation [LinkText](url)"
-
-	| res |
-	res := self splitter parse: 'abc(LinkText)(myURL)last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc(LinkText)(myURL)last)' }
-]
-
-{ #category : #'tests - formats' }
-MicInlineParserTest_old2 >> testStrike [
-
-	| res |
-	res := self splitter parse: 'abc~strike~def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. 'StrikeFormat(Text(strike))'. 'Text(def)' }.
-	self assert: res second class equals: MicStrikeFormatBlock
-]
-
-{ #category : #'tests to make green again' }
-MicInlineParserTest_old2 >> testTwoConsecutiveEscapeCharacter [
-
-	"we should have just one escape"
-
-	| res |
-	res := self splitter parse: '\\'.
-	self assert: (res collect: [ :x | x printString ]) equals: { 'Text(\)' }
-]
-
-{ #category : #'tests - annotation' }
-MicInlineParserTest_old2 >> testUnclosedAnnotation [
-
-	| res |
-	res := self splitter parse: 'abc<?an annotation>def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc<?an annotation>def)' }
-]
-
-{ #category : #'tests - formats' }
-MicInlineParserTest_old2 >> testUnclosedBold [
-
-	| res |
-	res := self splitter parse: 'abc**xyz'.
-	self assert: res first printString equals: 'Text(abc**xyz)'
-]
-
-{ #category : #'tests - figure' }
-MicInlineParserTest_old2 >> testUnclosedFigure [
-	"Test the image annotation ![AltText](url)"
-
-	| res |
-	res := self splitter parse: 'abc![AltText]last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc![AltText]last)' }
-]
-
-{ #category : #'tests - math' }
-MicInlineParserTest_old2 >> testUnclosedMath [
-
-	| res |
-	res := self splitter parse: 'abc$	V_i = C_0 - C_3	&def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc$	V)'. 'ItalicFormat(Text(i = C))'. 'Text(0 - C_3	&def)' }
-]
-
-{ #category : #tests }
-MicInlineParserTest_old2 >> testUnclosedOpeners [
-	| openers |
-	openers := MicAbstractDelimiter subclasses select: [ :d | d hasSubclasses not and: [d isOpener  ]] thenCollect: [ :d | d markup ].
-	openers do: [ :opener |
-		Microdown parse: 'foo', opener.
-		Microdown parse: opener,'bar'.
-		Microdown parse: 'foo',opener,'bar'.
-		 ]
-]
-
-{ #category : #'tests - math' }
-MicInlineParserTest_old2 >> testUnclosedRaw [
-
-	| res |
-	res := self splitter parse: 'abc{{	V_i = C_0 - C_3	&def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc{{	V)'. 'ItalicFormat(Text(i = C))'. 'Text(0 - C_3	&def)' }
-]
-
-{ #category : #'tests - formats' }
-MicInlineParserTest_old2 >> testUnclosedStrike [
-
-	| res |
-	res := self splitter parse: 'abc~strikeédef'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc~strikeédef)' }
-]
-
-{ #category : #'tests - url' }
-MicInlineParserTest_old2 >> testUrlObjectInUrlBlocks [
-
-	| res |
-	res := self splitter parse: 'abc[test](myURL)last'.
-	self assert: (res second reference isKindOf: MicResourceReference)
-
-]
-
-{ #category : #'tests to make green again' }
-MicInlineParserTest_old2 >> testUrlObjectInUrlBlocks2 [
-
-	| res |
-	res := self splitter parse:
-		       'abc[pulse](https://github.com/Ducasse/NewTools-NewHelpBrowser/pulse#merged-pull-requests)last'.
-	self assert: (res second reference isKindOf: MicHTTPResourceReference ).
-	self assert: res second reference fullName equals: 'https://github.com/Ducasse/NewTools-NewHelpBrowser/pulse#merged-pull-requests'
-]
-
-{ #category : #tests }
-MicInlineParserTest_old2 >> testWrappedElementOnBold [
-	| mic |
-	mic := (self splitter parse: '**bold**') first.
-	self assert: mic class equals: MicBoldFormatBlock.
-	self assert: mic children first substring equals: 'bold'
-]
-
-{ #category : #tests }
-MicInlineParserTest_old2 >> testWrappedElementOnNested [
-	| mic |
-	mic := (self splitter parse: '**_italic_**') first.
-	self assert: mic wrappedElements first class equals: MicItalicFormatBlock.
-	self assert: mic wrappedElements first substring equals: 'italic'.
-	self flag: #fixeMe. "should check that we do not have empty mictext"
-]
diff --git a/src/Microdown/MicEvaluatedBlock2.class.st b/src/Microdown/MicEvaluatedBlock2.class.st
index 59fdd564..ad4f7458 100644
--- a/src/Microdown/MicEvaluatedBlock2.class.st
+++ b/src/Microdown/MicEvaluatedBlock2.class.st
@@ -3,16 +3,39 @@ I represent blocks with sub structure. Typically italics inside bold
 "
 Class {
 	#name : #MicEvaluatedBlock2,
-	#superclass : #MicInlineElement2,
+	#superclass : #MicInlineBlock2,
+	#instVars : [
+		'children'
+	],
 	#category : #'Microdown-InlineParser'
 }
 
-{ #category : #printing }
-MicEvaluatedBlock2 >> printOn: aStream [
+{ #category : #'as yet unclassified' }
+MicEvaluatedBlock2 class >> blockName [
+	^ (super blockName) withoutSuffix: 'Format'
+]
+
+{ #category : #parsing }
+MicEvaluatedBlock2 class >> parse: token stream: aTokenStream for: aParser [
+	^ aParser parseEvaluatedBlock: self token: token stream: aTokenStream
+]
+
+{ #category : #accessing }
+MicEvaluatedBlock2 >> children [
 
-	self printWithoutConventions: aStream.
-	aStream nextPut: $(.
-	self children ifNotNil: [ children do: [ :each | each printOn: aStream ] 
-		separatedBy: [aStream nextPutAll: ' ']].
-	aStream nextPut: $)
+	^ children
+]
+
+{ #category : #accessing }
+MicEvaluatedBlock2 >> children: anObject [
+
+	children := anObject
+]
+
+{ #category : #printing }
+MicEvaluatedBlock2 >> printOn: stream [
+	stream << self blockName << '{ '.
+	children do: [ :ch | ch printOn: stream. stream nextPut: Character space  ].
+	stream << $}
+	
 ]
diff --git a/src/Microdown/MicFigureBlock2.class.st b/src/Microdown/MicFigureBlock2.class.st
index 2ee09194..a509ee23 100644
--- a/src/Microdown/MicFigureBlock2.class.st
+++ b/src/Microdown/MicFigureBlock2.class.st
@@ -20,6 +20,11 @@ Class {
 	#category : #'Microdown-InlineParser'
 }
 
+{ #category : #visiting }
+MicFigureBlock2 >> accept: aVisitor [
+ 	^ aVisitor visitFigure: self
+]
+
 { #category : #accessing }
 MicFigureBlock2 >> arguments [
 
@@ -32,6 +37,12 @@ MicFigureBlock2 >> arguments: anObject [
 	arguments := anObject
 ]
 
+{ #category : #printing }
+MicFigureBlock2 >> caption [
+	"print helper"
+	^ String streamContents: [:st | self children do: [ :each | st nextPutAll: each substring ] ] 
+]
+
 { #category : #visiting }
 MicFigureBlock2 >> closeMe [
 	"the link url - ![alt text](url) - url is allowed to have title in quotes
@@ -44,18 +55,3 @@ MicFigureBlock2 >> closeMe [
 		trimBoth: [:char | {$". Character space} includes: char].
 	self arguments: (MicArgumentList withString: title)
 ]
-
-{ #category : #printing }
-MicFigureBlock2 >> printOn: aStream [
- 		aStream nextPut: $!;
- 			nextPut: $[;
- 			nextPutAll: self caption;
- 			nextPut: $];
- 			nextPut: $(.
-		aStream nextPutAll: (
-			url
-				ifNotNil: [ url ] 
-				ifNil: [ String empty ]).		 
-		aStream nextPut: $).
- 		
-]
diff --git a/src/Microdown/MicInlineBlock2.class.st b/src/Microdown/MicInlineBlock2.class.st
new file mode 100644
index 00000000..7a108f86
--- /dev/null
+++ b/src/Microdown/MicInlineBlock2.class.st
@@ -0,0 +1,47 @@
+"
+I am an inline block generated by inline splitter, to parse inline text.
+
+I am characterized by:
+- start & end: locations of my opener & closer delimiters in initial string
+- substring: concerned text (without delimiters so)
+- kind: my type, symbol which must be the same than my relative delimiter type (#basic for normal text)
+- children: array in case of nested inline blocks
+
+
+"
+Class {
+	#name : #MicInlineBlock2,
+	#superclass : #MicElement,
+	#category : #'Microdown-InlineParser'
+}
+
+{ #category : #'as yet unclassified' }
+MicInlineBlock2 class >> blockName [
+	^ (self instanceSide name asString withoutPrefix: 'Mic') withoutSuffix: 'Block2'
+]
+
+{ #category : #testing }
+MicInlineBlock2 class >> isEvaluated [
+	^ true
+]
+
+{ #category : #visiting }
+MicInlineBlock2 >> accept: dummy [
+	"implemented in subclasses"
+]
+
+{ #category : #'as yet unclassified' }
+MicInlineBlock2 >> blockName [
+	^ self class blockName
+]
+
+{ #category : #visiting }
+MicInlineBlock2 >> closeMe [
+	"use for post parsing initialization"
+]
+
+{ #category : #private }
+MicInlineBlock2 >> inlineParserClass [
+
+	^ MicInlineParser2
+]
diff --git a/src/Microdown/MicInlineBlockWithUrl2.class.st b/src/Microdown/MicInlineBlockWithUrl2.class.st
index 203951dc..90436689 100644
--- a/src/Microdown/MicInlineBlockWithUrl2.class.st
+++ b/src/Microdown/MicInlineBlockWithUrl2.class.st
@@ -9,8 +9,9 @@ My subclasses manage figures and links.
 "
 Class {
 	#name : #MicInlineBlockWithUrl2,
-	#superclass : #MicInlineElement2,
+	#superclass : #MicInlineBlock2,
 	#instVars : [
+		'children',
 		'url',
 		'reference'
 	],
@@ -23,24 +24,24 @@ MicInlineBlockWithUrl2 class >> parse: token stream: aTokenStream for: aParser [
 ]
 
 { #category : #accessing }
-MicInlineBlockWithUrl2 >> captionElements [ 
-	"caption is an old mistake for the part between the square brackets [caption](url)"
+MicInlineBlockWithUrl2 >> children [
+
 	^ children
 ]
 
+{ #category : #accessing }
+MicInlineBlockWithUrl2 >> children: anObject [
+
+	children := anObject
+]
+
 { #category : #printing }
-MicInlineBlockWithUrl2 >> printOn: aStream [
-	| contents |
-	contents := children
-		            ifEmpty: [ self substring ]
-		            ifNotEmpty: [ self childrenPrintOn ].
-	aStream
-		nextPut: $[;
-		nextPutAll: contents;
-		nextPut: $];
-		nextPut: $(.
-		aStream nextPutAll: url. 
-	aStream nextPut: $)
+MicInlineBlockWithUrl2 >> printOn: stream [
+	stream << self blockName << '{ '.
+	children do: [ :ch | ch printOn: stream. stream nextPut: Character space  ].
+	stream << $}.
+	stream << $( << url << $)
+	
 ]
 
 { #category : #accessing }
diff --git a/src/Microdown/MicInlineElement2.class.st b/src/Microdown/MicInlineElement2.class.st
deleted file mode 100644
index e089ad24..00000000
--- a/src/Microdown/MicInlineElement2.class.st
+++ /dev/null
@@ -1,130 +0,0 @@
-"
-I am an inline block generated by inline splitter, to parse inline text.
-
-I am characterized by:
-- start & end: locations of my opener & closer delimiters in initial string
-- substring: concerned text (without delimiters so)
-- kind: my type, symbol which must be the same than my relative delimiter type (#basic for normal text)
-- children: array in case of nested inline blocks
-
-
-"
-Class {
-	#name : #MicInlineElement2,
-	#superclass : #MicElement,
-	#instVars : [
-		'substring',
-		'children'
-	],
-	#category : #'Microdown-InlineParser'
-}
-
-{ #category : #testing }
-MicInlineElement2 class >> isEvaluated [
-	^ true
-]
-
-{ #category : #parsing }
-MicInlineElement2 class >> parse: token stream: aTokenStream for: aParser [
-	^ aParser parseEvaluatedBlock: self token: token stream: aTokenStream
-]
-
-{ #category : #visiting }
-MicInlineElement2 >> accept: dummy [
-	"implemented in subclasses"
-]
-
-{ #category : #accessing }
-MicInlineElement2 >> children [
-
-	^ children
-]
-
-{ #category : #accessing }
-MicInlineElement2 >> children: anObject [
-
-	children := anObject
-]
-
-{ #category : #printing }
-MicInlineElement2 >> childrenPrintOn [
-	^ (children asString allButFirst: 9) allButLast
-]
-
-{ #category : #visiting }
-MicInlineElement2 >> closeMe [
-	"use for post parsing initialization"
-]
-
-{ #category : #initialization }
-MicInlineElement2 >> initialize [
-	children := #().
-	substring := ''
-]
-
-{ #category : #private }
-MicInlineElement2 >> inlineParserClass [
-
-	^ MicInlineParser2
-]
-
-{ #category : #accessing }
-MicInlineElement2 >> kind [
-	"return a small string name used for printing and testing"
-	^ { MicAnchorReferenceBlock2 -> #anchorReference.
-	MicMathInlineBlock2 -> #math.
-	MicRawBlock2 -> #raw.
-	MicTextBlock2 -> #basic.
-	MicBoldFormatBlock2 -> #bold.
-	MicItalicFormatBlock2 -> #italic.
-	MicMonospaceFormatBlock2 -> #monospace.
-	MicStrikeFormatBlock2 -> #strike.
-	MicFigureBlock2 -> #figure.
-	MicLinkBlock2 -> #linkName } asDictionary at: self
-]
-
-{ #category : #printing }
-MicInlineElement2 >> print: aString surroundedOn: aStream [
-
-	aStream 
-		nextPut: $(;
-		nextPutAll: aString;
-		nextPut: $) 
-
-]
-
-{ #category : #printing }
-MicInlineElement2 >> printOn: aStream [
-
-	| contents |
-	contents := children 
-		ifEmpty: [ self substring ] 
-		ifNotEmpty: [ self childrenPrintOn ].
-	aStream nextPut: $[;
-				nextPutAll: contents;
-				nextPut: $];
-				nextPut: $(;
-				nextPutAll: self kind;
-				nextPut: $) 
-
-]
-
-{ #category : #printing }
-MicInlineElement2 >> printWithoutConventions: aStream [
-	"Remove Mic and Block from the class."
-	
-	aStream nextPutAll: ((self class name allButFirst: 3) allButLast: 5).
-
-]
-
-{ #category : #accessing }
-MicInlineElement2 >> substring [
-
-	^ substring
-]
-
-{ #category : #accessing }
-MicInlineElement2 >> substring: anObject [
-
-	substring := anObject
-]
diff --git a/src/Microdown/MicInlineParser2.class.st b/src/Microdown/MicInlineParser2.class.st
index d02cf676..f5a4068b 100644
--- a/src/Microdown/MicInlineParser2.class.st
+++ b/src/Microdown/MicInlineParser2.class.st
@@ -12,6 +12,11 @@ Class {
 	#category : #'Microdown-InlineParser'
 }
 
+{ #category : #parsing }
+MicInlineParser2 class >> parse: string [
+	^ self new parse: string
+]
+
 { #category : #'block creation' }
 MicInlineParser2 >> createInlineBlock: token inStream: aReadStream [ 
 	| blockClass newBlock|
@@ -22,28 +27,9 @@ MicInlineParser2 >> createInlineBlock: token inStream: aReadStream [
 	
 ]
 
-{ #category : #'block creation' }
-MicInlineParser2 >> createRawStyleBlock: token [
-	| opener block substring|
-	opener := (MicAbstractDelimiter rawStyleOpeningMarkups)
-		detect: [ :o | token beginsWith: o markup]
-		ifNone: [ nil ].
-	opener ifNil: [ ^ self createTextBlock: token ].
-	block := opener associatedInlineBlock new.
-	substring := token 
-		copyFrom: opener markup size + 1 
-		to: token size - block closingDelimiter size.
-	^ block
-		substring: substring;
-		children: { self createTextBlock: substring }
-		
-]
-
 { #category : #'block creation' }
 MicInlineParser2 >> createTextBlock: token [
-	^ MicTextBlock2 new
-		substring: token;
-		children: #()
+	^ MicTextBlock2 new substring: token
 ]
 
 { #category : #'private parsing' }
@@ -66,7 +52,7 @@ MicInlineParser2 >> joinTextNodesOf: children [
 		 ].
 	(bufferText isNotNil and: [ bufferText substring isNotEmpty  ]) 
 		ifTrue: [ outStream nextPut: bufferText ].
-	 ^ outStream contents
+	 ^ outStream contents asArray
 ]
 
 { #category : #parsing }
@@ -107,7 +93,7 @@ MicInlineParser2 >> parseEvaluatedBlock: blockType token: token stream: tokenStr
 { #category : #'private parsing' }
 MicInlineParser2 >> parseNameUrlBlock: blockType from: aTokenStream token: token [
 	| skipRes children urlToken|
-	skipRes := (self skipTo: token delimiter closer inStream: aTokenStream).
+	skipRes := (self skipToUrlStartInStream: aTokenStream).
 	skipRes ifNil: [ ^ self createTextBlock: token substring].
 	children := self parseChildrenIn: skipRes second.
 	urlToken := aTokenStream next.
@@ -146,3 +132,28 @@ MicInlineParser2 >> skipTo: closer inStream: tokenStream [
 	^ nil
 	
 ]
+
+{ #category : #'private parsing' }
+MicInlineParser2 >> skipToUrlStartInStream: tokenStream [
+	"Skip to my UrlStart. Notice, I might find a nested url construct"
+	| startPos substringStream nestingLevel|
+	startPos := tokenStream position.
+	substringStream := WriteStream on: ''.
+	nestingLevel := 0.
+	[ tokenStream atEnd]
+		whileFalse: [ | token|
+			token := tokenStream peek.
+			({ LinkNameOpenerMarkup. FigureNameOpenerMarkup  } includes: token delimiter markup)
+				ifTrue: [ nestingLevel := nestingLevel + 1 ].
+			token delimiter markup = NameCloserUrlOpener
+				ifTrue: [ nestingLevel = 0
+					ifFalse: [ nestingLevel := nestingLevel -1 ]
+			 		ifTrue: [ ^ { substringStream contents.  
+						 ReadStream on: tokenStream contents from: startPos + 1 to: tokenStream position} ]].
+			substringStream nextPutAll: token substring.
+			tokenStream next.
+			].
+	tokenStream position: startPos.
+	^ nil
+	
+]
diff --git a/src/Microdown/MicLinkBlock2.class.st b/src/Microdown/MicLinkBlock2.class.st
index 81b87b98..fa0893a8 100644
--- a/src/Microdown/MicLinkBlock2.class.st
+++ b/src/Microdown/MicLinkBlock2.class.st
@@ -6,3 +6,14 @@ Class {
 	#superclass : #MicInlineBlockWithUrl2,
 	#category : #'Microdown-InlineParser'
 }
+
+{ #category : #visiting }
+MicLinkBlock2 >> accept: aVisitor [
+	^ aVisitor visitLink: self
+]
+
+{ #category : #visiting }
+MicLinkBlock2 >> closeMe [
+	
+	self reference: (MicResourceReference fromUri: url).
+]
diff --git a/src/Microdown/MicMathInlineBlock2.class.st b/src/Microdown/MicMathInlineBlock2.class.st
index 183fe322..7cf5e211 100644
--- a/src/Microdown/MicMathInlineBlock2.class.st
+++ b/src/Microdown/MicMathInlineBlock2.class.st
@@ -29,3 +29,8 @@ Class {
 	#superclass : #MicUnEvaluatedBlock2,
 	#category : #'Microdown-InlineParser'
 }
+
+{ #category : #visiting }
+MicMathInlineBlock2 >> accept: aVisitor [
+	^ aVisitor visitMathInline: self
+]
diff --git a/src/Microdown/MicMonospaceFormatBlock.class.st b/src/Microdown/MicMonospaceFormatBlock.class.st
index b56964b0..13dab3ff 100644
--- a/src/Microdown/MicMonospaceFormatBlock.class.st
+++ b/src/Microdown/MicMonospaceFormatBlock.class.st
@@ -67,12 +67,3 @@ MicMonospaceFormatBlock >> kind [
 MicMonospaceFormatBlock >> openingDelimiter [
 	^ self class openingDelimiter
 ]
-
-{ #category : #printing }
-MicMonospaceFormatBlock >> printOn: aStream [
-
-	self printWithoutConventions: aStream.
-	aStream nextPut: $(.
-	aStream nextPutAll: substring.
-	aStream nextPut: $)
-]
diff --git a/src/Microdown/MicMonospaceFormatBlock2.class.st b/src/Microdown/MicMonospaceFormatBlock2.class.st
index df00c735..294f78ab 100644
--- a/src/Microdown/MicMonospaceFormatBlock2.class.st
+++ b/src/Microdown/MicMonospaceFormatBlock2.class.st
@@ -7,16 +7,12 @@ Class {
 	#category : #'Microdown-InlineParser'
 }
 
+{ #category : #'as yet unclassified' }
+MicMonospaceFormatBlock2 class >> blockName [
+	^ (super blockName) withoutSuffix: 'Format'
+]
+
 { #category : #visiting }
 MicMonospaceFormatBlock2 >> accept: aVisitor [
 	^ aVisitor visitMonospace: self
 ]
-
-{ #category : #printing }
-MicMonospaceFormatBlock2 >> printOn: aStream [
-
-	self printWithoutConventions: aStream.
-	aStream nextPut: $(.
-	aStream nextPutAll: substring.
-	aStream nextPut: $)
-]
diff --git a/src/Microdown/MicRawBlock2.class.st b/src/Microdown/MicRawBlock2.class.st
index b95c0ce8..9a362ba4 100644
--- a/src/Microdown/MicRawBlock2.class.st
+++ b/src/Microdown/MicRawBlock2.class.st
@@ -10,3 +10,8 @@ Class {
 	#superclass : #MicUnEvaluatedBlock2,
 	#category : #'Microdown-InlineParser'
 }
+
+{ #category : #visiting }
+MicRawBlock2 >> accept: aVisitor [
+	^ aVisitor visitRaw: self
+]
diff --git a/src/Microdown/MicTextBlock2.class.st b/src/Microdown/MicTextBlock2.class.st
index 285671e9..1230ba34 100644
--- a/src/Microdown/MicTextBlock2.class.st
+++ b/src/Microdown/MicTextBlock2.class.st
@@ -7,10 +7,7 @@ Class {
 	#category : #'Microdown-InlineParser'
 }
 
-{ #category : #printing }
-MicTextBlock2 >> printOn: aStream [
-
-	self printWithoutConventions: aStream.
-	self print: self substring surroundedOn: aStream.
-
+{ #category : #visiting }
+MicTextBlock2 >> accept: aVisitor [
+	^ aVisitor visitText: self
 ]
diff --git a/src/Microdown/MicUnEvaluatedBlock2.class.st b/src/Microdown/MicUnEvaluatedBlock2.class.st
index e7e73a05..e98688ac 100644
--- a/src/Microdown/MicUnEvaluatedBlock2.class.st
+++ b/src/Microdown/MicUnEvaluatedBlock2.class.st
@@ -3,7 +3,10 @@ I represent blocks whose contents is not microdown markup as such.
 "
 Class {
 	#name : #MicUnEvaluatedBlock2,
-	#superclass : #MicInlineElement2,
+	#superclass : #MicInlineBlock2,
+	#instVars : [
+		'substring'
+	],
 	#category : #'Microdown-InlineParser'
 }
 
@@ -16,3 +19,21 @@ MicUnEvaluatedBlock2 class >> isEvaluated [
 MicUnEvaluatedBlock2 class >> parse: delimiter stream: aTokenStream for: aParser [
 	^ aParser parseNonEvaluatedBlock: self token: delimiter stream: aTokenStream
 ]
+
+{ #category : #printing }
+MicUnEvaluatedBlock2 >> printOn: stream [
+	stream << self blockName << '(' << substring << ')'
+	
+]
+
+{ #category : #accessing }
+MicUnEvaluatedBlock2 >> substring [
+
+	^ substring
+]
+
+{ #category : #accessing }
+MicUnEvaluatedBlock2 >> substring: anObject [
+
+	substring := anObject
+]

From 9339e00cadbe6d2597f71c25861587caf1f384b4 Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Wed, 26 Oct 2022 07:28:45 +0200
Subject: [PATCH 08/40] interrim commit

---
 .../MicInlineParser2Test.class.st             | 280 +++++++++++++-----
 .../MicInlineTokenStreamTest.class.st         |  40 +--
 src/Microdown/MicAnnotationBlock2.class.st    |   2 +-
 src/Microdown/MicInlineBuilder.class.st       |  11 +
 src/Microdown/MicInlineParser2.class.st       |  20 +-
 src/Microdown/MicInlineToken.class.st         |  18 +-
 src/Microdown/MicInlineTokenStream.class.st   |   4 +-
 src/Microdown/MicUnEvaluatedBlock2.class.st   |  22 +-
 8 files changed, 265 insertions(+), 132 deletions(-)
 create mode 100644 src/Microdown/MicInlineBuilder.class.st

diff --git a/src/Microdown-Tests/MicInlineParser2Test.class.st b/src/Microdown-Tests/MicInlineParser2Test.class.st
index 66cc2d99..702167a2 100644
--- a/src/Microdown-Tests/MicInlineParser2Test.class.st
+++ b/src/Microdown-Tests/MicInlineParser2Test.class.st
@@ -7,19 +7,28 @@ Class {
 	#category : #'Microdown-Tests-InlineParser'
 }
 
+{ #category : #'as yet unclassified' }
+MicInlineParser2Test class >> generateAllTests [
+	<script>
+	| testGenerators |
+	testGenerators := (self class methods select: [ :meth | meth selector beginsWith: #'generate' ])
+			copyWithout: (self class >> #generateAllTests).
+	testGenerators do: [ :method | method valueWithReceiver: self arguments: #() ]
+]
+
 { #category : #'as yet unclassified' }
 MicInlineParser2Test class >> generateEvaluatedTests [
 	| template tests|
 	template := 'test{1}
 	"Auto generated by self class>>#generateEvaluatedTests"
 	| res |
-	res := ( self inlineParse:{2}) first.
-	self assert: res printString equals: ({3} new children: \{ MicTextBlock2 new substring: ''aaaa''\}) printString
+	res := ( self inlineParse:''{2}aaaa{3}'') first.
+	self assert: res printString equals: ({4} new children: \{ MicTextBlock2 new bodystring: ''aaaa''\}) printString
 	'.
 	tests := { 
-		{ 'Bold'. (BoldMarkup, 'aaaa', BoldMarkup) printString. 'MicBoldFormatBlock2'}.
-		{ 'Italic'. (ItalicMarkup, 'aaaa', ItalicMarkup) printString. 'MicItalicFormatBlock2' }.
-		{ 'Strike'. (StrikeMarkup, 'aaaa', StrikeMarkup) printString. 'MicStrikeFormatBlock2'  }
+		{ 'Bold'. BoldMarkup. BoldMarkup. 'MicBoldFormatBlock2'}.
+		{ 'Italic'. ItalicMarkup. ItalicMarkup. 'MicItalicFormatBlock2' }.
+		{ 'Strike'. StrikeMarkup. StrikeMarkup. 'MicStrikeFormatBlock2'  }
 	 }.
 	^ tests do: [ :t | self compile: (template format: t ) classified: 'test generated']
 	
@@ -33,7 +42,7 @@ MicInlineParser2Test class >> generateEvaluatedTests_BackslashNotNested [
 	| res |
 	res := ( self inlineParse:{2}) first.
 	self assert: res printString equals: ({3} new children: \{
-		MicTextBlock2 new substring: ''{4}'' \}) printString
+		MicTextBlock2 new bodystring: ''{4}'' \}) printString
 	'.
 	tests := { 
 		{ 'Bold'. (BoldMarkup, 'aa\',ItalicMarkup, 'bbbb', ItalicMarkup,'cc', BoldMarkup) printString. 
@@ -55,9 +64,9 @@ MicInlineParser2Test class >> generateEvaluatedTests_Nested [
 	| res |
 	res := ( self inlineParse:{2}) first.
 	self assert: res printString equals: ({3} new children: \{
-		MicTextBlock2 new substring: ''aa''.
-		{4} new children: \{ MicTextBlock2 new substring: ''bbbb''\}.
-		MicTextBlock2 new substring: ''cc''
+		MicTextBlock2 new bodystring: ''aa''.
+		{4} new children: \{ MicTextBlock2 new bodystring: ''bbbb''\}.
+		MicTextBlock2 new bodystring: ''cc''
 		\}) printString
 	'.
 	tests := { 
@@ -80,7 +89,7 @@ MicInlineParser2Test class >> generateEvaluatedTests_UnclompletedNested [
 	| res |
 	res := ( self inlineParse:{2}) first.
 	self assert: res printString equals: ({3} new children: \{
-		MicTextBlock2 new substring: {4} \}) printString
+		MicTextBlock2 new bodystring: {4} \}) printString
 	'.
 	tests := { 
 		{ 'Bold'. (BoldMarkup, 'aa',ItalicMarkup, 'bbbbcc', BoldMarkup) printString. 
@@ -94,6 +103,63 @@ MicInlineParser2Test class >> generateEvaluatedTests_UnclompletedNested [
 	
 ]
 
+{ #category : #'as yet unclassified' }
+MicInlineParser2Test class >> generateUnEvaluated [
+	| template tests|
+	template := 'test{1}
+	"Auto generated by self class>>#generateUnEvaluated"
+	| res |
+	res := self inlineParse: {2}.
+	self assert: res first printString equals: ''{1}(bbbb)'' '.
+	tests := { 
+		{ 'AnchorReference'. (AnchorReferenceOpenerMarkup , 'bbbb',AnchorReferenceCloserMarkup ) printString}.
+		{ 'Annotation'. (AnnotationOpenerMarkup, 'bbbb',AnnotationCloserMarkup ) printString}.
+		{ 'MathInline'. (MathMarkup, 'bbbb',MathMarkup   ) printString}.
+		{ 'Monospace'. (MonospaceMarkup, 'bbbb',MonospaceMarkup  ) printString}.
+		{ 'Raw'. (RawOpenerMarkup, 'bbbb',RawCloserMarkup  ) printString}
+	 }.
+	^ tests do: [ :t | self compile: (template format: t ) classified: 'test generated']
+	
+]
+
+{ #category : #'as yet unclassified' }
+MicInlineParser2Test class >> generateUnEvaluated_backSlashed [
+	| template tests|
+	template := 'test{1}_backSlashed
+	"Auto generated by self class>>#generateUnEvaluated_backSlashed"
+	| res |
+	res := self inlineParse: ''{2}bb\\xccc\\{3}cccbb{3}''.
+	self assert: res first printString equals: ''{1}(bb\\xccc{3}cccbb)'' '.
+	tests := { 
+		{ 'AnchorReference'. AnchorReferenceOpenerMarkup. AnchorReferenceCloserMarkup}.
+		{ 'Annotation'. AnnotationOpenerMarkup. AnnotationCloserMarkup}.
+		{ 'MathInline'.MathMarkup. MathMarkup}.
+		{ 'Monospace'. MonospaceMarkup. MonospaceMarkup}.
+		{ 'Raw'. RawOpenerMarkup. RawCloserMarkup}
+	 }.
+	^ tests do: [ :t | self compile: (template format: t ) classified: 'test generated']
+	
+]
+
+{ #category : #'as yet unclassified' }
+MicInlineParser2Test class >> generateUnEvaluated_unevaluated [
+	| template tests|
+	template := 'test{1}_unevaluated
+	"Auto generated by self class>>#generateUnEvaluated_unevaluated"
+	| res |
+	res := self inlineParse:''{2}bb**ccc**bb{3}''.
+	self assert: res first printString equals: ''{1}(bb**ccc**bb)'' '.
+	tests := { 
+		{ 'AnchorReference'. AnchorReferenceOpenerMarkup. AnchorReferenceCloserMarkup}.
+		{ 'Annotation'. AnnotationOpenerMarkup. AnnotationCloserMarkup}.
+		{ 'MathInline'.MathMarkup. MathMarkup}.
+		{ 'Monospace'. MonospaceMarkup. MonospaceMarkup}.
+		{ 'Raw'. RawOpenerMarkup. RawCloserMarkup}
+	 }.
+	^ tests do: [ :t | self compile: (template format: t ) classified: 'test generated']
+	
+]
+
 { #category : #'as yet unclassified' }
 MicInlineParser2Test class >> generateUrlTests [
 	| template tests|
@@ -103,7 +169,7 @@ MicInlineParser2Test class >> generateUrlTests [
 	res := ( self inlineParse: {2}) first.
 	self assert: res printString equals: (
 		Mic{1}Block2 new 
-			children: \{ MicTextBlock2 new substring: ''aaaa''\}; url: ''bbb'' ) printString'.
+			children: \{ MicTextBlock2 new bodystring: ''aaaa''\}; url: ''bbb'' ) printString'.
 	tests := { 
 		{ 'Link'. (LinkNameOpenerMarkup, 'aaaa',NameCloserUrlOpener, 'bbb', URLCloserMarkup) printString}.
 		{ 'Figure'. (FigureNameOpenerMarkup, 'aaaa',NameCloserUrlOpener, 'bbb', URLCloserMarkup) printString}.
@@ -134,46 +200,52 @@ MicInlineParser2Test >> inlineParse: string [
 	^ MicInlineParser2 parse: string
 ]
 
-{ #category : #tests }
-MicInlineParser2Test >> testAnchor [
+{ #category : #'test generated' }
+MicInlineParser2Test >> testAnchorReference [
+	"Auto generated by self class>>#generateUnEvaluated"
 	| res |
-	res := self inlineParse: (AnchorReferenceOpenerMarkup ,'bbbb', AnchorReferenceCloserMarkup ).
-	self assert: res first printString equals: 'AnchorReference(bbbb)'
+	res := self inlineParse: '*@bbbb@*'.
+	self assert: res first printString equals: 'AnchorReference(bbbb)' 
 ]
 
-{ #category : #tests }
-MicInlineParser2Test >> testAnchor_backSlashed [
+{ #category : #'test generated' }
+MicInlineParser2Test >> testAnchorReference_backSlashed [
+	"Auto generated by self class>>#generateUnEvaluated_backSlashed"
 	| res |
-	res := self inlineParse: (AnchorReferenceOpenerMarkup ,'bb\xccc\', AnchorReferenceCloserMarkup,'cccbb', AnchorReferenceCloserMarkup ).
-	self assert: res first printString equals: 'AnchorReference(bb\xccc@*cccbb)'
+	res := self inlineParse: '*@bb\xccc\@*cccbb@*'.
+	self assert: res first printString equals: 'AnchorReference(bb\xccc@*cccbb)' 
 ]
 
-{ #category : #tests }
-MicInlineParser2Test >> testAnchor_unevaluated [
+{ #category : #'test generated' }
+MicInlineParser2Test >> testAnchorReference_unevaluated [
+	"Auto generated by self class>>#generateUnEvaluated_unevaluated"
 	| res |
-	res := self inlineParse: (AnchorReferenceOpenerMarkup ,'bb**ccc**bb', AnchorReferenceCloserMarkup ).
-	self assert: res first printString equals: 'AnchorReference(bb**ccc**bb)'
+	res := self inlineParse:'*@bb**ccc**bb@*'.
+	self assert: res first printString equals: 'AnchorReference(bb**ccc**bb)' 
 ]
 
-{ #category : #tests }
+{ #category : #'test generated' }
 MicInlineParser2Test >> testAnnotation [
+	"Auto generated by self class>>#generateUnEvaluated"
 	| res |
-	res := self inlineParse: (AnnotationOpenerMarkup  ,'bbbb', AnnotationCloserMarkup  ).
-	self assert: res first printString equals: 'Annotation(bbbb)'
+	res := self inlineParse: '{!bbbb!}'.
+	self assert: res first printString equals: 'Annotation(bbbb)' 
 ]
 
-{ #category : #tests }
+{ #category : #'test generated' }
 MicInlineParser2Test >> testAnnotation_backSlashed [
+	"Auto generated by self class>>#generateUnEvaluated_backSlashed"
 	| res |
-	res := self inlineParse: (AnnotationOpenerMarkup  ,'bb\xccc\', AnnotationCloserMarkup ,'cccbb', AnnotationCloserMarkup ).
-	self assert: res first printString equals: 'Annotation(bb\xccc!}cccbb)'
+	res := self inlineParse: '{!bb\xccc\!}cccbb!}'.
+	self assert: res first printString equals: 'Annotation(bb\xccc!}cccbb)' 
 ]
 
-{ #category : #tests }
+{ #category : #'test generated' }
 MicInlineParser2Test >> testAnnotation_unevaluated [
+	"Auto generated by self class>>#generateUnEvaluated_unevaluated"
 	| res |
-	res := self inlineParse: (AnnotationOpenerMarkup  ,'bb**ccc**bb', AnnotationCloserMarkup  ).
-	self assert: res first printString equals: 'Annotation(bb**ccc**bb)'
+	res := self inlineParse:'{!bb**ccc**bb!}'.
+	self assert: res first printString equals: 'Annotation(bb**ccc**bb)' 
 ]
 
 { #category : #'test generated' }
@@ -181,33 +253,40 @@ MicInlineParser2Test >> testBold [
 	"Auto generated by self class>>#generateEvaluatedTests"
 	| res |
 	res := ( self inlineParse:'**aaaa**') first.
-	self assert: res printString equals: (MicBoldFormatBlock2 new children: { MicTextBlock2 new substring: 'aaaa'}) printString
+	self assert: res printString equals: (MicBoldFormatBlock2 new children: { MicTextBlock2 new bodystring: 'aaaa'}) printString
 	
 ]
 
 { #category : #'test generated' }
 MicInlineParser2Test >> testBold_BackslashNotNested [
-	"Auto generated by self class>>#generateEvaluatedTests_UnclompletedNested"
+	"Auto generated by self class>>#generateEvaluatedTests_BackslashNotNested"
 	| res |
-	res := ( self inlineParse:'**aa_bbbbcc**') first.
+	res := ( self inlineParse:'**aa\_bbbb_cc**') first.
 	self assert: res printString equals: (MicBoldFormatBlock2 new children: {
-		MicTextBlock2 new substring: 'aa_bbbbcc' }) printString
+		MicTextBlock2 new bodystring: 'aa_bbbb_cc' }) printString
 	
 ]
 
 { #category : #'test generated' }
 MicInlineParser2Test >> testBold_Nested [
-	"Auto generated by self class>>#generateEvaluatedTests"
+	"Auto generated by self class>>#generateEvaluatedTests_Nested"
 	| res |
 	res := ( self inlineParse:'**aa_bbbb_cc**') first.
 	self assert: res printString equals: (MicBoldFormatBlock2 new children: {
-		MicTextBlock2 new substring: 'aa'.
-		MicItalicFormatBlock2 new children: { MicTextBlock2 new substring: 'bbbb'}.
-		MicTextBlock2 new substring: 'cc'
+		MicTextBlock2 new bodystring: 'aa'.
+		MicItalicFormatBlock2 new children: { MicTextBlock2 new bodystring: 'bbbb'}.
+		MicTextBlock2 new bodystring: 'cc'
 		}) printString
 	
 ]
 
+{ #category : #tests }
+MicInlineParser2Test >> testBrokenNestedBlocksHandles [
+	| res |
+	res := (self inlineParse: '![[aaaa]bbb)](ccc)sss![[aaaa](bbb](ccc)').
+	self assert: res printString equals: 'an Array(Text(![) Link{ Text(aaaa]bbb)) }(ccc) Text(sss![) Link{ Text(aaaa) }(bbb](ccc))'
+]
+
 { #category : #'test generated' }
 MicInlineParser2Test >> testFigure [
 	"Auto generated by self class>>#generateUrlTests"
@@ -215,7 +294,7 @@ MicInlineParser2Test >> testFigure [
 	res := ( self inlineParse: '![aaaa](bbb)') first.
 	self assert: res printString equals: (
 		MicFigureBlock2 new 
-			children: { MicTextBlock2 new substring: 'aaaa'}; url: 'bbb' ) printString
+			children: { MicTextBlock2 new bodystring: 'aaaa'}; url: 'bbb' ) printString
 ]
 
 { #category : #'test generated' }
@@ -232,17 +311,30 @@ MicInlineParser2Test >> testItalic [
 	"Auto generated by self class>>#generateEvaluatedTests"
 	| res |
 	res := ( self inlineParse:'_aaaa_') first.
-	self assert: res printString equals: (MicItalicFormatBlock2 new children: { MicTextBlock2 new substring: 'aaaa'}) printString
+	self assert: res printString equals: (MicItalicFormatBlock2 new children: { MicTextBlock2 new bodystring: 'aaaa'}) printString
 	
 ]
 
 { #category : #'test generated' }
 MicInlineParser2Test >> testItalic_BackslashNotNested [
-	"Auto generated by self class>>#generateEvaluatedTests_UnclompletedNested"
+	"Auto generated by self class>>#generateEvaluatedTests_BackslashNotNested"
 	| res |
-	res := ( self inlineParse:'_aa~bbbbcc_') first.
+	res := ( self inlineParse:'_aa\~bbbb~cc_') first.
 	self assert: res printString equals: (MicItalicFormatBlock2 new children: {
-		MicTextBlock2 new substring: 'aa~bbbbcc' }) printString
+		MicTextBlock2 new bodystring: 'aa~bbbb~cc' }) printString
+	
+]
+
+{ #category : #'test generated' }
+MicInlineParser2Test >> testItalic_Nested [
+	"Auto generated by self class>>#generateEvaluatedTests_Nested"
+	| res |
+	res := ( self inlineParse:'_aa~bbbb~cc_') first.
+	self assert: res printString equals: (MicItalicFormatBlock2 new children: {
+		MicTextBlock2 new bodystring: 'aa'.
+		MicStrikeFormatBlock2 new children: { MicTextBlock2 new bodystring: 'bbbb'}.
+		MicTextBlock2 new bodystring: 'cc'
+		}) printString
 	
 ]
 
@@ -253,7 +345,7 @@ MicInlineParser2Test >> testLink [
 	res := ( self inlineParse: '[aaaa](bbb)') first.
 	self assert: res printString equals: (
 		MicLinkBlock2 new 
-			children: { MicTextBlock2 new substring: 'aaaa'}; url: 'bbb' ) printString
+			children: { MicTextBlock2 new bodystring: 'aaaa'}; url: 'bbb' ) printString
 ]
 
 { #category : #'test generated' }
@@ -265,67 +357,84 @@ MicInlineParser2Test >> testLink_Refs [
 	self assert: res reference path equals: 'bbb' 
 ]
 
-{ #category : #tests }
-MicInlineParser2Test >> testMath [
+{ #category : #'test generated' }
+MicInlineParser2Test >> testMathInline [
+	"Auto generated by self class>>#generateUnEvaluated"
 	| res |
-	res := self inlineParse: (MathMarkup  ,'bbbb', MathMarkup).
-	self assert: res first printString equals: 'MathInline(bbbb)'
+	res := self inlineParse: '$bbbb$'.
+	self assert: res first printString equals: 'MathInline(bbbb)' 
 ]
 
-{ #category : #tests }
-MicInlineParser2Test >> testMath_backSlashed [
+{ #category : #'test generated' }
+MicInlineParser2Test >> testMathInline_backSlashed [
+	"Auto generated by self class>>#generateUnEvaluated_backSlashed"
 	| res |
-	res := self inlineParse: (MathMarkup, 'bb\xccc\', MathMarkup, 'cccbb', MathMarkup ).
-	self assert: res first printString equals: 'MathInline(bb\xccc$cccbb)'
+	res := self inlineParse: '$bb\xccc\$cccbb$'.
+	self assert: res first printString equals: 'MathInline(bb\xccc$cccbb)' 
 ]
 
-{ #category : #tests }
-MicInlineParser2Test >> testMath_unevaluated [
+{ #category : #'test generated' }
+MicInlineParser2Test >> testMathInline_unevaluated [
+	"Auto generated by self class>>#generateUnEvaluated_unevaluated"
 	| res |
-	res := self inlineParse: (MathMarkup  ,'bb**cccc**bb', MathMarkup).
-	self assert: res first printString equals: 'MathInline(bb**cccc**bb)'
+	res := self inlineParse:'$bb**ccc**bb$'.
+	self assert: res first printString equals: 'MathInline(bb**ccc**bb)' 
 ]
 
-{ #category : #tests }
+{ #category : #'test generated' }
 MicInlineParser2Test >> testMonospace [
+	"Auto generated by self class>>#generateUnEvaluated"
 	| res |
-	res := self inlineParse: (MonospaceMarkup ,'bbbb', MonospaceMarkup).
-	self assert: res first printString equals: 'Monospace(bbbb)'
+	res := self inlineParse: '`bbbb`'.
+	self assert: res first printString equals: 'Monospace(bbbb)' 
 ]
 
-{ #category : #tests }
+{ #category : #'test generated' }
 MicInlineParser2Test >> testMonospace_backSlashed [
+	"Auto generated by self class>>#generateUnEvaluated_backSlashed"
 	| res |
-	res := self inlineParse: (MonospaceMarkup, 'bb\xccc\', MonospaceMarkup, 'cccbb', MonospaceMarkup ).
-	self assert: res first printString equals: 'Monospace(bb\xccc`cccbb)'
+	res := self inlineParse: '`bb\xccc\`cccbb`'.
+	self assert: res first printString equals: 'Monospace(bb\xccc`cccbb)' 
 ]
 
-{ #category : #tests }
+{ #category : #'test generated' }
 MicInlineParser2Test >> testMonospace_unevaluated [
+	"Auto generated by self class>>#generateUnEvaluated_unevaluated"
 	| res |
-	res := self inlineParse: (MonospaceMarkup ,'bb**cccc**bb', MonospaceMarkup).
-	self assert: res first printString equals: 'Monospace(bb**cccc**bb)'
+	res := self inlineParse:'`bb**ccc**bb`'.
+	self assert: res first printString equals: 'Monospace(bb**ccc**bb)' 
 ]
 
 { #category : #tests }
+MicInlineParser2Test >> testNestedBlocksWithUrl [
+	| res |
+	res := (self inlineParse: '[![aaaa](bbb)](ccc)   ![[aaaa](bbb)](ccc)').
+	self assert: res first printString equals: 'Link{ Figure{ Text(aaaa) }(bbb) }(ccc)'.
+	self assert: res third printString equals: 'Figure{ Link{ Text(aaaa) }(bbb) }(ccc)'
+]
+
+{ #category : #'test generated' }
 MicInlineParser2Test >> testRaw [
+	"Auto generated by self class>>#generateUnEvaluated"
 	| res |
-	res := self inlineParse: (RawOpenerMarkup ,'bbbb', RawCloserMarkup).
-	self assert: res first printString equals: 'Raw(bbbb)'
+	res := self inlineParse: '{{bbbb}}'.
+	self assert: res first printString equals: 'Raw(bbbb)' 
 ]
 
-{ #category : #tests }
+{ #category : #'test generated' }
 MicInlineParser2Test >> testRaw_backSlashed [
+	"Auto generated by self class>>#generateUnEvaluated_backSlashed"
 	| res |
-	res := self inlineParse: (RawOpenerMarkup , 'bb\xccc\', RawCloserMarkup , 'cccbb', RawCloserMarkup ).
-	self assert: res first printString equals: 'Raw(bb\xccc}}cccbb)'
+	res := self inlineParse: '{{bb\xccc\}}cccbb}}'.
+	self assert: res first printString equals: 'Raw(bb\xccc}}cccbb)' 
 ]
 
-{ #category : #tests }
+{ #category : #'test generated' }
 MicInlineParser2Test >> testRaw_unevaluated [
+	"Auto generated by self class>>#generateUnEvaluated_unevaluated"
 	| res |
-	res := self inlineParse: (RawOpenerMarkup ,'bb**cccc**bb', RawCloserMarkup).
-	self assert: res first printString equals: 'Raw(bb**cccc**bb)'
+	res := self inlineParse:'{{bb**ccc**bb}}'.
+	self assert: res first printString equals: 'Raw(bb**ccc**bb)' 
 ]
 
 { #category : #'test generated' }
@@ -333,17 +442,30 @@ MicInlineParser2Test >> testStrike [
 	"Auto generated by self class>>#generateEvaluatedTests"
 	| res |
 	res := ( self inlineParse:'~aaaa~') first.
-	self assert: res printString equals: (MicStrikeFormatBlock2 new children: { MicTextBlock2 new substring: 'aaaa'}) printString
+	self assert: res printString equals: (MicStrikeFormatBlock2 new children: { MicTextBlock2 new bodystring: 'aaaa'}) printString
 	
 ]
 
 { #category : #'test generated' }
 MicInlineParser2Test >> testStrike_BackslashNotNested [
-	"Auto generated by self class>>#generateEvaluatedTests_UnclompletedNested"
+	"Auto generated by self class>>#generateEvaluatedTests_BackslashNotNested"
 	| res |
-	res := ( self inlineParse:'~aa**bbbbcc~') first.
+	res := ( self inlineParse:'~aa\**bbbb**cc~') first.
 	self assert: res printString equals: (MicStrikeFormatBlock2 new children: {
-		MicTextBlock2 new substring: 'aa**bbbbcc' }) printString
+		MicTextBlock2 new bodystring: 'aa**bbbb**cc' }) printString
+	
+]
+
+{ #category : #'test generated' }
+MicInlineParser2Test >> testStrike_Nested [
+	"Auto generated by self class>>#generateEvaluatedTests_Nested"
+	| res |
+	res := ( self inlineParse:'~aa**bbbb**cc~') first.
+	self assert: res printString equals: (MicStrikeFormatBlock2 new children: {
+		MicTextBlock2 new bodystring: 'aa'.
+		MicBoldFormatBlock2 new children: { MicTextBlock2 new bodystring: 'bbbb'}.
+		MicTextBlock2 new bodystring: 'cc'
+		}) printString
 	
 ]
 
diff --git a/src/Microdown-Tests/MicInlineTokenStreamTest.class.st b/src/Microdown-Tests/MicInlineTokenStreamTest.class.st
index d3fdf5a7..52fa4ce7 100644
--- a/src/Microdown-Tests/MicInlineTokenStreamTest.class.st
+++ b/src/Microdown-Tests/MicInlineTokenStreamTest.class.st
@@ -15,7 +15,7 @@ MicInlineTokenStreamTest >> testBackslash [
 	| src tokens |
 	src := 'aa\xbb'.
 	tokens := (MicInlineTokenStream on: src) contents.
-	self assert: tokens first substring equals: 'aaxbb'
+	self assert: tokens first string equals: 'aaxbb'
 ]
 
 { #category : #tests }
@@ -23,7 +23,7 @@ MicInlineTokenStreamTest >> testBackslash_AnchorReference [
 	| src tokens |
 	src := 'aa*@oo\xoo\@oo`@*bb'.
 	tokens := (MicInlineTokenStream on: src) contents.
-	self assert: tokens second substring equals: '*@oo\xoo@oo`@*'
+	self assert: tokens second string equals: '*@oo\xoo@oo`@*'
 ]
 
 { #category : #tests }
@@ -31,7 +31,7 @@ MicInlineTokenStreamTest >> testBackslash_InFormattedElements [
 	| src tokens |
 	src := 'aa**oo\xoo**bb'.
 	tokens := (MicInlineTokenStream on: src) contents.
-	self assert: tokens third substring equals: 'ooxoo'
+	self assert: tokens third string equals: 'ooxoo'
 ]
 
 { #category : #tests }
@@ -39,7 +39,7 @@ MicInlineTokenStreamTest >> testBackslash_InMath [
 	| src tokens |
 	src := 'aa$oo\xoo\$oo$bb'.
 	tokens := (MicInlineTokenStream on: src) contents.
-	self assert: tokens second substring equals: '$oo\xoo$oo$'
+	self assert: tokens second string equals: '$oo\xoo$oo$'
 ]
 
 { #category : #tests }
@@ -47,7 +47,7 @@ MicInlineTokenStreamTest >> testBackslash_InMonospace [
 	| src tokens |
 	src := 'aa`oo\xoo\`oo`$bb'.
 	tokens := (MicInlineTokenStream on: src) contents.
-	self assert: tokens second substring equals: '`oo\xoo`oo`'
+	self assert: tokens second string equals: '`oo\xoo`oo`'
 ]
 
 { #category : #tests }
@@ -55,7 +55,7 @@ MicInlineTokenStreamTest >> testBackslash_InRaw [
 	| src tokens |
 	src := 'aa{{oo\xoo\}oo`}}bb'.
 	tokens := (MicInlineTokenStream on: src) contents.
-	self assert: tokens second substring equals: '{{oo\xoo}oo`}}'
+	self assert: tokens second string equals: '{{oo\xoo}oo`}}'
 ]
 
 { #category : #tests }
@@ -69,7 +69,7 @@ MicInlineTokenStreamTest >> testTokenize [
 MicInlineTokenStreamTest >> testTokenize_Annotation [
 	| tokens | 
 	tokens := (MicInlineTokenStream on: 'aa',AnnotationOpenerMarkup ,'bbb', AnnotationCloserMarkup) contents.
-	self assert: tokens second substring equals: (AnnotationOpenerMarkup ,'bbb', AnnotationCloserMarkup).
+	self assert: tokens second string equals: (AnnotationOpenerMarkup ,'bbb', AnnotationCloserMarkup).
 	self assert: tokens second delimiter equals: (MicInlineDelimiter at: AnnotationOpenerMarkup)
 ]
 
@@ -78,9 +78,9 @@ MicInlineTokenStreamTest >> testTokenize_FigureWithURL [
 	| tokens | 
 	"anchors are not evaluated, but bodied directly"
 	tokens := (MicInlineTokenStream on: 'aa',FigureNameOpenerMarkup  ,'bbb', NameCloserUrlOpener ,'ccc', URLCloserMarkup) contents.
-	self assert: tokens second substring equals: FigureNameOpenerMarkup.
+	self assert: tokens second string equals: FigureNameOpenerMarkup.
 	self assert: tokens second delimiter equals: (MicInlineDelimiter at: FigureNameOpenerMarkup).
-	self assert: tokens fourth substring equals: (NameCloserUrlOpener ,'ccc', URLCloserMarkup).
+	self assert: tokens fourth string equals: (NameCloserUrlOpener ,'ccc', URLCloserMarkup).
 	self assert: tokens fourth delimiter equals: (MicInlineDelimiter at: NameCloserUrlOpener).
 	
 ]
@@ -89,7 +89,7 @@ MicInlineTokenStreamTest >> testTokenize_FigureWithURL [
 MicInlineTokenStreamTest >> testTokenize_Text [
 	| tokens | 
 	tokens := (MicInlineTokenStream on: 'aaaa') contents.
-	self assert: tokens first substring equals: 'aaaa'.
+	self assert: tokens first string equals: 'aaaa'.
 	self assert: tokens first delimiter markup equals: FixiousTextDelimiter.
 ]
 
@@ -98,7 +98,7 @@ MicInlineTokenStreamTest >> testTokenize_UrlPart [
 	| tokens | 
 	"anchors are not evaluated, but bodied directly"
 	tokens := (MicInlineTokenStream on: 'aa',NameCloserUrlOpener ,'bbb', URLCloserMarkup) contents.
-	self assert: tokens second substring equals: (NameCloserUrlOpener ,'bbb', URLCloserMarkup).
+	self assert: tokens second string equals: (NameCloserUrlOpener ,'bbb', URLCloserMarkup).
 	self assert: tokens second delimiter equals: (MicInlineDelimiter at: NameCloserUrlOpener)
 ]
 
@@ -107,7 +107,7 @@ MicInlineTokenStreamTest >> testTokenize_anchorRefs [
 	| tokens | 
 	"anchors are not evaluated, but bodied directly"
 	tokens := (MicInlineTokenStream on: 'aa',AnchorReferenceOpenerMarkup ,'bbb', AnchorReferenceCloserMarkup) contents.
-	self assert: tokens second substring equals: (AnchorReferenceOpenerMarkup,'bbb', AnchorReferenceCloserMarkup).
+	self assert: tokens second string equals: (AnchorReferenceOpenerMarkup,'bbb', AnchorReferenceCloserMarkup).
 	self assert: tokens second delimiter equals: (MicInlineDelimiter at: AnchorReferenceOpenerMarkup).
 ]
 
@@ -115,7 +115,7 @@ MicInlineTokenStreamTest >> testTokenize_anchorRefs [
 MicInlineTokenStreamTest >> testTokenize_bold [
 	| tokens | 
 	tokens := (MicInlineTokenStream on: 'aa',BoldMarkup ,'bbb') contents.
-	self assert: tokens second substring equals: BoldMarkup.
+	self assert: tokens second string equals: BoldMarkup.
 	self assert: tokens second delimiter equals: (MicInlineDelimiter at: BoldMarkup).
 ]
 
@@ -124,7 +124,7 @@ MicInlineTokenStreamTest >> testTokenize_figureName [
 	| tokens | 
 	"anchors are not evaluated, but bodied directly"
 	tokens := (MicInlineTokenStream on: 'aa',FigureNameOpenerMarkup ,'bbb', NameCloserUrlOpener) contents.
-	self assert: tokens second substring equals: FigureNameOpenerMarkup.
+	self assert: tokens second string equals: FigureNameOpenerMarkup.
 	self assert: tokens second delimiter equals: (MicInlineDelimiter at: FigureNameOpenerMarkup)
 ]
 
@@ -132,7 +132,7 @@ MicInlineTokenStreamTest >> testTokenize_figureName [
 MicInlineTokenStreamTest >> testTokenize_italic [
 	| tokens | 
 	tokens := (MicInlineTokenStream on: 'aa',ItalicMarkup ,'bbb') contents.
-	self assert: tokens second substring equals: ItalicMarkup.
+	self assert: tokens second string equals: ItalicMarkup.
 	self assert: tokens second delimiter equals: (MicInlineDelimiter at: ItalicMarkup).
 ]
 
@@ -141,7 +141,7 @@ MicInlineTokenStreamTest >> testTokenize_linkName [
 	| tokens | 
 	"anchors are not evaluated, but bodied directly"
 	tokens := (MicInlineTokenStream on: 'aa',LinkNameOpenerMarkup ,'bbb', NameCloserUrlOpener) contents.
-	self assert: tokens second substring equals: LinkNameOpenerMarkup.
+	self assert: tokens second string equals: LinkNameOpenerMarkup.
 	self assert: tokens second delimiter equals: (MicInlineDelimiter at: LinkNameOpenerMarkup)
 ]
 
@@ -150,7 +150,7 @@ MicInlineTokenStreamTest >> testTokenize_math [
 	| tokens | 
 	"anchors are not evaluated, but bodied directly"
 	tokens := (MicInlineTokenStream on: 'aa', MathMarkup,'bbb', MathMarkup) contents.
-	self assert: tokens second substring equals: (MathMarkup,'bbb', MathMarkup).
+	self assert: tokens second string equals: (MathMarkup,'bbb', MathMarkup).
 	self assert: tokens second delimiter equals: (MicInlineDelimiter at: MathMarkup).
 ]
 
@@ -159,7 +159,7 @@ MicInlineTokenStreamTest >> testTokenize_monospace [
 	| tokens | 
 	"anchors are not evaluated, but bodied directly"
 	tokens := (MicInlineTokenStream on: 'aa',MonospaceMarkup ,'bbb', MonospaceMarkup) contents.
-	self assert: tokens second substring equals: (MonospaceMarkup,'bbb', MonospaceMarkup).
+	self assert: tokens second string equals: (MonospaceMarkup,'bbb', MonospaceMarkup).
 	self assert: tokens second delimiter equals: (MicInlineDelimiter at: MonospaceMarkup).
 ]
 
@@ -168,7 +168,7 @@ MicInlineTokenStreamTest >> testTokenize_raw [
 	| tokens | 
 	"anchors are not evaluated, but bodied directly"
 	tokens := (MicInlineTokenStream on: 'aa', RawOpenerMarkup ,'bbb', RawCloserMarkup) contents.
-	self assert: tokens second substring equals: (RawOpenerMarkup,'bbb', RawCloserMarkup).
+	self assert: tokens second string equals: (RawOpenerMarkup,'bbb', RawCloserMarkup).
 	self assert: tokens second delimiter equals: (MicInlineDelimiter at: RawOpenerMarkup).
 ]
 
@@ -176,6 +176,6 @@ MicInlineTokenStreamTest >> testTokenize_raw [
 MicInlineTokenStreamTest >> testTokenize_strike [
 	| tokens | 
 	tokens := (MicInlineTokenStream on: 'aa',StrikeMarkup ,'bbb') contents.
-	self assert: tokens second substring equals: StrikeMarkup.
+	self assert: tokens second string equals: StrikeMarkup.
 	self assert: tokens second delimiter equals: (MicInlineDelimiter at: StrikeMarkup).
 ]
diff --git a/src/Microdown/MicAnnotationBlock2.class.st b/src/Microdown/MicAnnotationBlock2.class.st
index cb52eec3..14c86767 100644
--- a/src/Microdown/MicAnnotationBlock2.class.st
+++ b/src/Microdown/MicAnnotationBlock2.class.st
@@ -33,5 +33,5 @@ MicAnnotationBlock2 >> arguments [
 
 { #category : #visiting }
 MicAnnotationBlock2 >> closeMe [
-	arguments := MicArgumentList split: substring.
+	arguments := MicArgumentList split: bodystring.
 ]
diff --git a/src/Microdown/MicInlineBuilder.class.st b/src/Microdown/MicInlineBuilder.class.st
new file mode 100644
index 00000000..5b4a36cd
--- /dev/null
+++ b/src/Microdown/MicInlineBuilder.class.st
@@ -0,0 +1,11 @@
+"
+I am a builder class for creating inline block trees.
+"
+Class {
+	#name : #MicInlineBuilder,
+	#superclass : #Object,
+	#pools : [
+		'MicMicrodownSharedPool'
+	],
+	#category : #'Microdown-InlineParser'
+}
diff --git a/src/Microdown/MicInlineParser2.class.st b/src/Microdown/MicInlineParser2.class.st
index f5a4068b..9158ebd1 100644
--- a/src/Microdown/MicInlineParser2.class.st
+++ b/src/Microdown/MicInlineParser2.class.st
@@ -29,7 +29,7 @@ MicInlineParser2 >> createInlineBlock: token inStream: aReadStream [
 
 { #category : #'block creation' }
 MicInlineParser2 >> createTextBlock: token [
-	^ MicTextBlock2 new substring: token
+	^ MicTextBlock2 new bodystring: token
 ]
 
 { #category : #'private parsing' }
@@ -42,15 +42,15 @@ MicInlineParser2 >> joinTextNodesOf: children [
 		child class = MicTextBlock2
 			ifTrue: [ bufferText 
 				ifNil: [ bufferText := child ]
-				ifNotNil: [ bufferText substring: (bufferText substring , child substring) ] ]
+				ifNotNil: [ bufferText bodystring: (bufferText bodystring , child bodystring) ] ]
 			ifFalse: [ bufferText
 				ifNil: [ outStream nextPut: child ]
 				ifNotNil: [ 
-					bufferText substring ifNotEmpty: [outStream nextPut: bufferText].
+					bufferText bodystring ifNotEmpty: [outStream nextPut: bufferText].
 					outStream nextPut: child. bufferText := nil ]
 				 ]
 		 ].
-	(bufferText isNotNil and: [ bufferText substring isNotEmpty  ]) 
+	(bufferText isNotNil and: [ bufferText bodystring isNotEmpty  ]) 
 		ifTrue: [ outStream nextPut: bufferText ].
 	 ^ outStream contents asArray
 ]
@@ -73,7 +73,7 @@ MicInlineParser2 >> parseChildrenIn: tokenStream [
 			token := tokenStream next.
 			child := token delimiter isOpener 
 				ifTrue: [self createInlineBlock: token inStream: tokenStream]
-				ifFalse: [ self createTextBlock: token substring].
+				ifFalse: [ self createTextBlock: token string].
 			children add: child.
 		].
 	^ self joinTextNodesOf: children
@@ -83,7 +83,7 @@ MicInlineParser2 >> parseChildrenIn: tokenStream [
 MicInlineParser2 >> parseEvaluatedBlock: blockType token: token stream: tokenStream [
 	| skipRes |
 	skipRes := (self skipTo: token delimiter closer inStream: tokenStream).
-	skipRes ifNil: [ ^ self createTextBlock: token substring].
+	skipRes ifNil: [ ^ self createTextBlock: token string].
 	tokenStream next. "skip closer"
 	^ blockType new
 		children: (self parseChildrenIn: skipRes second );
@@ -94,7 +94,7 @@ MicInlineParser2 >> parseEvaluatedBlock: blockType token: token stream: tokenStr
 MicInlineParser2 >> parseNameUrlBlock: blockType from: aTokenStream token: token [
 	| skipRes children urlToken|
 	skipRes := (self skipToUrlStartInStream: aTokenStream).
-	skipRes ifNil: [ ^ self createTextBlock: token substring].
+	skipRes ifNil: [ ^ self createTextBlock: token string].
 	children := self parseChildrenIn: skipRes second.
 	urlToken := aTokenStream next.
 	^ blockType new
@@ -109,7 +109,7 @@ MicInlineParser2 >> parseNameUrlBlock: blockType from: aTokenStream token: token
 { #category : #'private parsing' }
 MicInlineParser2 >> parseNonEvaluatedBlock: blockClass token: token stream: aTokenStream [
 	^ blockClass new
-		substring: token undelimitedSubstring;
+		bodystring: token undelimitedSubstring;
 		closeMe
 ]
 
@@ -125,7 +125,7 @@ MicInlineParser2 >> skipTo: closer inStream: tokenStream [
 			token delimiter markup = closer ifTrue: [ 
 				^ { substringStream contents.  
 					 ReadStream on: tokenStream contents from: startPos + 1 to: tokenStream position} ].
-			substringStream nextPutAll: token substring.
+			substringStream nextPutAll: token string.
 			tokenStream next.
 			].
 	tokenStream position: startPos.
@@ -150,7 +150,7 @@ MicInlineParser2 >> skipToUrlStartInStream: tokenStream [
 					ifFalse: [ nestingLevel := nestingLevel -1 ]
 			 		ifTrue: [ ^ { substringStream contents.  
 						 ReadStream on: tokenStream contents from: startPos + 1 to: tokenStream position} ]].
-			substringStream nextPutAll: token substring.
+			substringStream nextPutAll: token string.
 			tokenStream next.
 			].
 	tokenStream position: startPos.
diff --git a/src/Microdown/MicInlineToken.class.st b/src/Microdown/MicInlineToken.class.st
index 9b88dcc1..ca98c564 100644
--- a/src/Microdown/MicInlineToken.class.st
+++ b/src/Microdown/MicInlineToken.class.st
@@ -9,8 +9,8 @@ Class {
 	#name : #MicInlineToken,
 	#superclass : #Object,
 	#instVars : [
-		'substring',
-		'delimiter'
+		'delimiter',
+		'string'
 	],
 	#pools : [
 		'MicMicrodownSharedPool'
@@ -32,25 +32,25 @@ MicInlineToken >> delimiter: anObject [
 
 { #category : #printing }
 MicInlineToken >> printOn: aStream [
-	aStream << delimiter printString << $( << substring << $)
+	aStream << delimiter printString << $( << string << $)
 ]
 
 { #category : #accessing }
-MicInlineToken >> substring [
+MicInlineToken >> string [
 
-	^ substring
+	^ string
 ]
 
 { #category : #accessing }
-MicInlineToken >> substring: anObject [
+MicInlineToken >> string: anObject [
 
-	substring := anObject
+	string := anObject
 ]
 
 { #category : #accessing }
 MicInlineToken >> undelimitedSubstring [
 	"assume I am a token for a unevaluated delimiter, containing raw body - remove my delimiters"
-	^substring 
+	^string 
 		copyFrom: delimiter markup size + 1 
-		to: (substring size - delimiter closer size)
+		to: (string size - delimiter closer size)
 ]
diff --git a/src/Microdown/MicInlineTokenStream.class.st b/src/Microdown/MicInlineTokenStream.class.st
index a17bd401..2a4efa0c 100644
--- a/src/Microdown/MicInlineTokenStream.class.st
+++ b/src/Microdown/MicInlineTokenStream.class.st
@@ -94,7 +94,7 @@ MicInlineTokenStream >> addDelimiter: string [
 		ifTrue: [self class backslashReescape: string except: delimiter closer first asString]
 		ifFalse: [string].
 	tokens add: (MicInlineToken new 
-		substring: decodedString;
+		string: decodedString;
 		delimiter: delimiter)
 ]
 
@@ -102,7 +102,7 @@ MicInlineTokenStream >> addDelimiter: string [
 MicInlineTokenStream >> addText: matchedString [
 	| token |
 	token := MicInlineToken new 
-		substring: (self class backslashDecode: matchedString);
+		string: (self class backslashDecode: matchedString);
 		delimiter: (MicInlineDelimiter at: FixiousTextDelimiter).
 	tokens add: token
 ]
diff --git a/src/Microdown/MicUnEvaluatedBlock2.class.st b/src/Microdown/MicUnEvaluatedBlock2.class.st
index e98688ac..2bccaed4 100644
--- a/src/Microdown/MicUnEvaluatedBlock2.class.st
+++ b/src/Microdown/MicUnEvaluatedBlock2.class.st
@@ -5,7 +5,7 @@ Class {
 	#name : #MicUnEvaluatedBlock2,
 	#superclass : #MicInlineBlock2,
 	#instVars : [
-		'substring'
+		'bodystring'
 	],
 	#category : #'Microdown-InlineParser'
 }
@@ -20,20 +20,20 @@ MicUnEvaluatedBlock2 class >> parse: delimiter stream: aTokenStream for: aParser
 	^ aParser parseNonEvaluatedBlock: self token: delimiter stream: aTokenStream
 ]
 
-{ #category : #printing }
-MicUnEvaluatedBlock2 >> printOn: stream [
-	stream << self blockName << '(' << substring << ')'
-	
-]
-
 { #category : #accessing }
-MicUnEvaluatedBlock2 >> substring [
+MicUnEvaluatedBlock2 >> bodystring [
 
-	^ substring
+	^ bodystring
 ]
 
 { #category : #accessing }
-MicUnEvaluatedBlock2 >> substring: anObject [
+MicUnEvaluatedBlock2 >> bodystring: anObject [
 
-	substring := anObject
+	bodystring := anObject
+]
+
+{ #category : #printing }
+MicUnEvaluatedBlock2 >> printOn: stream [
+	stream << self blockName << '(' << bodystring << ')'
+	
 ]

From b93c9151598195e054a60370fef603a26310f892 Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Wed, 2 Nov 2022 09:08:43 +0100
Subject: [PATCH 09/40] richtext composer tests positive with new inline
 compiler

---
 .../MicRichTextComposer.class.st              | 29 +++----
 .../MicRichTextFormatConfiguration.class.st   |  2 +-
 .../MicInlineParser2Test.class.st             | 77 ++++++++++++-------
 src/Microdown/MicAnnotationBlock2.class.st    | 29 ++++++-
 src/Microdown/MicElement.class.st             |  2 +-
 src/Microdown/MicHeaderBlock.class.st         |  9 +--
 src/Microdown/MicInlineBlockWithUrl2.class.st |  6 ++
 src/Microdown/MicInlineBuilder.class.st       | 11 ---
 src/Microdown/MicInlineParser2.class.st       |  6 ++
 src/Microdown/MicListItemBlock.class.st       | 42 ++++------
 .../MicMonospaceFormatBlock2.class.st         | 12 +++
 src/Microdown/MicUnEvaluatedBlock2.class.st   |  6 ++
 src/Microdown/MicrodownVisitor.class.st       |  3 +-
 13 files changed, 132 insertions(+), 102 deletions(-)
 delete mode 100644 src/Microdown/MicInlineBuilder.class.st

diff --git a/src/Microdown-RichTextComposer/MicRichTextComposer.class.st b/src/Microdown-RichTextComposer/MicRichTextComposer.class.st
index 5ff46a5d..61baee7b 100644
--- a/src/Microdown-RichTextComposer/MicRichTextComposer.class.st
+++ b/src/Microdown-RichTextComposer/MicRichTextComposer.class.st
@@ -437,16 +437,16 @@ MicRichTextComposer >> visitEnvironment: aMicEnvironmentBlock [
 { #category : #'visiting - inline elements' }
 MicRichTextComposer >> visitFigure: aFigure [
 
-	| image anchor|
-	[[ image := aFigure reference loadImage.
-		anchor := self anchorFor: image of: aFigure.
-		canvas << (self textWithImage: image usingAnchor: anchor)
-	 ]
-		on: MicResourceReferenceError, UnrecognizedImageFormatError
-		do: [ self visitAll: aFigure captionElements  ]
-	]
+	| image anchor |
+	[ 
+	[ 
+	image := aFigure reference loadImage.
+	anchor := self anchorFor: image of: aFigure.
+	canvas << (self textWithImage: image usingAnchor: anchor) ]
+		on: MicResourceReferenceError , UnrecognizedImageFormatError
+		do: [ self visitAll: aFigure children ] ]
 		on: Error
-		do: [ :error | canvas << ('>>> ', error printString, ' <<<') ]
+		do: [ :error | canvas << ('>>> ' , error printString , ' <<<') ]
 ]
 
 { #category : #visiting }
@@ -509,17 +509,6 @@ MicRichTextComposer >> visitLink: aLink [
 	canvas includeAttribute: attribute in: [ super visitLink: aLink ]
 ]
 
-{ #category : #'visiting - document' }
-MicRichTextComposer >> visitLink_old: aLink [
-
-	| attribute |
-	attribute := TextAction new
-		             actOnClickBlock: [ 
-			             WebBrowser openOn: aLink url ];
-		             yourself.
-	canvas includeAttribute: attribute in: [ super visitLink: aLink ]
-]
-
 { #category : #'visiting - list' }
 MicRichTextComposer >> visitListItem: anItem [
 	| bullet |
diff --git a/src/Microdown-RichTextComposer/MicRichTextFormatConfiguration.class.st b/src/Microdown-RichTextComposer/MicRichTextFormatConfiguration.class.st
index f858889e..1ae7475d 100644
--- a/src/Microdown-RichTextComposer/MicRichTextFormatConfiguration.class.st
+++ b/src/Microdown-RichTextComposer/MicRichTextFormatConfiguration.class.st
@@ -18,7 +18,7 @@ I support the following arguments: {!richtext|bullets=◊»!}
 "
 Class {
 	#name : #MicRichTextFormatConfiguration,
-	#superclass : #MicAnnotationBlock,
+	#superclass : #MicAnnotationBlock2,
 	#category : #'Microdown-RichTextComposer-BlockExtensions'
 }
 
diff --git a/src/Microdown-Tests/MicInlineParser2Test.class.st b/src/Microdown-Tests/MicInlineParser2Test.class.st
index 702167a2..39e33f0c 100644
--- a/src/Microdown-Tests/MicInlineParser2Test.class.st
+++ b/src/Microdown-Tests/MicInlineParser2Test.class.st
@@ -40,17 +40,14 @@ MicInlineParser2Test class >> generateEvaluatedTests_BackslashNotNested [
 	template := 'test{1}_BackslashNotNested
 	"Auto generated by self class>>#generateEvaluatedTests_BackslashNotNested"
 	| res |
-	res := ( self inlineParse:{2}) first.
-	self assert: res printString equals: ({3} new children: \{
-		MicTextBlock2 new bodystring: ''{4}'' \}) printString
+	res := ( self inlineParse:''{2}aa\\{4}bbbb{5}cc{3}'') first.
+	self assert: res printString equals: ({6} new children: \{
+		MicTextBlock2 new bodystring: ''aa{4}bbbb{5}cc'' \}) printString
 	'.
 	tests := { 
-		{ 'Bold'. (BoldMarkup, 'aa\',ItalicMarkup, 'bbbb', ItalicMarkup,'cc', BoldMarkup) printString. 
-				'MicBoldFormatBlock2'. 'aa',ItalicMarkup, 'bbbb', ItalicMarkup,'cc' }.
-		{ 'Italic'. (ItalicMarkup, 'aa\',StrikeMarkup , 'bbbb', StrikeMarkup ,'cc', ItalicMarkup) printString. 
-				'MicItalicFormatBlock2'. 'aa',StrikeMarkup , 'bbbb', StrikeMarkup ,'cc'  }.
-		{  'Strike'.(StrikeMarkup, 'aa\',BoldMarkup , 'bbbb', BoldMarkup,'cc', StrikeMarkup) printString. 
-			'MicStrikeFormatBlock2'. 'aa',BoldMarkup , 'bbbb', BoldMarkup,'cc' }
+		{ 'Bold'. BoldMarkup. BoldMarkup. ItalicMarkup. ItalicMarkup. 'MicBoldFormatBlock2'}.
+		{ 'Italic'. ItalicMarkup. ItalicMarkup. StrikeMarkup.StrikeMarkup. 'MicItalicFormatBlock2'}.
+		{ 'Strike'. StrikeMarkup. StrikeMarkup. BoldMarkup. BoldMarkup. 'MicStrikeFormatBlock2' }
 	 }.
 	^ tests do: [ :t | self compile: (template format: t ) classified: 'test generated']
 	
@@ -62,20 +59,17 @@ MicInlineParser2Test class >> generateEvaluatedTests_Nested [
 	template := 'test{1}_Nested
 	"Auto generated by self class>>#generateEvaluatedTests_Nested"
 	| res |
-	res := ( self inlineParse:{2}) first.
-	self assert: res printString equals: ({3} new children: \{
+	res := ( self inlineParse:''{2}aa{4}bbbb{5}cc{3}'') first.
+	self assert: res printString equals: ({6} new children: \{
 		MicTextBlock2 new bodystring: ''aa''.
-		{4} new children: \{ MicTextBlock2 new bodystring: ''bbbb''\}.
+		{7} new children: \{ MicTextBlock2 new bodystring: ''bbbb''\}.
 		MicTextBlock2 new bodystring: ''cc''
 		\}) printString
 	'.
 	tests := { 
-		{ 'Bold'. (BoldMarkup, 'aa',(ItalicMarkup, 'bbbb', ItalicMarkup),'cc', BoldMarkup) printString. 
-				'MicBoldFormatBlock2'. 'MicItalicFormatBlock2' }.
-		{ 'Italic'. (ItalicMarkup, 'aa',(StrikeMarkup , 'bbbb', StrikeMarkup ),'cc', ItalicMarkup) printString. 
-				'MicItalicFormatBlock2'. 'MicStrikeFormatBlock2'  }.
-		{  'Strike'.(StrikeMarkup, 'aa',(BoldMarkup , 'bbbb', BoldMarkup),'cc', StrikeMarkup) printString. 
-			'MicStrikeFormatBlock2'. MicBoldFormatBlock2 }
+		{ 'Bold'. BoldMarkup. BoldMarkup. ItalicMarkup. ItalicMarkup. 'MicBoldFormatBlock2'. 'MicItalicFormatBlock2'}.
+		{ 'Italic'. ItalicMarkup. ItalicMarkup. StrikeMarkup.StrikeMarkup. 'MicItalicFormatBlock2'. 'MicStrikeFormatBlock2'}.
+		{ 'Strike'. StrikeMarkup. StrikeMarkup. BoldMarkup. BoldMarkup. 'MicStrikeFormatBlock2'. 'MicBoldFormatBlock2'  }
 	 }.
 	^ tests do: [ :t | self compile: (template format: t ) classified: 'test generated']
 	
@@ -84,20 +78,17 @@ MicInlineParser2Test class >> generateEvaluatedTests_Nested [
 { #category : #'as yet unclassified' }
 MicInlineParser2Test class >> generateEvaluatedTests_UnclompletedNested [
 	| template tests|
-	template := 'test{1}_BackslashNotNested
+	template := 'test{1}_UnclompletedNested
 	"Auto generated by self class>>#generateEvaluatedTests_UnclompletedNested"
 	| res |
-	res := ( self inlineParse:{2}) first.
-	self assert: res printString equals: ({3} new children: \{
-		MicTextBlock2 new bodystring: {4} \}) printString
+	res := ( self inlineParse:''{2}aa{4}bbbbcc{3}'') first.
+	self assert: res printString equals: ({5} new children: \{
+		MicTextBlock2 new bodystring: ''aa{4}bbbbcc'' \}) printString
 	'.
 	tests := { 
-		{ 'Bold'. (BoldMarkup, 'aa',ItalicMarkup, 'bbbbcc', BoldMarkup) printString. 
-				'MicBoldFormatBlock2'. ('aa',ItalicMarkup, 'bbbbcc') printString}.
-		{ 'Italic'. (ItalicMarkup, 'aa',StrikeMarkup , 'bbbbcc', ItalicMarkup) printString. 
-				'MicItalicFormatBlock2'. ('aa',StrikeMarkup , 'bbbbcc') printString}.
-		{  'Strike'.(StrikeMarkup, 'aa',BoldMarkup , 'bbbbcc', StrikeMarkup) printString. 
-			'MicStrikeFormatBlock2'. ('aa',BoldMarkup , 'bbbbcc') printString}
+		{ 'Bold'. BoldMarkup. BoldMarkup. ItalicMarkup. MicBoldFormatBlock2}.
+		{ 'Italic'. ItalicMarkup. ItalicMarkup. StrikeMarkup. MicItalicFormatBlock2}.
+		{ 'Strike'. StrikeMarkup. StrikeMarkup. BoldMarkup. MicStrikeFormatBlock2 }
 	 }.
 	^ tests do: [ :t | self compile: (template format: t ) classified: 'test generated']
 	
@@ -280,6 +271,16 @@ MicInlineParser2Test >> testBold_Nested [
 	
 ]
 
+{ #category : #'test generated' }
+MicInlineParser2Test >> testBold_UnclompletedNested [
+	"Auto generated by self class>>#generateEvaluatedTests_UnclompletedNested"
+	| res |
+	res := ( self inlineParse:'**aa_bbbbcc**') first.
+	self assert: res printString equals: (MicBoldFormatBlock2 new children: {
+		MicTextBlock2 new bodystring: 'aa_bbbbcc' }) printString
+	
+]
+
 { #category : #tests }
 MicInlineParser2Test >> testBrokenNestedBlocksHandles [
 	| res |
@@ -338,6 +339,16 @@ MicInlineParser2Test >> testItalic_Nested [
 	
 ]
 
+{ #category : #'test generated' }
+MicInlineParser2Test >> testItalic_UnclompletedNested [
+	"Auto generated by self class>>#generateEvaluatedTests_UnclompletedNested"
+	| res |
+	res := ( self inlineParse:'_aa~bbbbcc_') first.
+	self assert: res printString equals: (MicItalicFormatBlock2 new children: {
+		MicTextBlock2 new bodystring: 'aa~bbbbcc' }) printString
+	
+]
+
 { #category : #'test generated' }
 MicInlineParser2Test >> testLink [
 	"Auto generated by self class>>#generateUrlTests"
@@ -469,6 +480,16 @@ MicInlineParser2Test >> testStrike_Nested [
 	
 ]
 
+{ #category : #'test generated' }
+MicInlineParser2Test >> testStrike_UnclompletedNested [
+	"Auto generated by self class>>#generateEvaluatedTests_UnclompletedNested"
+	| res |
+	res := ( self inlineParse:'~aa**bbbbcc~') first.
+	self assert: res printString equals: (MicStrikeFormatBlock2 new children: {
+		MicTextBlock2 new bodystring: 'aa**bbbbcc' }) printString
+	
+]
+
 { #category : #tests }
 MicInlineParser2Test >> testText [
 	| res |
diff --git a/src/Microdown/MicAnnotationBlock2.class.st b/src/Microdown/MicAnnotationBlock2.class.st
index 14c86767..6e597af3 100644
--- a/src/Microdown/MicAnnotationBlock2.class.st
+++ b/src/Microdown/MicAnnotationBlock2.class.st
@@ -20,6 +20,23 @@ Class {
 	#category : #'Microdown-InlineParser'
 }
 
+{ #category : #parsing }
+MicAnnotationBlock2 class >> parse: delimiter stream: aTokenStream for: aParser [
+	| bodystring arguments tag extensionClass |
+	bodystring := delimiter undelimitedSubstring.
+	arguments := MicArgumentList
+		            split: bodystring
+		            defaultArg: #annotationKind
+		            defaultValue: 'Me'.
+	tag := arguments defaultValue trimBoth.
+
+	extensionClass := self extensionClassFor: tag.
+	
+	^ extensionClass new
+		bodystring: bodystring;
+		arguments: arguments
+]
+
 { #category : #visiting }
 MicAnnotationBlock2 >> accept: aVisitor [
 	^ aVisitor visitAnnotation: self
@@ -31,7 +48,13 @@ MicAnnotationBlock2 >> arguments [
 	^ arguments
 ]
 
-{ #category : #visiting }
-MicAnnotationBlock2 >> closeMe [
-	arguments := MicArgumentList split: bodystring.
+{ #category : #accessing }
+MicAnnotationBlock2 >> arguments: argumentList [
+
+	arguments := argumentList
+]
+
+{ #category : #accessing }
+MicAnnotationBlock2 >> name [
+	^ arguments defaultValue
 ]
diff --git a/src/Microdown/MicElement.class.st b/src/Microdown/MicElement.class.st
index 0c2c2440..3a6aa9d1 100644
--- a/src/Microdown/MicElement.class.st
+++ b/src/Microdown/MicElement.class.st
@@ -67,7 +67,7 @@ MicElement >> inlineParse: aString [
 { #category : #private }
 MicElement >> inlineParserClass [
 
-	^ MicInlineParser
+	^ MicInlineParser2
 ]
 
 { #category : #private }
diff --git a/src/Microdown/MicHeaderBlock.class.st b/src/Microdown/MicHeaderBlock.class.st
index fcb7ee1e..ccbe440f 100644
--- a/src/Microdown/MicHeaderBlock.class.st
+++ b/src/Microdown/MicHeaderBlock.class.st
@@ -42,17 +42,10 @@ MicHeaderBlock >> addLineAndReturnNextNode: line [
 	self level: ('(#+)' asRegex
 		matchesPrefix: line;
 		subexpression: 1) size.
-	children := (line copyFrom: level + 1 to: line size) trim.
+	children := self inlineParse: (line copyFrom: level + 1 to: line size) trim.
 	^ self
 ]
 
-{ #category : #'parse support' }
-MicHeaderBlock >> closeMe [
-	super closeMe.
-	children :=  self inlineParse: children
-
-]
-
 { #category : #accessing }
 MicHeaderBlock >> formattedCode [ 
 	^super formattedCode , '[ ', self level printString, '/', self header, ' ]'
diff --git a/src/Microdown/MicInlineBlockWithUrl2.class.st b/src/Microdown/MicInlineBlockWithUrl2.class.st
index 90436689..0913fc97 100644
--- a/src/Microdown/MicInlineBlockWithUrl2.class.st
+++ b/src/Microdown/MicInlineBlockWithUrl2.class.st
@@ -23,6 +23,12 @@ MicInlineBlockWithUrl2 class >> parse: token stream: aTokenStream for: aParser [
 	^ aParser parseNameUrlBlock: self from: aTokenStream token: token
 ]
 
+{ #category : #visiting }
+MicInlineBlockWithUrl2 >> captionElements [
+	self deprecated: 'Use children instead' transformWith: '`@rec captionElements' -> '`@rec children'.
+	^ children
+]
+
 { #category : #accessing }
 MicInlineBlockWithUrl2 >> children [
 
diff --git a/src/Microdown/MicInlineBuilder.class.st b/src/Microdown/MicInlineBuilder.class.st
deleted file mode 100644
index 5b4a36cd..00000000
--- a/src/Microdown/MicInlineBuilder.class.st
+++ /dev/null
@@ -1,11 +0,0 @@
-"
-I am a builder class for creating inline block trees.
-"
-Class {
-	#name : #MicInlineBuilder,
-	#superclass : #Object,
-	#pools : [
-		'MicMicrodownSharedPool'
-	],
-	#category : #'Microdown-InlineParser'
-}
diff --git a/src/Microdown/MicInlineParser2.class.st b/src/Microdown/MicInlineParser2.class.st
index 9158ebd1..6597a231 100644
--- a/src/Microdown/MicInlineParser2.class.st
+++ b/src/Microdown/MicInlineParser2.class.st
@@ -17,6 +17,12 @@ MicInlineParser2 class >> parse: string [
 	^ self new parse: string
 ]
 
+{ #category : #'as yet unclassified' }
+MicInlineParser2 class >> rootParse: aString [
+	"I am used for test, returning a root block with my children"
+	^ MicRootBlock new children: (self parse: aString)
+]
+
 { #category : #'block creation' }
 MicInlineParser2 >> createInlineBlock: token inStream: aReadStream [ 
 	| blockClass newBlock|
diff --git a/src/Microdown/MicListItemBlock.class.st b/src/Microdown/MicListItemBlock.class.st
index 4e8e247a..6c59e3bf 100644
--- a/src/Microdown/MicListItemBlock.class.st
+++ b/src/Microdown/MicListItemBlock.class.st
@@ -69,18 +69,15 @@ MicListItemBlock >> addLineAndReturnNextNode: line [
 	"SD: I thought that a list item was holding a paragraph but it holds directly text."
 		
 	(self isAList: normalized)
-		ifTrue: [ ^ self newBlockFor: normalized parent: self ]
+		ifTrue: [ 
+			self inlineParse: text.
+			text := ''.
+			^ self newBlockFor: normalized parent: self ]
 		ifFalse: [ 
 			"here we manage multiple lines list item."
 			text := text , String cr , normalized ]
 ]
 
-{ #category : #accessing }
-MicListItemBlock >> basicText [
-
-	^ text
-]
-
 { #category : #testing }
 MicListItemBlock >> canConsumeLine: line [
 	"return if this block can consume line"
@@ -91,19 +88,8 @@ MicListItemBlock >> canConsumeLine: line [
 { #category : #visiting }
 MicListItemBlock >> closeMe [
 
-"1. item 1 **foo**
-   on the same line
-  - sublevel item 1 **bold**
-  - sublevel item 2
-2. item 2
-In this example textElements of the first item will be the elements for 
-	item 1 **foo**
-   on the same line
-"
 	super closeMe.
-	textElements :=  self inlineParse: text.	
-	textElements reverseDo: [ :each | 
-		children addFirst: each ].
+	self inlineParse: text
 ]
 
 { #category : #accessing }
@@ -126,19 +112,19 @@ MicListItemBlock >> nestedLevel [
 ]
 
 { #category : #accessing }
-MicListItemBlock >> text [
-
-	^ String streamContents: [ :str | textElements do: [ :each | str nextPutAll: each substring ] ]
+MicListItemBlock >> testText [
+	"I am used to make it easier to write tests"
+	^ String streamContents: [ :str | children do: [ :each | str nextPutAll: each substring ] ]
 ]
 
 { #category : #accessing }
-MicListItemBlock >> textElements [ 
-	
-	^ textElements 
+MicListItemBlock >> text [
+	self deprecated: 'Use testText instead' transformWith: '`@rec text' -> '`@rec testText'.
+	^ self testText 
 ]
 
 { #category : #accessing }
-MicListItemBlock >> textElements: aCollection [ 
-	
-	textElements := aCollection
+MicListItemBlock >> textElements [ 
+	self deprecated: 'I should not be used, use children' transformWith: '`@rec textElements' -> '`@rec children'.
+	^ children  
 ]
diff --git a/src/Microdown/MicMonospaceFormatBlock2.class.st b/src/Microdown/MicMonospaceFormatBlock2.class.st
index 294f78ab..d007d329 100644
--- a/src/Microdown/MicMonospaceFormatBlock2.class.st
+++ b/src/Microdown/MicMonospaceFormatBlock2.class.st
@@ -16,3 +16,15 @@ MicMonospaceFormatBlock2 class >> blockName [
 MicMonospaceFormatBlock2 >> accept: aVisitor [
 	^ aVisitor visitMonospace: self
 ]
+
+{ #category : #accessing }
+MicMonospaceFormatBlock2 >> children [
+	"should be deprecated"
+	^ Array with: (MicTextBlock2 new bodystring: self bodystring)
+]
+
+{ #category : #accessing }
+MicMonospaceFormatBlock2 >> text [
+	"should be deprecated "
+	^ self bodystring 
+]
diff --git a/src/Microdown/MicUnEvaluatedBlock2.class.st b/src/Microdown/MicUnEvaluatedBlock2.class.st
index 2bccaed4..2beaa3ea 100644
--- a/src/Microdown/MicUnEvaluatedBlock2.class.st
+++ b/src/Microdown/MicUnEvaluatedBlock2.class.st
@@ -37,3 +37,9 @@ MicUnEvaluatedBlock2 >> printOn: stream [
 	stream << self blockName << '(' << bodystring << ')'
 	
 ]
+
+{ #category : #obsolete }
+MicUnEvaluatedBlock2 >> substring [
+	self flag: 'to be obsoleted, use bodystring'.
+	^ bodystring
+]
diff --git a/src/Microdown/MicrodownVisitor.class.st b/src/Microdown/MicrodownVisitor.class.st
index 67d29466..5186aee7 100644
--- a/src/Microdown/MicrodownVisitor.class.st
+++ b/src/Microdown/MicrodownVisitor.class.st
@@ -137,8 +137,7 @@ MicrodownVisitor >> visitItalic: aFormat [
 { #category : #'visiting - inline elements' }
 MicrodownVisitor >> visitLink: aLink [
 
-	^ aLink captionElements do: [:each | each accept: self ].
-
+	^ aLink children do: [ :each | each accept: self ]
 ]
 
 { #category : #'visiting - list' }

From 84cdbad6f805855147eae8d93783c79237ddb7de Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Wed, 2 Nov 2022 09:24:18 +0100
Subject: [PATCH 10/40] fixing tests and code

---
 .../MicCodeblockEvaluatorTest.class.st        |  27 +-
 .../MicDumperTest.class.st                    |   4 +-
 .../MicCitationBlockTest.class.st             |   2 +-
 .../MicEnvironmentBlockTest.class.st          |  26 +-
 .../MicHTTPResourceReferenceTest.class.st     |   2 +-
 .../MicOrderedListBlockTest.class.st          | 150 +++++------
 .../MicUnorderedListBlockTest.class.st        | 241 +++++++++---------
 .../MicrodownInlineParserTest.class.st        |   8 +-
 src/Microdown/MicCitationBlock.class.st       |   2 +-
 src/Microdown/MicFootnoteBlock.class.st       |   2 +-
 src/Microdown/MicTextBlock2.class.st          |   5 +
 src/Microdown/MicUnEvaluatedBlock2.class.st   |  11 +
 12 files changed, 258 insertions(+), 222 deletions(-)

diff --git a/src/Microdown-Evaluator-Tests/MicCodeblockEvaluatorTest.class.st b/src/Microdown-Evaluator-Tests/MicCodeblockEvaluatorTest.class.st
index 44b42c86..d7921913 100644
--- a/src/Microdown-Evaluator-Tests/MicCodeblockEvaluatorTest.class.st
+++ b/src/Microdown-Evaluator-Tests/MicCodeblockEvaluatorTest.class.st
@@ -11,20 +11,25 @@ MicCodeblockEvaluatorTest >> actualClass [
 
 { #category : #private }
 MicCodeblockEvaluatorTest >> testCodeblockWithEvalExecuteBody [
+
 	| input |
-	input := MicRootBlock new
-		addChild:
-			(MicParagraphBlock new
-				addChild:
-						((MicCodeBlock new body: 'stream nextPutAll: ''- test''')
-								eval: true; 
-								yourself);
-				yourself) yourself.
+	input := MicRootBlock new addChild: (MicParagraphBlock new
+			          addChild:
+				          ((MicCodeBlock new body: 'stream nextPutAll: ''- test''')
+					           eval: true;
+					           yourself);
+			          yourself) yourself.
 	self actualClass new visit: input.
 	self assert: input children first class equals: MicParagraphBlock.
-	self assert: input children first children first class equals: MicUnorderedListBlock.
-	self assert: input children first children first children first class equals: MicListItemBlock.
-	self assert: input children first children first children first text equals: 'test'
+	self
+		assert: input children first children first class
+		equals: MicUnorderedListBlock.
+	self
+		assert: input children first children first children first class
+		equals: MicListItemBlock.
+	self
+		assert: input children first children first children first testText
+		equals: 'test'
 ]
 
 { #category : #tests }
diff --git a/src/Microdown-PrettyPrinter-Tests/MicDumperTest.class.st b/src/Microdown-PrettyPrinter-Tests/MicDumperTest.class.st
index f8cb3c90..51e1eec9 100644
--- a/src/Microdown-PrettyPrinter-Tests/MicDumperTest.class.st
+++ b/src/Microdown-PrettyPrinter-Tests/MicDumperTest.class.st
@@ -43,12 +43,12 @@ MicDumperTest >> testBoldFormat [
 	| micBold |
 	micBold := (parser parse: factory boldFormatSample) children first
 		           children first.
-	self assert: micBold children first class equals: MicTextBlock.
+	self assert: micBold children first class equals: MicTextBlock2.
 	visitor visit: micBold.
 	self
 		assert: visitor contents
 		equals:
-		'(MicBoldFormatBlock new textElement: (MicTextBlock new substring: ''Foo''))'
+		'(MicBoldFormatBlock2 new children: (MicTextBlock2 new substring: ''Foo''))'
 ]
 
 { #category : #'test - inline - blocks' }
diff --git a/src/Microdown-Tests/MicCitationBlockTest.class.st b/src/Microdown-Tests/MicCitationBlockTest.class.st
index ed2ce8a7..e9beaaf6 100644
--- a/src/Microdown-Tests/MicCitationBlockTest.class.st
+++ b/src/Microdown-Tests/MicCitationBlockTest.class.st
@@ -19,7 +19,7 @@ MicCitationBlockTest >> testDefaultingClassWhenNoTag [
 	
 	| doc |
 	doc := parser parse: '{!citation2|key=Duca99a!}'.
-	self assert: doc children first children first class equals: MicAnnotationBlock.
+	self assert: doc children first children first class equals: MicAnnotationBlock2.
 	self assert: doc children first children first name equals: 'citation2'.
 	self assert: (doc children first children first arguments at: #key) equals: 'Duca99a'.
 ]
diff --git a/src/Microdown-Tests/MicEnvironmentBlockTest.class.st b/src/Microdown-Tests/MicEnvironmentBlockTest.class.st
index 2e22f7a7..3bfccd5b 100644
--- a/src/Microdown-Tests/MicEnvironmentBlockTest.class.st
+++ b/src/Microdown-Tests/MicEnvironmentBlockTest.class.st
@@ -217,26 +217,32 @@ MicEnvironmentBlockTest >> testEnvironmentWithCorrespondingClassIsCreated [
 
 { #category : #'tests - default environment' }
 MicEnvironmentBlockTest >> testEnvironmentWithFormat [
+
 	"'<?slide
 - item 1 
 - item 2
 ?>
-'" 
+'"
+
 	| source root env environmentName |
 	environmentName := 'slide'.
-	source := EnvironmentOpeningBlockMarkup , environmentName, String cr, 
-	 '- item1 **bold**
+	source := EnvironmentOpeningBlockMarkup , environmentName , String cr
+	          , '- item1 **bold**
 - item 2
 
-blbababbab bababba', String cr, EnvironmentClosingBlockMarkup, String cr.
-	root :=  parser parse: source.
-	
+blbababbab bababba' , String cr , EnvironmentClosingBlockMarkup
+	          , String cr.
+	root := parser parse: source.
+
 	self assert: root children size equals: 1.
-	env := root children first. 
+	env := root children first.
 
-	self assert: env children first children first class equals: MicListItemBlock.
-	self assert: env children first children first textElements second class equals: MicBoldFormatBlock 
-	
+	self
+		assert: env children first children first class
+		equals: MicListItemBlock.
+	self
+		assert: env children first children first children second class
+		equals: MicBoldFormatBlock
 ]
 
 { #category : #'tests - default environment' }
diff --git a/src/Microdown-Tests/MicHTTPResourceReferenceTest.class.st b/src/Microdown-Tests/MicHTTPResourceReferenceTest.class.st
index f3873c97..429bca82 100644
--- a/src/Microdown-Tests/MicHTTPResourceReferenceTest.class.st
+++ b/src/Microdown-Tests/MicHTTPResourceReferenceTest.class.st
@@ -109,7 +109,7 @@ MicHTTPResourceReferenceTest >> testLoadMicrodownResolvesUrlsRelativeToTheParent
 	doc := ref loadMicrodown.
 
 	topLevelImageRef := doc children fourth children first.
-	self assert: topLevelImageRef class equals: MicFigureBlock.
+	self assert: topLevelImageRef class equals: MicFigureBlock2.
 	self
 		assert: (topLevelImageRef reference loadImage) height
 		equals: 90
diff --git a/src/Microdown-Tests/MicOrderedListBlockTest.class.st b/src/Microdown-Tests/MicOrderedListBlockTest.class.st
index 99031650..a82348be 100644
--- a/src/Microdown-Tests/MicOrderedListBlockTest.class.st
+++ b/src/Microdown-Tests/MicOrderedListBlockTest.class.st
@@ -28,60 +28,61 @@ MicOrderedListBlockTest >> subjectClass [
 
 { #category : #tests }
 MicOrderedListBlockTest >> testEmbeddedUnordered [
+
 	| source root list |
-	source := 
-'1. item 1
+	source := '1. item 1
    - sublevel item 1
    - sublevel item 2
 1. item 2'.
 	root := parser parse: source.
 	list := root children first.
 	self assert: list children size equals: 2.
-	self assert: list children second text equals: 'item 2'.
-	
+	self assert: list children second testText equals: 'item 2'.
+
 	"item 1 + nested list"
 	self assert: list children first children size equals: 2.
-		
-	self assert: list children first 
-			children first text equals: 'item 1'.
-			
-	self assert: list children first "list item"
-			children second children first text equals: 'sublevel item 1'.	
+
+	self assert: list children first children first text equals: 'item 1'.
+
+	self
+		assert: list children first children second children first testText
+		equals: 'sublevel item 1' "list item"
 ]
 
 { #category : #'tests - nested' }
 MicOrderedListBlockTest >> testNestedLevel [
+
 	| source root list item1 |
-	source := 
-'1. item 1
+	source := '1. item 1
    6) sublevel
 1. item 2'.
 	root := parser parse: source.
 	list := root children first.
 	self assert: list children size equals: 2.
-	
+
 	item1 := list children first.
-	self assert: item1 text equals: 'item 1'.
+	self assert: item1 testText equals: 'item 1'.
 	self assert: item1 class equals: MicListItemBlock.
 	self assert: item1 nestedLevel equals: 1.
-	
+
 	"this is the inner list"
 	self assert: item1 children second nestedLevel equals: 2.
 	self assert: item1 children second class equals: MicOrderedListBlock.
-		
-	"this is the inner list first item"
-	self assert: item1 children second children first text equals: 'sublevel'.
-	self assert: item1 children second children first class equals: MicListItemBlock.
-
-	
 
+	"this is the inner list first item"
+	self
+		assert: item1 children second children first text
+		equals: 'sublevel'.
+	self
+		assert: item1 children second children first class
+		equals: MicListItemBlock
 ]
 
 { #category : #'tests - nested' }
 MicOrderedListBlockTest >> testNestedLevel2 [
+
 	| source root list item1 sublevelItem |
-	source := 
-'1. item 1
+	source := '1. item 1
    6) sublevel
       1. subsublevel
    7) sublevel2
@@ -89,30 +90,31 @@ MicOrderedListBlockTest >> testNestedLevel2 [
 	root := parser parse: source.
 	list := root children first.
 	self assert: list children size equals: 2.
-	
+
 	item1 := list children first.
 	sublevelItem := item1 children second children first.
-	
+
 	"this is the inner list"
 	self assert: item1 children second nestedLevel equals: 2.
 	self assert: item1 children second class equals: MicOrderedListBlock.
-		
+
 	"this is the inner list first item"
-	self assert: sublevelItem text equals: 'sublevel'.
+	self assert: sublevelItem testText equals: 'sublevel'.
 	self assert: sublevelItem class equals: MicListItemBlock.
 
-	self assert: sublevelItem children second children first nestedLevel equals: 3.
-	self assert: sublevelItem children second children first text equals: 'subsublevel'.
-	
-
+	self
+		assert: sublevelItem children second children first nestedLevel
+		equals: 3.
+	self
+		assert: sublevelItem children second children first text
+		equals: 'subsublevel'
 ]
 
 { #category : #tests }
 MicOrderedListBlockTest >> testNotSpawingNewParagraph [
+
 	| root list |
-	root :=  parser
-		parse:
-'1. first item
+	root := parser parse: '1. first item
    with a follow up 
    and another one. 
 2. second item
@@ -120,70 +122,68 @@ MicOrderedListBlockTest >> testNotSpawingNewParagraph [
 	list := root children first.
 	self assert: list children size equals: 2.
 	self assert: list class equals: self orderedListBlockClass.
-	self assert: list startIndex equals: 1. 
-	self assert: list children second text equals: 'second item
-follow up of second item'.
-	
+	self assert: list startIndex equals: 1.
+	self assert: list children second testText equals: 'second item
+follow up of second item'
 ]
 
 { #category : #tests }
 MicOrderedListBlockTest >> testSingleLevelList2 [
+
 	| source root list |
-	source := 
-'19. item 1
+	source := '19. item 1
     expanded
 7.  item 2'.
 	root := parser parse: source.
 	list := root children first.
 	self assert: list children size equals: 2.
-	self assert: list children first text equals: 'item 1
+	self assert: list children first testText equals: 'item 1
 expanded'.
-	self assert: list  startIndex equals: 19
+	self assert: list startIndex equals: 19
 ]
 
 { #category : #tests }
 MicOrderedListBlockTest >> testSingleLevelList2WithNoIndent [
+
 	"when we want a paragraph to be part of an item it should be indented "
 
 	| source root list |
-	source := 
-'19. item 1
+	source := '19. item 1
 expanded as new paragraph
 7.  item 2
     part of item2'.
 	root := parser parse: source.
 	self assert: root children size equals: 3.
-	"two lists + one paragraph"	
+	"two lists + one paragraph"
 	list := root children first.
 	self assert: list children size equals: 1.
-	self assert: list children first text equals: 'item 1'.
-	self assert: list  startIndex equals: 19.
-	
-	self assert: root children last children first text equals: 'item 2
+	self assert: list children first testText equals: 'item 1'.
+	self assert: list startIndex equals: 19.
+
+	self
+		assert: root children last children first testText
+		equals: 'item 2
 part of item2'
 ]
 
 { #category : #tests }
 MicOrderedListBlockTest >> testSingleLevelListWithNormalNumbering [
+
 	| root list |
-	root :=  parser
-		parse:
-'1. first item
+	root := parser parse: '1. first item
 2. second item'.
 	list := root children first.
 	self assert: list children size equals: 2.
 	self assert: list class equals: self orderedListBlockClass.
-	self assert: list startIndex equals: 1. 
-	self assert: list children second text equals: 'second item'.
-	
+	self assert: list startIndex equals: 1.
+	self assert: list children second testText equals: 'second item'
 ]
 
 { #category : #tests }
 MicOrderedListBlockTest >> testSingleLevelListWithNormalNumberingWithEmptyLines [
+
 	| root list |
-	root :=  parser
-		parse:
-'1. first item
+	root := parser parse: '1. first item
 
 
 
@@ -192,42 +192,42 @@ MicOrderedListBlockTest >> testSingleLevelListWithNormalNumberingWithEmptyLines
 	list := root children first.
 	self assert: list children size equals: 2.
 	self assert: list class equals: self orderedListBlockClass.
-	self assert: list startIndex equals: 1. 
-	self assert: list children second text equals: 'second item'.
-	
+	self assert: list startIndex equals: 1.
+	self assert: list children second testText equals: 'second item'
 ]
 
 { #category : #tests }
 MicOrderedListBlockTest >> testSingleLevelListWithStrangelyNumberedItems [
+
 	| root list |
-	root := parser
-		parse:
-			'11. item 1
+	root := parser parse: '11. item 1
 2. item 2'.
 	list := root children first.
 	self assert: list children size equals: 2.
 	self assert: list class equals: self orderedListBlockClass.
-	self assert: list startIndex equals: 11. 
-	self assert: list children second text equals: 'item 2'
+	self assert: list startIndex equals: 11.
+	self assert: list children second testText equals: 'item 2'
 ]
 
 { #category : #tests }
 MicOrderedListBlockTest >> testSpawingNewParagraph [
+
 	| root |
-	root :=  parser
-		parse:
-'1. first item
+	root := parser parse: '1. first item
    with a follow up
 a new paragraph. 
 2. second list first item
    follow up of second item'.
-	self assert: root children size equals: 3. 
-	self assert: root children first children first text equals: 'first item
+	self assert: root children size equals: 3.
+	self
+		assert: root children first children first testText
+		equals: 'first item
 with a follow up'.
 	self assert: root children third startIndex equals: 2.
-	self assert: root children third children first text equals: 'second list first item
-follow up of second item'.
-	
+	self
+		assert: root children third children first testText
+		equals: 'second list first item
+follow up of second item'
 ]
 
 { #category : #'tests - list' }
@@ -240,5 +240,5 @@ MicOrderedListBlockTest >> testUnOrderedListAPIToAccessText [
 
 	self assert: list class equals: MicListItemBlock.
 	self assert: list nestedLevel equals: 1.
-	self assert: list text equals: '_first_'
+	self assert: list testText equals: '_first_'
 ]
diff --git a/src/Microdown-Tests/MicUnorderedListBlockTest.class.st b/src/Microdown-Tests/MicUnorderedListBlockTest.class.st
index 14f866cc..7b6b631b 100644
--- a/src/Microdown-Tests/MicUnorderedListBlockTest.class.st
+++ b/src/Microdown-Tests/MicUnorderedListBlockTest.class.st
@@ -14,51 +14,48 @@ MicUnorderedListBlockTest >> subjectClass [
 
 { #category : #tests }
 MicUnorderedListBlockTest >> testEmbeddedOrdered [
+
 	| source root list |
-	source := 
-'- item 1
+	source := '- item 1
   1. sublevel item 1
   4. sublevel item 2
 - item 2'.
 	root := parser parse: source.
 	list := root children first.
 	self assert: list children size equals: 2.
-	self assert: list children second text equals: 'item 2'.
-	self assert: list children first "item 1"
-			children second "unordered list"
-			children second "sub item"
-			text equals: 'sublevel item 2'
+	self assert: list children second testText equals: 'item 2'.
+	self
+		assert: list children first children second children second testText
+		equals: 'sublevel item 2' "item 1" "unordered list" "sub item"
 ]
 
 { #category : #tests }
 MicUnorderedListBlockTest >> testEmbeddedOrderedWithFormatting [
+
 	| source root list item4 |
-	source := 
-'- item 1
+	source := '- item 1
   1. **sublevel** ~item 1~
   4. **sublevel4** ~item 24~
 - item 2'.
 	root := parser parse: source.
 	list := root children first.
 	self assert: list children size equals: 2.
-	
-	item4 := list children first "item 1"
-			children second "unordered list"
-			children second.
-			
-	self assert: item4 text equals: 'sublevel4 item 24'.
+
+	item4 := list children first children second children second. "item 1" "unordered list"
+
+	self assert: item4 testText equals: 'sublevel4 item 24'.
 	self assert: item4 textElements first kind equals: 'bold'.
 	self assert: item4 textElements first substring equals: 'sublevel4'.
 
 	self assert: item4 textElements third kind equals: 'strike'.
-	self assert: item4 textElements third substring equals: 'item 24'.
+	self assert: item4 textElements third substring equals: 'item 24'
 ]
 
 { #category : #tests }
 MicUnorderedListBlockTest >> testMixing2 [
+
 	| source root list1 list2 |
-	source := 
-'
+	source := '
 - item 1
   - sub item 1.1
   - sub item 1.2
@@ -70,21 +67,21 @@ MicUnorderedListBlockTest >> testMixing2 [
 3. item 2
 '.
 	root := parser parse: source.
-	self assert: root children size equals: 2. 
+	self assert: root children size equals: 2.
 	list1 := root children first.
 	self assert: list1 children size equals: 2.
-	self assert: list1 children second text equals: 'item 2'.
-	
+	self assert: list1 children second testText equals: 'item 2'.
+
 	list2 := root children second.
 	self assert: list2 children size equals: 2.
-	self assert: list2 children second text equals: 'item 2'.
+	self assert: list2 children second testText equals: 'item 2'
 ]
 
 { #category : #tests }
 MicUnorderedListBlockTest >> testMixingOrderedInsideUnorderedWithParagraph [
-	| source root list1  |
-	source := 
-'
+
+	| source root list1 |
+	source := '
 - item 1
   on 
   multiple lines
@@ -93,51 +90,52 @@ MicUnorderedListBlockTest >> testMixingOrderedInsideUnorderedWithParagraph [
 - item 2
 '.
 	root := parser parse: source.
-	self assert: root children size equals: 1. 
+	self assert: root children size equals: 1.
 	list1 := root children first.
 	self assert: list1 children size equals: 2.
-	self assert: list1 children second text equals: 'item 2'.
-	
-	self assert: list1 children first text equals: 'item 1
+	self assert: list1 children second testText equals: 'item 2'.
+
+	self assert: list1 children first testText equals: 'item 1
 on 
 multiple lines
  1. sub item 1 
- 3. sub item 2'.
+ 3. sub item 2'
 ]
 
 { #category : #'tests - nested' }
 MicUnorderedListBlockTest >> testNestedLevel [
-	| source root list item1|
-	source := 
-'- item 1
+
+	| source root list item1 |
+	source := '- item 1
   1. sublevel
 - item 2'.
 	root := parser parse: source.
 	list := root children first.
 	self assert: list children size equals: 2.
-	
+
 	item1 := list children first.
-	self assert: item1 text equals: 'item 1'.
+	self assert: item1 testText equals: 'item 1'.
 	self assert: item1 class equals: MicListItemBlock.
 	self assert: item1 nestedLevel equals: 1.
-	
+
 	"this is the inner list"
 	self assert: item1 children second nestedLevel equals: 2.
 	self assert: item1 children second class equals: MicOrderedListBlock.
-		
-	"this is the inner list first item"
-	self assert: item1 children second children first text equals: 'sublevel'.
-	self assert: item1 children second children first class equals: MicListItemBlock.
-
-	
 
+	"this is the inner list first item"
+	self
+		assert: item1 children second children first text
+		equals: 'sublevel'.
+	self
+		assert: item1 children second children first class
+		equals: MicListItemBlock
 ]
 
 { #category : #'tests - nested' }
 MicUnorderedListBlockTest >> testNestedLevel2 [
-	| source root list item1 sublevelItem|
-	source := 
-'- item 1
+
+	| source root list item1 sublevelItem |
+	source := '- item 1
   - sublevel
     - subsublevel
   - sublevel2
@@ -145,20 +143,26 @@ MicUnorderedListBlockTest >> testNestedLevel2 [
 	root := parser parse: source.
 	list := root children first.
 	self assert: list children size equals: 2.
-	
+
 	item1 := list children first.
 	sublevelItem := item1 children second children first.
-	
+
 	"this is the inner list"
 	self assert: item1 children second nestedLevel equals: 2.
-	self assert: item1 children second class equals: MicUnorderedListBlock.
-		
+	self
+		assert: item1 children second class
+		equals: MicUnorderedListBlock.
+
 	"this is the inner list first item"
-	self assert: sublevelItem text equals: 'sublevel'.
+	self assert: sublevelItem testText equals: 'sublevel'.
 	self assert: sublevelItem class equals: MicListItemBlock.
 
-	self assert: sublevelItem children second children first nestedLevel equals: 3.
-	self assert: sublevelItem children second children first text equals: 'subsublevel'.
+	self
+		assert: sublevelItem children second children first nestedLevel
+		equals: 3.
+	self
+		assert: sublevelItem children second children first text
+		equals: 'subsublevel'
 ]
 
 { #category : #'tests - list' }
@@ -168,26 +172,26 @@ MicUnorderedListBlockTest >> testOrderedListAPIToAccessText [
 	list := (self parser parse: '1.a 2.b') children first children first.
 	self assert: list class equals: MicListItemBlock.
 	self assert: list nestedLevel equals: 1.
-	self assert: list text equals: '2.b'
+	self assert: list testText equals: '2.b'
 ]
 
 { #category : #tests }
 MicUnorderedListBlockTest >> testSingleLevelList [
+
 	| source root list |
-	source := 
-'- item 1
+	source := '- item 1
 - item 2'.
 	root := parser parse: source.
 	list := root children first.
 	self assert: list children size equals: 2.
-	self assert: list children second text equals: 'item 2'
+	self assert: list children second testText equals: 'item 2'
 ]
 
 { #category : #tests }
 MicUnorderedListBlockTest >> testSingleLevelList2 [
+
 	| source root list |
-	source := 
-'- item 1
+	source := '- item 1
   expanded
 - item 2'.
 	root := parser parse: source.
@@ -195,26 +199,34 @@ MicUnorderedListBlockTest >> testSingleLevelList2 [
 	"root contains only a list."
 	list := root children first.
 	self assert: list children size equals: 2.
-	self assert: list children first text equals: 'item 1
+	self assert: list children first testText equals: 'item 1
 expanded'
 ]
 
 { #category : #tests }
 MicUnorderedListBlockTest >> testSingleLevelList2WithFormatting [
+
 	| source root list |
-	source := 
-'- **item 1**
+	source := '- **item 1**
   `expanded`
 - item 2'.
 	root := parser parse: source.
 	list := root children first.
-	self assert: list children first text equals: 'item 1
+	self assert: list children first testText equals: 'item 1
 expanded'.
 	self assert: list children first textElements size equals: 3.
-	self assert: list children first textElements first kind equals: 'bold'.
-	self assert: list children first textElements first substring equals: 'item 1'.
-	self assert: list children first textElements third kind equals: 'monospace'.
-	self assert: list children first textElements third substring equals: 'expanded'.
+	self
+		assert: list children first textElements first kind
+		equals: 'bold'.
+	self
+		assert: list children first textElements first substring
+		equals: 'item 1'.
+	self
+		assert: list children first textElements third kind
+		equals: 'monospace'.
+	self
+		assert: list children first textElements third substring
+		equals: 'expanded'
 ]
 
 { #category : #tests }
@@ -231,29 +243,29 @@ MicUnorderedListBlockTest >> testSingleLevelListAllBulletTypes [
 
 { #category : #tests }
 MicUnorderedListBlockTest >> testSingleLevelListSplitWithEmptyLine [
+
 	| source root list |
-	source := 
-'- item 1
+	source := '- item 1
 - item 2
 
 - item 3 of the same list'.
 	root := parser parse: source.
 	self assert: root children size equals: 1.
 	"root contains a list"
-	
+
 	list := root children first.
 	self assert: list children size equals: 3.
-	self assert: list children first text equals: 'item 1'.
-	self assert: list children third text equals: 'item 3 of the same list'.
-
-
+	self assert: list children first testText equals: 'item 1'.
+	self
+		assert: list children third testText
+		equals: 'item 3 of the same list'
 ]
 
 { #category : #tests }
 MicUnorderedListBlockTest >> testSingleLevelListSplitWithMultipleEmptyLines [
+
 	| source root list |
-	source := 
-'- item 1
+	source := '- item 1
 - item 2
 
 
@@ -263,105 +275,101 @@ MicUnorderedListBlockTest >> testSingleLevelListSplitWithMultipleEmptyLines [
 	root := parser parse: source.
 	self assert: root children size equals: 1.
 	"root contains a list"
-	
+
 	list := root children first.
 	self assert: list children size equals: 3.
-	self assert: list children first text equals: 'item 1'.
-	self assert: list children third text equals: 'item 3 of the same list'.
-
-
+	self assert: list children first testText equals: 'item 1'.
+	self
+		assert: list children third testText
+		equals: 'item 3 of the same list'
 ]
 
 { #category : #tests }
 MicUnorderedListBlockTest >> testSingleLevelListStartingWithoutSpaceSplitParagraph [
+
 	| source root list |
-	source := 
-'- item 1
+	source := '- item 1
   expanded
 and here
 - item 2'.
 	root := parser parse: source.
 	self assert: root children size equals: 3.
 	"root contains a list, a paragraph and another list"
-	
+
 	list := root children first.
 	self assert: list children size equals: 1.
-	self assert: list children first text equals: 'item 1
+	self assert: list children first testText equals: 'item 1
 expanded'.
-	self assert: root children third children first text equals: 'item 2'.
-
-
+	self
+		assert: root children third children first testText
+		equals: 'item 2'
 ]
 
 { #category : #tests }
 MicUnorderedListBlockTest >> testSingleLevelListStartingWithoutSpaceSplitParagraph2 [
+
 	| source root list |
-	source := 
-'- item 1
+	source := '- item 1
   expanded
   same indentation no new paragraph
 - item 2'.
 	root := parser parse: source.
 	self assert: root children size equals: 1.
 	"root contains a list"
-	
+
 	list := root children first.
 	self assert: list children size equals: 2.
-	self assert: list children first text equals: 'item 1
+	self assert: list children first testText equals: 'item 1
 expanded
 same indentation no new paragraph'.
-	self assert: list children second text equals: 'item 2'.
-
-
+	self assert: list children second testText equals: 'item 2'
 ]
 
 { #category : #tests }
 MicUnorderedListBlockTest >> testSingleLevelListWithItemSpawning [
+
 	| root list |
-	root :=  parser
-		parse:
-'- first item
+	root := parser parse: '- first item
   with a follow up 
   and another one. 
 - second item
   follow up of second item'.
 	list := root children first.
 	self assert: list children size equals: 2.
-	self assert: list children second text equals: 'second item
-follow up of second item'.
-	
+	self assert: list children second testText equals: 'second item
+follow up of second item'
 ]
 
 { #category : #tests }
 MicUnorderedListBlockTest >> testSingleLevelListWithStar [
+
 	| source root list |
-	source := 
-'* item 1
+	source := '* item 1
 * item 2'.
 	root := parser parse: source.
 	list := root children first.
 	self assert: list children size equals: 2.
-	self assert: list children second text equals: 'item 2'
+	self assert: list children second testText equals: 'item 2'
 ]
 
 { #category : #tests }
 MicUnorderedListBlockTest >> testSingleLevelMixedList [
+
 	| source root list |
-	source := 
-'- item 1
+	source := '- item 1
 * item 2
 - item 3'.
 	root := parser parse: source.
 	list := root children first.
 	self assert: list children size equals: 3.
-	self assert: list children second text equals: 'item 2'
+	self assert: list children second testText equals: 'item 2'
 ]
 
 { #category : #tests }
 MicUnorderedListBlockTest >> testTwoLevelList [
+
 	| source root list |
-	source := 
-'- item 1
+	source := '- item 1
   * sublevel1
   * sublevel2
   * sublevel3
@@ -369,14 +377,11 @@ MicUnorderedListBlockTest >> testTwoLevelList [
 	root := parser parse: source.
 	list := root children first.
 	self assert: list children size equals: 2.
-	self assert: list children second text equals: 'item 2'.
-	self assert: list children first "item 1 list"
-			children second "unorded list"
-			children first "sub item"
-			text equals: 'sublevel1'.
-	self assert: list children first "item 1"
-			children second "unorded list"
-			children second "sub item"
-			text equals: 'sublevel2'
-			
+	self assert: list children second testText equals: 'item 2'.
+	self
+		assert: list children first children second children first testText
+		equals: 'sublevel1'. "item 1 list" "unorded list" "sub item"
+	self
+		assert: list children first children second children second testText
+		equals: 'sublevel2' "item 1" "unorded list" "sub item"
 ]
diff --git a/src/Microdown-Tests/MicrodownInlineParserTest.class.st b/src/Microdown-Tests/MicrodownInlineParserTest.class.st
index 732da24b..93ab35b2 100644
--- a/src/Microdown-Tests/MicrodownInlineParserTest.class.st
+++ b/src/Microdown-Tests/MicrodownInlineParserTest.class.st
@@ -261,7 +261,9 @@ MicrodownInlineParserTest >> testFigureWithParameters [
 	self assert: elements size equals: 1.
 	figure := elements first.
 	self assert: figure caption equals: 'caption terminating with a .'.
-	self assert: figure captionElements first text equals: 'caption terminating with a .'.
+	self
+		assert: figure children first text
+		equals: 'caption terminating with a .'.
 	self assert: figure arguments keys size equals: 2
 ]
 
@@ -274,7 +276,9 @@ MicrodownInlineParserTest >> testFigureWithParameters_withoutQuotes [
 	self assert: elements size equals: 1.
 	figure := elements first.
 	self assert: figure caption equals: 'caption terminating with a .'.
-	self assert: figure captionElements first text equals: 'caption terminating with a .'.
+	self
+		assert: figure children first text
+		equals: 'caption terminating with a .'.
 	self assert: figure arguments keys size equals: 2
 ]
 
diff --git a/src/Microdown/MicCitationBlock.class.st b/src/Microdown/MicCitationBlock.class.st
index 90640f6d..3cb4f9dd 100644
--- a/src/Microdown/MicCitationBlock.class.st
+++ b/src/Microdown/MicCitationBlock.class.st
@@ -9,7 +9,7 @@ this is a text with a {!citation|ref=Duca99a!}
 "
 Class {
 	#name : #MicCitationBlock,
-	#superclass : #MicAnnotationBlock,
+	#superclass : #MicAnnotationBlock2,
 	#category : #'Microdown-Extensions'
 }
 
diff --git a/src/Microdown/MicFootnoteBlock.class.st b/src/Microdown/MicFootnoteBlock.class.st
index 037c454b..1437170c 100644
--- a/src/Microdown/MicFootnoteBlock.class.st
+++ b/src/Microdown/MicFootnoteBlock.class.st
@@ -5,7 +5,7 @@ this is a text with a `{!footnote|note=Here is a nice footenote.!}`
 "
 Class {
 	#name : #MicFootnoteBlock,
-	#superclass : #MicAnnotationBlock,
+	#superclass : #MicAnnotationBlock2,
 	#category : #'Microdown-Extensions'
 }
 
diff --git a/src/Microdown/MicTextBlock2.class.st b/src/Microdown/MicTextBlock2.class.st
index 1230ba34..acfa7c13 100644
--- a/src/Microdown/MicTextBlock2.class.st
+++ b/src/Microdown/MicTextBlock2.class.st
@@ -11,3 +11,8 @@ Class {
 MicTextBlock2 >> accept: aVisitor [
 	^ aVisitor visitText: self
 ]
+
+{ #category : #accessing }
+MicTextBlock2 >> text [
+	^ bodystring 
+]
diff --git a/src/Microdown/MicUnEvaluatedBlock2.class.st b/src/Microdown/MicUnEvaluatedBlock2.class.st
index 2beaa3ea..262fb82a 100644
--- a/src/Microdown/MicUnEvaluatedBlock2.class.st
+++ b/src/Microdown/MicUnEvaluatedBlock2.class.st
@@ -32,6 +32,17 @@ MicUnEvaluatedBlock2 >> bodystring: anObject [
 	bodystring := anObject
 ]
 
+{ #category : #accessing }
+MicUnEvaluatedBlock2 >> children [
+	"to be nicely polymorphic all nodes have children"
+	^#()
+]
+
+{ #category : #accessing }
+MicUnEvaluatedBlock2 >> children: newChildren [
+	"to be nicely polymorphic all nodes have children"
+]
+
 { #category : #printing }
 MicUnEvaluatedBlock2 >> printOn: stream [
 	stream << self blockName << '(' << bodystring << ')'

From c47345213efe875bcd6e9232396c35a5b34c8de5 Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Wed, 2 Nov 2022 13:59:59 +0100
Subject: [PATCH 11/40] still cleaning tests

---
 src/Microdown-Tests/MicCodeBlockTest.class.st |   4 +-
 .../MicEnvironmentBlockTest.class.st          |   4 +-
 .../MicFigureBlockTest.class.st               |  10 +-
 .../MicFormatBlockTest.class.st               | 109 ++++++++++--------
 .../MicHeaderBlockTest.class.st               |  10 +-
 .../MicInlineBlock2Test.class.st              |   2 +-
 .../MicInlineParser2Test.class.st             |   2 +-
 src/Microdown-Tests/MicLinkBlockTest.class.st |  41 ++-----
 src/Microdown-Tests/MicMathBlockTest.class.st |  18 ++-
 .../MicOrderedListBlockTest.class.st          |  15 ++-
 src/Microdown-Tests/MicRawBlockTest.class.st  |   2 +-
 .../MicUnorderedListBlockTest.class.st        |   5 +-
 src/Microdown/MicEvaluatedBlock2.class.st     |  22 +++-
 src/Microdown/MicFigureBlock2.class.st        |  35 ------
 src/Microdown/MicHeaderBlock.class.st         |   7 +-
 src/Microdown/MicInlineBlock2.class.st        |   7 ++
 src/Microdown/MicInlineBlockWithUrl2.class.st |  52 ++++++++-
 src/Microdown/MicLinkBlock2.class.st          |   6 -
 src/Microdown/MicListItemBlock.class.st       |   2 +-
 .../MicSameStartStopMarkupBlock.class.st      |  13 ++-
 src/Microdown/MicTextBlock2.class.st          |  14 +++
 21 files changed, 217 insertions(+), 163 deletions(-)

diff --git a/src/Microdown-Tests/MicCodeBlockTest.class.st b/src/Microdown-Tests/MicCodeBlockTest.class.st
index 12fb90ba..7cbc4bf0 100644
--- a/src/Microdown-Tests/MicCodeBlockTest.class.st
+++ b/src/Microdown-Tests/MicCodeBlockTest.class.st
@@ -420,10 +420,10 @@ Color >> asMorph
 	self assert: (code arguments at: #language) equals: 'pharo'.
 	
 	self assert: code caption equals: 'Color is a class.'.
-	self assert: code captionElements first kind equals: 'monospace'.
+	self assert: code captionElements first blockName asLowercase equals: 'monospace'.
 	self assert: code captionElements first substring equals: 'Color'.
 	
-	self assert: code captionElements second kind equals: 'basic'.
+	self assert: code captionElements second blockName asLowercase equals: 'text'.
 	self assert: code captionElements second substring equals: ' is a class.'.
 	
 	self assert: code label equals: 'scr:asMorphInColor'.
diff --git a/src/Microdown-Tests/MicEnvironmentBlockTest.class.st b/src/Microdown-Tests/MicEnvironmentBlockTest.class.st
index 3bfccd5b..e9c8a7de 100644
--- a/src/Microdown-Tests/MicEnvironmentBlockTest.class.st
+++ b/src/Microdown-Tests/MicEnvironmentBlockTest.class.st
@@ -107,7 +107,7 @@ blbababbab bababba', String cr, EnvironmentClosingBlockMarkup, String cr.
 	self assert: env children first children size equals: 2.
 	self assert: env children first children first class equals: MicListItemBlock.
 	self assert: env children second class equals: MicParagraphBlock.
-	self assert: env children second children first class equals: MicTextBlock.
+	self assert: env children second children first class equals: MicTextBlock2.
 	
 ]
 
@@ -242,7 +242,7 @@ blbababbab bababba' , String cr , EnvironmentClosingBlockMarkup
 		equals: MicListItemBlock.
 	self
 		assert: env children first children first children second class
-		equals: MicBoldFormatBlock
+		equals: MicBoldFormatBlock2
 ]
 
 { #category : #'tests - default environment' }
diff --git a/src/Microdown-Tests/MicFigureBlockTest.class.st b/src/Microdown-Tests/MicFigureBlockTest.class.st
index e7afbabb..98eb2c10 100644
--- a/src/Microdown-Tests/MicFigureBlockTest.class.st
+++ b/src/Microdown-Tests/MicFigureBlockTest.class.st
@@ -12,7 +12,7 @@ MicFigureBlockTest >> setUp [
 
 	super setUp.
 	parser := self parser.
-	splitterClass := MicInlineParser 
+	splitterClass := MicInlineParser2 
 ]
 
 { #category : #tests }
@@ -28,8 +28,8 @@ MicFigureBlockTest >> testAlt [
 		           '![caption with space and dot...](https://github.com/pillar-markup/Microdown/runs/4336482137?check_suite_focus=true  width=80&alt=je suis le alt texte)')
 		          first.
 
-	self assert: figure hasArguments.
-	self assert: figure alt equals: 'je suis le alt texte'
+	self assert: figure arguments notEmpty.
+	self assert: (figure arguments at: #alt) equals: 'je suis le alt texte'
 ]
 
 { #category : #tests }
@@ -104,7 +104,7 @@ MicFigureBlockTest >> testIsNotRelativeFilePathWithUrl [
 MicFigureBlockTest >> testPrintOn [
 	| figure |
 	figure := (splitterClass new parse: '![caption](http://www.Pharo.ORG)') first.
-	self assert: figure asString equals: '![caption](http://www.Pharo.ORG)'
+	self assert: figure asString equals: 'Figure{ Text(caption) }(http://www.Pharo.ORG)'
 	
 	"not really good but let us make it work"
 ]
@@ -113,7 +113,7 @@ MicFigureBlockTest >> testPrintOn [
 MicFigureBlockTest >> testPrintOnWithParameters [
 	| figure |
 	figure := (splitterClass new parse: '![caption](http://anURL.org?label=1&title=testFigure)') first.
-	self assert: figure printString equals: '![caption](http://anURL.org?label=1&title=testFigure)'
+	self assert: figure asString equals: 'Figure{ Text(caption) }(http://anURL.org?label=1&title=testFigure)'
 ]
 
 { #category : #tests }
diff --git a/src/Microdown-Tests/MicFormatBlockTest.class.st b/src/Microdown-Tests/MicFormatBlockTest.class.st
index 808296c3..b4ead5f8 100644
--- a/src/Microdown-Tests/MicFormatBlockTest.class.st
+++ b/src/Microdown-Tests/MicFormatBlockTest.class.st
@@ -14,9 +14,9 @@ MicFormatBlockTest >> testBoldAPIToAccessText [
 
 	| bold |
 	bold := (self parser parse: '**a b**') children first children first.
-	self assert: bold class equals: MicBoldFormatBlock.
-	self assert: bold textElement class equals: MicTextBlock.
-	self assert: bold textElement substring equals: 'a b'
+	self assert: bold class equals: MicBoldFormatBlock2.
+	self assert: bold children first class equals: MicTextBlock2.
+	self assert: bold children first bodystring equals: 'a b'
 ]
 
 { #category : #'tests - bold' }
@@ -24,9 +24,9 @@ MicFormatBlockTest >> testBoldAPIToSetText [
 
 	| bold |
 	bold := (self parser parse: '**a b**') children first children first.
-	self assert: bold class equals: MicBoldFormatBlock.
-	bold textElement: (MicTextBlock new substring: 'Blblbl').
-	self assert: bold textElement substring equals: 'Blblbl'
+	self assert: bold class equals: MicBoldFormatBlock2.
+	bold children: { (MicTextBlock2 new bodystring: 'Blblbl') }.
+	self assert: bold children first bodystring equals: 'Blblbl'
 ]
 
 { #category : #'tests - bold' }
@@ -34,34 +34,42 @@ MicFormatBlockTest >> testBoldCreatesInnerText [
 
 	| bold |
 	bold := (self parser parse: '**a b**') children first children first.
-	self assert: bold class equals: MicBoldFormatBlock.
-	self assert: bold children first class equals: MicTextBlock.
-	self assert: bold children first substring equals: 'a b'
+	self assert: bold class equals: MicBoldFormatBlock2.
+	self assert: bold children first class equals: MicTextBlock2.
+	self assert: bold children first bodystring equals: 'a b'
 ]
 
 { #category : #'tests - bold' }
 MicFormatBlockTest >> testBoldItalicAPIToAccessText [
 
 	| italic |
-	italic := (self parser parse: '**_a b_**') children first children first.
-	self assert: italic class equals: MicBoldFormatBlock.
-	self assert: italic textElement class equals: MicItalicFormatBlock.
+	italic := (self parser parse: '**_a b_**') children first children
+		          first.
+	self assert: italic class equals: MicBoldFormatBlock2.
 	self
-		assert: italic textElement children first class
-		equals: MicTextBlock.
-	self assert: italic textElement substring equals: 'a b'
+		assert: italic children first class
+		equals: MicItalicFormatBlock2.
+	self
+		assert: italic children first children first class
+		equals: MicTextBlock2.
+	self
+		assert: italic children first children first bodystring
+		equals: 'a b'
 ]
 
 { #category : #tests }
 MicFormatBlockTest >> testBoldWrappedElements [
-	
+
 	| paragraph |
 	paragraph := (self parserClass parse: '**aa bb** c') children first.
 	self assert: paragraph children size equals: 2.
-	self assert: paragraph children first wrappedElements size equals: 1. 
-	self assert: paragraph children first class equals: MicBoldFormatBlock.
-	self assert: paragraph children first wrappedElements first class equals: MicTextBlock.
-	
+	self assert: paragraph children first children size equals: 1.
+	self
+		assert: paragraph children first class
+		equals: MicBoldFormatBlock2.
+	self
+		assert: paragraph children first children first class
+		equals: MicTextBlock2
 ]
 
 { #category : #'tests - bold' }
@@ -71,10 +79,10 @@ MicFormatBlockTest >> testBoldWrappedWithAccessAPIElements [
 	paragraph := (self parser parse: '**aa bb** c') children first.
 	self assert: paragraph children size equals: 2.
 	self
-		assert: paragraph children first textElement substring
+		assert: paragraph children first children first bodystring
 		equals: 'aa bb'.
-	self assert: paragraph children second class equals: MicTextBlock.
-	self assert: paragraph children second substring equals: ' c'
+	self assert: paragraph children second class equals: MicTextBlock2.
+	self assert: paragraph children second bodystring equals: ' c'
 ]
 
 { #category : #tests }
@@ -91,9 +99,9 @@ MicFormatBlockTest >> testItalicAPIToAccessText [
 
 	| italic |
 	italic := (self parser parse: '_a b_') children first children first.
-	self assert: italic class equals: MicItalicFormatBlock.
-	self assert: italic textElement class equals: MicTextBlock.
-	self assert: italic textElement substring equals: 'a b'
+	self assert: italic class equals: MicItalicFormatBlock2.
+	self assert: italic children first class equals: MicTextBlock2.
+	self assert: italic children first bodystring equals: 'a b'
 ]
 
 { #category : #'tests - italic' }
@@ -101,9 +109,9 @@ MicFormatBlockTest >> testItalicAPIToSetText [
 
 	| italic |
 	italic := (self parser parse: '_a b_') children first children first.
-	self assert: italic class equals: MicItalicFormatBlock.
-	italic textElement: (MicTextBlock new substring: 'Blblbl').
-	self assert: italic textElement substring equals: 'Blblbl'
+	self assert: italic class equals: MicItalicFormatBlock2.
+	italic children: { (MicTextBlock2 new bodystring: 'Blblbl') }.
+	self assert: italic children first bodystring equals: 'Blblbl'
 ]
 
 { #category : #'tests - italic' }
@@ -111,9 +119,9 @@ MicFormatBlockTest >> testItalicCreatesInnerText [
 
 	| italic |
 	italic := (self parser parse: '_a b_') children first children first.
-	self assert: italic class equals: MicItalicFormatBlock.
-	self assert: italic children first class equals: MicTextBlock.
-	self assert: italic children first substring equals: 'a b'
+	self assert: italic class equals: MicItalicFormatBlock2.
+	self assert: italic children first class equals: MicTextBlock2.
+	self assert: italic children first bodystring equals: 'a b'
 ]
 
 { #category : #'tests - italic' }
@@ -122,13 +130,13 @@ MicFormatBlockTest >> testItalicWrappedElements [
 	| paragraph |
 	paragraph := (self parser parse: '_aa bb_ c') children first.
 	self assert: paragraph children size equals: 2.
-	self assert: paragraph children first wrappedElements size equals: 1.
+	self assert: paragraph children first children size equals: 1.
 	self
 		assert: paragraph children first class
-		equals: MicItalicFormatBlock.
+		equals: MicItalicFormatBlock2.
 	self
-		assert: paragraph children first wrappedElements first class
-		equals: MicTextBlock
+		assert: paragraph children first children first class
+		equals: MicTextBlock2
 ]
 
 { #category : #'tests - italic' }
@@ -138,10 +146,10 @@ MicFormatBlockTest >> testItalicWrappedWithAccessAPIElements [
 	paragraph := (self parser parse: '_aa bb_ c') children first.
 	self assert: paragraph children size equals: 2.
 	self
-		assert: paragraph children first textElement substring
+		assert: paragraph children first children first bodystring
 		equals: 'aa bb'.
-	self assert: paragraph children second class equals: MicTextBlock.
-	self assert: paragraph children second substring equals: ' c'
+	self assert: paragraph children second class equals: MicTextBlock2.
+	self assert: paragraph children second bodystring equals: ' c'
 ]
 
 { #category : #'tests - monospace' }
@@ -149,9 +157,9 @@ MicFormatBlockTest >> testMonospaceCreatesInnerText [
 
 	| mono |
 	mono := (self parser parse: '`a b`') children first children first.
-	self assert: mono class equals: MicMonospaceFormatBlock.
-	self assert: mono children first class equals: MicTextBlock.
-	self assert: mono children first substring equals: 'a b'
+	self assert: mono class equals: MicMonospaceFormatBlock2.
+	self assert: mono children first class equals: MicTextBlock2.
+	self assert: mono children first bodystring equals: 'a b'
 ]
 
 { #category : #'tests - monospace' }
@@ -159,10 +167,9 @@ MicFormatBlockTest >> testMonospaceTextCreatesInnerText [
 
 	| mono |
 	mono := (self parser parse: '`a b`') children first children first.
-	self assert: mono class equals: MicMonospaceFormatBlock.
-	self assert: mono text equals: 'a b'.
-	self assert: mono textElement class equals: MicTextBlock.
-	self assert: mono textElement substring equals: 'a b'
+	self assert: mono class equals: MicMonospaceFormatBlock2.
+	self assert: mono bodystring equals: 'a b'.
+	
 ]
 
 { #category : #'tests - monospace' }
@@ -170,8 +177,8 @@ MicFormatBlockTest >> testMonospaceWrappedElements [
 
 	| mono |
 	mono := (self parser parse: '`a b`') children first children first.
-	self assert: mono wrappedElements first class equals: MicTextBlock.
-	self assert: mono wrappedElements first substring equals: 'a b'
+	self assert: mono class equals: MicMonospaceFormatBlock2 .
+	self assert: mono substring equals: 'a b'
 ]
 
 { #category : #'tests - bold' }
@@ -179,7 +186,7 @@ MicFormatBlockTest >> testPrintingBold [
 
 	| bold |
 	bold := (self parser parse: '**a b**') children first children first.
-	self assert: bold printString equals: 'BoldFormat(Text(a b))'
+	self assert: bold printString equals: 'BoldFormat{ Text(a b) }'
 	
 ]
 
@@ -188,7 +195,7 @@ MicFormatBlockTest >> testPrintingBold2 [
 
 	| bold |
 	bold := (self parser parse: '`_a b_`') children first children first.
-	self assert: bold printString equals: 'MonospaceFormat(Text(_a b_))'
+	self assert: bold printString equals: 'Monospace(_a b_)'
 ]
 
 { #category : #'tests - italic' }
@@ -196,7 +203,7 @@ MicFormatBlockTest >> testPrintingItalic [
 
 	| bold |
 	bold := (self parser parse: '_a b_') children first children first.
-	self assert: bold printString equals: 'ItalicFormat(Text(a b))'
+	self assert: bold printString equals: 'ItalicFormat{ Text(a b) }'
 ]
 
 { #category : #tests }
diff --git a/src/Microdown-Tests/MicHeaderBlockTest.class.st b/src/Microdown-Tests/MicHeaderBlockTest.class.st
index babdc6fd..4ecc8c81 100644
--- a/src/Microdown-Tests/MicHeaderBlockTest.class.st
+++ b/src/Microdown-Tests/MicHeaderBlockTest.class.st
@@ -27,8 +27,8 @@ MicHeaderBlockTest >> testHeaderAPIToAccessText [
 	| header |
 	header := (self parser parse: '# titre1') children first.
 	self assert: header class equals: MicHeaderBlock.
-	self assert: header children first class equals: MicTextBlock.
-	self assert: header children first substring equals: 'titre1'
+	self assert: header children first class equals: MicTextBlock2.
+	self assert: header children first bodystring equals: 'titre1'
 ]
 
 { #category : #tests }
@@ -48,8 +48,8 @@ MicHeaderBlockTest >> testHeaderCreatesInnerText [
 	| header |
 	header := (self parser parse: '# titre1') children first.
 	self assert: header class equals: MicHeaderBlock.
-	self assert: header children first class equals: MicTextBlock.
-	self assert: header children first substring equals: 'titre1'
+	self assert: header children first class equals: MicTextBlock2.
+	self assert: header children first bodystring equals: 'titre1'
 ]
 
 { #category : #tests }
@@ -114,6 +114,6 @@ MicHeaderBlockTest >> testHeaderLongElements [
 	self assert: header children size equals: 1.
 	self
 		assert: header children first class
-		equals: MicTextBlock.
+		equals: MicTextBlock2.
 	
 ]
diff --git a/src/Microdown-Tests/MicInlineBlock2Test.class.st b/src/Microdown-Tests/MicInlineBlock2Test.class.st
index 01fdc3a5..240931e3 100644
--- a/src/Microdown-Tests/MicInlineBlock2Test.class.st
+++ b/src/Microdown-Tests/MicInlineBlock2Test.class.st
@@ -17,6 +17,6 @@ MicInlineBlock2Test >> testAllTerminalNodesImplementsAccept [
 { #category : #tests }
 MicInlineBlock2Test >> testBlockName [
 	self assert: MicFigureBlock2 blockName equals: 'Figure'.
-	self assert: MicBoldFormatBlock2 blockName equals: 'Bold'
+	self assert: MicBoldFormatBlock2 blockName equals: 'BoldFormat'
 	
 ]
diff --git a/src/Microdown-Tests/MicInlineParser2Test.class.st b/src/Microdown-Tests/MicInlineParser2Test.class.st
index 39e33f0c..abec45b7 100644
--- a/src/Microdown-Tests/MicInlineParser2Test.class.st
+++ b/src/Microdown-Tests/MicInlineParser2Test.class.st
@@ -508,5 +508,5 @@ MicInlineParser2Test >> testText_backSlashed [
 MicInlineParser2Test >> testText_isEvaluated [
 	| res |
 	res := self inlineParse: 'bb**cccc**bb'.
-	self assert: res printString equals: 'an Array(Text(bb) Bold{ Text(cccc) } Text(bb))'
+	self assert: res printString equals: 'an Array(Text(bb) BoldFormat{ Text(cccc) } Text(bb))'
 ]
diff --git a/src/Microdown-Tests/MicLinkBlockTest.class.st b/src/Microdown-Tests/MicLinkBlockTest.class.st
index 6f090f9e..49ae3337 100644
--- a/src/Microdown-Tests/MicLinkBlockTest.class.st
+++ b/src/Microdown-Tests/MicLinkBlockTest.class.st
@@ -67,7 +67,7 @@ MicLinkBlockTest >> setUp [
 
 	super setUp.
 	parser := self parser. 
-	splitterClass := MicInlineParser
+	splitterClass := MicInlineParser2
 ]
 
 { #category : #tests }
@@ -79,7 +79,7 @@ MicLinkBlockTest >> subjectClass [
 MicLinkBlockTest >> testFullName [
 
 	link := self parseLink: self linkSample.
-	self assert: link fullName equals: '/anUrl'
+	self assert: link reference fullName equals: '/anUrl'
 
 ]
 
@@ -98,27 +98,17 @@ MicLinkBlockTest >> testHasArguments [
 MicLinkBlockTest >> testLinkAPIToAccessText [
 
 	link := self parseLink: self linkSample.
-	self assert: link class equals: MicLinkBlock.
+	self assert: link class equals: MicLinkBlock2.
 	self assert: link url equals: '/anUrl'
 ]
 
-{ #category : #'tests - link' }
-MicLinkBlockTest >> testLinkAPIToSetText [
-
-	link := self parseLink: self linkSample.
-	self assert: link class equals: MicLinkBlock.
-
-	link captionElements: { (MicTextBlock new substring: 'Blblbl') }.
-	self assert: link caption equals: 'Blblbl'
-]
-
 { #category : #'tests - link' }
 MicLinkBlockTest >> testLinkBoldAPIToAccessText [
 
 	link := self parseLink: self linkBoldSample.
-	self assert: link class equals: MicLinkBlock.
-	self assert: link children first class equals: MicBoldFormatBlock.
-	self assert: link children first children first class equals: MicTextBlock.
+	self assert: link class equals: MicLinkBlock2.
+	self assert: link children first class equals: MicBoldFormatBlock2.
+	self assert: link children first children first class equals: MicTextBlock2.
 
 	self assert: link url equals: '/anUrl'
 ]
@@ -127,7 +117,7 @@ MicLinkBlockTest >> testLinkBoldAPIToAccessText [
 MicLinkBlockTest >> testLinkCreatesInnerText [
 
 	link := self parseLink: '[ab](https://ab.com)'.
-	self assert: link class equals: MicLinkBlock.
+	self assert: link class equals: MicLinkBlock2.
 	self assert: link url equals: 'https://ab.com'
 ]
 
@@ -135,29 +125,20 @@ MicLinkBlockTest >> testLinkCreatesInnerText [
 MicLinkBlockTest >> testLinkItalicAPIToAccessText [
 
 	link := self parseLink: self linkItalicSample.
-	self assert: link class equals: MicLinkBlock.
-	self assert: link children first class equals: MicItalicFormatBlock.
+	self assert: link class equals: MicLinkBlock2.
+	self assert: link children first class equals: MicItalicFormatBlock2.
 	self
 		assert: link children first children first class
-		equals: MicTextBlock.
+		equals: MicTextBlock2.
 
 	self assert: link url equals: '/anUrl'
 ]
 
-{ #category : #'tests - link' }
-MicLinkBlockTest >> testOpeningDelimiter [
-
-	link := self parseLink: self linkSample.
-	self assert: (link openingDelimiter isKindOf: String).
-	self deny: link openingDelimiter isEmpty.
-	self assert: link openingDelimiter equals: '['
-]
-
 { #category : #tests }
 MicLinkBlockTest >> testPrintOn [
 
 	link := (splitterClass new parse: '[caption](http://www.pharo.org)') first.
-	self assert: link asString equals: '[caption](http://www.pharo.org)'
+	self assert: link asString equals: 'Link{ Text(caption) }(http://www.pharo.org)'
 ]
 
 { #category : #tests }
diff --git a/src/Microdown-Tests/MicMathBlockTest.class.st b/src/Microdown-Tests/MicMathBlockTest.class.st
index 941dabdf..109c576c 100644
--- a/src/Microdown-Tests/MicMathBlockTest.class.st
+++ b/src/Microdown-Tests/MicMathBlockTest.class.st
@@ -109,9 +109,10 @@ MicMathBlockTest >> testMathBlockWithParametersCaptionAndFormatting [
 	| root math |
 	root := self parserClass new parse: '
 
-',MathOpeningBlockMarkup,'key=cite&label=42&caption=Ze **great** formula
+' , MathOpeningBlockMarkup
+		        , 'key=cite&label=42&caption=Ze **great** formula
 V_i = C_0 - C_3 
-',MathClosingBlockMarkup.
+' , MathClosingBlockMarkup.
 	math := root children first.
 	self assert: math class equals: MicMathBlock.
 	self
@@ -120,10 +121,15 @@ V_i = C_0 - C_3
 	self assert: (math arguments at: 'key') equals: 'cite'.
 	self assert: (math arguments at: 'label') equals: '42'.
 	self
-		assert: (math arguments at: 'caption') first kind
-		equals: 'basic'.
-	self assert: math caption equals: 'Ze great formula'.
-	self assert: math captionElements second kind equals: 'bold'
+		assert: (math arguments at: 'caption') first blockName asLowercase
+		equals: 'text'.
+	self
+		assert: math testCaptionString asString
+		equals:
+		'an Array(Text(Ze ) BoldFormat{ Text(great) } Text( formula))'.
+	self
+		assert: math captionElements second blockName asLowercase
+		equals: 'boldformat'
 ]
 
 { #category : #tests }
diff --git a/src/Microdown-Tests/MicOrderedListBlockTest.class.st b/src/Microdown-Tests/MicOrderedListBlockTest.class.st
index a82348be..a978ca69 100644
--- a/src/Microdown-Tests/MicOrderedListBlockTest.class.st
+++ b/src/Microdown-Tests/MicOrderedListBlockTest.class.st
@@ -53,7 +53,8 @@ MicOrderedListBlockTest >> testEmbeddedUnordered [
 MicOrderedListBlockTest >> testNestedLevel [
 
 	| source root list item1 |
-	source := '1. item 1
+	source := 
+'1. item 1
    6) sublevel
 1. item 2'.
 	root := parser parse: source.
@@ -61,7 +62,7 @@ MicOrderedListBlockTest >> testNestedLevel [
 	self assert: list children size equals: 2.
 
 	item1 := list children first.
-	self assert: item1 testText equals: 'item 1'.
+	self assert: item1 children first bodystring equals: 'item 1'.
 	self assert: item1 class equals: MicListItemBlock.
 	self assert: item1 nestedLevel equals: 1.
 
@@ -71,7 +72,7 @@ MicOrderedListBlockTest >> testNestedLevel [
 
 	"this is the inner list first item"
 	self
-		assert: item1 children second children first text
+		assert: item1 children second children first children first bodystring 
 		equals: 'sublevel'.
 	self
 		assert: item1 children second children first class
@@ -99,14 +100,16 @@ MicOrderedListBlockTest >> testNestedLevel2 [
 	self assert: item1 children second class equals: MicOrderedListBlock.
 
 	"this is the inner list first item"
-	self assert: sublevelItem testText equals: 'sublevel'.
+	self
+		assert: sublevelItem children first bodystring
+		equals: 'sublevel'.
 	self assert: sublevelItem class equals: MicListItemBlock.
 
 	self
 		assert: sublevelItem children second children first nestedLevel
 		equals: 3.
 	self
-		assert: sublevelItem children second children first text
+		assert: sublevelItem children second children first children first bodystring
 		equals: 'subsublevel'
 ]
 
@@ -240,5 +243,5 @@ MicOrderedListBlockTest >> testUnOrderedListAPIToAccessText [
 
 	self assert: list class equals: MicListItemBlock.
 	self assert: list nestedLevel equals: 1.
-	self assert: list testText equals: '_first_'
+	self assert: list children first children first children first bodystring equals: 'first'
 ]
diff --git a/src/Microdown-Tests/MicRawBlockTest.class.st b/src/Microdown-Tests/MicRawBlockTest.class.st
index 38bf7151..3f97820b 100644
--- a/src/Microdown-Tests/MicRawBlockTest.class.st
+++ b/src/Microdown-Tests/MicRawBlockTest.class.st
@@ -17,5 +17,5 @@ MicRawBlockTest >> testRaw [
 	self assert: root children first class equals: MicParagraphBlock.
 	self
 		assert: root children first children second class
-		equals: MicRawBlock
+		equals: MicRawBlock2
 ]
diff --git a/src/Microdown-Tests/MicUnorderedListBlockTest.class.st b/src/Microdown-Tests/MicUnorderedListBlockTest.class.st
index 7b6b631b..3b72dde8 100644
--- a/src/Microdown-Tests/MicUnorderedListBlockTest.class.st
+++ b/src/Microdown-Tests/MicUnorderedListBlockTest.class.st
@@ -33,7 +33,8 @@ MicUnorderedListBlockTest >> testEmbeddedOrdered [
 MicUnorderedListBlockTest >> testEmbeddedOrderedWithFormatting [
 
 	| source root list item4 |
-	source := '- item 1
+	source := 
+'- item 1
   1. **sublevel** ~item 1~
   4. **sublevel4** ~item 24~
 - item 2'.
@@ -44,7 +45,7 @@ MicUnorderedListBlockTest >> testEmbeddedOrderedWithFormatting [
 	item4 := list children first children second children second. "item 1" "unordered list"
 
 	self assert: item4 testText equals: 'sublevel4 item 24'.
-	self assert: item4 textElements first kind equals: 'bold'.
+	self assert: item4 textElements first kind equals: 'boldformat'.
 	self assert: item4 textElements first substring equals: 'sublevel4'.
 
 	self assert: item4 textElements third kind equals: 'strike'.
diff --git a/src/Microdown/MicEvaluatedBlock2.class.st b/src/Microdown/MicEvaluatedBlock2.class.st
index ad4f7458..29daf264 100644
--- a/src/Microdown/MicEvaluatedBlock2.class.st
+++ b/src/Microdown/MicEvaluatedBlock2.class.st
@@ -12,7 +12,7 @@ Class {
 
 { #category : #'as yet unclassified' }
 MicEvaluatedBlock2 class >> blockName [
-	^ (super blockName) withoutSuffix: 'Format'
+	^ (super blockName) "withoutSuffix: 'Format'"
 ]
 
 { #category : #parsing }
@@ -39,3 +39,23 @@ MicEvaluatedBlock2 >> printOn: stream [
 	stream << $}
 	
 ]
+
+{ #category : #accessing }
+MicEvaluatedBlock2 >> textElement [
+	"Should only be used for tests"
+	self deprecated: 'Just use children' transformWith: '`@rec textElement' -> '`@rec children first'.
+	^ children first
+]
+
+{ #category : #accessing }
+MicEvaluatedBlock2 >> textElement: elem [
+	"Should only be used for tests"
+	self deprecated: 'Just use children' transformWith: '`@rec textElement: `@arg' -> '`@rec children: {`@arg}'.
+	^ children := { elem }
+]
+
+{ #category : #accessing }
+MicEvaluatedBlock2 >> wrappedElements [
+	self deprecated: 'Just use children' transformWith: '`@rec wrappedElements' -> '`@rec children'.
+	^ children 
+]
diff --git a/src/Microdown/MicFigureBlock2.class.st b/src/Microdown/MicFigureBlock2.class.st
index a509ee23..917855e1 100644
--- a/src/Microdown/MicFigureBlock2.class.st
+++ b/src/Microdown/MicFigureBlock2.class.st
@@ -13,10 +13,6 @@ What is important to see is that there is a space between the url arguments and
 Class {
 	#name : #MicFigureBlock2,
 	#superclass : #MicInlineBlockWithUrl2,
-	#instVars : [
-		'arguments',
-		'captionElements'
-	],
 	#category : #'Microdown-InlineParser'
 }
 
@@ -24,34 +20,3 @@ Class {
 MicFigureBlock2 >> accept: aVisitor [
  	^ aVisitor visitFigure: self
 ]
-
-{ #category : #accessing }
-MicFigureBlock2 >> arguments [
-
-	^ arguments
-]
-
-{ #category : #accessing }
-MicFigureBlock2 >> arguments: anObject [
-
-	arguments := anObject
-]
-
-{ #category : #printing }
-MicFigureBlock2 >> caption [
-	"print helper"
-	^ String streamContents: [:st | self children do: [ :each | st nextPutAll: each substring ] ] 
-]
-
-{ #category : #visiting }
-MicFigureBlock2 >> closeMe [
-	"the link url - ![alt text](url) - url is allowed to have title in quotes
-	(url ""title"") "
-
-	| split title|
-	split := url splitOnFirst: Character space.
-	self reference: (MicResourceReference fromUri: split first).
-	title := (split second ifNil: [ '' ]) 
-		trimBoth: [:char | {$". Character space} includes: char].
-	self arguments: (MicArgumentList withString: title)
-]
diff --git a/src/Microdown/MicHeaderBlock.class.st b/src/Microdown/MicHeaderBlock.class.st
index ccbe440f..954ad0b5 100644
--- a/src/Microdown/MicHeaderBlock.class.st
+++ b/src/Microdown/MicHeaderBlock.class.st
@@ -53,10 +53,9 @@ MicHeaderBlock >> formattedCode [
 
 { #category : #accessing }
 MicHeaderBlock >> header [
-	
-	^ String streamContents: [ :s | children do: [ :e | s nextPutAll: e substring ] ]
-	
-	
+
+	^ String streamContents: [ :s | 
+		  children do: [ :e | s nextPutAll: e bodystring ] ]
 ]
 
 { #category : #accessing }
diff --git a/src/Microdown/MicInlineBlock2.class.st b/src/Microdown/MicInlineBlock2.class.st
index 7a108f86..8bbcbd42 100644
--- a/src/Microdown/MicInlineBlock2.class.st
+++ b/src/Microdown/MicInlineBlock2.class.st
@@ -45,3 +45,10 @@ MicInlineBlock2 >> inlineParserClass [
 
 	^ MicInlineParser2
 ]
+
+{ #category : #accessing }
+MicInlineBlock2 >> kind [
+	"Should only be used for tests"
+	self deprecated: 'use blockName instead' transformWith: '`@rec kind' -> '`@rec blockName asLowercase'.
+	^ self blockName asLowercase 
+]
diff --git a/src/Microdown/MicInlineBlockWithUrl2.class.st b/src/Microdown/MicInlineBlockWithUrl2.class.st
index 0913fc97..4ab2a217 100644
--- a/src/Microdown/MicInlineBlockWithUrl2.class.st
+++ b/src/Microdown/MicInlineBlockWithUrl2.class.st
@@ -13,7 +13,8 @@ Class {
 	#instVars : [
 		'children',
 		'url',
-		'reference'
+		'reference',
+		'arguments'
 	],
 	#category : #'Microdown-InlineParser'
 }
@@ -23,12 +24,37 @@ MicInlineBlockWithUrl2 class >> parse: token stream: aTokenStream for: aParser [
 	^ aParser parseNameUrlBlock: self from: aTokenStream token: token
 ]
 
+{ #category : #testing }
+MicInlineBlockWithUrl2 >> anchor [
+	^ self arguments 
+		at: #anchor 
+		ifAbsent: [ nil ] 
+]
+
+{ #category : #accessing }
+MicInlineBlockWithUrl2 >> arguments [
+
+	^ arguments
+]
+
+{ #category : #accessing }
+MicInlineBlockWithUrl2 >> arguments: anObject [
+
+	arguments := anObject
+]
+
 { #category : #visiting }
 MicInlineBlockWithUrl2 >> captionElements [
 	self deprecated: 'Use children instead' transformWith: '`@rec captionElements' -> '`@rec children'.
 	^ children
 ]
 
+{ #category : #visiting }
+MicInlineBlockWithUrl2 >> captionElements: someChildren [
+	self deprecated: 'Use children: instead' transformWith: '`@rec captionElements: `@arg' -> '`@rec children: `@arg'.
+	children := someChildren 
+]
+
 { #category : #accessing }
 MicInlineBlockWithUrl2 >> children [
 
@@ -41,6 +67,30 @@ MicInlineBlockWithUrl2 >> children: anObject [
 	children := anObject
 ]
 
+{ #category : #visiting }
+MicInlineBlockWithUrl2 >> closeMe [
+	"the link url - ![alt text](url) - url is allowed to have title in quotes
+	(url ""title"") "
+
+	| split title|
+	split := url splitOnFirst: Character space.
+	self reference: (MicResourceReference fromUri: split first).
+	title := (split second ifNil: [ '' ]) 
+		trimBoth: [:char | {$". Character space} includes: char].
+	self arguments: (MicArgumentList withString: title)
+]
+
+{ #category : #testing }
+MicInlineBlockWithUrl2 >> hasAnchor [
+
+	^ self anchor isNotNil
+]
+
+{ #category : #testing }
+MicInlineBlockWithUrl2 >> hasArguments [
+	^ arguments size > 0
+]
+
 { #category : #printing }
 MicInlineBlockWithUrl2 >> printOn: stream [
 	stream << self blockName << '{ '.
diff --git a/src/Microdown/MicLinkBlock2.class.st b/src/Microdown/MicLinkBlock2.class.st
index fa0893a8..87d7c4f9 100644
--- a/src/Microdown/MicLinkBlock2.class.st
+++ b/src/Microdown/MicLinkBlock2.class.st
@@ -11,9 +11,3 @@ Class {
 MicLinkBlock2 >> accept: aVisitor [
 	^ aVisitor visitLink: self
 ]
-
-{ #category : #visiting }
-MicLinkBlock2 >> closeMe [
-	
-	self reference: (MicResourceReference fromUri: url).
-]
diff --git a/src/Microdown/MicListItemBlock.class.st b/src/Microdown/MicListItemBlock.class.st
index 6c59e3bf..b44f7b64 100644
--- a/src/Microdown/MicListItemBlock.class.st
+++ b/src/Microdown/MicListItemBlock.class.st
@@ -114,7 +114,7 @@ MicListItemBlock >> nestedLevel [
 { #category : #accessing }
 MicListItemBlock >> testText [
 	"I am used to make it easier to write tests"
-	^ String streamContents: [ :str | children do: [ :each | str nextPutAll: each substring ] ]
+	^ String streamContents: [ :str | children do: [ :each | str nextPutAll: each printString ] ]
 ]
 
 { #category : #accessing }
diff --git a/src/Microdown/MicSameStartStopMarkupBlock.class.st b/src/Microdown/MicSameStartStopMarkupBlock.class.st
index 314ed6d8..4dd6b4bc 100644
--- a/src/Microdown/MicSameStartStopMarkupBlock.class.st
+++ b/src/Microdown/MicSameStartStopMarkupBlock.class.st
@@ -29,13 +29,14 @@ MicSameStartStopMarkupBlock >> arguments [
 
 { #category : #visiting }
 MicSameStartStopMarkupBlock >> caption [
-	^ String streamContents: [:s |  self captionElements do: [ :each | s nextPutAll: each substring ] ]
+	self deprecated: 'Should only be used for test' transformWith: '`@rec caption' -> '`@rec testCaptionString'.
+	^ self testCaptionString.
 ]
 
 { #category : #'accessing-delegated' }
 MicSameStartStopMarkupBlock >> caption: aString [
-	
-	arguments at: #caption put: (MicInlineParser new parse: aString)
+	self error: 'This is most likely wrong to call this method'.
+	arguments at: #caption put: (self inlineParse: aString)
 ]
 
 { #category : #visiting }
@@ -65,3 +66,9 @@ MicSameStartStopMarkupBlock >> lineStopMarkup [
 
 	^ self lineStartMarkup
 ]
+
+{ #category : #visiting }
+MicSameStartStopMarkupBlock >> testCaptionString [
+
+	^ (self arguments at: #caption ifAbsent: [ ^'No Caption' ]) printString
+]
diff --git a/src/Microdown/MicTextBlock2.class.st b/src/Microdown/MicTextBlock2.class.st
index acfa7c13..fc11c473 100644
--- a/src/Microdown/MicTextBlock2.class.st
+++ b/src/Microdown/MicTextBlock2.class.st
@@ -12,6 +12,20 @@ MicTextBlock2 >> accept: aVisitor [
 	^ aVisitor visitText: self
 ]
 
+{ #category : #obsolete }
+MicTextBlock2 >> substring [
+	"Should only be used for tests"
+	self deprecated: 'Just use bodystring' transformWith: '`@rec substring' -> '`@rec bodystring'.
+	^ bodystring 
+]
+
+{ #category : #obsolete }
+MicTextBlock2 >> substring: aBody [
+	"Should only be used for tests"
+	self deprecated: 'Just use bodystring:' transformWith: '`@rec substring: `@arg' -> '`@rec bodystring: `@arg'.
+	^ bodystring 
+]
+
 { #category : #accessing }
 MicTextBlock2 >> text [
 	^ bodystring 

From 8ee405e0e63c38e0558e8c1162e6d53597b1c72a Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Wed, 2 Nov 2022 14:44:18 +0100
Subject: [PATCH 12/40] All parser tests green

---
 src/Microdown-Tests/MicCodeBlockTest.class.st |  49 +-
 .../MicFigureBlockTest.class.st               |   2 +-
 .../MicInlineParserTest.class.st              | 742 ------------------
 src/Microdown-Tests/MicMathBlockTest.class.st |   9 +-
 .../MicOrderedListBlockTest.class.st          |  32 +-
 .../MicUnorderedListBlockTest.class.st        | 108 +--
 .../MicrodownInlineParserTest.class.st        | 580 --------------
 .../MicrodownParserTest.class.st              |  61 +-
 src/Microdown/MicAnnotatedBlock.class.st      |   3 +-
 .../MicSameStartStopMarkupBlock.class.st      |   1 -
 10 files changed, 150 insertions(+), 1437 deletions(-)
 delete mode 100644 src/Microdown-Tests/MicInlineParserTest.class.st
 delete mode 100644 src/Microdown-Tests/MicrodownInlineParserTest.class.st

diff --git a/src/Microdown-Tests/MicCodeBlockTest.class.st b/src/Microdown-Tests/MicCodeBlockTest.class.st
index 7cbc4bf0..8b07b9fe 100644
--- a/src/Microdown-Tests/MicCodeBlockTest.class.st
+++ b/src/Microdown-Tests/MicCodeBlockTest.class.st
@@ -61,7 +61,7 @@ MicCodeBlockTest >> testCaption [
 	codeBlock := self subjectClass new.
 	codeBlock caption: '**Here** is a nice caption.'.
 	self assert: codeBlock hasCaption. 
-	self assert: codeBlock captionElements first class equals: MicBoldFormatBlock.
+	self assert: codeBlock captionElements first class equals: MicBoldFormatBlock2.
 	self assert: codeBlock captionElements size equals: 2.
 ]
 
@@ -377,24 +377,29 @@ MicCodeBlockTest >> testSetLabel [
 
 { #category : #tests }
 MicCodeBlockTest >> testSingleBlockWithArguments [
+
 	"
 	```language=pharo&caption=Getting a morph for an instance of ==Color==&label=scr:asMorphInColor
 Color >> asMorph
     ^ Morph new color: self
 	```
 	"
-	| source root code  textBody argument |
+
+	| source root code textBody argument |
 	textBody := 'Color >> asMorph
     ^ Morph new color: self'.
 	argument := 'language=pharo&caption=Getting a morph for an instance of ==Color==&label=scr:asMorphInColor'.
-	source := CodeblockMarkup, argument, String cr, textBody, String cr, CodeblockMarkup. 
+	source := CodeblockMarkup , argument , String cr , textBody
+	          , String cr , CodeblockMarkup.
 	root := self parser parse: source.
 	self assert: root children size equals: 1.
 	code := root children first.
 	self assert: code code equals: textBody.
-	self assert: (code arguments at:#language) equals: 'pharo'.
-	self assert: code captionElements first substring equals: 'Getting a morph for an instance of ==Color=='.
-	self assert: (code arguments at:#label) equals: 'scr:asMorphInColor'.
+	self assert: (code arguments at: #language) equals: 'pharo'.
+	self
+		assert: code captionElements first bodystring
+		equals: 'Getting a morph for an instance of ==Color=='.
+	self assert: (code arguments at: #label) equals: 'scr:asMorphInColor'
 ]
 
 { #category : #tests }
@@ -406,27 +411,37 @@ Color >> asMorph
     ^ Morph new color: self
 	```
 	"
-	| source root code  textBody argument |
+
+	| source root code textBody argument |
 	textBody := 'Color >> asMorph
     ^ Morph new color: self'.
 	argument := 'language=pharo&caption=`Color` is a class.&label=scr:asMorphInColor'.
-	source := CodeblockMarkup, argument, String cr, textBody, String cr, CodeblockMarkup. 
+	source := CodeblockMarkup , argument , String cr , textBody
+	          , String cr , CodeblockMarkup.
 	root := self parser parse: source.
 
-	
+
 	code := root children first.
 	self assert: code code equals: textBody.
 	self assert: code language equals: #pharo.
 	self assert: (code arguments at: #language) equals: 'pharo'.
-	
-	self assert: code caption equals: 'Color is a class.'.
-	self assert: code captionElements first blockName asLowercase equals: 'monospace'.
+
+	self
+		assert: code testCaptionString
+		equals: 'an Array(Monospace(Color) Text( is a class.))'.
+	self
+		assert: code captionElements first blockName asLowercase
+		equals: 'monospace'.
 	self assert: code captionElements first substring equals: 'Color'.
-	
-	self assert: code captionElements second blockName asLowercase equals: 'text'.
-	self assert: code captionElements second substring equals: ' is a class.'.
-	
-	self assert: code label equals: 'scr:asMorphInColor'.
+
+	self
+		assert: code captionElements second blockName asLowercase
+		equals: 'text'.
+	self
+		assert: code captionElements second bodystring
+		equals: ' is a class.'.
+
+	self assert: code label equals: 'scr:asMorphInColor'
 ]
 
 { #category : #'tests - deviation' }
diff --git a/src/Microdown-Tests/MicFigureBlockTest.class.st b/src/Microdown-Tests/MicFigureBlockTest.class.st
index 98eb2c10..fcd87aa7 100644
--- a/src/Microdown-Tests/MicFigureBlockTest.class.st
+++ b/src/Microdown-Tests/MicFigureBlockTest.class.st
@@ -64,7 +64,7 @@ MicFigureBlockTest >> testArgumentAtIfPresent [
 MicFigureBlockTest >> testCaption [
 	| figure |
 	figure := (splitterClass new parse: '![caption with space and dot...](http://www.Pharo.ORG)') first.
-	self assert: figure caption equals: 'caption with space and dot...'
+	self assert: figure children first bodystring equals: 'caption with space and dot...'
 	
 	
 ]
diff --git a/src/Microdown-Tests/MicInlineParserTest.class.st b/src/Microdown-Tests/MicInlineParserTest.class.st
deleted file mode 100644
index 281af4a7..00000000
--- a/src/Microdown-Tests/MicInlineParserTest.class.st
+++ /dev/null
@@ -1,742 +0,0 @@
-"
-These tests should be merged in MicrodDownInlineParserTest
-"
-Class {
-	#name : #MicInlineParserTest,
-	#superclass : #TestCase,
-	#pools : [
-		'MicMicrodownSharedPool'
-	],
-	#category : #'Microdown-Tests-Parser'
-}
-
-{ #category : #accessing }
-MicInlineParserTest >> splitter [
-	^ MicInlineParser new
-]
-
-{ #category : #'tests - anchors' }
-MicInlineParserTest >> testAnchorReference [
-
-	| res |
-	res := self splitter parse: 'abc*@anchorA@*def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. '[anchorA](anchorReference)'.
-		'Text(def)' }.
-	self assert: (res second isKindOf: MicAnchorReferenceBlock)
-]
-
-{ #category : #'tests - anchors' }
-MicInlineParserTest >> testAnchorReferenceUnevaluated [
-
-	"When isEvaluated class method returns false, like anchor reference's case, inline inside shoudn't be evaluated"
-
-	| res |
-	res := self splitter parse: 'abc*@def**not bold**ghi@*xyz'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. '[def**not bold**ghi](anchorReference)'.
-			'Text(xyz)' }
-]
-
-{ #category : #'tests - annotation' }
-MicInlineParserTest >> testAnnotationWithParameters [
-
-	| res |
-	res := self splitter parse:
-		       'abc', AnnotationOpenerMarkup ,'an annotation|key=cite&label=42',AnnotationCloserMarkup,'def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. AnnotationOpenerMarkup,'an annotation|key=cite&label=42', AnnotationCloserMarkup.
-			'Text(def)' }.
-	self assert: (res second isKindOf: MicAnnotationBlock).
-	self assert: (res second arguments at: 'key') equals: 'cite'.
-	self assert: (res second arguments at: 'label') equals: '42'
-]
-
-{ #category : #'tests - annotation' }
-MicInlineParserTest >> testAnnotationWithParametersWithBlank [
-
-	| res |
-	res := self splitter parse: 'abc', AnnotationOpenerMarkup,'an annotation|key=&label=42', AnnotationCloserMarkup,'def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. AnnotationOpenerMarkup ,'an annotation|key=&label=42', AnnotationCloserMarkup.
-			'Text(def)' }.
-	self assert: (res second isKindOf: MicAnnotationBlock).
-	self assert: (res second arguments at: 'key') equals: ''.
-	self assert: (res second arguments at: 'label') equals: '42'
-]
-
-{ #category : #'tests - formats' }
-MicInlineParserTest >> testBold [
-
-	| res |
-	res := self splitter parse: 'abc**bold**def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. 'BoldFormat(Text(bold))'. 'Text(def)' }.
-	self assert: res second kind equals: #bold.
-
-	res := self splitter parse: 'abc** b old **def'.
-	self
-		assert: (res collect: [ :x | x printString ]) "#('Text(abc)' 'BoldFormat(Text( b old ))' 'Text(def)')"
-		equals: { 'Text(abc)'. 'BoldFormat(Text( b old ))'. 'Text(def)' }.
-	self assert: res second kind equals: #bold
-]
-
-{ #category : #tests }
-MicInlineParserTest >> testCurlyBraceDoesNotLeadToProblem [
-	| mic |
-	mic := (self splitter parse:  ' jhkjhk { a }') first.
-	self assert: mic substring equals:  ' jhkjhk { a }'
-]
-
-{ #category : #'tests to make green again' }
-MicInlineParserTest >> testEscapeCharacter [
-
-	"we should have just one escape"
-
-	| res |
-	res := self splitter parse: 'not \`mono\` here'.
-	self assert: (res collect: [ :x | x printString ]) equals: { 'Text(not `mono` here)' }
-]
-
-{ #category : #'tests - escape' }
-MicInlineParserTest >> testEscapeCharacterAtBeginning [
-	"Test the escape \ in simple case (here, bold one)"
-
-	| res |
-	res := self splitter parse: '\**test**'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(**test**)' }
-]
-
-{ #category : #'tests - escape' }
-MicInlineParserTest >> testEscapeCharacterInLinkName [
-	"Test the escape \ in link description"
-
-	| res |
-	res := self splitter parse: 'abc[\**test**](myURL)last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. '[**test**](myURL)'. 'Text(last)' }
-]
-
-{ #category : #'tests - escape' }
-MicInlineParserTest >> testEscapeCharacterInNestedCase [
-	"Test the escape \ in case of nested formats"
-
-	| res |
-	res := self splitter parse: 'abc_\**not bold** italic_last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: {'Text(abc)' . 'ItalicFormat(Text(**not bold** italic))' . 'Text(last)'}.
-]
-
-{ #category : #'tests - escape' }
-MicInlineParserTest >> testEscapeCharacterInNestedLinkName [
-	"Test the escape \ in case of nested linknames"
-
-	| res |
-	res := self splitter parse: 'abc[\[nested\]](myURL)last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. '[[nested]](myURL)'. 'Text(last)' }
-]
-
-{ #category : #'tests to make green again' }
-MicInlineParserTest >> testEscapeCharacterTwoConsecutive [
-	"we should have just one escape"
-
-	| res |
-	res := self splitter parse: '\\begin\\atend\\'.
-	self assert: (res collect: [ :x | x printString ]) equals: { 'Text(\begin\atend\)' }
-]
-
-{ #category : #'tests to make green again' }
-MicInlineParserTest >> testEscapeCharacterWithNoCharacterAfter [
-
-	| res |
-	res := self splitter parse: '\'.
-	
-	self
-		assert: res first substring equals: '\'
-]
-
-{ #category : #tests }
-MicInlineParserTest >> testEscapeEncode [
-	| roundTrip |
-	self assert: (MicInlineParser escapeEncode: '') equals: ''.
-	self assert: (MicInlineParser escapeEncode: 'abc') equals: 'abc'.
-	self assert: (MicInlineParser escapeEncode: 'abc\') equals: 'abc\'.
-	self assert: (MicInlineParser escapeEncode: '\') equals: '\'.
-	roundTrip := [ :str | MicInlineParser escapeDecode: (MicInlineParser escapeEncode: str) ].
-	self assert: (roundTrip value: 'aa\\bb') equals: 'aa\bb'.
-	self assert: (roundTrip value: '\aa\\bb') equals: 'aa\bb'.
-	self assert: (roundTrip value: 'aa\`bb') equals: 'aa`bb'.
-	self assert: (roundTrip value: 'aa\@b@b') equals: 'aa@b@b'.
-	self assert: (roundTrip value: '\\') equals: '\'.
-]
-
-{ #category : #'tests - formats' }
-MicInlineParserTest >> testEscapeMonospace [
-	"When isEvaluated class method returns false, like monospace's case, inline inside shoudn't be evaluated"
-
-	| res |
-	res := self splitter parse: 'abc`\`monospace\``efg'.
-	self
-		assert: res second substring equals: '`monospace`'.
-	self assert: res second class equals: MicMonospaceFormatBlock
-]
-
-{ #category : #tests }
-MicInlineParserTest >> testEscapeReEscape [
-	| roundTrip |
-	roundTrip := [ :str :keep | 
-		MicInlineParser escapeReescape: (MicInlineParser escapeEncode: str)  except:  keep ].
-	
-	self assert: (roundTrip value: '' value: 'aa') equals: ''.
-	self assert: (roundTrip value: 'abc' value: '') equals: 'abc'.
-	self assert: (roundTrip value: 'aa\\bb' value: '' ) equals: 'aa\\bb'.
-	self assert: (roundTrip value: '\aa\\bb' value: 'a') equals: 'aa\\bb'.
-]
-
-{ #category : #'tests - escape' }
-MicInlineParserTest >> testEscapeTripleBold [
-	"Test the escape \ in case of nested formats"
-
-	| res |
-	res := self splitter parse:  'c\***bo**la'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: {'Text(c*)' . 'BoldFormat(Text(bo))' . 'Text(la)'}.
-]
-
-{ #category : #'tests - various' }
-MicInlineParserTest >> testExclamationMark [
-
-	"Test that 'bla!bla' is ok, and not a failed image, same goes for '![goo]no parenthesis'"
-
-	| res |
-	res := self splitter parse: 'bla!bla'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(bla!bla)' }.
-	res := self splitter parse: '![goo]no parenthesis'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(![goo]no parenthesis)' }
-]
-
-{ #category : #'tests - figure' }
-MicInlineParserTest >> testFigure [
-	"Test the image annotation ![AltText](url)"
-
-	| res |
-	res := self splitter parse:
-		       'abc![AltText](my_directory/image.png)last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. '![AltText](my_directory/image.png)'.
-			'Text(last)' }.
-	self assert: (res second isKindOf: MicFigureBlock).
-	self assert: (res second reference  isKindOf: MicResourceReference)
-	
-]
-
-{ #category : #'tests - figure' }
-MicInlineParserTest >> testFigureWithBracketInsteadOfParentheses [
-	"Test the image annotation ![AltText](url)"
-
-	| res |
-	res := self splitter parse:
-		       'abc![AltText][my_directory/image.png]last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc![AltText][my_directory/image.png]last)' }
-]
-
-{ #category : #'tests - figure' }
-MicInlineParserTest >> testFigureWithParameters [
-
-	"Test the image annotation ![AltText](url)"
-
-	| res |
-	res := self splitter parse:
-		       'abc![AltText](my_directory/image.png label=42&width=90)last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals:
-			{ 'Text(abc)'. '![AltText](my_directory/image.png label=42&width=90)'.
-			'Text(last)' }.
-	self assert: (res second isKindOf: MicFigureBlock).
-	self assert: (res second reference isKindOf: MicResourceReference).
-	self assert: (res second arguments at: 'label') equals: '42'.
-	self assert: (res second arguments at: 'width') equals: '90'
-]
-
-{ #category : #'tests - figure' }
-MicInlineParserTest >> testFigureWithParametersWithBlank [
-
-	"Test the image annotation ![AltText](url)"
-
-	| res |
-	res := self splitter parse:
-		       'abc![AltText](my_directory/image.png label=&width=90)last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals:
-			{ 'Text(abc)'. '![AltText](my_directory/image.png label=&width=90)'.
-			'Text(last)' }.
-	self assert: (res second isKindOf: MicFigureBlock).
-	self assert: (res second reference isKindOf: MicResourceReference).
-	self assert: (res second arguments at: 'label') equals: ''.
-	self assert: (res second arguments at: 'width') equals: '90'
-]
-
-{ #category : #'tests - figure' }
-MicInlineParserTest >> testFigureWithParenthesesInsteadOfBracket [
-	"Test the image annotation ![AltText](url)"
-
-	| res |
-	res := self splitter parse:
-		       'abc!(AltText)(my_directory/image.png)last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc!(AltText)(my_directory/image.png)last)' }
-]
-
-{ #category : #'tests - formats' }
-MicInlineParserTest >> testItalic [
-
-	| res |
-	res := self splitter parse: 'abc_italics_def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. 'ItalicFormat(Text(italics))'. 'Text(def)' }.
-
-	res := self splitter parse: 'abc_ ita lics _def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. 'ItalicFormat(Text( ita lics ))'. 'Text(def)' }
-]
-
-{ #category : #'tests - formats' }
-MicInlineParserTest >> testItalicNestedInBold [
-
-	| res |
-	res := self splitter parse: 'abc**bold_italic_bold**xyz'.
-	self
-		assert: (res collect: [ :x | x printString ]) 
-		equals: { 'Text(abc)'. 'BoldFormat(Text(bold) ItalicFormat(Text(italic)) Text(bold))'.
-			'Text(xyz)' }
-]
-
-{ #category : #'tests - formats' }
-MicInlineParserTest >> testItalicNestedInBoldWithSpace [
-
-	| res |
-	res := self splitter parse: 'abc**x_y_z**cba'.
-	self
-		assert: (res collect: [ :x | x printString ]) 
-		equals: { 'Text(abc)'. 'BoldFormat(Text(x) ItalicFormat(Text(y)) Text(z))'. 'Text(cba)' }
-]
-
-{ #category : #'tests - math' }
-MicInlineParserTest >> testMath [
-
-	| res |
-	res := self splitter parse: 'abc$	V_i = C_0 - C_3	$def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. '[	V_i = C_0 - C_3	](math)'.
-		'Text(def)' }.
-	self assert: (res second isKindOf: MicMathInlineBlock)
-]
-
-{ #category : #'tests - math' }
-MicInlineParserTest >> testMath2 [
-
-	| res |
-	res := self splitter parse: 'abc$math env$def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. '[math env](math)'. 'Text(def)' }
-]
-
-{ #category : #'tests - math' }
-MicInlineParserTest >> testMathshouldBeUnevaluated [
-
-	"When isEvaluated class method returns false, like math's case, inline inside shoudn't be evaluated"
-
-	| res |
-	res := self splitter parse: 'abc$def**not bold**ghi$xyz'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. '[def**not bold**ghi](math)'.
-		'Text(xyz)' }
-]
-
-{ #category : #'tests - formats' }
-MicInlineParserTest >> testMonospace [
-
-	| res |
-	res := self splitter parse: 'ab`block`de'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(ab)'. 'MonospaceFormat(Text(block))'. 'Text(de)' }
-]
-
-{ #category : #'tests - formats' }
-MicInlineParserTest >> testMonospaceDoesNotTreatNestedElements [
-
-	| res |
-	res := self splitter parse: '`[* foo *])`'.
-	self assert: res first substring equals: '[* foo *])'
-]
-
-{ #category : #'tests - formats' }
-MicInlineParserTest >> testMonospaceUnevaluated [
-	"When isEvaluated class method returns false, like monospace's case, inline inside shoudn't be evaluated"
-
-	| res |
-	res := self splitter parse: 'abc`def**not bold**ghi`xyz'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. 'MonospaceFormat(Text(def**not bold**ghi))'.
-			'Text(xyz)' }.
-	self assert: res second class equals: MicMonospaceFormatBlock
-]
-
-{ #category : #'tests - formats' }
-MicInlineParserTest >> testMultipleSequenceFormats [
-
-	"Test with multiple annotations"
-
-	| res |
-	res := self splitter parse: 'abc**abc**xyz`xyz`last'.
-	self
-		assert: (res collect: [ :x | x printString ]) "#('Text(abc)' 'BoldFormat(Text(abc))' 'Text(xyz)' 'MonospaceFormat(Text(xyz))' 'Text(last)')"
-		equals: { 'Text(abc)'. 'BoldFormat(Text(abc))'. 'Text(xyz)'. 'MonospaceFormat(Text(xyz))'.
-		'Text(last)' }
-]
-
-{ #category : #'tests - various' }
-MicInlineParserTest >> testNoAnnotation [
-
-	| res |
-	res := self splitter parse: 'abc'.
-	self assert: res first printString equals: 'Text(abc)'.
-
-	res := self splitter parse: 'abc def gh'.
-	self assert: res first printString equals: 'Text(abc def gh)'
-]
-
-{ #category : #'tests - formats' }
-MicInlineParserTest >> testOverlappingFormat [
-
-	| res |
-	res := self splitter parse: 'ab**boldstart_ boldend** italicEnd_de'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: #('Text(ab)' 'BoldFormat(Text(boldstart_ boldend))' 'Text( italicEnd_de)')
-]
-
-{ #category : #'tests - formats' }
-MicInlineParserTest >> testOverlappingFormat2 [
-
-	| res |
-	res := self splitter parse: 'ab**boldstart_ boldend** _italicstart zz italicEnd_de'.
-	self
-		assert: (res collect: [ :x | x printString ]) ""
-		equals: #('Text(ab)' 'BoldFormat(Text(boldstart_ boldend))' 'Text( )' 'ItalicFormat(Text(italicstart zz italicEnd))' 'Text(de)')
-]
-
-{ #category : #'tests - various' }
-MicInlineParserTest >> testParseEmptyText [
-
-	| res |
-	res := self splitter parse: ''.
-	self assert: res isEmpty
-]
-
-{ #category : #'tests - link' }
-MicInlineParserTest >> testParseMissingStartURL [
-	"Test the link annotation [LinkText]url)"
-
-	| res |
-	res := self splitter parse: '[Pharo is cool])'.
-	self assert: res first class = MicTextBlock.
-]
-
-{ #category : #'tests - link' }
-MicInlineParserTest >> testParseMissingStartURLInPresenceOfNestedFormat [
-	"Test the link annotation [LinkText]url) _*foo*_"
-
-	| res |
-	res := self splitter parse: '[LinkText]htt) 
-	_*foo*_'.
-	self assert: res first class = MicTextBlock.
-
-]
-
-{ #category : #'tests - link' }
-MicInlineParserTest >> testParseShitInMiddleURL [
-	"Test the link annotation [Pharo is cool]khkjhjkh klhkjhkh (http://pharo.org)"
-
-	| res |
-	res := self splitter parse:
-		       '[Pharo is cool]khkjhjkh klhkjhkh (http://pharo.org)'.
-
-	self assert: res first class = MicTextBlock.
-	self assert: res size equals: 1
-]
-
-{ #category : #'tests - raw' }
-MicInlineParserTest >> testRaw [
-
-	| res |
-	res := self splitter parse: 'abc{{someRaw}}def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. '[someRaw](raw)'. 'Text(def)' }
-]
-
-{ #category : #'tests - raw' }
-MicInlineParserTest >> testRawUnevaluated [
-
-	"When isEvaluated class method returns false, like raw's case, inline inside shoudn't be evaluated"
-
-	| res |
-	res := self splitter parse: 'abc{{def**not bold**ghi}}xyz'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. '[def**not bold**ghi](raw)'.
-		'Text(xyz)' }
-]
-
-{ #category : #'tests - formats' }
-MicInlineParserTest >> testSequenceOfFormats [
-	"Test with multiple annotations"
-
-	| res |
-	res := self splitter parse: 'abc**abc**xyz`xyz`last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. 'BoldFormat(Text(abc))'. 'Text(xyz)'. 'MonospaceFormat(Text(xyz))'.
-		'Text(last)' }
-]
-
-{ #category : #'tests - annotation' }
-MicInlineParserTest >> testSplitAnnotation [
-
-	| res |
-	res := self splitter parse:
-		       'abc',AnnotationOpenerMarkup,'type:value|key1=val1&key2=val2', AnnotationCloserMarkup, 'def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. AnnotationOpenerMarkup,'type:value|key1=val1&key2=val2',AnnotationCloserMarkup .
-			'Text(def)' }
-]
-
-{ #category : #'tests - annotation' }
-MicInlineParserTest >> testSplitBlockAnnotation [
-
-	| res |
-	res := self splitter 
-		parse: 'abc', AnnotationOpenerMarkup ,'an annotation', AnnotationCloserMarkup ,'def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. AnnotationOpenerMarkup ,'an annotation',AnnotationCloserMarkup . 'Text(def)' }.
-	self assert: (res second isKindOf: MicAnnotationBlock)
-]
-
-{ #category : #'tests - link' }
-MicInlineParserTest >> testSplitBlockLink [
-	"Test the link annotation [LinkText](url)"
-
-	| res |
-	res := self splitter parse: 'abc[LinkText](myURL)last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. '[LinkText](myURL)'. 'Text(last)' }.
-	self assert: (res second reference isKindOf: MicResourceReference)
-
-]
-
-{ #category : #'tests - link' }
-MicInlineParserTest >> testSplitBlockLinkIncomplete [
-
-	| res |
-	res := self splitter parse: 'abc[LinkText]last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc[LinkText]last)' }.
-	self assert: res first class equals: MicTextBlock
-]
-
-{ #category : #'tests - link' }
-MicInlineParserTest >> testSplitBlockLinkInlineImage [
-
-	| res |
-	res := self splitter parse: 'abc[![alttext](imageurl)](url)last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. '[![alttext](imageurl)](url)'.
-			'Text(last)' }.
-
-]
-
-{ #category : #'tests - link' }
-MicInlineParserTest >> testSplitBlockLinkWithBracketInsteadOfParentheses [
-
-	"Test the link annotation [LinkText](url)"
-
-	| res |
-	res := self splitter parse: 'abc[LinkText][myURL]last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc[LinkText][myURL]last)' }
-]
-
-{ #category : #'tests - link' }
-MicInlineParserTest >> testSplitBlockLinkWithParenthesesInsteadOfBracket [
-
-	"Test the link annotation [LinkText](url)"
-
-	| res |
-	res := self splitter parse: 'abc(LinkText)(myURL)last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc(LinkText)(myURL)last)' }
-]
-
-{ #category : #'tests - formats' }
-MicInlineParserTest >> testStrike [
-
-	| res |
-	res := self splitter parse: 'abc~strike~def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc)'. 'StrikeFormat(Text(strike))'. 'Text(def)' }.
-	self assert: res second class equals: MicStrikeFormatBlock
-]
-
-{ #category : #'tests to make green again' }
-MicInlineParserTest >> testTwoConsecutiveEscapeCharacter [
-
-	"we should have just one escape"
-
-	| res |
-	res := self splitter parse: '\\'.
-	self assert: (res collect: [ :x | x printString ]) equals: { 'Text(\)' }
-]
-
-{ #category : #'tests - annotation' }
-MicInlineParserTest >> testUnclosedAnnotation [
-
-	| res |
-	res := self splitter parse: 'abc<?an annotation>def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc<?an annotation>def)' }
-]
-
-{ #category : #'tests - formats' }
-MicInlineParserTest >> testUnclosedBold [
-
-	| res |
-	res := self splitter parse: 'abc**xyz'.
-	self assert: res first printString equals: 'Text(abc**xyz)'
-]
-
-{ #category : #'tests - figure' }
-MicInlineParserTest >> testUnclosedFigure [
-	"Test the image annotation ![AltText](url)"
-
-	| res |
-	res := self splitter parse: 'abc![AltText]last'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc![AltText]last)' }
-]
-
-{ #category : #'tests - math' }
-MicInlineParserTest >> testUnclosedMath [
-
-	| res |
-	res := self splitter parse: 'abc$	V_i = C_0 - C_3	&def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc$	V)'. 'ItalicFormat(Text(i = C))'. 'Text(0 - C_3	&def)' }
-]
-
-{ #category : #tests }
-MicInlineParserTest >> testUnclosedOpeners [
-	| openers |
-	openers := MicAbstractDelimiter subclasses select: [ :d | d hasSubclasses not and: [d isOpener  ]] thenCollect: [ :d | d markup ].
-	openers do: [ :opener |
-		Microdown parse: 'foo', opener.
-		Microdown parse: opener,'bar'.
-		Microdown parse: 'foo',opener,'bar'.
-		 ]
-]
-
-{ #category : #'tests - math' }
-MicInlineParserTest >> testUnclosedRaw [
-
-	| res |
-	res := self splitter parse: 'abc{{	V_i = C_0 - C_3	&def'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc{{	V)'. 'ItalicFormat(Text(i = C))'. 'Text(0 - C_3	&def)' }
-]
-
-{ #category : #'tests - formats' }
-MicInlineParserTest >> testUnclosedStrike [
-
-	| res |
-	res := self splitter parse: 'abc~strikeédef'.
-	self
-		assert: (res collect: [ :x | x printString ])
-		equals: { 'Text(abc~strikeédef)' }
-]
-
-{ #category : #'tests - url' }
-MicInlineParserTest >> testUrlObjectInUrlBlocks [
-
-	| res |
-	res := self splitter parse: 'abc[test](myURL)last'.
-	self assert: (res second reference isKindOf: MicResourceReference)
-
-]
-
-{ #category : #'tests to make green again' }
-MicInlineParserTest >> testUrlObjectInUrlBlocks2 [
-
-	| res |
-	res := self splitter parse:
-		       'abc[pulse](https://github.com/Ducasse/NewTools-NewHelpBrowser/pulse#merged-pull-requests)last'.
-	self assert: (res second reference isKindOf: MicHTTPResourceReference ).
-	self assert: res second reference fullName equals: 'https://github.com/Ducasse/NewTools-NewHelpBrowser/pulse#merged-pull-requests'
-]
-
-{ #category : #tests }
-MicInlineParserTest >> testWrappedElementOnBold [
-	| mic |
-	mic := (self splitter parse: '**bold**') first.
-	self assert: mic class equals: MicBoldFormatBlock.
-	self assert: mic substring equals: 'bold'
-]
-
-{ #category : #tests }
-MicInlineParserTest >> testWrappedElementOnNested [
-	| mic |
-	mic := (self splitter parse: '**_italic_**') first.
-	self assert: mic wrappedElements first class equals: MicItalicFormatBlock.
-	self assert: mic wrappedElements first substring equals: 'italic'.
-	self flag: #fixeMe. "should check that we do not have empty mictext"
-]
diff --git a/src/Microdown-Tests/MicMathBlockTest.class.st b/src/Microdown-Tests/MicMathBlockTest.class.st
index 109c576c..8cf209d8 100644
--- a/src/Microdown-Tests/MicMathBlockTest.class.st
+++ b/src/Microdown-Tests/MicMathBlockTest.class.st
@@ -87,9 +87,10 @@ MicMathBlockTest >> testMathBlockWithParametersCaption [
 	| root math |
 	root := self parserClass new parse: '
 
-', MathOpeningBlockMarkup, 'key=cite&label=42&caption=Ze great formula
+' , MathOpeningBlockMarkup
+		        , 'key=cite&label=42&caption=Ze great formula
 V_i = C_0 - C_3 
-', MathClosingBlockMarkup.
+' , MathClosingBlockMarkup.
 	math := root children first.
 	self assert: math class equals: MicMathBlock.
 	self
@@ -98,9 +99,9 @@ V_i = C_0 - C_3
 	self assert: (math arguments at: 'key') equals: 'cite'.
 	self assert: (math arguments at: 'label') equals: '42'.
 	self
-		assert: (math arguments at: 'caption') first substring
+		assert: (math arguments at: 'caption') first bodystring
 		equals: 'Ze great formula'.
-	self assert: math caption equals: 'Ze great formula'
+	self assert: math testCaptionString equals: 'an Array(Text(Ze great formula))'
 ]
 
 { #category : #tests }
diff --git a/src/Microdown-Tests/MicOrderedListBlockTest.class.st b/src/Microdown-Tests/MicOrderedListBlockTest.class.st
index a978ca69..692ec5fb 100644
--- a/src/Microdown-Tests/MicOrderedListBlockTest.class.st
+++ b/src/Microdown-Tests/MicOrderedListBlockTest.class.st
@@ -37,7 +37,7 @@ MicOrderedListBlockTest >> testEmbeddedUnordered [
 	root := parser parse: source.
 	list := root children first.
 	self assert: list children size equals: 2.
-	self assert: list children second testText equals: 'item 2'.
+	self assert: list children second testText equals: 'Text(item 2)'.
 
 	"item 1 + nested list"
 	self assert: list children first children size equals: 2.
@@ -46,7 +46,7 @@ MicOrderedListBlockTest >> testEmbeddedUnordered [
 
 	self
 		assert: list children first children second children first testText
-		equals: 'sublevel item 1' "list item"
+		equals: 'Text(sublevel item 1)' "list item"
 ]
 
 { #category : #'tests - nested' }
@@ -126,8 +126,8 @@ MicOrderedListBlockTest >> testNotSpawingNewParagraph [
 	self assert: list children size equals: 2.
 	self assert: list class equals: self orderedListBlockClass.
 	self assert: list startIndex equals: 1.
-	self assert: list children second testText equals: 'second item
-follow up of second item'
+	self assert: list children second testText equals: 'Text(second item
+follow up of second item)'
 ]
 
 { #category : #tests }
@@ -140,8 +140,8 @@ MicOrderedListBlockTest >> testSingleLevelList2 [
 	root := parser parse: source.
 	list := root children first.
 	self assert: list children size equals: 2.
-	self assert: list children first testText equals: 'item 1
-expanded'.
+	self assert: list children first testText equals: 'Text(item 1
+expanded)'.
 	self assert: list startIndex equals: 19
 ]
 
@@ -160,13 +160,13 @@ expanded as new paragraph
 	"two lists + one paragraph"
 	list := root children first.
 	self assert: list children size equals: 1.
-	self assert: list children first testText equals: 'item 1'.
+	self assert: list children first testText equals: 'Text(item 1)'.
 	self assert: list startIndex equals: 19.
 
 	self
 		assert: root children last children first testText
-		equals: 'item 2
-part of item2'
+		equals: 'Text(item 2
+part of item2)'
 ]
 
 { #category : #tests }
@@ -179,7 +179,7 @@ MicOrderedListBlockTest >> testSingleLevelListWithNormalNumbering [
 	self assert: list children size equals: 2.
 	self assert: list class equals: self orderedListBlockClass.
 	self assert: list startIndex equals: 1.
-	self assert: list children second testText equals: 'second item'
+	self assert: list children second testText equals: 'Text(second item)'
 ]
 
 { #category : #tests }
@@ -196,7 +196,7 @@ MicOrderedListBlockTest >> testSingleLevelListWithNormalNumberingWithEmptyLines
 	self assert: list children size equals: 2.
 	self assert: list class equals: self orderedListBlockClass.
 	self assert: list startIndex equals: 1.
-	self assert: list children second testText equals: 'second item'
+	self assert: list children second testText equals: 'Text(second item)'
 ]
 
 { #category : #tests }
@@ -209,7 +209,7 @@ MicOrderedListBlockTest >> testSingleLevelListWithStrangelyNumberedItems [
 	self assert: list children size equals: 2.
 	self assert: list class equals: self orderedListBlockClass.
 	self assert: list startIndex equals: 11.
-	self assert: list children second testText equals: 'item 2'
+	self assert: list children second testText equals: 'Text(item 2)'
 ]
 
 { #category : #tests }
@@ -224,13 +224,13 @@ a new paragraph.
 	self assert: root children size equals: 3.
 	self
 		assert: root children first children first testText
-		equals: 'first item
-with a follow up'.
+		equals: 'Text(first item
+with a follow up)'.
 	self assert: root children third startIndex equals: 2.
 	self
 		assert: root children third children first testText
-		equals: 'second list first item
-follow up of second item'
+		equals: 'Text(second list first item
+follow up of second item)'
 ]
 
 { #category : #'tests - list' }
diff --git a/src/Microdown-Tests/MicUnorderedListBlockTest.class.st b/src/Microdown-Tests/MicUnorderedListBlockTest.class.st
index 3b72dde8..af174a05 100644
--- a/src/Microdown-Tests/MicUnorderedListBlockTest.class.st
+++ b/src/Microdown-Tests/MicUnorderedListBlockTest.class.st
@@ -23,18 +23,17 @@ MicUnorderedListBlockTest >> testEmbeddedOrdered [
 	root := parser parse: source.
 	list := root children first.
 	self assert: list children size equals: 2.
-	self assert: list children second testText equals: 'item 2'.
+	self assert: list children second testText equals: 'Text(item 2)'.
 	self
 		assert: list children first children second children second testText
-		equals: 'sublevel item 2' "item 1" "unordered list" "sub item"
+		equals: 'Text(sublevel item 2)' "item 1" "unordered list" "sub item"
 ]
 
 { #category : #tests }
 MicUnorderedListBlockTest >> testEmbeddedOrderedWithFormatting [
 
 	| source root list item4 |
-	source := 
-'- item 1
+	source := '- item 1
   1. **sublevel** ~item 1~
   4. **sublevel4** ~item 24~
 - item 2'.
@@ -44,12 +43,23 @@ MicUnorderedListBlockTest >> testEmbeddedOrderedWithFormatting [
 
 	item4 := list children first children second children second. "item 1" "unordered list"
 
-	self assert: item4 testText equals: 'sublevel4 item 24'.
-	self assert: item4 textElements first kind equals: 'boldformat'.
-	self assert: item4 textElements first substring equals: 'sublevel4'.
+	self
+		assert: item4 testText
+		equals:
+		'BoldFormat{ Text(sublevel4) }Text( )StrikeFormat{ Text(item 24) }'.
+	self
+		assert: item4 children first blockName asLowercase
+		equals: 'boldformat'.
+	self
+		assert: item4 children first children first bodystring
+		equals: 'sublevel4'.
 
-	self assert: item4 textElements third kind equals: 'strike'.
-	self assert: item4 textElements third substring equals: 'item 24'
+	self
+		assert: item4 children third blockName asLowercase
+		equals: 'strikeformat'.
+	self
+		assert: item4 children third children first bodystring
+		equals: 'item 24'
 ]
 
 { #category : #tests }
@@ -71,11 +81,11 @@ MicUnorderedListBlockTest >> testMixing2 [
 	self assert: root children size equals: 2.
 	list1 := root children first.
 	self assert: list1 children size equals: 2.
-	self assert: list1 children second testText equals: 'item 2'.
+	self assert: list1 children second testText equals: 'Text(item 2)'.
 
 	list2 := root children second.
 	self assert: list2 children size equals: 2.
-	self assert: list2 children second testText equals: 'item 2'
+	self assert: list2 children second testText equals: 'Text(item 2)'
 ]
 
 { #category : #tests }
@@ -94,13 +104,13 @@ MicUnorderedListBlockTest >> testMixingOrderedInsideUnorderedWithParagraph [
 	self assert: root children size equals: 1.
 	list1 := root children first.
 	self assert: list1 children size equals: 2.
-	self assert: list1 children second testText equals: 'item 2'.
+	self assert: list1 children second testText equals: 'Text(item 2)'.
 
-	self assert: list1 children first testText equals: 'item 1
+	self assert: list1 children first testText equals: 'Text(item 1
 on 
 multiple lines
  1. sub item 1 
- 3. sub item 2'
+ 3. sub item 2)'
 ]
 
 { #category : #'tests - nested' }
@@ -115,7 +125,7 @@ MicUnorderedListBlockTest >> testNestedLevel [
 	self assert: list children size equals: 2.
 
 	item1 := list children first.
-	self assert: item1 testText equals: 'item 1'.
+	self assert: item1 children first bodystring equals: 'item 1'.
 	self assert: item1 class equals: MicListItemBlock.
 	self assert: item1 nestedLevel equals: 1.
 
@@ -125,7 +135,7 @@ MicUnorderedListBlockTest >> testNestedLevel [
 
 	"this is the inner list first item"
 	self
-		assert: item1 children second children first text
+		assert: item1 children second children first children first bodystring
 		equals: 'sublevel'.
 	self
 		assert: item1 children second children first class
@@ -155,14 +165,16 @@ MicUnorderedListBlockTest >> testNestedLevel2 [
 		equals: MicUnorderedListBlock.
 
 	"this is the inner list first item"
-	self assert: sublevelItem testText equals: 'sublevel'.
+	self
+		assert: sublevelItem children first bodystring
+		equals: 'sublevel'.
 	self assert: sublevelItem class equals: MicListItemBlock.
 
 	self
 		assert: sublevelItem children second children first nestedLevel
 		equals: 3.
 	self
-		assert: sublevelItem children second children first text
+		assert: sublevelItem children second children first children first bodystring
 		equals: 'subsublevel'
 ]
 
@@ -173,7 +185,7 @@ MicUnorderedListBlockTest >> testOrderedListAPIToAccessText [
 	list := (self parser parse: '1.a 2.b') children first children first.
 	self assert: list class equals: MicListItemBlock.
 	self assert: list nestedLevel equals: 1.
-	self assert: list testText equals: '2.b'
+	self assert: list testText equals: 'Text(2.b)'
 ]
 
 { #category : #tests }
@@ -185,7 +197,7 @@ MicUnorderedListBlockTest >> testSingleLevelList [
 	root := parser parse: source.
 	list := root children first.
 	self assert: list children size equals: 2.
-	self assert: list children second testText equals: 'item 2'
+	self assert: list children second testText equals: 'Text(item 2)'
 ]
 
 { #category : #tests }
@@ -200,8 +212,8 @@ MicUnorderedListBlockTest >> testSingleLevelList2 [
 	"root contains only a list."
 	list := root children first.
 	self assert: list children size equals: 2.
-	self assert: list children first testText equals: 'item 1
-expanded'
+	self assert: list children first testText equals: 'Text(item 1
+expanded)'
 ]
 
 { #category : #tests }
@@ -213,20 +225,22 @@ MicUnorderedListBlockTest >> testSingleLevelList2WithFormatting [
 - item 2'.
 	root := parser parse: source.
 	list := root children first.
-	self assert: list children first testText equals: 'item 1
-expanded'.
-	self assert: list children first textElements size equals: 3.
 	self
-		assert: list children first textElements first kind
-		equals: 'bold'.
+		assert: list children first testText
+		equals: 'BoldFormat{ Text(item 1) }Text(
+)Monospace(expanded)'.
+	self assert: list children first children size equals: 3.
+	self
+		assert: list children first children first blockName asLowercase
+		equals: 'boldformat'.
 	self
-		assert: list children first textElements first substring
+		assert: list children first children first children first bodystring
 		equals: 'item 1'.
 	self
-		assert: list children first textElements third kind
+		assert: list children first children third blockName asLowercase
 		equals: 'monospace'.
 	self
-		assert: list children first textElements third substring
+		assert: list children first children third substring
 		equals: 'expanded'
 ]
 
@@ -256,10 +270,10 @@ MicUnorderedListBlockTest >> testSingleLevelListSplitWithEmptyLine [
 
 	list := root children first.
 	self assert: list children size equals: 3.
-	self assert: list children first testText equals: 'item 1'.
+	self assert: list children first testText equals: 'Text(item 1)'.
 	self
 		assert: list children third testText
-		equals: 'item 3 of the same list'
+		equals: 'Text(item 3 of the same list)'
 ]
 
 { #category : #tests }
@@ -279,10 +293,10 @@ MicUnorderedListBlockTest >> testSingleLevelListSplitWithMultipleEmptyLines [
 
 	list := root children first.
 	self assert: list children size equals: 3.
-	self assert: list children first testText equals: 'item 1'.
+	self assert: list children first testText equals: 'Text(item 1)'.
 	self
 		assert: list children third testText
-		equals: 'item 3 of the same list'
+		equals: 'Text(item 3 of the same list)'
 ]
 
 { #category : #tests }
@@ -299,11 +313,11 @@ and here
 
 	list := root children first.
 	self assert: list children size equals: 1.
-	self assert: list children first testText equals: 'item 1
-expanded'.
+	self assert: list children first testText equals: 'Text(item 1
+expanded)'.
 	self
 		assert: root children third children first testText
-		equals: 'item 2'
+		equals: 'Text(item 2)'
 ]
 
 { #category : #tests }
@@ -320,10 +334,10 @@ MicUnorderedListBlockTest >> testSingleLevelListStartingWithoutSpaceSplitParagra
 
 	list := root children first.
 	self assert: list children size equals: 2.
-	self assert: list children first testText equals: 'item 1
+	self assert: list children first testText equals: 'Text(item 1
 expanded
-same indentation no new paragraph'.
-	self assert: list children second testText equals: 'item 2'
+same indentation no new paragraph)'.
+	self assert: list children second testText equals: 'Text(item 2)'
 ]
 
 { #category : #tests }
@@ -337,8 +351,8 @@ MicUnorderedListBlockTest >> testSingleLevelListWithItemSpawning [
   follow up of second item'.
 	list := root children first.
 	self assert: list children size equals: 2.
-	self assert: list children second testText equals: 'second item
-follow up of second item'
+	self assert: list children second testText equals: 'Text(second item
+follow up of second item)'
 ]
 
 { #category : #tests }
@@ -350,7 +364,7 @@ MicUnorderedListBlockTest >> testSingleLevelListWithStar [
 	root := parser parse: source.
 	list := root children first.
 	self assert: list children size equals: 2.
-	self assert: list children second testText equals: 'item 2'
+	self assert: list children second testText equals: 'Text(item 2)'
 ]
 
 { #category : #tests }
@@ -363,7 +377,7 @@ MicUnorderedListBlockTest >> testSingleLevelMixedList [
 	root := parser parse: source.
 	list := root children first.
 	self assert: list children size equals: 3.
-	self assert: list children second testText equals: 'item 2'
+	self assert: list children second testText equals: 'Text(item 2)'
 ]
 
 { #category : #tests }
@@ -378,11 +392,11 @@ MicUnorderedListBlockTest >> testTwoLevelList [
 	root := parser parse: source.
 	list := root children first.
 	self assert: list children size equals: 2.
-	self assert: list children second testText equals: 'item 2'.
+	self assert: list children second testText equals: 'Text(item 2)'.
 	self
 		assert: list children first children second children first testText
-		equals: 'sublevel1'. "item 1 list" "unorded list" "sub item"
+		equals: 'Text(sublevel1)'. "item 1 list" "unorded list" "sub item"
 	self
 		assert: list children first children second children second testText
-		equals: 'sublevel2' "item 1" "unorded list" "sub item"
+		equals: 'Text(sublevel2)' "item 1" "unorded list" "sub item"
 ]
diff --git a/src/Microdown-Tests/MicrodownInlineParserTest.class.st b/src/Microdown-Tests/MicrodownInlineParserTest.class.st
deleted file mode 100644
index 93ab35b2..00000000
--- a/src/Microdown-Tests/MicrodownInlineParserTest.class.st
+++ /dev/null
@@ -1,580 +0,0 @@
-"
-The logic is to call the main parser so that the inline elements are in the blocks as after the closeMe phase of a Block (this is where the inline block are parsed). 
-"
-Class {
-	#name : #MicrodownInlineParserTest,
-	#superclass : #TestCase,
-	#pools : [
-		'MicMicrodownSharedPool'
-	],
-	#category : #'Microdown-Tests-Parser'
-}
-
-{ #category : #parsing }
-MicrodownInlineParserTest >> parse: aString [
-	"self new parse: 'foo_abbb_zz' "
-
-	^ self parserClass parse: aString
-]
-
-{ #category : #parsing }
-MicrodownInlineParserTest >> parseAndReturnElementsOfParagraphFor: aString [ 
- 	"self new parse: 'foo_abbb_zz' "
-	
- 	^ (self parse: aString) children first children
- 
-]
-
-{ #category : #parsing }
-MicrodownInlineParserTest >> parser [
-	^ self parserClass new 
-]
-
-{ #category : #parsing }
-MicrodownInlineParserTest >> parserClass [ 
-	^ Microdown 
-]
-
-{ #category : #'tests - raw' }
-MicrodownInlineParserTest >> rawTestingFor: aString [
-
- 	| elements |
- 	elements := self parseAndReturnElementsOfParagraphFor: 'abc{{', aString, '}}def'.
- 	self assert: elements size equals: 3.
- 	self assert: elements first substring equals: 'abc'.
- 	self assert: elements second substring equals: aString.
- 	self assert: elements second kind equals: 'raw'.
- 	self assert: elements second openingDelimiter equals: '{{'.
- 	self assert: elements second closingDelimiter equals: '}}'
-]
-
-{ #category : #'tests - format' }
-MicrodownInlineParserTest >> testAPIToAccessChildrenOfNestedElements [
-
- 	| elements bold |
- 	elements := self parseAndReturnElementsOfParagraphFor: 'abc**_italicAndBold_ boldOnly**def'.
- 	self assert: elements size equals: 3.
-
-	"we can ask text to any element" 
-	self assert: elements first substring equals: 'abc'.
-	self assert: elements first text equals: 'abc'.
-	
-	bold := elements second.
-	self assert: bold class equals: MicBoldFormatBlock.
-	self assert: bold children size equals: 2.
-	self assert: bold children first class equals: MicItalicFormatBlock.
-	self assert: bold children first children first class equals: MicTextBlock.
-	self assert: bold children second text equals: ' boldOnly'.
-	self assert: bold children second class equals: MicTextBlock.
-]
-
-{ #category : #'tests - anchors' }
-MicrodownInlineParserTest >> testAnchorReferenceWithoutClosure [
- 	| elements |
- 	elements := (self parseAndReturnElementsOfParagraphFor: 'abc*@anchorsdef').
- 	self assert: elements size equals: 1.
- 	self assert: elements first substring equals: 'abc*@anchorsdef'
-]
-
-{ #category : #'tests - anchors' }
-MicrodownInlineParserTest >> testAnchorRefernce [
- 	| elements |
- 	elements := (self parseAndReturnElementsOfParagraphFor: 'abc*@anchors@*def').
- 	self assert: elements size equals: 3.
- 	self assert: elements first substring equals: 'abc'.
- 	self assert: elements second substring equals: 'anchors'.
- 	self assert: elements second kind equals: 'anchorReference'.
- 	self assert: elements second openingDelimiter equals: '*@'.
- 	self assert: elements second closingDelimiter equals: '@*'
-]
-
-{ #category : #'tests - annotations' }
-MicrodownInlineParserTest >> testAnnotationBasic [
- 	| elements annotation |
- 	elements := self parseAndReturnElementsOfParagraphFor: 'needed ', AnnotationOpenerMarkup ,'footnote | value=A foonote is annotation.', AnnotationCloserMarkup.
-	"pay attention an annotation is inside a paragraph (else this is an environment)"
-	annotation := elements second.
-	
- 	self assert: annotation substring equals: 'footnote | value=A foonote is annotation.'.
-	
- 	self assert: annotation kind equals: 'annotation'.
- 	self assert: annotation openingDelimiter equals: AnnotationOpenerMarkup.
- 	self assert: annotation closingDelimiter equals: AnnotationCloserMarkup
- 
-]
-
-{ #category : #'tests - annotations' }
-MicrodownInlineParserTest >> testAnnotationPrintString [
- 	
-	| elements |
- 	elements := self parseAndReturnElementsOfParagraphFor: 'abc',AnnotationOpenerMarkup,'footnote | value=A foonote is annotation.&width=90',AnnotationCloserMarkup,'def'.
- 	self assert: elements size equals: 3.
- 	self assert: elements second text equals: 'footnote | value=A foonote is annotation.&width=90'.
-	self assert: elements second name equals: 'footnote'
-]
-
-{ #category : #'tests - annotations' }
-MicrodownInlineParserTest >> testAnnotations [
- 	| elements |
- 	elements := self parseAndReturnElementsOfParagraphFor: 'abc', AnnotationOpenerMarkup,'footnote | value=A foonote is annotation.', AnnotationCloserMarkup,'def'.
- 	self assert: elements size equals: 3.
- 	self assert: elements first substring equals: 'abc'.
- 	self assert: elements second substring equals: 'footnote | value=A foonote is annotation.'.
- 	self assert: elements second kind equals: 'annotation'.
- 	self assert: elements second openingDelimiter equals: AnnotationOpenerMarkup.
- 	self assert: elements second closingDelimiter equals: AnnotationCloserMarkup
- 
-]
-
-{ #category : #'tests - annotations' }
-MicrodownInlineParserTest >> testAnnotationsWithoutClosure [
- 	| elements |
- 	elements := self parseAndReturnElementsOfParagraphFor: 'abc<?footnote | value=A foonote is anannotation.def'.
- 	self assert: elements size equals: 1.
- 	self assert: elements first substring equals: 'abc<?footnote | value=A foonote is anannotation.def'
- 
-]
-
-{ #category : #'tests - format' }
-MicrodownInlineParserTest >> testBold [
- 	| elements |
- 	elements := self parseAndReturnElementsOfParagraphFor: 'abc**bolds**def'.
- 	self assert: elements size equals: 3.
- 	self assert: elements first substring equals: 'abc'.
-	self assert: elements first class equals: MicTextBlock.
-	
- 	self assert: elements second substring equals: 'bolds'.
-	self assert: elements second class equals: MicBoldFormatBlock.
- 	self assert: elements second kind equals: 'bold'.
-	self assert: elements second children first class equals: MicTextBlock.
-	
- 	self assert: elements second openingDelimiter equals: '**'
- 
-]
-
-{ #category : #'tests - format' }
-MicrodownInlineParserTest >> testBoldsAndCorrectNestedItalics [
-
- 	| elements bold italic |
- 	elements := self parseAndReturnElementsOfParagraphFor: 'abc**_italicitalic_**def'.
- 	self assert: elements size equals: 3.
- 	self assert: elements first substring equals: 'abc'.
-	bold := elements second.
-	italic := bold children first.
-	self assert: bold kind equals: 'bold'.
-	self assert: italic kind equals: 'italic'.
-		
- 	self assert: italic substring equals: 'italicitalic'.
-	self flag: #fixme. 
-	"self assert: bold substring equals: 'italicitalic'"
- 	
-	
-
- 
-]
-
-{ #category : #'tests - format' }
-MicrodownInlineParserTest >> testBoldsAndNestedItalics [ 
- 	| elements |
- 	elements := (self parseAndReturnElementsOfParagraphFor: 'abc**_bolds_**def').
- 	self assert: elements size equals: 3.
- 	self assert: elements first substring equals: 'abc'.
- 	self assert: elements second substring equals: '_bolds_'.
- 	self assert: elements second kind equals: 'bold'.
- 	self assert: elements second openingDelimiter equals: '**'
- 
-]
-
-{ #category : #'tests - format' }
-MicrodownInlineParserTest >> testBoldsAndNestedItalicsWithClosureAfterOpenItalics [
-
- 	| elements |
- 	elements := self parseAndReturnElementsOfParagraphFor: 'abc**_bolds**_def'.
- 	self assert: elements size equals: 3.
- 	self assert: elements first substring equals: 'abc'.
- 	self assert: elements second substring equals: '_bolds'.
-	self assert: elements third substring equals: '_def'.
- 	self assert: elements second kind equals: 'bold'.
- 	self assert: elements second openingDelimiter equals: '**'
- 
-]
-
-{ #category : #'tests - format' }
-MicrodownInlineParserTest >> testBoldsWithoutClosure [ 
-
- 	| elements |
- 	elements := self parseAndReturnElementsOfParagraphFor: 'abc**boldsdef'.
- 	self assert: elements size equals: 1.
- 	self assert: elements first substring equals: 'abc**boldsdef'
- 
-]
-
-{ #category : #'tests - others' }
-MicrodownInlineParserTest >> testEscape [
-
- 	| elements |
- 	elements := self parseAndReturnElementsOfParagraphFor: 'abc\_bolds_def'.
- 	self assert: elements size equals: 1.
- 	self assert: elements first substring equals: 'abc_bolds_def'.
- 	self assert: elements first kind equals: 'basic'.
- 
-]
-
-{ #category : #tests }
-MicrodownInlineParserTest >> testEscapeAsLastCharacterDoesNotBreak [
-	
-	| elts  |
-	elts  := self parseAndReturnElementsOfParagraphFor:  'ch\'.
-	self assert: elts size equals: 1.
-	self assert: elts first class  equals: MicTextBlock.
-	self assert: elts first substring  equals: 'ch\'.
-	
-	elts  := self parseAndReturnElementsOfParagraphFor:  'ch\\'.
-	self assert: elts size equals: 1.
-	self assert: elts first class  equals: MicTextBlock.
-	self assert: elts first substring  equals: 'ch\'.
-	
-	elts  := self parseAndReturnElementsOfParagraphFor:  'ch\a'.
-	self assert: elts size equals: 1.
-	self assert: elts first class  equals: MicTextBlock.
-	self assert: elts first substring  equals: 'cha'.
-]
-
-{ #category : #'tests - figure' }
-MicrodownInlineParserTest >> testFigure [
- 	| elements |
- 	elements := self parseAndReturnElementsOfParagraphFor: 'abc![caption](http://www.pharo.org?parameters=value)def'.
- 	self assert: elements size equals: 3.
- 	self assert: elements first substring equals: 'abc'.
- 	self assert: elements second caption equals: 'caption'.
- 	self assert: elements second kind equals: 'figure'.
- 	self assert: elements second openingDelimiter equals: '!['.
- 	self assert: elements second closingDelimiter equals: ')'
-]
-
-{ #category : #'tests - figure' }
-MicrodownInlineParserTest >> testFigureWithParameters [
-
-	| elements figure |
-	elements := self parseAndReturnElementsOfParagraphFor:
-		            '![caption terminating with a .](http://www.pharo.org/pharoLogo.png "micAnchor=fig2&micWidth=80")'.
-	self assert: elements size equals: 1.
-	figure := elements first.
-	self assert: figure caption equals: 'caption terminating with a .'.
-	self
-		assert: figure children first text
-		equals: 'caption terminating with a .'.
-	self assert: figure arguments keys size equals: 2
-]
-
-{ #category : #'tests - figure' }
-MicrodownInlineParserTest >> testFigureWithParameters_withoutQuotes [
-
-	| elements figure |
-	elements := self parseAndReturnElementsOfParagraphFor:
-		            '![caption terminating with a .](http://www.pharo.org/pharoLogo.png micAnchor=fig2&micWidth=80)'.
-	self assert: elements size equals: 1.
-	figure := elements first.
-	self assert: figure caption equals: 'caption terminating with a .'.
-	self
-		assert: figure children first text
-		equals: 'caption terminating with a .'.
-	self assert: figure arguments keys size equals: 2
-]
-
-{ #category : #'tests - format' }
-MicrodownInlineParserTest >> testItalic [
- 	| elements |
- 	elements := self parseAndReturnElementsOfParagraphFor: 'abc_italics_def'.
- 	self assert: elements size equals: 3.
- 	self assert: elements first substring equals: 'abc'.
- 	self assert: elements second substring equals: 'italics'.
- 	self assert: elements second kind equals: 'italic'.
- 	self assert: elements second openingDelimiter equals: '_'
-]
-
-{ #category : #'tests - format' }
-MicrodownInlineParserTest >> testItalicsAndNestedBolds [
- 	| elements |
- 	elements := (self parseAndReturnElementsOfParagraphFor: 'abc_**italics**_def').
- 	self assert: elements size equals: 3.
- 	self assert: elements first substring equals: 'abc'.
- 	self assert: elements second substring equals: '**italics**'.
- 	self assert: elements second kind equals: 'italic'.
- 	self assert: elements second openingDelimiter equals: '_'
-]
-
-{ #category : #'tests - format' }
-MicrodownInlineParserTest >> testItalicsAndNestedBoldsWithClosureAfterOpenBolds [
-
- 	| elements |
- 	elements := self parseAndReturnElementsOfParagraphFor: 'abc_**italics_**def'.
- 	self assert: elements size equals: 3.
- 	self assert: elements first substring equals: 'abc'.
- 	self assert: elements second substring equals: '**italics'.
-	self assert: elements third substring equals: '**def'.
- 	self assert: elements second kind equals: 'italic'.
- 	self assert: elements second openingDelimiter equals: '_'
- 
-]
-
-{ #category : #'tests - format' }
-MicrodownInlineParserTest >> testItalicsWithoutClosure [
-
- 	| elements |
- 	elements := self parseAndReturnElementsOfParagraphFor: 'abc_italicsdef'.
- 	self assert: elements size equals: 1.
- 	self assert: elements first substring equals: 'abc_italicsdef'
-]
-
-{ #category : #'tests - link' }
-MicrodownInlineParserTest >> testLink [
- 	| elements |
- 	elements := (self parseAndReturnElementsOfParagraphFor: 'abc[Pharo.Org](http://www.pharo.org)def').
- 	self assert: elements size equals: 3.
- 	self assert: elements first substring equals: 'abc'.
-	
- 	self assert: elements second caption equals: 'Pharo.Org'.
- 	self assert: elements second kind equals: 'linkName'.
-	self assert: elements second url equals: 'http://www.pharo.org'.
-	
-	
- 	self assert: elements second openingDelimiter equals: '['.
- 	self assert: elements second closingDelimiter equals: ')'
-]
-
-{ #category : #'tests - link' }
-MicrodownInlineParserTest >> testLinkWithParameters [
- 	| elements |
- 	elements := (self parseAndReturnElementsOfParagraphFor: 'abc[GH Ducasse](https://github.com/Ducasse?tab=repositories)def').
- 	self assert: elements size equals: 3.
- 	self assert: elements first substring equals: 'abc'.
- 	self assert: elements second substring equals: 'GH Ducasse'.
- 	self assert: elements second kind equals: 'linkName'.
-	
-	self assert: elements second url equals: 'https://github.com/Ducasse?tab=repositories'.
-	
- 	self assert: elements second openingDelimiter equals: '['.
- 	self assert: elements second closingDelimiter equals: ')'
-]
-
-{ #category : #'tests - others' }
-MicrodownInlineParserTest >> testMath [
- 	| elements |
- 	elements := (self parseAndReturnElementsOfParagraphFor: 'abc$V_i = C_0 - C_3$def').
- 	self assert: elements size equals: 3.
- 	self assert: elements first substring equals: 'abc'.
- 	self assert: elements second substring equals: 'V_i = C_0 - C_3'.
- 	self assert: elements second kind equals: 'math'.
- 	self assert: elements second openingDelimiter equals: '$'
-]
-
-{ #category : #'tests - others' }
-MicrodownInlineParserTest >> testMathBackslash [
- 	| elements |
- 	elements := (self parseAndReturnElementsOfParagraphFor: '$ f(a) = \frac{1}{2\pi i} \oint_{\gamma} \frac{f(z)}{z - a} dz $').
- 	self assert: elements first substring equals: ' f(a) = \frac{1}{2\pi i} \oint_{\gamma} \frac{f(z)}{z - a} dz '.
-
-]
-
-{ #category : #'tests - format' }
-MicrodownInlineParserTest >> testMonospace [
-
- 	| elements |
- 	elements := self parseAndReturnElementsOfParagraphFor: 'abc`monospaces`def'.
- 	self assert: elements size equals: 3.
- 	self assert: elements first substring equals: 'abc'.
- 	self assert: elements second substring equals: 'monospaces'.
- 	self assert: elements second kind equals: 'monospace'.
- 	self assert: elements second openingDelimiter equals: '`'
-
-]
-
-{ #category : #'tests - format' }
-MicrodownInlineParserTest >> testMonospacesWithBackQuote [
- 	| elements |
- 	elements := self parseAndReturnElementsOfParagraphFor: 'abc`foo\`bar`def'.
- 	self assert: elements size equals: 3.
- 	self assert: elements second substring equals: 'foo`bar'
-
-]
-
-{ #category : #'tests - format' }
-MicrodownInlineParserTest >> testMonospacesWithBackSlash [
- 	| elements |
- 	elements := self parseAndReturnElementsOfParagraphFor: 'abc`foo\bar`def'.
- 	self assert: elements size equals: 3.
- 	self assert: elements second substring equals: 'foo\bar'
-
-]
-
-{ #category : #'tests - format' }
-MicrodownInlineParserTest >> testMonospacesWithDoubleBackSlash [
- 	| elements |
- 	elements := self parseAndReturnElementsOfParagraphFor: 'abc`foo\\bar`def'.
- 	self assert: elements size equals: 3.
- 	self assert: elements second substring equals: 'foo\\bar'
-
-]
-
-{ #category : #'tests - format' }
-MicrodownInlineParserTest >> testMonospacesWithTwoBackslashes [
- 	| elements |
- 	elements := self parseAndReturnElementsOfParagraphFor: '`\a+\b`'.
- 	self assert: elements size equals: 1.
- 	self assert: elements first substring equals: '\a+\b'
-]
-
-{ #category : #'tests - format' }
-MicrodownInlineParserTest >> testMonospacesWithoutClosure [
- 	| elements |
- 	elements := self parseAndReturnElementsOfParagraphFor: 'abc`monospacesdef'.
- 	self assert: elements size equals: 1.
- 	self assert: elements first substring equals: 'abc`monospacesdef'
-
-]
-
-{ #category : #'tests - raw' }
-MicrodownInlineParserTest >> testRawWitoutClosure [
-
- 	| elements |
- 	elements := self parseAndReturnElementsOfParagraphFor: 'abc{{rawsdef'.
- 	self assert: elements size equals: 1.
- 	self assert: elements first substring equals: 'abc{{rawsdef'
-]
-
-{ #category : #'tests - raw' }
-MicrodownInlineParserTest >> testRaws [
-	self rawTestingFor: 'anything'
-]
-
-{ #category : #'tests - raw' }
-MicrodownInlineParserTest >> testRawsDoesNotHandleWellCurly [
-	| elements |
- 	elements := self parseAndReturnElementsOfParagraphFor: 'abc{{', 'anything}', '}}def'.
- 	self assert: elements size equals: 3.
- 	self assert: elements first substring equals: 'abc'.
- 	self assert: elements second substring equals: 'anything'.
-	self assert: elements third substring equals: '}def'.
- 	self assert: elements second kind equals: 'raw'.
- 	self assert: elements second openingDelimiter equals: '{{'.
- 	self assert: elements second closingDelimiter equals: '}}'
-	
-]
-
-{ #category : #'tests - escape' }
-MicrodownInlineParserTest >> testRawsDoesNotHandleWellEscape [
-	"Well, actually it does"
-	self rawTestingFor: 'anything\*foo'.
-	
-]
-
-{ #category : #'tests - raw' }
-MicrodownInlineParserTest >> testRawsHandleWellCurlyIfNotLast [
-	
-	self rawTestingFor: 'anything}88'.
-
-]
-
-{ #category : #'tests - raw' }
-MicrodownInlineParserTest >> testRawsWithBold [
-
- 	self rawTestingFor: '**bold**'
-]
-
-{ #category : #'tests - raw' }
-MicrodownInlineParserTest >> testRawsWithItalic [
-
- 	self rawTestingFor: '_italic_'
-]
-
-{ #category : #'tests - raw' }
-MicrodownInlineParserTest >> testRawsWithMonospace [
- 	self rawTestingFor: '`monononono`'
-]
-
-{ #category : #'tests - raw' }
-MicrodownInlineParserTest >> testRawsWithStrike [
- 	self rawTestingFor: '~strikkkkk~'
-]
-
-{ #category : #'tests - format' }
-MicrodownInlineParserTest >> testStrike [
-
- 	| elements |
- 	elements := self parseAndReturnElementsOfParagraphFor: 'abc~strikes~def'.
- 	self assert: elements size equals: 3.
- 	self assert: elements first substring equals: 'abc'.
- 	self assert: elements second substring equals: 'strikes'.
- 	self assert: elements second kind equals: 'strike'.
- 	self assert: elements second openingDelimiter equals: '~'
-]
-
-{ #category : #'tests - format' }
-MicrodownInlineParserTest >> testStrikesWithoutClosure [
-
- 	| elements |
- 	elements := self parseAndReturnElementsOfParagraphFor: 'abc~strikesdef'.
- 	self assert: elements size equals: 1.
- 	self assert: elements first substring equals: 'abc~strikesdef'
-
-]
-
-{ #category : #'tests - structure' }
-MicrodownInlineParserTest >> testStructureOfAnchorReference [
-
- 	| element |
- 	element := (self parseAndReturnElementsOfParagraphFor: '  *@anchorReference@*') first.
-	self assert: element text equals: 'anchorReference'.
-	self assert: element children equals: #()
-	
-]
-
-{ #category : #'tests - structure' }
-MicrodownInlineParserTest >> testStructureOfAnnotation [
-
- 	| element |
- 	element := (self parseAndReturnElementsOfParagraphFor: AnnotationOpenerMarkup , 'annotation' , AnnotationCloserMarkup ) first.
-	self assert: element text equals: 'annotation'.
-	self assert: element name equals: 'annotation'.
-	self assert: element children equals: #()
-	
-]
-
-{ #category : #'tests - structure' }
-MicrodownInlineParserTest >> testStructureOfBoldNestedText [
-
- 	| element |
- 	element := (self parseAndReturnElementsOfParagraphFor: '**_abc_def**') first.
-	self assert: element class equals: MicBoldFormatBlock.
-	self assert: element substring equals: '_abc_def'.
-	self assert: element children first substring equals: 'abc'.
-	self assert: element children first class equals: MicItalicFormatBlock.
-	self assert: element children second substring equals: 'def'.
-	self assert: element children second class equals: MicTextBlock.
-	self assert: element children first children first class equals: MicTextBlock.
-	
-	
-]
-
-{ #category : #'tests - structure' }
-MicrodownInlineParserTest >> testStructureOfBoldSimpleText [
-
- 	| element |
- 	element := (self parseAndReturnElementsOfParagraphFor: '**abc def**') first.
-	self assert: element class equals: MicBoldFormatBlock.
-	self assert: element substring equals: 'abc def'.
-	self assert: element children size equals: 1.
-	self assert: element children first class equals: MicTextBlock.
-	
-]
-
-{ #category : #'tests - structure' }
-MicrodownInlineParserTest >> testStructureOfPlainText [
-
- 	| element |
- 	element := (self parseAndReturnElementsOfParagraphFor: 'abc') first.
-	self assert: element text equals: 'abc'.
-	self assert: element class equals: MicTextBlock.
-	self assert: element children equals: #()
-]
diff --git a/src/Microdown-Tests/MicrodownParserTest.class.st b/src/Microdown-Tests/MicrodownParserTest.class.st
index d36d4c7d..f21de7f7 100644
--- a/src/Microdown-Tests/MicrodownParserTest.class.st
+++ b/src/Microdown-Tests/MicrodownParserTest.class.st
@@ -148,10 +148,10 @@ paragraph on two lines.'.
 	self assert: root children size equals: 1.
 	annotated := root children first. 
 	self assert: annotated label equals: 'important'.
-	self assert: annotated text equals: 'this is an important
-paragraph on two lines.'.
-	self assert: annotated textElements first kind equals: 'bold'.
-	self assert: annotated textElements third kind equals: 'italic'.
+	self 
+		assert: annotated children asArray asString 
+		equals: 'an Array(BoldFormat{ Text(this) } Text( is an ) ItalicFormat{ Text(important) } Text(
+paragraph on two lines.))'
 ]
 
 { #category : #'tests - annotated-paragraph' }
@@ -162,9 +162,9 @@ MicrodownParserTest >> testAnnotatedBlockTextElements [
 	root :=  parser parse: source.
 	self assert: root children size equals: 1.
 	annotated := root children first. 
-	self assert: root children first textElements first class equals: MicTextBlock.
-	self assert: root children first textElements second class equals: MicBoldFormatBlock.
-	self assert: root children first textElements third class equals: MicTextBlock
+	self assert: root children first textElements first class equals: MicTextBlock2.
+	self assert: root children first textElements second class equals: MicBoldFormatBlock2.
+	self assert: root children first textElements third class equals: MicTextBlock2
 	
 
 ]
@@ -338,15 +338,15 @@ MicrodownParserTest >> testHeaderLevel4 [
 MicrodownParserTest >> testHeaderLevel4WithBold [
 
 	| source root |
-	source := (HeaderMarkup repeat: 4), 'Level **four** `mono` end'.
+	source := (HeaderMarkup repeat: 4) , 'Level **four** `mono` end'.
 	root := self parser parse: source.
 	self assert: root children size equals: 1.
-	self assert: root children first children first substring equals: 'Level '.
-	self assert: root children first children second substring equals: 'four'.
-	self assert: root children first children third substring equals: ' '.
-	self assert: root children first children fourth substring equals: 'mono'.
-	self assert: root children first children fifth substring equals: ' end'.
-	self assert: root children first level equals: 4.
+	self
+		assert: root children first children first bodystring
+		equals: 'Level '.
+	self
+		assert: root children first children asString
+		equals: 'an Array(Text(Level ) BoldFormat{ Text(four) } Text( ) Monospace(mono) Text( end))'.
 ]
 
 { #category : #'tests - horizontal' }
@@ -427,15 +427,19 @@ support(I) \geq minsup \}'
 MicrodownParserTest >> testMathBlockWithArguments [
 
 	| source root math |
-	source := MathOpeningBlockMarkup, 'label=equation&caption=doNiceMath' , String cr, 
-	 '\mathcal{F} = \{ I \subseteq B | support(I) \geq minsup \}', String cr,
-	MathClosingBlockMarkup, String cr.
+	source := MathOpeningBlockMarkup
+	          , 'label=equation&caption=doNiceMath' , String cr
+	          ,
+	          '\mathcal{F} = \{ I \subseteq B | support(I) \geq minsup \}'
+	          , String cr , MathClosingBlockMarkup , String cr.
 
-	root :=  parser parse: source.
+	root := parser parse: source.
 	self assert: root children size equals: 1.
 	math := root children first.
 	self assert: (math arguments at: 'label') equals: 'equation'.
-	self assert: (math arguments at: 'caption') first substring equals: 'doNiceMath'
+	self
+		assert: (math arguments at: 'caption') first bodystring
+		equals: 'doNiceMath'
 ]
 
 { #category : #'tests - path' }
@@ -503,14 +507,15 @@ this is a code block
 { #category : #'tests - table' }
 MicrodownParserTest >> testPipeEscape [
 
-	| tableBlock firstElementOfSecondRowAsString|
+	| tableBlock firstElementOfSecondRowAsString |
 	tableBlock := (parser parse: '
 |foo|bar|
 |12\|3|456|') children first.
 	"Extract the text node"
 	firstElementOfSecondRowAsString := tableBlock rows second first.
 	"now get to the actual string stored there"
-	firstElementOfSecondRowAsString := firstElementOfSecondRowAsString first substring.
+	firstElementOfSecondRowAsString := firstElementOfSecondRowAsString
+		                                   first bodystring.
 	self assert: firstElementOfSecondRowAsString equals: '12|3'
 ]
 
@@ -546,7 +551,7 @@ MicrodownParserTest >> testSimpleTable [
 	self assert: mic class equals: MicTableBlock.
 	self assert: mic rows size equals: 2.
 	self assert: mic rows first size equals: 2.
-	self assert: mic rows first first first class equals: MicTextBlock
+	self assert: mic rows first first first class equals: MicTextBlock2
 ]
 
 { #category : #'tests - error' }
@@ -577,7 +582,7 @@ MicrodownParserTest >> testSimpleTableWithFormatting [
 	self assert: mic class equals: MicTableBlock.
 	self assert: mic rows size equals: 2.
 	self assert: mic rows first size equals: 2.
-	self assert: mic rows first first first class equals: MicBoldFormatBlock
+	self assert: mic rows first first first class equals: MicBoldFormatBlock2
 ]
 
 { #category : #'tests - table' }
@@ -596,11 +601,11 @@ MicrodownParserTest >> testSimpleTableWithFormattingWithSomeElements [
 	self assert: mic rows first size equals: 2.
 	self
 		assert: mic rows first first first class
-		equals: MicBoldFormatBlock.
-	self assert: mic rows first first second class equals: MicTextBlock.
+		equals: MicBoldFormatBlock2.
+	self assert: mic rows first first second class equals: MicTextBlock2.
 	self
 		assert: mic rows first first third class
-		equals: MicItalicFormatBlock
+		equals: MicItalicFormatBlock2
 ]
 
 { #category : #'tests - table' }
@@ -617,7 +622,7 @@ MicrodownParserTest >> testSimpleTableWithMoreLongRow [
 	self assert: mic class equals: MicTableBlock.
 	self assert: mic rows size equals: 2.
 	self assert: mic rows first size equals: 2.
-	self assert: mic rows first first first class equals: MicTextBlock
+	self assert: mic rows first first first class equals: MicTextBlock2
 ]
 
 { #category : #'tests - table' }
@@ -634,7 +639,7 @@ MicrodownParserTest >> testSimpleTableWithShortRow [
 	self assert: mic class equals: MicTableBlock.
 	self assert: mic rows size equals: 2.
 	self assert: mic rows first size equals: 2.
-	self assert: mic rows first first first class equals: MicTextBlock
+	self assert: mic rows first first first class equals: MicTextBlock2
 ]
 
 { #category : #'tests - comments' }
diff --git a/src/Microdown/MicAnnotatedBlock.class.st b/src/Microdown/MicAnnotatedBlock.class.st
index 47f55cd2..33a259fb 100644
--- a/src/Microdown/MicAnnotatedBlock.class.st
+++ b/src/Microdown/MicAnnotatedBlock.class.st
@@ -37,7 +37,8 @@ MicAnnotatedBlock >> lineMarkup [
 { #category : #accessing }
 MicAnnotatedBlock >> text [
 
-	^ String streamContents: [ :s | self textElements do: [ :each | s nextPutAll: each substring ] ]
+	^ String streamContents: [ :s | 
+		  self textElements do: [ :each | s nextPutAll: each bodystring ] ]
 ]
 
 { #category : #accessing }
diff --git a/src/Microdown/MicSameStartStopMarkupBlock.class.st b/src/Microdown/MicSameStartStopMarkupBlock.class.st
index 4dd6b4bc..2163014b 100644
--- a/src/Microdown/MicSameStartStopMarkupBlock.class.st
+++ b/src/Microdown/MicSameStartStopMarkupBlock.class.st
@@ -35,7 +35,6 @@ MicSameStartStopMarkupBlock >> caption [
 
 { #category : #'accessing-delegated' }
 MicSameStartStopMarkupBlock >> caption: aString [
-	self error: 'This is most likely wrong to call this method'.
 	arguments at: #caption put: (self inlineParse: aString)
 ]
 

From 59adb446dcc0f75b6fdc0fd4d1c0f84d7a52033d Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Wed, 2 Nov 2022 14:49:18 +0100
Subject: [PATCH 13/40] Core running

---
 .../MicCodeblockEvaluatorTest.class.st        |  2 +-
 .../MicLaTeXWriter.class.st                   |  2 +-
 .../MicRealDumper.class.st                    | 16 ++++++-------
 .../MicTextualMicrodownExporter.class.st      |  4 ++--
 .../MicRichTextComposerTest.class.st          |  2 +-
 .../MicRichTextComposer.class.st              | 24 +++++++++----------
 6 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/src/Microdown-Evaluator-Tests/MicCodeblockEvaluatorTest.class.st b/src/Microdown-Evaluator-Tests/MicCodeblockEvaluatorTest.class.st
index d7921913..b72a743e 100644
--- a/src/Microdown-Evaluator-Tests/MicCodeblockEvaluatorTest.class.st
+++ b/src/Microdown-Evaluator-Tests/MicCodeblockEvaluatorTest.class.st
@@ -29,7 +29,7 @@ MicCodeblockEvaluatorTest >> testCodeblockWithEvalExecuteBody [
 		equals: MicListItemBlock.
 	self
 		assert: input children first children first children first testText
-		equals: 'test'
+		equals: 'Text(test)'
 ]
 
 { #category : #tests }
diff --git a/src/Microdown-LaTeXExporter/MicLaTeXWriter.class.st b/src/Microdown-LaTeXExporter/MicLaTeXWriter.class.st
index d461ffed..079e78bd 100644
--- a/src/Microdown-LaTeXExporter/MicLaTeXWriter.class.st
+++ b/src/Microdown-LaTeXExporter/MicLaTeXWriter.class.st
@@ -360,7 +360,7 @@ MicLaTeXWriter >> visitTableRow: aRow with: aBool at: anIndex [
 { #category : #blocks }
 MicLaTeXWriter >> visitText: aText [
 
-	canvas nextPutAllLines: aText substring
+	canvas nextPutAllLines: aText bodystring
 ]
 
 { #category : #'blocks - list' }
diff --git a/src/Microdown-PrettyPrinter/MicRealDumper.class.st b/src/Microdown-PrettyPrinter/MicRealDumper.class.st
index 2663421b..377d4777 100644
--- a/src/Microdown-PrettyPrinter/MicRealDumper.class.st
+++ b/src/Microdown-PrettyPrinter/MicRealDumper.class.st
@@ -287,15 +287,13 @@ MicRealDumper >> visitTable: aTable [
 
 { #category : #'visit - section' }
 MicRealDumper >> visitText: aText [
-	
-	self 
-		element: aText 
-		during: [
-			stream
-				nextPutAll: 'substring: ';
-				nextPutAll: '''';
-				nextPutAll: aText substring;
-				nextPutAll: '''' ]
+
+	self element: aText during: [ 
+		stream
+			nextPutAll: 'substring: ';
+			nextPutAll: '''';
+			nextPutAll: aText bodystring;
+			nextPutAll: '''' ]
 ]
 
 { #category : #'visit - section' }
diff --git a/src/Microdown-PrettyPrinter/MicTextualMicrodownExporter.class.st b/src/Microdown-PrettyPrinter/MicTextualMicrodownExporter.class.st
index 0fc91eff..9ce9da32 100644
--- a/src/Microdown-PrettyPrinter/MicTextualMicrodownExporter.class.st
+++ b/src/Microdown-PrettyPrinter/MicTextualMicrodownExporter.class.st
@@ -323,8 +323,8 @@ MicTextualMicrodownExporter >> visitTable: aTable [
 
 { #category : #'visit - block' }
 MicTextualMicrodownExporter >> visitText: aMicTextBlock [
-	
-	builder text:  (self backSlashString: aMicTextBlock substring)
+
+	builder text: (self backSlashString: aMicTextBlock bodystring)
 ]
 
 { #category : #visiting }
diff --git a/src/Microdown-RichTextComposer-Tests/MicRichTextComposerTest.class.st b/src/Microdown-RichTextComposer-Tests/MicRichTextComposerTest.class.st
index c6212308..d4fc4517 100644
--- a/src/Microdown-RichTextComposer-Tests/MicRichTextComposerTest.class.st
+++ b/src/Microdown-RichTextComposer-Tests/MicRichTextComposerTest.class.st
@@ -266,7 +266,7 @@ line 2
 	self assert: richText asString trim equals: 
 'line 1
 line 2
-Roger Rabbit'
+an Array(Text(Roger Rabbit))'
 ]
 
 { #category : #'tests - codeBlock' }
diff --git a/src/Microdown-RichTextComposer/MicRichTextComposer.class.st b/src/Microdown-RichTextComposer/MicRichTextComposer.class.st
index 61baee7b..225c1a90 100644
--- a/src/Microdown-RichTextComposer/MicRichTextComposer.class.st
+++ b/src/Microdown-RichTextComposer/MicRichTextComposer.class.st
@@ -377,21 +377,19 @@ MicRichTextComposer >> visitCenter: aMicCenterBlock [
 
 { #category : #visiting }
 MicRichTextComposer >> visitCode: aCodeBlock [
+
 	canvas newLineIfNotAlready.
 	canvas indentIn: [ 
 		canvas
-			<< ((self codeStylerClass stylerFor: aCodeBlock language)
-					style: aCodeBlock body );
+			<< ((self codeStylerClass stylerFor: aCodeBlock language) style:
+						 aCodeBlock body);
 			newLine.
 		aCodeBlock hasCaption ifTrue: [ 
-			canvas 
-				includeAttribute: TextEmphasis bold 
-				in: [ 
-					canvas
-						<< aCodeBlock caption asText;
-					newLine ]]].
+			canvas includeAttribute: TextEmphasis bold in: [ 
+				canvas
+					<< aCodeBlock testCaptionString asText;
+					newLine ] ] ].
 	canvas << textStyler interBlockSpacing
-		
 ]
 
 { #category : #'visiting -  format' }
@@ -690,10 +688,12 @@ MicRichTextComposer >> visitTable: tableBlock [
 
 { #category : #'visiting -  format' }
 MicRichTextComposer >> visitText: anInlineBlock [
+
 	"we should set attribute because it would override link and others."
-	|text|
-	text := anInlineBlock substring asText.
-	canvas << (textStyler postTextTreatment: text )
+
+	| text |
+	text := anInlineBlock bodystring asText.
+	canvas << (textStyler postTextTreatment: text)
 ]
 
 { #category : #'visiting - list' }

From 5e506304e1bb781b816927bd280014c03c43f5bb Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Wed, 2 Nov 2022 14:53:28 +0100
Subject: [PATCH 14/40] Fixed closeMe in Quoteblock

---
 src/Microdown/MicQuoteBlock.class.st | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Microdown/MicQuoteBlock.class.st b/src/Microdown/MicQuoteBlock.class.st
index 47a550ec..38952890 100644
--- a/src/Microdown/MicQuoteBlock.class.st
+++ b/src/Microdown/MicQuoteBlock.class.st
@@ -25,7 +25,7 @@ MicQuoteBlock >> accept: aVisitor [
 MicQuoteBlock >> closeMe [
 	super closeMe.
 	
-	children := MicInlineParser new parse: text
+	children := self inlineParse: text
 ]
 
 { #category : #testing }

From fb9739d47acac87fd3cd6f13e865f286c968247a Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Wed, 2 Nov 2022 16:39:00 +0100
Subject: [PATCH 15/40] All HTML related tests green

---
 .../MicHTMLExporterTest.class.st                       | 10 +++++-----
 .../MicFigureBlock2.extension.st                       |  6 ++++++
 src/Microdown-HTMLExporter/MicHTMLTag.class.st         |  4 ++--
 src/Microdown-HTMLExporter/MicHTMLVisitor.class.st     |  8 +++-----
 .../MicInlineBlockWithUrl2.extension.st                |  6 ++++++
 src/Microdown-HTMLExporter/MicLinkBlock2.extension.st  |  7 +++++++
 src/Microdown/MicEvaluatedBlock2.class.st              |  5 +++++
 src/Microdown/MicFigureBlock2.class.st                 |  5 +++++
 src/Microdown/MicLinkBlock2.class.st                   |  5 +++++
 src/Microdown/MicUnEvaluatedBlock2.class.st            |  5 +++++
 10 files changed, 49 insertions(+), 12 deletions(-)
 create mode 100644 src/Microdown-HTMLExporter/MicFigureBlock2.extension.st
 create mode 100644 src/Microdown-HTMLExporter/MicInlineBlockWithUrl2.extension.st
 create mode 100644 src/Microdown-HTMLExporter/MicLinkBlock2.extension.st

diff --git a/src/Microdown-HTMLExporter-Tests/MicHTMLExporterTest.class.st b/src/Microdown-HTMLExporter-Tests/MicHTMLExporterTest.class.st
index 0b0c0d8e..2afec6c9 100644
--- a/src/Microdown-HTMLExporter-Tests/MicHTMLExporterTest.class.st
+++ b/src/Microdown-HTMLExporter-Tests/MicHTMLExporterTest.class.st
@@ -106,7 +106,7 @@ MicHTMLExporterTest >> testFigureBold [
 	self 
 		parse: factory figureBoldSample 
 		andCheckWeGet: newLine ,
-'<p><figure><img src="/anUrl" alt="**Foo**" class="figureTest" width="80"><figcaption><strong>Foo</strong></figcaption></img></figure></p>'
+'<p><figure><img src="/anUrl" alt="Foo" class="figureTest" width="80"><figcaption><strong>Foo</strong></figcaption></img></figure></p>'
 ]
 
 { #category : #tests }
@@ -115,7 +115,7 @@ MicHTMLExporterTest >> testFigureItalic [
 	self 
 		parse: factory figureItalicSample 
 		andCheckWeGet: newLine ,
-'<p><figure><img src="/anUrl" alt="_Foo_" class="figureTest" width="80"><figcaption><i>Foo</i></figcaption></img></figure></p>'
+'<p><figure><img src="/anUrl" alt="Foo" class="figureTest" width="80"><figcaption><i>Foo</i></figcaption></img></figure></p>'
 ]
 
 { #category : #tests }
@@ -124,7 +124,7 @@ MicHTMLExporterTest >> testFigureNested [
 	self 
 		parse: factory figureNestedSample 
 		andCheckWeGet: newLine ,
-'<p><figure><img src="/anUrl" alt="**Foo_**" class="figureTest" width="80"><figcaption><strong>Foo_</strong></figcaption></img></figure></p>'
+'<p><figure><img src="/anUrl" alt="Foo_" class="figureTest" width="80"><figcaption><strong>Foo_</strong></figcaption></img></figure></p>'
 ]
 
 { #category : #tests }
@@ -142,7 +142,7 @@ MicHTMLExporterTest >> testFigureStrike [
 	self 
 		parse: factory figureStrikeSample 
 		andCheckWeGet: newLine ,
-'<p><figure><img src="/anUrl" alt="~Foo~" class="figureTest" width="80"><figcaption><strike>Foo</strike></figcaption></img></figure></p>'
+'<p><figure><img src="/anUrl" alt="Foo" class="figureTest" width="80"><figcaption><strike>Foo</strike></figcaption></img></figure></p>'
 ]
 
 { #category : #tests }
@@ -178,7 +178,7 @@ MicHTMLExporterTest >> testGoutDeFraise [
 	self 
 		parse: factory figureGoutDeFraise 
 		andCheckWeGet: newLine ,
-'<p><figure><img src="un-gout-de-fraise.jpg" alt="Proposition pour le thème : _Un goût de fraise_"><figcaption>Proposition pour le thème : <i>Un goût de fraise</i></figcaption></img></figure></p>'
+'<p><figure><img src="un-gout-de-fraise.jpg" alt="Proposition pour le thème :  Un goût de fraise"><figcaption>Proposition pour le thème : <i>Un goût de fraise</i></figcaption></img></figure></p>'
 ]
 
 { #category : #tests }
diff --git a/src/Microdown-HTMLExporter/MicFigureBlock2.extension.st b/src/Microdown-HTMLExporter/MicFigureBlock2.extension.st
new file mode 100644
index 00000000..0210293e
--- /dev/null
+++ b/src/Microdown-HTMLExporter/MicFigureBlock2.extension.st
@@ -0,0 +1,6 @@
+Extension { #name : #MicFigureBlock2 }
+
+{ #category : #'*Microdown-HTMLExporter' }
+MicFigureBlock2 >> altText [
+	^ (self children collect: #plainText) joinUsing: ' '
+]
diff --git a/src/Microdown-HTMLExporter/MicHTMLTag.class.st b/src/Microdown-HTMLExporter/MicHTMLTag.class.st
index 91516f8a..8893c857 100644
--- a/src/Microdown-HTMLExporter/MicHTMLTag.class.st
+++ b/src/Microdown-HTMLExporter/MicHTMLTag.class.st
@@ -31,8 +31,8 @@ MicHTMLTag >> addArguments: aMicInlineBlockWithUrl [
 
 	aMicInlineBlockWithUrl hasArguments ifFalse: [ ^ self ].
 	self htmlArgumentsMapDo: [ :argAssoc | 
-		aMicInlineBlockWithUrl
-			argumentAt: argAssoc key
+		aMicInlineBlockWithUrl arguments 
+			at: argAssoc key
 			ifPresent: [ :labelString | self parameterAt: argAssoc value put: labelString ] ]
 ]
 
diff --git a/src/Microdown-HTMLExporter/MicHTMLVisitor.class.st b/src/Microdown-HTMLExporter/MicHTMLVisitor.class.st
index 405f9102..1b348c96 100644
--- a/src/Microdown-HTMLExporter/MicHTMLVisitor.class.st
+++ b/src/Microdown-HTMLExporter/MicHTMLVisitor.class.st
@@ -314,9 +314,7 @@ MicHTMLVisitor >> visitFigCaption: aFigCaptionBlock [
 
 	canvas tag
 		name: 'figcaption';
-		with: [ 
-			aFigCaptionBlock hasCaption ifTrue: [ 
-				aFigCaptionBlock captionElements do: [:each | each accept: self ] ] ]
+		with: [ self visitAll: aFigCaptionBlock children ]
 ]
 
 { #category : #'visiting - inline elements' }
@@ -357,7 +355,7 @@ MicHTMLVisitor >> visitImg: aMicFigureBlock [
 	canvas tag
 		name: 'img';
 		parameterAt: 'src' put: aMicFigureBlock reference path;
-		parameterAt: 'alt' put: (aMicFigureBlock hasChildren ifTrue: [ aMicFigureBlock text ] ifFalse: [ '' ]);
+		parameterAt: 'alt' put: aMicFigureBlock altText;
 		addArguments: aMicFigureBlock;
 		with: [ self visitFigCaption: aMicFigureBlock ]
 ]
@@ -379,7 +377,7 @@ MicHTMLVisitor >> visitLink: aLink [
 		parameterAt: 'target' put: self configuration targetAttribute;
 		parameterAt: 'href' put: aLink referencePath;
 		addArguments: aLink;
-		with: aLink caption
+		with: [self visitAll: aLink children]
 
 ]
 
diff --git a/src/Microdown-HTMLExporter/MicInlineBlockWithUrl2.extension.st b/src/Microdown-HTMLExporter/MicInlineBlockWithUrl2.extension.st
new file mode 100644
index 00000000..9e27d8f8
--- /dev/null
+++ b/src/Microdown-HTMLExporter/MicInlineBlockWithUrl2.extension.st
@@ -0,0 +1,6 @@
+Extension { #name : #MicInlineBlockWithUrl2 }
+
+{ #category : #'*Microdown-HTMLExporter' }
+MicInlineBlockWithUrl2 >> hasChildren [
+	^ self children notEmpty
+]
diff --git a/src/Microdown-HTMLExporter/MicLinkBlock2.extension.st b/src/Microdown-HTMLExporter/MicLinkBlock2.extension.st
new file mode 100644
index 00000000..c41d32bf
--- /dev/null
+++ b/src/Microdown-HTMLExporter/MicLinkBlock2.extension.st
@@ -0,0 +1,7 @@
+Extension { #name : #MicLinkBlock2 }
+
+{ #category : #'*Microdown-HTMLExporter' }
+MicLinkBlock2 >> referencePath [
+
+	^ self reference fullName
+]
diff --git a/src/Microdown/MicEvaluatedBlock2.class.st b/src/Microdown/MicEvaluatedBlock2.class.st
index 29daf264..20d2454c 100644
--- a/src/Microdown/MicEvaluatedBlock2.class.st
+++ b/src/Microdown/MicEvaluatedBlock2.class.st
@@ -32,6 +32,11 @@ MicEvaluatedBlock2 >> children: anObject [
 	children := anObject
 ]
 
+{ #category : #printing }
+MicEvaluatedBlock2 >> plainText [
+	^ (self children collect: #plainText) joinUsing: ' '
+]
+
 { #category : #printing }
 MicEvaluatedBlock2 >> printOn: stream [
 	stream << self blockName << '{ '.
diff --git a/src/Microdown/MicFigureBlock2.class.st b/src/Microdown/MicFigureBlock2.class.st
index 917855e1..cdb8bb6f 100644
--- a/src/Microdown/MicFigureBlock2.class.st
+++ b/src/Microdown/MicFigureBlock2.class.st
@@ -20,3 +20,8 @@ Class {
 MicFigureBlock2 >> accept: aVisitor [
  	^ aVisitor visitFigure: self
 ]
+
+{ #category : #printing }
+MicFigureBlock2 >> plainText [
+	^ '![', ((self children collect: #plainText) joinUsing: ' '), '](', url ,')'
+]
diff --git a/src/Microdown/MicLinkBlock2.class.st b/src/Microdown/MicLinkBlock2.class.st
index 87d7c4f9..b494446e 100644
--- a/src/Microdown/MicLinkBlock2.class.st
+++ b/src/Microdown/MicLinkBlock2.class.st
@@ -11,3 +11,8 @@ Class {
 MicLinkBlock2 >> accept: aVisitor [
 	^ aVisitor visitLink: self
 ]
+
+{ #category : #printing }
+MicLinkBlock2 >> plainText [
+	^ '[', ((self children collect: #plainText) joinUsing: ' '), '](', url ,')'
+]
diff --git a/src/Microdown/MicUnEvaluatedBlock2.class.st b/src/Microdown/MicUnEvaluatedBlock2.class.st
index 262fb82a..e1fe00ec 100644
--- a/src/Microdown/MicUnEvaluatedBlock2.class.st
+++ b/src/Microdown/MicUnEvaluatedBlock2.class.st
@@ -43,6 +43,11 @@ MicUnEvaluatedBlock2 >> children: newChildren [
 	"to be nicely polymorphic all nodes have children"
 ]
 
+{ #category : #printing }
+MicUnEvaluatedBlock2 >> plainText [
+	^ bodystring 
+]
+
 { #category : #printing }
 MicUnEvaluatedBlock2 >> printOn: stream [
 	stream << self blockName << '(' << bodystring << ')'

From 9b1bce110473590e7ecb1e749eedb243e08f5cab Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Thu, 3 Nov 2022 07:54:04 +0100
Subject: [PATCH 16/40] Latex and beamer all green

---
 .../MicLaTeXWriterTest.class.st               |  5 +---
 .../MicInlineBlockWithUrl2.extension.st       | 23 +++++++++++++++++++
 .../MicLaTeXWriter.class.st                   | 18 +++++++++++++--
 3 files changed, 40 insertions(+), 6 deletions(-)
 create mode 100644 src/Microdown-LaTeXExporter/MicInlineBlockWithUrl2.extension.st

diff --git a/src/Microdown-LaTeXExporter-Tests/MicLaTeXWriterTest.class.st b/src/Microdown-LaTeXExporter-Tests/MicLaTeXWriterTest.class.st
index 21775040..6068a0ae 100644
--- a/src/Microdown-LaTeXExporter-Tests/MicLaTeXWriterTest.class.st
+++ b/src/Microdown-LaTeXExporter-Tests/MicLaTeXWriterTest.class.st
@@ -276,12 +276,9 @@ MicLaTeXWriterTest >> testLink [
 { #category : #'tests - figure/link' }
 MicLaTeXWriterTest >> testLinkBold [
 
-	self flag: 'caption do not use bold in the caption'.
 	self writeFor: factory linkBoldSample.
-	self flag: #toFix.
-	"\textbf{Foo}" 
 	self assert: writer contents equals: newLine ,
-'\href{/anUrl}{**Foo**}\footnotesize{\url{/anUrl}}', newLine
+		'\href{/anUrl}{\textbf{Foo}}\footnotesize{\url{/anUrl}}', newLine
 ]
 
 { #category : #'tests - formats' }
diff --git a/src/Microdown-LaTeXExporter/MicInlineBlockWithUrl2.extension.st b/src/Microdown-LaTeXExporter/MicInlineBlockWithUrl2.extension.st
new file mode 100644
index 00000000..7d35c395
--- /dev/null
+++ b/src/Microdown-LaTeXExporter/MicInlineBlockWithUrl2.extension.st
@@ -0,0 +1,23 @@
+Extension { #name : #MicInlineBlockWithUrl2 }
+
+{ #category : #'*Microdown-LaTeXExporter' }
+MicInlineBlockWithUrl2 >> fileStringWithoutHostFile [
+	| urlString localFileIndicator |
+	urlString := url asString.
+	localFileIndicator := 'file://'.
+	^ (urlString beginsWith: localFileIndicator)
+			ifTrue: [ urlString allButFirst: localFileIndicator size ]
+			ifFalse: [ urlString ]
+]
+
+{ #category : #'*Microdown-LaTeXExporter' }
+MicInlineBlockWithUrl2 >> fullName [
+
+	^ reference fullName
+]
+
+{ #category : #'*Microdown-LaTeXExporter' }
+MicInlineBlockWithUrl2 >> hasCaption [
+
+	^ children notEmpty
+]
diff --git a/src/Microdown-LaTeXExporter/MicLaTeXWriter.class.st b/src/Microdown-LaTeXExporter/MicLaTeXWriter.class.st
index 079e78bd..2d2ca13a 100644
--- a/src/Microdown-LaTeXExporter/MicLaTeXWriter.class.st
+++ b/src/Microdown-LaTeXExporter/MicLaTeXWriter.class.st
@@ -227,12 +227,25 @@ MicLaTeXWriter >> visitItalic: anItalic [
 
 { #category : #'blocks - inline' }
 MicLaTeXWriter >> visitLink: aLink [
+	| reference |
+	reference := aLink fileStringWithoutHostFile.
+	canvas command
+		name: 'href';
+		parameter: reference;
+		parameter: [ self visitAll: aLink children ].
+	canvas command
+		name: 'footnotesize';
+		parameter: [ canvas command name: 'url'; parameter: (self protectUrl: reference) ]
+]
+
+{ #category : #'blocks - inline' }
+MicLaTeXWriter >> visitLink_old: aLink [
 	| text reference |
 	reference := aLink fileStringWithoutHostFile.
 	self flag: #todo.
 	"I do not get this logic if the string does not have file:// it can still be
 	something else than a url... all this logic is bogus."
-	text := aLink text.
+	text := aLink halt.
 	(text isEmptyOrNil or: [ reference = text ])
 		ifTrue: [ canvas command
 				name: 'url';
@@ -381,7 +394,8 @@ MicLaTeXWriter >> visitUnorderedList: aList [
 
 { #category : #helpers }
 MicLaTeXWriter >> writeCaptionOfExternalLink: anExternalLink [
-	self visitAll: anExternalLink captionElements
+
+	self visitAll: anExternalLink children
 ]
 
 { #category : #helpers }

From abedd014fb2537d0ff293dee620e9a800f90a8da Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Thu, 3 Nov 2022 08:30:29 +0100
Subject: [PATCH 17/40] TextualExporter all green

---
 .../MicTextualMicrodownExporter.class.st      |  9 +++++---
 .../MicAnchorReferenceBlock2.class.st         | 12 ++++++++++
 src/Microdown/MicAnnotationBlock2.class.st    | 12 ++++++++++
 src/Microdown/MicBoldFormatBlock2.class.st    | 12 ++++++++++
 src/Microdown/MicFigureBlock.class.st         |  2 +-
 src/Microdown/MicFigureBlock2.class.st        | 12 ++++++++++
 src/Microdown/MicInlineBlock2.class.st        | 22 ++++++++++++++++++-
 src/Microdown/MicItalicFormatBlock2.class.st  | 12 ++++++++++
 src/Microdown/MicLinkBlock2.class.st          | 12 ++++++++++
 src/Microdown/MicMathInlineBlock2.class.st    | 12 ++++++++++
 .../MicMonospaceFormatBlock2.class.st         | 12 ++++++++++
 src/Microdown/MicRawBlock2.class.st           | 12 ++++++++++
 src/Microdown/MicStrikeFormatBlock2.class.st  | 12 ++++++++++
 src/Microdown/MicrodownVisitor.class.st       |  5 ++---
 14 files changed, 150 insertions(+), 8 deletions(-)

diff --git a/src/Microdown-PrettyPrinter/MicTextualMicrodownExporter.class.st b/src/Microdown-PrettyPrinter/MicTextualMicrodownExporter.class.st
index 9ce9da32..447d2adf 100644
--- a/src/Microdown-PrettyPrinter/MicTextualMicrodownExporter.class.st
+++ b/src/Microdown-PrettyPrinter/MicTextualMicrodownExporter.class.st
@@ -129,7 +129,9 @@ MicTextualMicrodownExporter >> visitAnnotated: anAnnotated [
 { #category : #'visit - format' }
 MicTextualMicrodownExporter >> visitAnnotation: anAnnotation [
 
-	builder raw: anAnnotation printString
+	builder raw: anAnnotation openingDelimiter.
+	builder raw: anAnnotation bodystring.
+	builder raw: anAnnotation closingDelimiter 
 ]
 
 { #category : #'visit - format' }
@@ -175,7 +177,7 @@ MicTextualMicrodownExporter >> visitFigure: aFigure [
 	
 	builder newLine.
 	builder
-		figureURL: aFigure originUrl
+		figureURL: aFigure url
 		withCaption: [ super visitFigure: aFigure ]
 		
 ]
@@ -329,7 +331,8 @@ MicTextualMicrodownExporter >> visitText: aMicTextBlock [
 
 { #category : #visiting }
 MicTextualMicrodownExporter >> visitTextWithoutBackslash: aMicTextBlock [
-	builder text: aMicTextBlock substring
+
+	builder text: aMicTextBlock bodystring
 ]
 
 { #category : #'visit - block' }
diff --git a/src/Microdown/MicAnchorReferenceBlock2.class.st b/src/Microdown/MicAnchorReferenceBlock2.class.st
index 092ddd33..a5369b22 100644
--- a/src/Microdown/MicAnchorReferenceBlock2.class.st
+++ b/src/Microdown/MicAnchorReferenceBlock2.class.st
@@ -15,6 +15,18 @@ Class {
 	#category : #'Microdown-InlineParser'
 }
 
+{ #category : #accessing }
+MicAnchorReferenceBlock2 class >> closingDelimiter [
+
+ 	^ AnchorReferenceCloserMarkup
+]
+
+{ #category : #accessing }
+MicAnchorReferenceBlock2 class >> openingDelimiter [
+
+ 	^ AnchorReferenceOpenerMarkup
+]
+
 { #category : #visiting }
 MicAnchorReferenceBlock2 >> accept: aVisitor [
  	^ aVisitor visitAnchorReference: self
diff --git a/src/Microdown/MicAnnotationBlock2.class.st b/src/Microdown/MicAnnotationBlock2.class.st
index 6e597af3..3d3ca29f 100644
--- a/src/Microdown/MicAnnotationBlock2.class.st
+++ b/src/Microdown/MicAnnotationBlock2.class.st
@@ -20,6 +20,18 @@ Class {
 	#category : #'Microdown-InlineParser'
 }
 
+{ #category : #accessing }
+MicAnnotationBlock2 class >> closingDelimiter [
+
+ 	^ AnnotationCloserMarkup
+]
+
+{ #category : #accessing }
+MicAnnotationBlock2 class >> openingDelimiter [
+
+ 	^ AnnotationOpenerMarkup
+]
+
 { #category : #parsing }
 MicAnnotationBlock2 class >> parse: delimiter stream: aTokenStream for: aParser [
 	| bodystring arguments tag extensionClass |
diff --git a/src/Microdown/MicBoldFormatBlock2.class.st b/src/Microdown/MicBoldFormatBlock2.class.st
index b7679e39..1a9c664c 100644
--- a/src/Microdown/MicBoldFormatBlock2.class.st
+++ b/src/Microdown/MicBoldFormatBlock2.class.st
@@ -7,6 +7,18 @@ Class {
 	#category : #'Microdown-InlineParser'
 }
 
+{ #category : #accessing }
+MicBoldFormatBlock2 class >> closingDelimiter [
+
+ 	^ BoldMarkup
+]
+
+{ #category : #accessing }
+MicBoldFormatBlock2 class >> openingDelimiter [
+
+ 	^ BoldMarkup
+]
+
 { #category : #visiting }
 MicBoldFormatBlock2 >> accept: aVisitor [
 	^ aVisitor visitBold: self
diff --git a/src/Microdown/MicFigureBlock.class.st b/src/Microdown/MicFigureBlock.class.st
index 53918a6f..778e3440 100644
--- a/src/Microdown/MicFigureBlock.class.st
+++ b/src/Microdown/MicFigureBlock.class.st
@@ -116,7 +116,7 @@ MicFigureBlock >> openingDelimiter [
 MicFigureBlock >> originUrl [
 	^ self properties 
 		at: #originUrl 
-		ifAbsent: [ url ]
+		ifAbsent: [ url halt]
 ]
 
 { #category : #printing }
diff --git a/src/Microdown/MicFigureBlock2.class.st b/src/Microdown/MicFigureBlock2.class.st
index cdb8bb6f..1220029f 100644
--- a/src/Microdown/MicFigureBlock2.class.st
+++ b/src/Microdown/MicFigureBlock2.class.st
@@ -16,6 +16,18 @@ Class {
 	#category : #'Microdown-InlineParser'
 }
 
+{ #category : #accessing }
+MicFigureBlock2 class >> closingDelimiter [
+
+ 	^ NameCloserUrlOpener
+]
+
+{ #category : #accessing }
+MicFigureBlock2 class >> openingDelimiter [
+
+ 	^ FigureNameOpenerMarkup
+]
+
 { #category : #visiting }
 MicFigureBlock2 >> accept: aVisitor [
  	^ aVisitor visitFigure: self
diff --git a/src/Microdown/MicInlineBlock2.class.st b/src/Microdown/MicInlineBlock2.class.st
index 8bbcbd42..5c0d61c4 100644
--- a/src/Microdown/MicInlineBlock2.class.st
+++ b/src/Microdown/MicInlineBlock2.class.st
@@ -15,16 +15,26 @@ Class {
 	#category : #'Microdown-InlineParser'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #accessing }
 MicInlineBlock2 class >> blockName [
 	^ (self instanceSide name asString withoutPrefix: 'Mic') withoutSuffix: 'Block2'
 ]
 
+{ #category : #accessing }
+MicInlineBlock2 class >> closingDelimiter [
+	^ self subclassResponsibility
+]
+
 { #category : #testing }
 MicInlineBlock2 class >> isEvaluated [
 	^ true
 ]
 
+{ #category : #accessing }
+MicInlineBlock2 class >> openingDelimiter [
+	^ self subclassResponsibility
+]
+
 { #category : #visiting }
 MicInlineBlock2 >> accept: dummy [
 	"implemented in subclasses"
@@ -40,6 +50,11 @@ MicInlineBlock2 >> closeMe [
 	"use for post parsing initialization"
 ]
 
+{ #category : #accessing }
+MicInlineBlock2 >> closingDelimiter [ 
+	^ self class closingDelimiter
+]
+
 { #category : #private }
 MicInlineBlock2 >> inlineParserClass [
 
@@ -52,3 +67,8 @@ MicInlineBlock2 >> kind [
 	self deprecated: 'use blockName instead' transformWith: '`@rec kind' -> '`@rec blockName asLowercase'.
 	^ self blockName asLowercase 
 ]
+
+{ #category : #accessing }
+MicInlineBlock2 >> openingDelimiter [
+	^ self class openingDelimiter
+]
diff --git a/src/Microdown/MicItalicFormatBlock2.class.st b/src/Microdown/MicItalicFormatBlock2.class.st
index 3a37d67d..71f4c0b2 100644
--- a/src/Microdown/MicItalicFormatBlock2.class.st
+++ b/src/Microdown/MicItalicFormatBlock2.class.st
@@ -7,6 +7,18 @@ Class {
 	#category : #'Microdown-InlineParser'
 }
 
+{ #category : #accessing }
+MicItalicFormatBlock2 class >> closingDelimiter [
+
+ 	^ ItalicMarkup
+]
+
+{ #category : #accessing }
+MicItalicFormatBlock2 class >> openingDelimiter [
+
+ 	^ ItalicMarkup
+]
+
 { #category : #visiting }
 MicItalicFormatBlock2 >> accept: aVisitor [
 	^ aVisitor visitItalic: self
diff --git a/src/Microdown/MicLinkBlock2.class.st b/src/Microdown/MicLinkBlock2.class.st
index b494446e..fec3af64 100644
--- a/src/Microdown/MicLinkBlock2.class.st
+++ b/src/Microdown/MicLinkBlock2.class.st
@@ -7,6 +7,18 @@ Class {
 	#category : #'Microdown-InlineParser'
 }
 
+{ #category : #accessing }
+MicLinkBlock2 class >> closingDelimiter [
+
+ 	^ NameCloserUrlOpener
+]
+
+{ #category : #accessing }
+MicLinkBlock2 class >> openingDelimiter [
+
+ 	^ LinkNameOpenerMarkup
+]
+
 { #category : #visiting }
 MicLinkBlock2 >> accept: aVisitor [
 	^ aVisitor visitLink: self
diff --git a/src/Microdown/MicMathInlineBlock2.class.st b/src/Microdown/MicMathInlineBlock2.class.st
index 7cf5e211..83a00f82 100644
--- a/src/Microdown/MicMathInlineBlock2.class.st
+++ b/src/Microdown/MicMathInlineBlock2.class.st
@@ -30,6 +30,18 @@ Class {
 	#category : #'Microdown-InlineParser'
 }
 
+{ #category : #accessing }
+MicMathInlineBlock2 class >> closingDelimiter [
+
+ 	^ MathMarkup
+]
+
+{ #category : #accessing }
+MicMathInlineBlock2 class >> openingDelimiter [
+
+ 	^ MathMarkup
+]
+
 { #category : #visiting }
 MicMathInlineBlock2 >> accept: aVisitor [
 	^ aVisitor visitMathInline: self
diff --git a/src/Microdown/MicMonospaceFormatBlock2.class.st b/src/Microdown/MicMonospaceFormatBlock2.class.st
index d007d329..1836cf0f 100644
--- a/src/Microdown/MicMonospaceFormatBlock2.class.st
+++ b/src/Microdown/MicMonospaceFormatBlock2.class.st
@@ -12,6 +12,18 @@ MicMonospaceFormatBlock2 class >> blockName [
 	^ (super blockName) withoutSuffix: 'Format'
 ]
 
+{ #category : #accessing }
+MicMonospaceFormatBlock2 class >> closingDelimiter [
+
+ 	^ MonospaceMarkup
+]
+
+{ #category : #accessing }
+MicMonospaceFormatBlock2 class >> openingDelimiter [
+
+ 	^ MonospaceMarkup
+]
+
 { #category : #visiting }
 MicMonospaceFormatBlock2 >> accept: aVisitor [
 	^ aVisitor visitMonospace: self
diff --git a/src/Microdown/MicRawBlock2.class.st b/src/Microdown/MicRawBlock2.class.st
index 9a362ba4..bc1581a6 100644
--- a/src/Microdown/MicRawBlock2.class.st
+++ b/src/Microdown/MicRawBlock2.class.st
@@ -11,6 +11,18 @@ Class {
 	#category : #'Microdown-InlineParser'
 }
 
+{ #category : #accessing }
+MicRawBlock2 class >> closingDelimiter [
+
+ 	^ RawCloserMarkup
+]
+
+{ #category : #accessing }
+MicRawBlock2 class >> openingDelimiter [
+
+ 	^ RawOpenerMarkup
+]
+
 { #category : #visiting }
 MicRawBlock2 >> accept: aVisitor [
 	^ aVisitor visitRaw: self
diff --git a/src/Microdown/MicStrikeFormatBlock2.class.st b/src/Microdown/MicStrikeFormatBlock2.class.st
index 12afe5ac..b9fee1fc 100644
--- a/src/Microdown/MicStrikeFormatBlock2.class.st
+++ b/src/Microdown/MicStrikeFormatBlock2.class.st
@@ -7,6 +7,18 @@ Class {
 	#category : #'Microdown-InlineParser'
 }
 
+{ #category : #accessing }
+MicStrikeFormatBlock2 class >> closingDelimiter [
+
+ 	^ StrikeMarkup
+]
+
+{ #category : #accessing }
+MicStrikeFormatBlock2 class >> openingDelimiter [
+
+ 	^ StrikeMarkup
+]
+
 { #category : #visiting }
 MicStrikeFormatBlock2 >> accept: aVisitor [
 	^ aVisitor visitStrike: self
diff --git a/src/Microdown/MicrodownVisitor.class.st b/src/Microdown/MicrodownVisitor.class.st
index 5186aee7..ebf0cc70 100644
--- a/src/Microdown/MicrodownVisitor.class.st
+++ b/src/Microdown/MicrodownVisitor.class.st
@@ -102,9 +102,8 @@ MicrodownVisitor >> visitEnvironment: anEnvironment [
 
 { #category : #'visiting - inline elements' }
 MicrodownVisitor >> visitFigure: aFigure [
-	
-	^ aFigure captionElements do: [:each | each accept: self ]
-		
+
+	^ aFigure children do: [ :each | each accept: self ]
 ]
 
 { #category : #visiting }

From edf191ae65fbe5f82e3dbb2647f5ffbbf46e1685 Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Thu, 3 Nov 2022 08:39:56 +0100
Subject: [PATCH 18/40] fixed a hardcode inline parser ref

---
 src/Microdown-Tests/MicParagraphBlockTest.class.st | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Microdown-Tests/MicParagraphBlockTest.class.st b/src/Microdown-Tests/MicParagraphBlockTest.class.st
index 4066b730..8018378b 100644
--- a/src/Microdown-Tests/MicParagraphBlockTest.class.st
+++ b/src/Microdown-Tests/MicParagraphBlockTest.class.st
@@ -47,12 +47,14 @@ another line** and more'.
 
 	self
 		assert:
-		(MicInlineParser new parse: root children first text) first kind
-		equals: #bold.
+			(MicInlineParser2 new parse: root children first text) first
+				blockName asLowercase
+		equals: #boldformat.
 	self
 		assert:
-		(MicInlineParser new parse: root children second text) first kind
-		equals: #basic
+			(MicInlineParser2 new parse: root children second text) first
+				blockName asLowercase
+		equals: #text
 ]
 
 { #category : #tests }

From f998b070abeba4afd1b1bd8fa7e7198c1ecf296a Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Thu, 3 Nov 2022 08:48:08 +0100
Subject: [PATCH 19/40] removed old inline parser, delimiters and model

---
 .../MicMicrodownTextualBuilderTest.class.st   |   4 +-
 src/Microdown/MicAbstractDelimiter.class.st   | 199 -------
 .../MicAnchorReferenceBlock.class.st          |  84 ---
 ...MicAnchorReferenceCloserDelimiter.class.st |  37 --
 ...MicAnchorReferenceOpenerDelimiter.class.st |  37 --
 src/Microdown/MicAnnotationBlock.class.st     | 136 -----
 .../MicAnnotationCloserDelimiter.class.st     |  38 --
 .../MicAnnotationOpenerDelimiter.class.st     |  31 -
 src/Microdown/MicBoldDelimiter.class.st       |  33 --
 src/Microdown/MicBoldFormatBlock.class.st     |  40 --
 src/Microdown/MicDocumentListBlock.class.st   |   2 +-
 src/Microdown/MicFigureBlock.class.st         | 135 -----
 .../MicFigureNameOpenerDelimiter.class.st     |  48 --
 src/Microdown/MicFormatBlock.class.st         |  60 --
 src/Microdown/MicInlineBlockWithUrl.class.st  | 191 -------
 src/Microdown/MicInlineElement.class.st       | 200 -------
 src/Microdown/MicInlineParser.class.st        | 538 ------------------
 src/Microdown/MicItalicDelimiter.class.st     |  33 --
 src/Microdown/MicItalicFormatBlock.class.st   |  41 --
 src/Microdown/MicLinkBlock.class.st           |  61 --
 .../MicLinkNameCloserDelimiter.class.st       |  28 -
 src/Microdown/MicLinkNameDelimiter.class.st   |  32 --
 .../MicLinkNameOpenerDelimiter.class.st       |  28 -
 src/Microdown/MicMathDelimiter.class.st       |  34 --
 src/Microdown/MicMathInlineBlock.class.st     |  83 ---
 src/Microdown/MicMonospaceDelimiter.class.st  |  33 --
 .../MicMonospaceFormatBlock.class.st          |  69 ---
 src/Microdown/MicRawBlock.class.st            |  64 ---
 src/Microdown/MicRawCloserDelimiter.class.st  |  33 --
 src/Microdown/MicRawOpenerDelimiter.class.st  |  33 --
 src/Microdown/MicStrikeDelimiter.class.st     |  33 --
 src/Microdown/MicStrikeFormatBlock.class.st   |  40 --
 src/Microdown/MicTextBlock.class.st           |  27 -
 src/Microdown/MicURLCloserDelimiter.class.st  |  38 --
 src/Microdown/MicURLOpenerDelimiter.class.st  |  38 --
 35 files changed, 3 insertions(+), 2558 deletions(-)
 delete mode 100644 src/Microdown/MicAbstractDelimiter.class.st
 delete mode 100644 src/Microdown/MicAnchorReferenceBlock.class.st
 delete mode 100644 src/Microdown/MicAnchorReferenceCloserDelimiter.class.st
 delete mode 100644 src/Microdown/MicAnchorReferenceOpenerDelimiter.class.st
 delete mode 100644 src/Microdown/MicAnnotationBlock.class.st
 delete mode 100644 src/Microdown/MicAnnotationCloserDelimiter.class.st
 delete mode 100644 src/Microdown/MicAnnotationOpenerDelimiter.class.st
 delete mode 100644 src/Microdown/MicBoldDelimiter.class.st
 delete mode 100644 src/Microdown/MicBoldFormatBlock.class.st
 delete mode 100644 src/Microdown/MicFigureBlock.class.st
 delete mode 100644 src/Microdown/MicFigureNameOpenerDelimiter.class.st
 delete mode 100644 src/Microdown/MicFormatBlock.class.st
 delete mode 100644 src/Microdown/MicInlineBlockWithUrl.class.st
 delete mode 100644 src/Microdown/MicInlineElement.class.st
 delete mode 100644 src/Microdown/MicInlineParser.class.st
 delete mode 100644 src/Microdown/MicItalicDelimiter.class.st
 delete mode 100644 src/Microdown/MicItalicFormatBlock.class.st
 delete mode 100644 src/Microdown/MicLinkBlock.class.st
 delete mode 100644 src/Microdown/MicLinkNameCloserDelimiter.class.st
 delete mode 100644 src/Microdown/MicLinkNameDelimiter.class.st
 delete mode 100644 src/Microdown/MicLinkNameOpenerDelimiter.class.st
 delete mode 100644 src/Microdown/MicMathDelimiter.class.st
 delete mode 100644 src/Microdown/MicMathInlineBlock.class.st
 delete mode 100644 src/Microdown/MicMonospaceDelimiter.class.st
 delete mode 100644 src/Microdown/MicMonospaceFormatBlock.class.st
 delete mode 100644 src/Microdown/MicRawBlock.class.st
 delete mode 100644 src/Microdown/MicRawCloserDelimiter.class.st
 delete mode 100644 src/Microdown/MicRawOpenerDelimiter.class.st
 delete mode 100644 src/Microdown/MicStrikeDelimiter.class.st
 delete mode 100644 src/Microdown/MicStrikeFormatBlock.class.st
 delete mode 100644 src/Microdown/MicTextBlock.class.st
 delete mode 100644 src/Microdown/MicURLCloserDelimiter.class.st
 delete mode 100644 src/Microdown/MicURLOpenerDelimiter.class.st

diff --git a/src/Microdown-Tests/MicMicrodownTextualBuilderTest.class.st b/src/Microdown-Tests/MicMicrodownTextualBuilderTest.class.st
index de04826e..462608bb 100644
--- a/src/Microdown-Tests/MicMicrodownTextualBuilderTest.class.st
+++ b/src/Microdown-Tests/MicMicrodownTextualBuilderTest.class.st
@@ -423,8 +423,8 @@ MicMicrodownTextualBuilderTest >> testRawFormat [
 { #category : #tests }
 MicMicrodownTextualBuilderTest >> testRawParametersWithNotStringAtValue [
 	
-	builder rawParameters: { 'label'->42 . 'size'->MicTextBlock } asDictionary.
-	self assert: builder contents equals: 'label=42&size=MicTextBlock'
+	builder rawParameters: { 'label'->42 . 'size'->MicTextBlock2 } asDictionary.
+	self assert: builder contents equals: 'label=42&size=MicTextBlock2'
 ]
 
 { #category : #'tests - slides' }
diff --git a/src/Microdown/MicAbstractDelimiter.class.st b/src/Microdown/MicAbstractDelimiter.class.st
deleted file mode 100644
index 20648976..00000000
--- a/src/Microdown/MicAbstractDelimiter.class.st
+++ /dev/null
@@ -1,199 +0,0 @@
-"
-I represent a delimiter used in grammar. I'm abstract.
-I'm useful for inline split parsing process.
-
-Methods to overide:
-- isCloser, isOpener: answer true or false whether am I a closing markup or an opening markup (I can be both for a format for instance, when markup is the same for both uses)
-- type: my type name, as a symbol
-- markup (a string)
-
-isActive is true when I must be part of searched delimiters during normal inline split process.
-(false for instance for delimiters relative to link or figure since they are analyzed in special procedure)
-
-My index refers to the index character in global string which is parsed.
-
-Always instantiate me with my constructor ""index:"" to precise it.
-"
-Class {
-	#name : #MicAbstractDelimiter,
-	#superclass : #Object,
-	#instVars : [
-		'index'
-	],
-	#pools : [
-		'MicMicrodownSharedPool'
-	],
-	#category : #'Microdown-Parser'
-}
-
-{ #category : #accessing }
-MicAbstractDelimiter class >> allActive [
-
-	^ self allSubclasses select: [ :subclass | subclass isActive ]
-]
-
-{ #category : #'as yet unclassified' }
-MicAbstractDelimiter class >> allRegex [
-	^ ((self allActive collect: [ :del | |str| 
-		str := WriteStream on: ''. 
-		(del associatedInlineBlock 
-			ifNil: [true] ifNotNil: [:block | block isEvaluated])
-			ifTrue: [ 
-				del markup do: [:char| str nextPut: $\;nextPut: char] ]
-			ifFalse: [
-				del markup do: [:char| str nextPut: $\;nextPut: char].
-				del associatedInlineBlock new closingDelimiter in: [ :other |
-					str nextPutAll: (self regexNot: other).
-					other do: [:char| str nextPut: $\;nextPut: char].
-					 ]
-				]. 
-		str contents]) joinUsing: '|') asRegex
-	
-]
-
-{ #category : #accessing }
-MicAbstractDelimiter class >> associatedInlineBlock [
-	^ self subclassResponsibility
-]
-
-{ #category : #accessing }
-MicAbstractDelimiter class >> associatedTypes [
-
-	^ { self type }
-]
-
-{ #category : #accessing }
-MicAbstractDelimiter class >> index: anIndex [
-	^ self new index: anIndex; yourself
-]
-
-{ #category : #testing }
-MicAbstractDelimiter class >> isActive [
-	^ true
-]
-
-{ #category : #testing }
-MicAbstractDelimiter class >> isBoth [
-	^ self isCloser and: self isOpener
-]
-
-{ #category : #accessing }
-MicAbstractDelimiter class >> isCloser [
-	^ self subclassResponsibility 
-]
-
-{ #category : #testing }
-MicAbstractDelimiter class >> isCloserOnly [
-	^ self isCloser and: self isOpener not
-]
-
-{ #category : #accessing }
-MicAbstractDelimiter class >> isOpener [
-	^ self subclassResponsibility 
-]
-
-{ #category : #testing }
-MicAbstractDelimiter class >> isOpenerOnly [
-	^ self isCloser not and: [ self isOpener ]
-]
-
-{ #category : #accessing }
-MicAbstractDelimiter class >> markup [
-	^ self subclassResponsibility 
-]
-
-{ #category : #'as yet unclassified' }
-MicAbstractDelimiter class >> rawStyleOpeningMarkups [
-	^ self allActive select: [ :del | del isOpener and: [ del associatedInlineBlock isEvaluated not ] ]
-]
-
-{ #category : #'as yet unclassified' }
-MicAbstractDelimiter class >> regexNot: markup [
-	"return a regular expression (string), which is recognizing anything but markup"
-	| str prefix|
-	str := WriteStream on: ''.
-	str nextPut: $(.
-	prefix := ''.
-	1 to: markup size do: [ :idx |
-		str nextPutAll: prefix; nextPut: $[;nextPut: $^; nextPut: (markup at: idx); nextPut: $].
-		prefix := '|', (markup copyFrom: 1 to: idx) escapeAll.
-		 ].
-	str nextPut: $);nextPut: $*.
-	^ str contents
-]
-
-{ #category : #accessing }
-MicAbstractDelimiter class >> size [
-	^ self markup size
-]
-
-{ #category : #accessing }
-MicAbstractDelimiter class >> type [
-	^ self subclassResponsibility 
-]
-
-{ #category : #dispatching }
-MicAbstractDelimiter >> addInlineBlock: anIndex to: inlineParser [
-
-	inlineParser addRegularInlineBlock: anIndex
-]
-
-{ #category : #accessing }
-MicAbstractDelimiter >> associatedInlineBlock [
-	^ self class associatedInlineBlock 
-]
-
-{ #category : #accessing }
-MicAbstractDelimiter >> endIndex [
-
-	^ self index - 1
-]
-
-{ #category : #accessing }
-MicAbstractDelimiter >> index [
-	^ index
-]
-
-{ #category : #accessing }
-MicAbstractDelimiter >> index: anInteger [
-	index := anInteger
-]
-
-{ #category : #testing }
-MicAbstractDelimiter >> isActive [
-	^ self class isActive
-]
-
-{ #category : #testing }
-MicAbstractDelimiter >> isCloser [
-	^ self class isCloser
-]
-
-{ #category : #testing }
-MicAbstractDelimiter >> isOpener [
-	^ self class isOpener
-]
-
-{ #category : #testing }
-MicAbstractDelimiter >> markup [
-	^ self class markup
-]
-
-{ #category : #printing }
-MicAbstractDelimiter >> printOn: aStream [
-	| name |
-	name := self class name.
-	aStream nextPutAll: (self class name copyFrom: 4 to: name size - 'Delimiter' size ).
-	aStream nextPut: $:; space ; nextPutAll: self markup
-	
-]
-
-{ #category : #accessing }
-MicAbstractDelimiter >> size [
-	^ self class size
-]
-
-{ #category : #accessing }
-MicAbstractDelimiter >> type [
-	^ self class type
-]
diff --git a/src/Microdown/MicAnchorReferenceBlock.class.st b/src/Microdown/MicAnchorReferenceBlock.class.st
deleted file mode 100644
index fb01f5b2..00000000
--- a/src/Microdown/MicAnchorReferenceBlock.class.st
+++ /dev/null
@@ -1,84 +0,0 @@
-"
-I represent a reference to a section, figure, environment. I follow the pattern `*@`, label, `@*`
-
-```
-See *@fig1@*
-```
-
-"
-Class {
-	#name : #MicAnchorReferenceBlock,
-	#superclass : #MicInlineElement,
-	#instVars : [
-		'reference'
-	],
-	#category : #'Microdown-ModelInline'
-}
-
-{ #category : #accessing }
-MicAnchorReferenceBlock class >> closingDelimiter [
-
- 	^ AnchorReferenceCloserMarkup
-]
-
-{ #category : #testing }
-MicAnchorReferenceBlock class >> isEvaluated [
-	^ false
-]
-
-{ #category : #accessing }
-MicAnchorReferenceBlock class >> openingDelimiter [
-
- 	^ AnchorReferenceOpenerMarkup
-]
-
-{ #category : #parsing }
-MicAnchorReferenceBlock class >> parse: delimiter stream: aTokenStream for: aParser [
-
-	^ aParser
-		  parseNonEvaluatedBlock: self
-		  token: delimiter
-		  stream: aTokenStream
-]
-
-{ #category : #visiting }
-MicAnchorReferenceBlock >> accept: aVisitor [
- 	^ aVisitor visitAnchorReference: self
-]
-
-{ #category : #accessing }
-MicAnchorReferenceBlock >> closingDelimiter [
-	^ self class closingDelimiter
-]
-
-{ #category : #initialization }
-MicAnchorReferenceBlock >> kind [
-
-	^ #anchorReference
-]
-
-{ #category : #accessing }
-MicAnchorReferenceBlock >> openingDelimiter [
-	^ self class openingDelimiter
-]
-
-{ #category : #accessing }
-MicAnchorReferenceBlock >> reference [
-	^ reference
-]
-
-{ #category : #accessing }
-MicAnchorReferenceBlock >> reference: aReference [
-	reference := aReference
-]
-
-{ #category : #visiting }
-MicAnchorReferenceBlock >> referenceAsHTML [	
-	| ref |
-	self flag: #todo.
-	ref := self reference.
-	(ref endsWith: '.md')
-		ifTrue: [ ref := (ref copyUpToLast: $.) , '.html' ]
-		ifFalse: [ Error signal: 'Reference : ' , ref , ' should end with .pillar or .pier' ].
-	^ ref
-]
diff --git a/src/Microdown/MicAnchorReferenceCloserDelimiter.class.st b/src/Microdown/MicAnchorReferenceCloserDelimiter.class.st
deleted file mode 100644
index c6f3a332..00000000
--- a/src/Microdown/MicAnchorReferenceCloserDelimiter.class.st
+++ /dev/null
@@ -1,37 +0,0 @@
-"
-An anchor reference represents a reference to a section, figure, environment. It follows the pattern `*@`, label, `@*`
-
-```
-See *@fig1@*
-```
-"
-Class {
-	#name : #MicAnchorReferenceCloserDelimiter,
-	#superclass : #MicAbstractDelimiter,
-	#category : #'Microdown-Parser'
-}
-
-{ #category : #accessing }
-MicAnchorReferenceCloserDelimiter class >> associatedInlineBlock [
-	^ MicAnchorReferenceBlock 
-]
-
-{ #category : #accessing }
-MicAnchorReferenceCloserDelimiter class >> isCloser [
-	^ true
-]
-
-{ #category : #accessing }
-MicAnchorReferenceCloserDelimiter class >> isOpener [
-	^ false
-]
-
-{ #category : #accessing }
-MicAnchorReferenceCloserDelimiter class >> markup [
-	^ AnchorReferenceCloserMarkup
-]
-
-{ #category : #accessing }
-MicAnchorReferenceCloserDelimiter class >> type [
-	^ #anchorReference 
-]
diff --git a/src/Microdown/MicAnchorReferenceOpenerDelimiter.class.st b/src/Microdown/MicAnchorReferenceOpenerDelimiter.class.st
deleted file mode 100644
index 1dff8e36..00000000
--- a/src/Microdown/MicAnchorReferenceOpenerDelimiter.class.st
+++ /dev/null
@@ -1,37 +0,0 @@
-"
-An anchor reference represents a reference to a section, figure, environment. It follows the pattern `*@`, label, `@*`
-
-```
-See *@fig1@*
-```
-"
-Class {
-	#name : #MicAnchorReferenceOpenerDelimiter,
-	#superclass : #MicAbstractDelimiter,
-	#category : #'Microdown-Parser'
-}
-
-{ #category : #accessing }
-MicAnchorReferenceOpenerDelimiter class >> associatedInlineBlock [
-	^ MicAnchorReferenceBlock 
-]
-
-{ #category : #accessing }
-MicAnchorReferenceOpenerDelimiter class >> isCloser [
-	^ false
-]
-
-{ #category : #accessing }
-MicAnchorReferenceOpenerDelimiter class >> isOpener [
-	^ true
-]
-
-{ #category : #accessing }
-MicAnchorReferenceOpenerDelimiter class >> markup [
-	^ AnchorReferenceOpenerMarkup
-]
-
-{ #category : #accessing }
-MicAnchorReferenceOpenerDelimiter class >> type [
-	^ #anchorReference
-]
diff --git a/src/Microdown/MicAnnotationBlock.class.st b/src/Microdown/MicAnnotationBlock.class.st
deleted file mode 100644
index 483a2ac6..00000000
--- a/src/Microdown/MicAnnotationBlock.class.st
+++ /dev/null
@@ -1,136 +0,0 @@
-"
-I represent an annotation delimted by `{!` and `!}`: a tag with parameters.
-
-The following is a citation annotation with as parameters the name variable bound to the string 'Duca99a'.
-
-```text
-{!citation|name=Duca99a!}
-```
-
-```
-MicroDownParser parse: '{!citation|name=Duca99a!}'
-```
-"
-Class {
-	#name : #MicAnnotationBlock,
-	#superclass : #MicInlineElement,
-	#instVars : [
-		'arguments'
-	],
-	#category : #'Microdown-ModelInline'
-}
-
-{ #category : #documentation }
-MicAnnotationBlock class >> addDocumentDefinedAnnotations: aBuilder [
-	| currentDefinedTags |
-	currentDefinedTags := self allSubclasses collect: [ :subclass | subclass tag -> subclass name].
-	aBuilder newLine.
-	aBuilder header: [ aBuilder text: 'Defined annotations' ] withLevel: 2.
-	aBuilder unorderedListDuring: [ 
-		currentDefinedTags do: [:tagAndClass | 
-	
-			aBuilder item: [ 
-				aBuilder 
-					bold: [aBuilder text: tagAndClass key];
-					text: ' defined by ';
-					monospace: tagAndClass value
-					]]
-		 ]
-]
-
-{ #category : #documentation }
-MicAnnotationBlock class >> buildMicroDownUsing: aBuilder withComment: aString [
-	
-	super buildMicroDownUsing: aBuilder withComment: aString.
-	self addDocumentDefinedAnnotations: aBuilder
-]
-
-{ #category : #accessing }
-MicAnnotationBlock class >> closingDelimiter [
-
- 	^ AnnotationCloserMarkup
-]
-
-{ #category : #constructor }
-MicAnnotationBlock class >> from: aStartInteger to: anEndInteger withSubstring: aString withChildren: aChildren [
-
-	| splitter tag extensionClass |
-	splitter := MicArgumentList
-		            split: aString
-		            defaultArg: #annotationKind
-		            defaultValue: 'Me'.
-	tag := splitter defaultValue trimBoth.
-
-	extensionClass := self extensionClassFor: tag.
-
-	^ extensionClass new
-		  start: aStartInteger;
-		  end: anEndInteger;
-		  substring: aString;
-		  children: aChildren;
-		  arguments: splitter;
-		  closeMe;
-		  cleanSubstring;
-		  yourself
-]
-
-{ #category : #accessing }
-MicAnnotationBlock class >> openingDelimiter [
-
- 	^ AnnotationOpenerMarkup
-]
-
-{ #category : #accessing }
-MicAnnotationBlock class >> tag [
-	^ #empty
-]
-
-{ #category : #visiting }
-MicAnnotationBlock >> accept: aVisitor [
-	^ aVisitor visitAnnotation: self
-]
-
-{ #category : #accessing }
-MicAnnotationBlock >> arguments [
-	^ arguments
-]
-
-{ #category : #accessing }
-MicAnnotationBlock >> arguments: anArguments [
-	arguments := anArguments
-]
-
-{ #category : #visiting }
-MicAnnotationBlock >> closeMe [ 
-
-	
-]
-
-{ #category : #accessing }
-MicAnnotationBlock >> closingDelimiter [
-	^ self class closingDelimiter
-]
-
-{ #category : #accessing }
-MicAnnotationBlock >> kind [
-
-	^ #annotation
-]
-
-{ #category : #accessing }
-MicAnnotationBlock >> name [
-	^ arguments defaultValue
-]
-
-{ #category : #accessing }
-MicAnnotationBlock >> openingDelimiter [
-	^ self class openingDelimiter
-]
-
-{ #category : #accessing }
-MicAnnotationBlock >> printOn: aStream [
-
-	aStream nextPutAll: self openingDelimiter.
-	aStream nextPutAll: self substring.
-	aStream nextPutAll: self closingDelimiter.
-]
diff --git a/src/Microdown/MicAnnotationCloserDelimiter.class.st b/src/Microdown/MicAnnotationCloserDelimiter.class.st
deleted file mode 100644
index d535b42d..00000000
--- a/src/Microdown/MicAnnotationCloserDelimiter.class.st
+++ /dev/null
@@ -1,38 +0,0 @@
-"
-An anchor reference represents a reference to a section, figure, environment. It follows the pattern `*@`, label, `*`
-
-```
-See *@fig1*
-```
-"
-Class {
-	#name : #MicAnnotationCloserDelimiter,
-	#superclass : #MicAbstractDelimiter,
-	#category : #'Microdown-Parser'
-}
-
-{ #category : #accessing }
-MicAnnotationCloserDelimiter class >> associatedInlineBlock [
-	^ MicAnnotationBlock 
-]
-
-{ #category : #accessing }
-MicAnnotationCloserDelimiter class >> isCloser [
-	^ true
-]
-
-{ #category : #accessing }
-MicAnnotationCloserDelimiter class >> isOpener [
-	^ false
-]
-
-{ #category : #accessing }
-MicAnnotationCloserDelimiter class >> markup [
-
-	^ AnnotationCloserMarkup
-]
-
-{ #category : #accessing }
-MicAnnotationCloserDelimiter class >> type [
-	^ #annotation
-]
diff --git a/src/Microdown/MicAnnotationOpenerDelimiter.class.st b/src/Microdown/MicAnnotationOpenerDelimiter.class.st
deleted file mode 100644
index 73ad5381..00000000
--- a/src/Microdown/MicAnnotationOpenerDelimiter.class.st
+++ /dev/null
@@ -1,31 +0,0 @@
-Class {
-	#name : #MicAnnotationOpenerDelimiter,
-	#superclass : #MicAbstractDelimiter,
-	#category : #'Microdown-Parser'
-}
-
-{ #category : #accessing }
-MicAnnotationOpenerDelimiter class >> associatedInlineBlock [
-	^ MicAnnotationBlock 
-]
-
-{ #category : #accessing }
-MicAnnotationOpenerDelimiter class >> isCloser [
-	^ false
-]
-
-{ #category : #accessing }
-MicAnnotationOpenerDelimiter class >> isOpener [
-	^ true
-]
-
-{ #category : #accessing }
-MicAnnotationOpenerDelimiter class >> markup [
-
-	^ AnnotationOpenerMarkup
-]
-
-{ #category : #accessing }
-MicAnnotationOpenerDelimiter class >> type [
-	^ #annotation
-]
diff --git a/src/Microdown/MicBoldDelimiter.class.st b/src/Microdown/MicBoldDelimiter.class.st
deleted file mode 100644
index ba227ed9..00000000
--- a/src/Microdown/MicBoldDelimiter.class.st
+++ /dev/null
@@ -1,33 +0,0 @@
-"
-I am the delimiter for bold/strong format.
-"
-Class {
-	#name : #MicBoldDelimiter,
-	#superclass : #MicAbstractDelimiter,
-	#category : #'Microdown-Parser'
-}
-
-{ #category : #accessing }
-MicBoldDelimiter class >> associatedInlineBlock [
-	^ MicBoldFormatBlock 
-]
-
-{ #category : #accessing }
-MicBoldDelimiter class >> isCloser [
-	^ true
-]
-
-{ #category : #accessing }
-MicBoldDelimiter class >> isOpener [
-	^ true
-]
-
-{ #category : #accessing }
-MicBoldDelimiter class >> markup [
-	^ BoldMarkup
-]
-
-{ #category : #accessing }
-MicBoldDelimiter class >> type [
-	^ #bold
-]
diff --git a/src/Microdown/MicBoldFormatBlock.class.st b/src/Microdown/MicBoldFormatBlock.class.st
deleted file mode 100644
index 1d91a896..00000000
--- a/src/Microdown/MicBoldFormatBlock.class.st
+++ /dev/null
@@ -1,40 +0,0 @@
-"
-I represent a bold text section. I'm delimited using `**` as in `**bold**` to obtain **bold**.
-"
-Class {
-	#name : #MicBoldFormatBlock,
-	#superclass : #MicFormatBlock,
-	#category : #'Microdown-ModelInline'
-}
-
-{ #category : #accessing }
-MicBoldFormatBlock class >> closingDelimiter [
-
- 	^ BoldMarkup
-]
-
-{ #category : #accessing }
-MicBoldFormatBlock class >> openingDelimiter [
-
- 	^ BoldMarkup
-]
-
-{ #category : #utilities }
-MicBoldFormatBlock >> accept: aVisitor [
-	^ aVisitor visitBold: self
-]
-
-{ #category : #accessing }
-MicBoldFormatBlock >> closingDelimiter [
-	^ self class closingDelimiter
-]
-
-{ #category : #utilities }
-MicBoldFormatBlock >> kind [
-	^ #bold
-]
-
-{ #category : #accessing }
-MicBoldFormatBlock >> openingDelimiter [
-	^ self class openingDelimiter
-]
diff --git a/src/Microdown/MicDocumentListBlock.class.st b/src/Microdown/MicDocumentListBlock.class.st
index c56dbf8d..09b9a214 100644
--- a/src/Microdown/MicDocumentListBlock.class.st
+++ b/src/Microdown/MicDocumentListBlock.class.st
@@ -1,6 +1,6 @@
 Class {
 	#name : #MicDocumentListBlock,
-	#superclass : #MicAnnotationBlock,
+	#superclass : #MicAnnotationBlock2,
 	#category : #'Microdown-Extensions'
 }
 
diff --git a/src/Microdown/MicFigureBlock.class.st b/src/Microdown/MicFigureBlock.class.st
deleted file mode 100644
index 778e3440..00000000
--- a/src/Microdown/MicFigureBlock.class.st
+++ /dev/null
@@ -1,135 +0,0 @@
-"
-I am a **figure**.
-
-My syntax is: `![Here is a nice caption.](https://files.pharo.org/media/logo/logo.png  ""anchor=figanchor&width=80"")`
-
-You should get the following picture: 
-![Here is a nice caption.](https://files.pharo.org/media/logo/logo.png ""anchor=figanchor&width=80"")
-
-I have a resources, i.e. an object referencing either a file (in relative or absolute manner) or an Url, that refers to a given image object.
-
-What is important to see is that there is a space between the url arguments and microdown arguments. 
-"
-Class {
-	#name : #MicFigureBlock,
-	#superclass : #MicInlineBlockWithUrl,
-	#category : #'Microdown-ModelInline'
-}
-
-{ #category : #accessing }
-MicFigureBlock class >> closingDelimiter [
-
- 	^ NameCloserUrlOpener
-]
-
-{ #category : #accessing }
-MicFigureBlock class >> openingDelimiter [
-
- 	^ FigureNameOpenerMarkup
-]
-
-{ #category : #converting }
-MicFigureBlock >> accept: aVisitor [
- 	^ aVisitor visitFigure: self
-]
-
-{ #category : #accessing }
-MicFigureBlock >> alt [
-  ^ self arguments at: #alt ifAbsent: ['']
-]
-
-{ #category : #accessing }
-MicFigureBlock >> alt: aString [
-    self arguments at: #alt put: aString
-]
-
-{ #category : #accessing }
-MicFigureBlock >> anchor [
-	^ self arguments 
-		at: #anchor 
-		ifAbsent: [ nil ] 
-]
-
-{ #category : #visiting }
-MicFigureBlock >> closeMe [
-	"the link url - ![alt text](url) - url is allowed to have title in quotes
-	(url ""title"") "
-
-	| split title|
-	split := url splitOnFirst: Character space.
-	self reference: (MicResourceReference fromUri: split first).
-	title := (split second ifNil: [ '' ]) 
-		trimBoth: [:char | {$". Character space} includes: char].
-	self arguments: (MicArgumentList withString: title).
-	self captionElements: (self inlineParse: substring).
-	self children: captionElements
-]
-
-{ #category : #'to be removed' }
-MicFigureBlock >> figurePath [
-	"this is a hack waiting for the resolution of resource references"
-	"when we have file://figures/foo.png we want to have figures/foo.png "
-	
-	^ (self url asString beginsWith: 'file://')
-		ifTrue: [ (self url allButFirst: 'file://' size) substrings at: 1 ]
-		ifFalse: [ self url substrings at: 1  ] 
-	
-	
-]
-
-{ #category : #printing }
-MicFigureBlock >> fullName [
-
-	^ reference fullName
-]
-
-{ #category : #testing }
-MicFigureBlock >> hasAnchor [
-
-	^ self anchor isNotNil
-]
-
-{ #category : #testing }
-MicFigureBlock >> hasCaption [
-	
-	^ captionElements notNil 
-]
-
-{ #category : #testing }
-MicFigureBlock >> hasChildren [
-	^ self children notEmpty
-]
-
-{ #category : #accessing }
-MicFigureBlock >> kind [
-	self flag: #todo. 
-	"remove me"
- 	^ #figure
-]
-
-{ #category : #accessing }
-MicFigureBlock >> openingDelimiter [
-	^ self class openingDelimiter
-]
-
-{ #category : #accessing }
-MicFigureBlock >> originUrl [
-	^ self properties 
-		at: #originUrl 
-		ifAbsent: [ url halt]
-]
-
-{ #category : #printing }
-MicFigureBlock >> printOn: aStream [
- 		aStream nextPut: $!;
- 			nextPut: $[;
- 			nextPutAll: self caption;
- 			nextPut: $];
- 			nextPut: $(.
-		aStream nextPutAll: (
-			url
-				ifNotNil: [ url ] 
-				ifNil: [ String empty ]).		 
-		aStream nextPut: $).
- 		
-]
diff --git a/src/Microdown/MicFigureNameOpenerDelimiter.class.st b/src/Microdown/MicFigureNameOpenerDelimiter.class.st
deleted file mode 100644
index 8dca9a40..00000000
--- a/src/Microdown/MicFigureNameOpenerDelimiter.class.st
+++ /dev/null
@@ -1,48 +0,0 @@
-"
-I am the opener delimiter for figure name.
-"
-Class {
-	#name : #MicFigureNameOpenerDelimiter,
-	#superclass : #MicAbstractDelimiter,
-	#category : #'Microdown-Parser'
-}
-
-{ #category : #accessing }
-MicFigureNameOpenerDelimiter class >> associatedInlineBlock [
-	^ MicFigureBlock
-]
-
-{ #category : #accessing }
-MicFigureNameOpenerDelimiter class >> associatedTypes [
-
-	^ {  
-		MicLinkNameDelimiter type.
-		self type.
-	}
-]
-
-{ #category : #accessing }
-MicFigureNameOpenerDelimiter class >> isCloser [
-	^ false
-]
-
-{ #category : #accessing }
-MicFigureNameOpenerDelimiter class >> isOpener [
-	^ true
-]
-
-{ #category : #accessing }
-MicFigureNameOpenerDelimiter class >> markup [
-	^ FigureNameOpenerMarkup
-]
-
-{ #category : #accessing }
-MicFigureNameOpenerDelimiter class >> type [
-	^ #figure
-]
-
-{ #category : #dispatching }
-MicFigureNameOpenerDelimiter >> addInlineBlock: anIndex to: inlineParser [
-
-	inlineParser linkOrFigureProcess: anIndex
-]
diff --git a/src/Microdown/MicFormatBlock.class.st b/src/Microdown/MicFormatBlock.class.st
deleted file mode 100644
index 9276f465..00000000
--- a/src/Microdown/MicFormatBlock.class.st
+++ /dev/null
@@ -1,60 +0,0 @@
-Class {
-	#name : #MicFormatBlock,
-	#superclass : #MicInlineElement,
-	#category : #'Microdown-ModelInline'
-}
-
-{ #category : #visiting }
-MicFormatBlock >> closeMe [
-	
-	| text |
-	
-	children ifEmpty: [
-			text :=  (MicTextBlock
-							from: start
-							to: end
-							withSubstring: substring
-							withChildren: Array empty).
-			self children: { text } ]
-]
-
-{ #category : #printing }
-MicFormatBlock >> printOn: aStream [
-
-	self printWithoutConventions: aStream.
-	aStream nextPut: $(.
-	self children ifNotNil: [ children do: [ :each | each printOn: aStream ] 
-		separatedBy: [aStream nextPutAll: ' ']].
-	aStream nextPut: $)
-]
-
-{ #category : #accessing }
-MicFormatBlock >> text [
-
- 	^ String streamContents: [:st | self wrappedElements do: [ :each | st nextPutAll: each text ]]
-]
-
-{ #category : #accessing }
-MicFormatBlock >> textElement [
-	^ children first
-]
-
-{ #category : #accessing }
-MicFormatBlock >> textElement: aMicTextBlock [ 
-	children := { aMicTextBlock }
-]
-
-{ #category : #accessing }
-MicFormatBlock >> textElements [
-	^ children 
-]
-
-{ #category : #accessing }
-MicFormatBlock >> textElements: aCollection [ 
-	children := aCollection
-]
-
-{ #category : #accessing }
-MicFormatBlock >> wrappedElements [
-	^ children
-]
diff --git a/src/Microdown/MicInlineBlockWithUrl.class.st b/src/Microdown/MicInlineBlockWithUrl.class.st
deleted file mode 100644
index d13ab31d..00000000
--- a/src/Microdown/MicInlineBlockWithUrl.class.st
+++ /dev/null
@@ -1,191 +0,0 @@
-"
-My subclasses manage figures and links.
-
-```
-![Pharologo](https://files.pharo.org/media/logo/logo.png
-```
-
-![Pharologo](https://files.pharo.org/media/logo/logo.png)
-"
-Class {
-	#name : #MicInlineBlockWithUrl,
-	#superclass : #MicInlineElement,
-	#instVars : [
-		'url',
-		'parser',
-		'captionElements',
-		'arguments',
-		'reference'
-	],
-	#category : #'Microdown-ModelInline'
-}
-
-{ #category : #accessing }
-MicInlineBlockWithUrl class >> closingDelimiter [
-
- 	^ URLCloserMarkup
-]
-
-{ #category : #private }
-MicInlineBlockWithUrl class >> fileStringWithoutHostFile: aString [
-	| localFileIndicator |
-	localFileIndicator := 'file://'.
-	^ (aString beginsWith: localFileIndicator)
-			ifTrue: [ aString allButFirst: localFileIndicator size ]
-			ifFalse: [ aString ]
-]
-
-{ #category : #'instance creation' }
-MicInlineBlockWithUrl class >> from: aStartInteger to: anEndInteger withKind: aKind withSubstring: aString withChildren: aChildren withURL: aURL [
-	^ self new 
-		start: aStartInteger; 
-		end: anEndInteger; 
-		substring: aString; 
-		children: aChildren;
-		url: aURL;
-		closeMe; 
-		cleanSubstring; 
-		yourself
-]
-
-{ #category : #'instance creation' }
-MicInlineBlockWithUrl class >> from: aStartInteger to: anEndInteger withKind: aKind withSubstring: aString withChildren: aChildren withURL: aURL withParser: aParser [
-	^ self new 
-		start: aStartInteger; 
-		end: anEndInteger; 
-		substring: aString; 
-		children: aChildren; 
-		url: aURL;
-		parser: aParser;
-		closeMe; 
-		cleanSubstring; 
-		yourself
-]
-
-{ #category : #'instance creation' }
-MicInlineBlockWithUrl class >> from: aStartInteger to: anEndInteger withKind: aKind withSubstring: aString withURL: aURL [
-	^ (self from: aStartInteger to: anEndInteger withKind: aKind withSubstring: aString withChildren: Array empty withURL: aURL)
-]
-
-{ #category : #parsing }
-MicInlineBlockWithUrl class >> parse: token stream: aTokenStream for: aParser [
-	^ aParser parseNameUrlBlock: self from: aTokenStream token: token
-]
-
-{ #category : #accessing }
-MicInlineBlockWithUrl >> argumentAt: aKey [
-
-	^ self arguments at: aKey
-]
-
-{ #category : #accessing }
-MicInlineBlockWithUrl >> argumentAt: aKey ifPresent: aBlock [
-	"Lookup the given key in the receiver. If it is present, answer the value of evaluating the given block with the value associated with the key. Otherwise, answer self."
-
-	self arguments 
-		at: aKey
-		ifPresent: aBlock
-]
-
-{ #category : #accessing }
-MicInlineBlockWithUrl >> argumentAt: aKey put: anObject [
-
-	self arguments at: aKey put: anObject
-]
-
-{ #category : #accessing }
-MicInlineBlockWithUrl >> arguments [
-	^ arguments
-]
-
-{ #category : #accessing }
-MicInlineBlockWithUrl >> arguments: aDictionary [
-	arguments := aDictionary
-]
-
-{ #category : #accessing }
-MicInlineBlockWithUrl >> caption [
-	^ String streamContents: [:st | self captionElements do: [ :each | st nextPutAll: each text ] ] 
-]
-
-{ #category : #visiting }
-MicInlineBlockWithUrl >> captionElements [ 
-	^ captionElements ifNil: [ OrderedCollection new ]
-]
-
-{ #category : #visiting }
-MicInlineBlockWithUrl >> captionElements: aCollection [ 
-	captionElements := aCollection
-]
-
-{ #category : #accessing }
-MicInlineBlockWithUrl >> closingDelimiter [
-	^ self class closingDelimiter
-]
-
-{ #category : #accessing }
-MicInlineBlockWithUrl >> fileStringWithoutHostFile [
-	^ self class fileStringWithoutHostFile: url asString
-]
-
-{ #category : #accessing }
-MicInlineBlockWithUrl >> hasArguments [
-	"Answer <true> if the receiver contain at least 1 argument"
-	
-	^ arguments notEmpty
-]
-
-{ #category : #accessing }
-MicInlineBlockWithUrl >> initialize [
-
-	super initialize.
-	arguments := OrderedDictionary new
-]
-
-{ #category : #accessing }
-MicInlineBlockWithUrl >> parser [ 
-	^ parser
-]
-
-{ #category : #accessing }
-MicInlineBlockWithUrl >> parser: aParser [
-	parser := aParser
-]
-
-{ #category : #printing }
-MicInlineBlockWithUrl >> printOn: aStream [
-	| contents |
-	contents := children
-		            ifEmpty: [ self substring ]
-		            ifNotEmpty: [ self childrenPrintOn ].
-	aStream
-		nextPut: $[;
-		nextPutAll: contents;
-		nextPut: $];
-		nextPut: $(.
-		aStream nextPutAll: url. 
-	aStream nextPut: $)
-]
-
-{ #category : #accessing }
-MicInlineBlockWithUrl >> reference [
-
-	^ reference
-]
-
-{ #category : #accessing }
-MicInlineBlockWithUrl >> reference: anObject [
-
-	reference := anObject
-]
-
-{ #category : #accessing }
-MicInlineBlockWithUrl >> url [
-	^ url
-]
-
-{ #category : #accessing }
-MicInlineBlockWithUrl >> url: anURL [
-
-	url := anURL
-]
diff --git a/src/Microdown/MicInlineElement.class.st b/src/Microdown/MicInlineElement.class.st
deleted file mode 100644
index 631afdbc..00000000
--- a/src/Microdown/MicInlineElement.class.st
+++ /dev/null
@@ -1,200 +0,0 @@
-"
-I am an inline block generated by inline splitter, to parse inline text.
-
-I am characterized by:
-- start & end: locations of my opener & closer delimiters in initial string
-- substring: concerned text (without delimiters so)
-- kind: my type, symbol which must be the same than my relative delimiter type (#basic for normal text)
-- children: array in case of nested inline blocks
-
-
-"
-Class {
-	#name : #MicInlineElement,
-	#superclass : #MicElement,
-	#instVars : [
-		'start',
-		'end',
-		'children',
-		'substring'
-	],
-	#category : #'Microdown-ModelInline'
-}
-
-{ #category : #constructor }
-MicInlineElement class >> from: aStartInteger to: anEndInteger withSubstring: aString [
-	^ self from: aStartInteger to: anEndInteger withSubstring: aString withChildren: Array new
-]
-
-{ #category : #constructor }
-MicInlineElement class >> from: aStartInteger to: anEndInteger withSubstring: aString withChildren: aChildren [
-	^ self new 
-		start: aStartInteger; 
-		end: anEndInteger; 
-		substring: aString; 
-		children: aChildren;
-		closeMe;  
-		cleanSubstring; 
-		yourself.	
-]
-
-{ #category : #testing }
-MicInlineElement class >> isEvaluated [
-	^ true
-]
-
-{ #category : #accessing }
-MicInlineElement class >> openingDelimiter [
-
-	self subclassResponsibility
-]
-
-{ #category : #parsing }
-MicInlineElement class >> parse: token stream: aTokenStream for: aParser [
-
-	^ aParser
-		  parseEvaluatedBlock: self
-		  token: token
-		  stream: aTokenStream
-]
-
-{ #category : #accessing }
-MicInlineElement >> children [
-	^ children
-]
-
-{ #category : #accessing }
-MicInlineElement >> children: anArray [
-	children := anArray
-]
-
-{ #category : #printing }
-MicInlineElement >> childrenPrintOn [
-	^ (children asString allButFirst: 9) allButLast
-]
-
-{ #category : #operations }
-MicInlineElement >> cleanSubstring [
-	"remove all \ left by the MicInlineParser - and replace \\ with single \"
-	self substring: (MicInlineParser escapeDecode: self substring )
-]
-
-{ #category : #visiting }
-MicInlineElement >> closeMe [
-	"Hook to perform post creation action. The name is the same as for blocks."
-	
-]
-
-{ #category : #accessing }
-MicInlineElement >> end [
-	^ end
-]
-
-{ #category : #accessing }
-MicInlineElement >> end: anInteger [
-	end := anInteger
-]
-
-{ #category : #operations }
-MicInlineElement >> escapeCharacter [
-	^ '\'
-]
-
-{ #category : #initialization }
-MicInlineElement >> initialize [
-
-	super initialize. 
-	children := #().
-	
-]
-
-{ #category : #testing }
-MicInlineElement >> isOnlyChild [
-	^ children isEmpty
-]
-
-{ #category : #accessing }
-MicInlineElement >> kind [
-	"we are deprecating the state"
-	^ self error
-]
-
-{ #category : #accessing }
-MicInlineElement >> literal [
-	^ substring copyFrom: start to: end. 
-]
-
-{ #category : #accessing }
-MicInlineElement >> openingDelimiter [
-	^ self class openingDelimiter
-]
-
-{ #category : #accessing }
-MicInlineElement >> openingDelimiterSize [
-
-	^ self openingDelimiter size
-]
-
-{ #category : #accessing }
-MicInlineElement >> parent: aParent [
-	parent := aParent
-]
-
-{ #category : #printing }
-MicInlineElement >> print: aString surroundedOn: aStream [
-
-	aStream 
-		nextPut: $(;
-		nextPutAll: aString;
-		nextPut: $) 
-
-]
-
-{ #category : #printing }
-MicInlineElement >> printOn: aStream [
-
-	| contents |
-	contents := children 
-		ifEmpty: [ self substring ] 
-		ifNotEmpty: [ self childrenPrintOn ].
-	aStream nextPut: $[;
-				nextPutAll: contents;
-				nextPut: $];
-				nextPut: $(;
-				nextPutAll: self kind;
-				nextPut: $) 
-
-]
-
-{ #category : #printing }
-MicInlineElement >> printWithoutConventions: aStream [
-	"Remove Mic and Block from the class."
-	
-	aStream nextPutAll: ((self class name allButFirst: 3) allButLast: 5).
-
-]
-
-{ #category : #accessing }
-MicInlineElement >> start [ 	
-	^ start
-]
-
-{ #category : #accessing }
-MicInlineElement >> start: anInteger [
-	start := anInteger 
-]
-
-{ #category : #obsolete }
-MicInlineElement >> substring [
-	^ substring
-]
-
-{ #category : #obsolete }
-MicInlineElement >> substring: aSubString [
-	substring := aSubString
-]
-
-{ #category : #accessing }
-MicInlineElement >> text [
- 	^ substring
-]
diff --git a/src/Microdown/MicInlineParser.class.st b/src/Microdown/MicInlineParser.class.st
deleted file mode 100644
index eae9baf3..00000000
--- a/src/Microdown/MicInlineParser.class.st
+++ /dev/null
@@ -1,538 +0,0 @@
-"
-I'm a parser of block text. I'm responsible to generate text, annotation, format, link, url kind of objects.
-"
-Class {
-	#name : #MicInlineParser,
-	#superclass : #Object,
-	#instVars : [
-		'openersStack',
-		'result',
-		'index',
-		'string',
-		'incrementation',
-		'children',
-		'nestedLevel',
-		'opener',
-		'closer',
-		'correctSubstring',
-		'correctURL',
-		'delimiterClass',
-		'keys',
-		'allDelimiters'
-	],
-	#classVars : [
-		'AllDelimiters',
-		'KeyBeginSet'
-	],
-	#pools : [
-		'MicMicrodownSharedPool'
-	],
-	#category : #'Microdown-Parser'
-}
-
-{ #category : #accessing }
-MicInlineParser class >> abstractDelimiterClass [
-
-	^ MicAbstractDelimiter
-]
-
-{ #category : #accessing }
-MicInlineParser class >> allDelimiters [
-	
-	AllDelimiters ifNil: [ 
-		AllDelimiters := Dictionary new.
-		self abstractDelimiterClass allActive do: [ :subclass | 
-				AllDelimiters 
-					at: subclass markup 
-					put: subclass ] ].
-
-	^ AllDelimiters 
-]
-
-{ #category : #'escape character' }
-MicInlineParser class >> escapeDecode: aString [
-	"I convert all encoded chars back to their original (without the leading escape character)"
-	"My sister method escapeEncode encodes into the format I decode from"
-	| inStream outStream char special |
-	aString ifEmpty: [ ^aString ].
-	special := [ :c | c asInteger between: self magicCharacter  and: self magicCharacter + 65536 ].
-	inStream := ReadStream on: aString.
-	outStream := WriteStream on: String new.
-	[ inStream atEnd ] whileFalse: [ 
-		char := inStream next.
-		(special value: char)
-			ifTrue: [ char := (char asInteger - self magicCharacter ) asCharacter  ].
-		outStream nextPut: char
-	].
-	^ outStream contents
-	
-]
-
-{ #category : #'escape character' }
-MicInlineParser class >> escapeEncode: aString [
-	"I convert all escaped characters (eg '\`' or '\\') into special characters which are not used in Microdown"
-	"My sister method escapeDecode reverts back"
-	| inStream outStream char |
-	aString size <= 1 ifTrue: [ ^aString ].
-	inStream := ReadStream on: aString.
-	outStream := WriteStream on: String new.
-	[ inStream atEnd ] whileFalse: [ 
-		char := inStream next.
-		(char = $\ and: [ inStream atEnd not ]) 
-			ifTrue: [ char := (inStream next asInteger + self magicCharacter) asCharacter  ].
-		outStream nextPut: char
-	].
-	^ outStream contents
-	
-]
-
-{ #category : #'escape character' }
-MicInlineParser class >> escapeReescape: aString except: keep [
-	"I convert all encoded back to escaped chars, except the characters in keep"
-	"My sister method escapeEncode encodes into the format I decode from"
-	| inStream outStream char |
-	aString ifEmpty: [ ^aString ].
-	inStream := ReadStream on: aString.
-	outStream := WriteStream on: String new.
-	[ inStream atEnd ] whileFalse: [ 
-		char := inStream next.
-		(char asInteger between: self magicCharacter  and: self magicCharacter + 65536)
-			ifTrue: [ 
-				char := (char asInteger - self magicCharacter ) asCharacter.  
-				(keep includes: char) ifFalse: [outStream nextPut: $\]] .
-		outStream nextPut: char
-	].
-	^ outStream contents
-	
-]
-
-{ #category : #'class initialization' }
-MicInlineParser class >> initialize [
-	<script>
-	AllDelimiters := KeyBeginSet := nil.
-]
-
-{ #category : #accessing }
-MicInlineParser class >> keyBeginSet [
-
-	KeyBeginSet ifNil: [ KeyBeginSet := (self allDelimiters keys collect: #first) asSet ].
-	^ KeyBeginSet
-]
-
-{ #category : #'escape character' }
-MicInlineParser class >> magicCharacter [
-	"All escaped characters are moved out of range. 
-	The unicode range Private Use Area is used, 
-	see https://en.wikipedia.org/wiki/Private_Use_Areas "
-	^ 16r100000 "Private Use Area-B"
-]
-
-{ #category : #'handle basic text' }
-MicInlineParser >> addATextFrom: start to: end toFinalArray: aFinalArray [
-	(start > end or: [end > string size])
-		ifTrue: [ " do nothing "]
-		ifFalse: [ aFinalArray add: (self newBasicInlineBlockFrom: start to: end ) ]
-]
-
-{ #category : #process }
-MicInlineParser >> addInlineBlock: indexOfAssociateOpener [
-	
-	opener := openersStack at: indexOfAssociateOpener.
-	closer := delimiterClass index: index.
-
-	opener addInlineBlock: indexOfAssociateOpener to: self
-
-]
-
-{ #category : #process }
-MicInlineParser >> addInlineBlock: indexOfAssociateOpener from: startIndex to: endIndex [
-
-	correctSubstring := string copyFrom: startIndex to: endIndex.
-	"Delete openers above in stack, considered as unclosed so ignored"
-	self popFrom: 1 to: indexOfAssociateOpener.
-	"Add found inline block"
-	openersStack 
-		ifNotEmpty: [ 
-			(openersStack size > nestedLevel)
-				ifTrue: [ 
-					children 
-						ifEmpty: [ children add: self newInlineBlock ]
-						ifNotEmpty: [ children addLast: self newInlineBlock ] ]
-				ifFalse: [ children add: self newInlineBlockWithoutChildren ] ]
-		ifEmpty: [ 
-			result add: self newInlineBlock.
-			children := LinkedList new ].
-
-	nestedLevel := openersStack size
-]
-
-{ #category : #process }
-MicInlineParser >> addRegularInlineBlock: indexOfAssociateOpener [
-	
-	self 
-		addInlineBlock: indexOfAssociateOpener 
-		from: opener index + opener size
-		to: closer endIndex
-]
-
-{ #category : #accessing }
-MicInlineParser >> allDelimiters [
-	^ allDelimiters 
-]
-
-{ #category : #process }
-MicInlineParser >> bothCase [
-	| indexOfAssociateOpener |
-	indexOfAssociateOpener := self findType: delimiterClass type.
-	(openersStack isEmpty or: [ indexOfAssociateOpener = 0 ])
-		ifTrue: [ 
-			"We consider the delimiter as a new opener or it's the first opener"
-			self pushNewOpener ]
-		ifFalse: [ 
-			"We consider the delimiter as a closer of last opened inline block"
-			self addInlineBlock: indexOfAssociateOpener ]
-]
-
-{ #category : #process }
-MicInlineParser >> closerOnlyCase [
-	"IF delimiter found is a closer which can close an opened inline block
-	THEN we add the associate inline block
-	ELSE we ignore it"
-	| indexOfAssociateOpener |
-	
-	indexOfAssociateOpener := self findAnyType: delimiterClass associatedTypes.
-	(indexOfAssociateOpener > 0) 
-		ifTrue: [ self addInlineBlock: indexOfAssociateOpener ]
-]
-
-{ #category : #process }
-MicInlineParser >> delimiterFoundProcess [
-	"Case 1: it's a opener only"
-	delimiterClass isOpenerOnly ifTrue: [ ^ self openerOnlyCase ].
-	"Case 2: it's both opener and closer"
-	delimiterClass isBoth ifTrue: [ ^ self bothCase ].
-	"Case 3: it's a closer only"
-	self closerOnlyCase
-]
-
-{ #category : #'instance creation' }
-MicInlineParser >> elementBlockClass [
-		
-	^ MicTextBlock
-]
-
-{ #category : #private }
-MicInlineParser >> findAnyType: aCollectionOfType [
-
-	^ openersStack findFirst: [ :each | aCollectionOfType includes: each type ]
-]
-
-{ #category : #private }
-MicInlineParser >> findType: aType [
-
-	^ self findAnyType: { aType }
-]
-
-{ #category : #actions }
-MicInlineParser >> identifyMarkupFor: aString [
-
-	(self class keyBeginSet includes: aString first) ifFalse: [ ^ 1 ].
-	keys do: [ :key |
-		(aString beginsWith: key) ifTrue: [ 
-			delimiterClass := allDelimiters at: key.
-			self delimiterFoundProcess.
-			^ key size ] ].
-	
-	^ 1
-]
-
-{ #category : #actions }
-MicInlineParser >> indexIncrement [
-	^ self indexIncrement: 1
-]
-
-{ #category : #actions }
-MicInlineParser >> indexIncrement: anInteger [
-	index := index + anInteger
-]
-
-{ #category : #initialization }
-MicInlineParser >> initialize [
-	super initialize.
-	self initializeDelimiters.
-	openersStack := Stack new.
-	result := LinkedList new.
-	children := LinkedList new.
-	nestedLevel := 0.
-	index := 1.
-
-]
-
-{ #category : #initialization }
-MicInlineParser >> initializeDelimiters [
-	allDelimiters := self class allDelimiters.
-	keys := allDelimiters keys.
-]
-
-{ #category : #'handle basic text' }
-MicInlineParser >> insertBasicText: anArrayOfInlineBlocks [
-	^ self 
-		insertBasicText: anArrayOfInlineBlocks 
-			withFinalArray: LinkedList new 
-			from: 1 
-			to: string size
-]
-
-{ #category : #'handle basic text' }
-MicInlineParser >> insertBasicText: anArrayOfInlineBlocks from: startIndex to: endIndex [
-	^ self 
-		insertBasicText: anArrayOfInlineBlocks 
-		withFinalArray: LinkedList new 
-		from: startIndex 
-		to: endIndex
-		
-]
-
-{ #category : #'handle basic text' }
-MicInlineParser >> insertBasicText: anArrayOfInlineBlocks 
-	withFinalArray: finalArray 
-	from: startIndex 
-	to: endIndex [
-	
-	anArrayOfInlineBlocks ifEmpty: [ ^ finalArray asArray ].
-	(anArrayOfInlineBlocks size = 1) ifTrue: [ 
-		| element |
-		element := anArrayOfInlineBlocks first.
-		finalArray ifEmpty: [ self addATextFrom: startIndex 
-										to: element start - 1 
-										toFinalArray: finalArray ].
-		finalArray add: element.
-		self addATextFrom: element end + 1 
-			to: endIndex 
-			toFinalArray: finalArray.
-		^ self insertBasicText: Array empty withFinalArray: finalArray from: startIndex to: endIndex
-	].
-	finalArray ifEmpty: [ 
-		self addATextFrom: startIndex 
-			to: anArrayOfInlineBlocks first start - 1 
-			toFinalArray: finalArray ].
-	finalArray add: anArrayOfInlineBlocks first.
-	self 
-		addATextFrom: anArrayOfInlineBlocks first end + 1 
-		to: anArrayOfInlineBlocks second start - 1 
-		toFinalArray: finalArray.
-
-	^ self insertBasicText: anArrayOfInlineBlocks allButFirst 
-		withFinalArray: finalArray 
-		from: startIndex 
-		to: endIndex
-	
-	
-	
-]
-
-{ #category : #process }
-MicInlineParser >> linkOrFigureProcess: indexOfAssociateOpener [
-	"IF we find a ( just after and a ) after again
-	THEN we add the associate link or figure inline block
-	ELSE we ignore it"
-	| startIndex endIndex urlCloserIndex |
-	
-	((string allButFirst: (closer index + closer size - 1)) beginsWith: URLOpenerMarkup)
-		ifTrue: [ 
-			urlCloserIndex := string indexOfSubCollection: URLCloserMarkup startingAt: closer index ifAbsent: [ 0 ].
-			(urlCloserIndex > 0) 
-				ifTrue: [ 
-					startIndex := opener index + opener size.
-					endIndex := closer index - 1.
-					correctSubstring := string copyFrom: startIndex to: endIndex.
-					correctURL := string copyFrom: (closer index + closer size + URLOpenerMarkup size) to: (urlCloserIndex - 1).
-					"Delete openers above in stack, considered as unclosed so ignored"
-					self popFrom: 1 to: indexOfAssociateOpener.
-					"Add found inline block"
-			(openersStack size > 0)
-				ifTrue: [ 
-					(openersStack size > nestedLevel)
-						ifTrue: [ 
-							children 
-								ifEmpty: [ children add: (self newURLInlineBlockWithCloser: urlCloserIndex) ]
-								ifNotEmpty: [ children last add: (self newURLInlineBlockWithCloser: urlCloserIndex) ] ]
-						ifFalse: [ children add: (self newURLInlineBlockWithoutChildrenWithCloser: urlCloserIndex) ].
-				]
-				ifFalse: [ 
-					result add: (self newURLInlineBlockWithCloser: urlCloserIndex).
-					children := LinkedList new.
-				].
-			incrementation := urlCloserIndex - index.
-			nestedLevel := openersStack size.
-				]
-				ifFalse: [ "do nothing" ]
-		]
-		ifFalse: [ "do nothing" ]
-]
-
-{ #category : #'instance creation' }
-MicInlineParser >> newBasicInlineBlockFrom: stIndex to: eIndex [
-	| text |
-	
-	text := string copyFrom: stIndex to: eIndex.
-	^ self elementBlockClass
-		from: stIndex
-		to: eIndex
-		withSubstring: text
-		withChildren: #()
-			
-		"should use copyFrom:to:"
-]
-
-{ #category : #'instance creation' }
-MicInlineParser >> newInlineBlock [
-	| inlineBlockClass |
-	
-	inlineBlockClass := opener associatedInlineBlock.
-	^ inlineBlockClass isEvaluated 
-		ifTrue: [ 
-			inlineBlockClass
-				from: opener index
-				to: closer index + closer size - 1
-				withSubstring: correctSubstring
-				withChildren: children asArray ]
-		ifFalse: [  
-			self newInlineBlockWithoutChildren ]
-]
-
-{ #category : #'instance creation' }
-MicInlineParser >> newInlineBlockWithoutChildren [
-	^ opener associatedInlineBlock
-			from: opener index
-			to: closer index + closer size - 1
-			withSubstring: correctSubstring
-			
-]
-
-{ #category : #'instance creation' }
-MicInlineParser >> newURLInlineBlockWithCloser: aCloserIndex [
-	| inlineBlockClass |
-	
-	inlineBlockClass := opener associatedInlineBlock.
-	^ inlineBlockClass isEvaluated 
-		ifTrue: [ 
-			inlineBlockClass
-				from: opener index
-				to: aCloserIndex
-				withKind: opener type
-				withSubstring: correctSubstring
-				withChildren: children asArray
-				withURL: correctURL
-				withParser: self ]
-		ifFalse: [  self newURLInlineBlockWithoutChildren ]
-	
-]
-
-{ #category : #'instance creation' }
-MicInlineParser >> newURLInlineBlockWithoutChildren [
-	^ opener associatedInlineBlock
-			from: opener index
-			to: closer index + closer size - 1
-			withKind: opener type
-			withSubstring: correctSubstring
-			withURL: correctURL
-]
-
-{ #category : #'instance creation' }
-MicInlineParser >> newURLInlineBlockWithoutChildrenWithCloser: aCloserIndex [
-	^ opener associatedInlineBlock
-			from: opener index
-			to: aCloserIndex
-			withKind: opener type
-			withSubstring: correctSubstring
-			withURL: correctURL
-]
-
-{ #category : #process }
-MicInlineParser >> openerOnlyCase [
-	self pushNewOpener
-]
-
-{ #category : #public }
-MicInlineParser >> parse: aString [
-
-	aString ifEmpty: [ ^ #() ].
-	string := self class escapeEncode: aString.
-	^ self read
-]
-
-{ #category : #actions }
-MicInlineParser >> popFrom: aStartIndex to: anEndIndex [
-	aStartIndex to: anEndIndex do: [ :i | openersStack pop ]
-	
-]
-
-{ #category : #actions }
-MicInlineParser >> pushNewOpener [
-	delimiterClass associatedInlineBlock isEvaluated 
-		ifTrue: [ openersStack push: (delimiterClass index: index)]
-		ifFalse: [ self rawRead ]
-]
-
-{ #category : #process }
-MicInlineParser >> rawRead [
-	| open rawType close startIndex endIndex rawContents rawBlock |
-
-	open := delimiterClass index: index.
-	rawType := open associatedInlineBlock.
-	close := rawType basicNew closingDelimiter.
-	startIndex := index.
-	endIndex := string findString: close startingAt: startIndex+1.
-	endIndex = 0 ifTrue: [ index := index +1. ^self ].
-	rawContents := string copyFrom: (startIndex+open size) to: (endIndex-1).
-	rawBlock := rawType from: startIndex to: endIndex -1 + close size withSubstring: rawContents.
-	openersStack 
-		ifEmpty: [ result add: rawBlock. children := LinkedList new ]
-		ifNotEmpty: [ children add: rawBlock ].
-	index:= endIndex.
-]
-
-{ #category : #actions }
-MicInlineParser >> read [
-	| next |
-	
-	[ index <= string size ] 
-	whileTrue: [
-		next := string allButFirst: index-1.
-		incrementation := self identifyMarkupFor: next.
-		self indexIncrement: incrementation ].
-	
-	^ self resultProcess
-]
-
-{ #category : #process }
-MicInlineParser >> resultProcess [
-	"At the end, we add all basic text between found inline blocks"
-	
-	result ifEmpty: [ ^ { self newBasicInlineBlockFrom: 1 to: string size } ].
-	result do: [ :each | 
-		| startSubstring endSubstring |
-		each substring isEmpty 	
-			ifTrue: [ startSubstring := endSubstring := 1 ]
-			ifFalse: [  	startSubstring := each start + each openingDelimiterSize.
-		endSubstring := startSubstring + each substring size - 1 ].
-		each children: (self insertBasicText: each children from: startSubstring to: endSubstring) ].
-	^ self insertBasicText: result
-]
-
-{ #category : #public }
-MicInlineParser >> start: aString [
-	self deprecated: 'Use parse: instead' transformWith: '`@receiver start: `@arg' -> '`@receiver parse: `@arg'.
-	^ self parse: aString
-]
-
-{ #category : #accessing }
-MicInlineParser >> urlCloserDelimiterClass [
-	^ MicURLCloserDelimiter
-]
-
-{ #category : #accessing }
-MicInlineParser >> urlOpenerDelimiterClass [
-	^ MicURLOpenerDelimiter 
-]
diff --git a/src/Microdown/MicItalicDelimiter.class.st b/src/Microdown/MicItalicDelimiter.class.st
deleted file mode 100644
index 01acdabc..00000000
--- a/src/Microdown/MicItalicDelimiter.class.st
+++ /dev/null
@@ -1,33 +0,0 @@
-"
-I am the delimiter for italic/emphasis format.
-"
-Class {
-	#name : #MicItalicDelimiter,
-	#superclass : #MicAbstractDelimiter,
-	#category : #'Microdown-Parser'
-}
-
-{ #category : #accessing }
-MicItalicDelimiter class >> associatedInlineBlock [
-	^ MicItalicFormatBlock 
-]
-
-{ #category : #accessing }
-MicItalicDelimiter class >> isCloser [
-	^ true
-]
-
-{ #category : #accessing }
-MicItalicDelimiter class >> isOpener [
-	^ true
-]
-
-{ #category : #accessing }
-MicItalicDelimiter class >> markup [
-	^ ItalicMarkup
-]
-
-{ #category : #accessing }
-MicItalicDelimiter class >> type [
-	^ #italic
-]
diff --git a/src/Microdown/MicItalicFormatBlock.class.st b/src/Microdown/MicItalicFormatBlock.class.st
deleted file mode 100644
index ef7a2aac..00000000
--- a/src/Microdown/MicItalicFormatBlock.class.st
+++ /dev/null
@@ -1,41 +0,0 @@
-"
-I represent an italic text section. I'm delimited using `_` as in `_italic_` to obtain _italic_.
-"
-Class {
-	#name : #MicItalicFormatBlock,
-	#superclass : #MicFormatBlock,
-	#category : #'Microdown-ModelInline'
-}
-
-{ #category : #accessing }
-MicItalicFormatBlock class >> closingDelimiter [
-
- 	^ ItalicMarkup
-]
-
-{ #category : #accessing }
-MicItalicFormatBlock class >> openingDelimiter [
-
- 	^ ItalicMarkup
-]
-
-{ #category : #visiting }
-MicItalicFormatBlock >> accept: aVisitor [
-	^ aVisitor visitItalic: self
-]
-
-{ #category : #accessing }
-MicItalicFormatBlock >> closingDelimiter [
-	^ self class closingDelimiter
-]
-
-{ #category : #accessing }
-MicItalicFormatBlock >> kind [
-
-	^ #italic
-]
-
-{ #category : #accessing }
-MicItalicFormatBlock >> openingDelimiter [
-	^ self class openingDelimiter
-]
diff --git a/src/Microdown/MicLinkBlock.class.st b/src/Microdown/MicLinkBlock.class.st
deleted file mode 100644
index 2f3d1a9c..00000000
--- a/src/Microdown/MicLinkBlock.class.st
+++ /dev/null
@@ -1,61 +0,0 @@
-"
-I represent a reference in a text. For example `[http://pharo.org](http://pharo.org)` creates [http://pharo.org](http://pharo.org).
-"
-Class {
-	#name : #MicLinkBlock,
-	#superclass : #MicInlineBlockWithUrl,
-	#category : #'Microdown-ModelInline'
-}
-
-{ #category : #accessing }
-MicLinkBlock class >> closingDelimiter [
-
- 	^ NameCloserUrlOpener
-]
-
-{ #category : #accessing }
-MicLinkBlock class >> openingDelimiter [
-
- 	^ LinkNameOpenerMarkup
-]
-
-{ #category : #visiting }
-MicLinkBlock >> accept: aVisitor [
-	^ aVisitor visitLink: self
-]
-
-{ #category : #visiting }
-MicLinkBlock >> closeMe [
-	
-	| split args |
-
-	split := url splitOnFirst: Character space.
-	self reference: (MicResourceReference fromUri: split first).
-	args := (split second ifNil: [ '' ]) trimBoth: [:char | {$". Character space} includes: char].
-	self arguments: (MicArgumentList withString: args).
-	self captionElements: (self inlineParse: substring).
-"	self children: captionElements"
-]
-
-{ #category : #accessing }
-MicLinkBlock >> fullName [
-	^ self reference fullName
-]
-
-{ #category : #testing }
-MicLinkBlock >> hasArguments [
-	"Answer <true> if the receiver contain at least 1 argument"
-	
-	^ (self url trimBoth findTokens: ' ') size > 1
-]
-
-{ #category : #accessing }
-MicLinkBlock >> kind [
-
- 	^ #linkName
-]
-
-{ #category : #accessing }
-MicLinkBlock >> openingDelimiter [
-	^ self class openingDelimiter
-]
diff --git a/src/Microdown/MicLinkNameCloserDelimiter.class.st b/src/Microdown/MicLinkNameCloserDelimiter.class.st
deleted file mode 100644
index 93228cf7..00000000
--- a/src/Microdown/MicLinkNameCloserDelimiter.class.st
+++ /dev/null
@@ -1,28 +0,0 @@
-"
-I am the closer delimiter for link name.
-"
-Class {
-	#name : #MicLinkNameCloserDelimiter,
-	#superclass : #MicLinkNameDelimiter,
-	#category : #'Microdown-Parser'
-}
-
-{ #category : #accessing }
-MicLinkNameCloserDelimiter class >> associatedInlineBlock [
-	^ nil
-]
-
-{ #category : #accessing }
-MicLinkNameCloserDelimiter class >> isCloser [
-	^ true
-]
-
-{ #category : #accessing }
-MicLinkNameCloserDelimiter class >> isOpener [
-	^ false
-]
-
-{ #category : #accessing }
-MicLinkNameCloserDelimiter class >> markup [
-	^ LinkNameCloserMarkup
-]
diff --git a/src/Microdown/MicLinkNameDelimiter.class.st b/src/Microdown/MicLinkNameDelimiter.class.st
deleted file mode 100644
index c6975ead..00000000
--- a/src/Microdown/MicLinkNameDelimiter.class.st
+++ /dev/null
@@ -1,32 +0,0 @@
-Class {
-	#name : #MicLinkNameDelimiter,
-	#superclass : #MicAbstractDelimiter,
-	#category : #'Microdown-Parser'
-}
-
-{ #category : #accessing }
-MicLinkNameDelimiter class >> associatedTypes [
-
-	^ {  
-		self type.
-		MicFigureNameOpenerDelimiter type.
-	}
-]
-
-{ #category : #testing }
-MicLinkNameDelimiter class >> isActive [
-
-	^ self ~= MicLinkNameDelimiter
-]
-
-{ #category : #accessing }
-MicLinkNameDelimiter class >> type [
-
-	^ #linkName
-]
-
-{ #category : #dispatching }
-MicLinkNameDelimiter >> addInlineBlock: anIndex to: inlineParser [
-
-	inlineParser linkOrFigureProcess: anIndex
-]
diff --git a/src/Microdown/MicLinkNameOpenerDelimiter.class.st b/src/Microdown/MicLinkNameOpenerDelimiter.class.st
deleted file mode 100644
index 77d4f8e4..00000000
--- a/src/Microdown/MicLinkNameOpenerDelimiter.class.st
+++ /dev/null
@@ -1,28 +0,0 @@
-"
-I am the opener delimiter for link name.
-"
-Class {
-	#name : #MicLinkNameOpenerDelimiter,
-	#superclass : #MicLinkNameDelimiter,
-	#category : #'Microdown-Parser'
-}
-
-{ #category : #accessing }
-MicLinkNameOpenerDelimiter class >> associatedInlineBlock [
-	^ MicLinkBlock 
-]
-
-{ #category : #accessing }
-MicLinkNameOpenerDelimiter class >> isCloser [
-	^ false
-]
-
-{ #category : #accessing }
-MicLinkNameOpenerDelimiter class >> isOpener [
-	^ true
-]
-
-{ #category : #accessing }
-MicLinkNameOpenerDelimiter class >> markup [
-	^ LinkNameOpenerMarkup
-]
diff --git a/src/Microdown/MicMathDelimiter.class.st b/src/Microdown/MicMathDelimiter.class.st
deleted file mode 100644
index a660b877..00000000
--- a/src/Microdown/MicMathDelimiter.class.st
+++ /dev/null
@@ -1,34 +0,0 @@
-"
-I'm a delimiter for math inline. An example is $V_i = C_0 - C_3$.
-I delimits `MicMathInlineBlock`.
-"
-Class {
-	#name : #MicMathDelimiter,
-	#superclass : #MicAbstractDelimiter,
-	#category : #'Microdown-Parser'
-}
-
-{ #category : #accessing }
-MicMathDelimiter class >> associatedInlineBlock [
-	^ MicMathInlineBlock 
-]
-
-{ #category : #accessing }
-MicMathDelimiter class >> isCloser [
-	^ true
-]
-
-{ #category : #accessing }
-MicMathDelimiter class >> isOpener [
-	^ true
-]
-
-{ #category : #accessing }
-MicMathDelimiter class >> markup [
-	^ MathMarkup
-]
-
-{ #category : #accessing }
-MicMathDelimiter class >> type [
-	^ #math
-]
diff --git a/src/Microdown/MicMathInlineBlock.class.st b/src/Microdown/MicMathInlineBlock.class.st
deleted file mode 100644
index 6f29b621..00000000
--- a/src/Microdown/MicMathInlineBlock.class.st
+++ /dev/null
@@ -1,83 +0,0 @@
-"
-Microdown supports in text math expression as in LaTeX using `$ 1 + 2 $`. Each exporter is then responsible to map the contents to the correct output. For PDF based on LaTeX mathInlineBlock can contain LaTeX, for HTML we expect the same using corresponding math library in JS.
-
-Here are several examples:
-
-#### Example 1
-Code: `$V_i = C_0 - C_3$`
-
-$V_i = C_0 - C_3$
-
-#### Example 2
-Code: `$a^2 + b^2 = c^2$`
-
-$a^2 + b^2 = c^2$
-
-#### Example 3
-Code: `$\sin(x) = \sum_{n=0}^{\infty} \frac{(-1)^{n}x^{2n+1}}{(2n+1)!}$`
-
-$\sin(x) = \sum_{n=0}^{\infty} \frac{(-1)^{n}x^{2n+1}}{(2n+1)!}$
-
-#### Example 4
-Code: `$f(a) = \frac{1}{2\pi i} \oint_{\gamma} \frac{f(z)}{z - a} dz$`
-
-$f(a) = \frac{1}{2\pi i} \oint_{\gamma} \frac{f(z)}{z - a} dz$
-
-"
-Class {
-	#name : #MicMathInlineBlock,
-	#superclass : #MicInlineElement,
-	#category : #'Microdown-ModelInline'
-}
-
-{ #category : #accessing }
-MicMathInlineBlock class >> closingDelimiter [
-
- 	^ MathMarkup
-]
-
-{ #category : #testing }
-MicMathInlineBlock class >> isEvaluated [
-	^ false
-]
-
-{ #category : #accessing }
-MicMathInlineBlock class >> openingDelimiter [
-
- 	^ MathMarkup
-]
-
-{ #category : #parsing }
-MicMathInlineBlock class >> parse: delimiter stream: aTokenStream for: aParser [
-
-	^ aParser
-		  parseNonEvaluatedBlock: self
-		  token: delimiter
-		  stream: aTokenStream
-]
-
-{ #category : #visiting }
-MicMathInlineBlock >> accept: aVisitor [
-	^ aVisitor visitMathInline: self
-]
-
-{ #category : #operations }
-MicMathInlineBlock >> cleanSubstring [
-	self substring: (MicInlineParser escapeReescape: self substring  except: '$')
-]
-
-{ #category : #accessing }
-MicMathInlineBlock >> closingDelimiter [
-	^ self class closingDelimiter
-]
-
-{ #category : #accessing }
-MicMathInlineBlock >> kind [
-
- 	^ #math
-]
-
-{ #category : #accessing }
-MicMathInlineBlock >> openingDelimiter [
-	^ self class openingDelimiter
-]
diff --git a/src/Microdown/MicMonospaceDelimiter.class.st b/src/Microdown/MicMonospaceDelimiter.class.st
deleted file mode 100644
index f4785ff7..00000000
--- a/src/Microdown/MicMonospaceDelimiter.class.st
+++ /dev/null
@@ -1,33 +0,0 @@
-"
-I am the delimiter for monospace/inline code format.
-"
-Class {
-	#name : #MicMonospaceDelimiter,
-	#superclass : #MicAbstractDelimiter,
-	#category : #'Microdown-Parser'
-}
-
-{ #category : #accessing }
-MicMonospaceDelimiter class >> associatedInlineBlock [
-	^ MicMonospaceFormatBlock 
-]
-
-{ #category : #accessing }
-MicMonospaceDelimiter class >> isCloser [
-	^ true
-]
-
-{ #category : #accessing }
-MicMonospaceDelimiter class >> isOpener [
-	^ true
-]
-
-{ #category : #accessing }
-MicMonospaceDelimiter class >> markup [
-	^ MonospaceMarkup
-]
-
-{ #category : #accessing }
-MicMonospaceDelimiter class >> type [
-	^ #monospace
-]
diff --git a/src/Microdown/MicMonospaceFormatBlock.class.st b/src/Microdown/MicMonospaceFormatBlock.class.st
deleted file mode 100644
index 13dab3ff..00000000
--- a/src/Microdown/MicMonospaceFormatBlock.class.st
+++ /dev/null
@@ -1,69 +0,0 @@
-"
-I represent a monospaced text section. I'm delimited using `\`` as in `\`monospace\`` to obtain `monospace`.
-"
-Class {
-	#name : #MicMonospaceFormatBlock,
-	#superclass : #MicFormatBlock,
-	#category : #'Microdown-ModelInline'
-}
-
-{ #category : #accessing }
-MicMonospaceFormatBlock class >> closingDelimiter [
-
- 	^ MonospaceMarkup
-]
-
-{ #category : #testing }
-MicMonospaceFormatBlock class >> isEvaluated [
-	^ false
-]
-
-{ #category : #accessing }
-MicMonospaceFormatBlock class >> openingDelimiter [
-
- 	^ MonospaceMarkup
-]
-
-{ #category : #parsing }
-MicMonospaceFormatBlock class >> parse: delimiter stream: aTokenStream for: aParser [
-
-	^ aParser
-		  parseNonEvaluatedBlock: self
-		  token: delimiter
-		  stream: aTokenStream
-]
-
-{ #category : #visiting }
-MicMonospaceFormatBlock >> accept: aVisitor [
-	^ aVisitor visitMonospace: self
-]
-
-{ #category : #visiting }
-MicMonospaceFormatBlock >> closeMe [
-	
-	| text decodedString |
-	decodedString := MicInlineParser escapeReescape: substring except: '`'.
-	self substring: decodedString.
-	children ifEmpty: [
-			text :=  (MicTextBlock
-							from: start
-							to: end
-							withSubstring: decodedString 
-							withChildren: Array empty).
-			self children: { text } ]
-]
-
-{ #category : #accessing }
-MicMonospaceFormatBlock >> closingDelimiter [
-	^ self class closingDelimiter
-]
-
-{ #category : #accessing }
-MicMonospaceFormatBlock >> kind [
-	^ #monospace
-]
-
-{ #category : #accessing }
-MicMonospaceFormatBlock >> openingDelimiter [
-	^ self class openingDelimiter
-]
diff --git a/src/Microdown/MicRawBlock.class.st b/src/Microdown/MicRawBlock.class.st
deleted file mode 100644
index 10f771be..00000000
--- a/src/Microdown/MicRawBlock.class.st
+++ /dev/null
@@ -1,64 +0,0 @@
-"
-Raw lets the user place anything (so don't use it).
-
-```
-{{ raw contents}}
-```
-"
-Class {
-	#name : #MicRawBlock,
-	#superclass : #MicInlineElement,
-	#category : #'Microdown-ModelInline'
-}
-
-{ #category : #accessing }
-MicRawBlock class >> closingDelimiter [
-
- 	^ RawCloserMarkup
-]
-
-{ #category : #testing }
-MicRawBlock class >> isEvaluated [
-	^ false
-]
-
-{ #category : #accessing }
-MicRawBlock class >> openingDelimiter [
-
- 	^ RawOpenerMarkup
-]
-
-{ #category : #parsing }
-MicRawBlock class >> parse: delimiter stream: aTokenStream for: aParser [
-
-	^ aParser
-		  parseNonEvaluatedBlock: self
-		  token: delimiter
-		  stream: aTokenStream
-]
-
-{ #category : #visiting }
-MicRawBlock >> accept: aVisitor [
-	^ aVisitor visitRaw: self
-]
-
-{ #category : #operations }
-MicRawBlock >> cleanSubstring [
-	self substring: (MicInlineParser escapeReescape: self substring  except: '')
-]
-
-{ #category : #accessing }
-MicRawBlock >> closingDelimiter [
-	^ self class closingDelimiter
-]
-
-{ #category : #accessing }
-MicRawBlock >> kind [
-
- 	^ #raw
-]
-
-{ #category : #accessing }
-MicRawBlock >> openingDelimiter [
-	^ self class openingDelimiter
-]
diff --git a/src/Microdown/MicRawCloserDelimiter.class.st b/src/Microdown/MicRawCloserDelimiter.class.st
deleted file mode 100644
index f604a3d3..00000000
--- a/src/Microdown/MicRawCloserDelimiter.class.st
+++ /dev/null
@@ -1,33 +0,0 @@
-"
-I am the closer delimiter for raw.
-"
-Class {
-	#name : #MicRawCloserDelimiter,
-	#superclass : #MicAbstractDelimiter,
-	#category : #'Microdown-Parser'
-}
-
-{ #category : #accessing }
-MicRawCloserDelimiter class >> associatedInlineBlock [
-	^ MicRawBlock 
-]
-
-{ #category : #accessing }
-MicRawCloserDelimiter class >> isCloser [
-	^ true
-]
-
-{ #category : #accessing }
-MicRawCloserDelimiter class >> isOpener [
-	^ false
-]
-
-{ #category : #accessing }
-MicRawCloserDelimiter class >> markup [
-	^ RawCloserMarkup
-]
-
-{ #category : #accessing }
-MicRawCloserDelimiter class >> type [
-	^ #raw
-]
diff --git a/src/Microdown/MicRawOpenerDelimiter.class.st b/src/Microdown/MicRawOpenerDelimiter.class.st
deleted file mode 100644
index 1e0e406c..00000000
--- a/src/Microdown/MicRawOpenerDelimiter.class.st
+++ /dev/null
@@ -1,33 +0,0 @@
-"
-I am the opener delimiter for raw.
-"
-Class {
-	#name : #MicRawOpenerDelimiter,
-	#superclass : #MicAbstractDelimiter,
-	#category : #'Microdown-Parser'
-}
-
-{ #category : #accessing }
-MicRawOpenerDelimiter class >> associatedInlineBlock [
-	^ MicRawBlock 
-]
-
-{ #category : #accessing }
-MicRawOpenerDelimiter class >> isCloser [
-	^ false
-]
-
-{ #category : #accessing }
-MicRawOpenerDelimiter class >> isOpener [
-	^ true
-]
-
-{ #category : #accessing }
-MicRawOpenerDelimiter class >> markup [
-	^ RawOpenerMarkup
-]
-
-{ #category : #accessing }
-MicRawOpenerDelimiter class >> type [
-	^ #raw
-]
diff --git a/src/Microdown/MicStrikeDelimiter.class.st b/src/Microdown/MicStrikeDelimiter.class.st
deleted file mode 100644
index db553869..00000000
--- a/src/Microdown/MicStrikeDelimiter.class.st
+++ /dev/null
@@ -1,33 +0,0 @@
-"
-I'm the delimiter for strikethrough format.
-"
-Class {
-	#name : #MicStrikeDelimiter,
-	#superclass : #MicAbstractDelimiter,
-	#category : #'Microdown-Parser'
-}
-
-{ #category : #accessing }
-MicStrikeDelimiter class >> associatedInlineBlock [
-	^ MicStrikeFormatBlock 
-]
-
-{ #category : #accessing }
-MicStrikeDelimiter class >> isCloser [
-	^ true
-]
-
-{ #category : #accessing }
-MicStrikeDelimiter class >> isOpener [
-	^ true
-]
-
-{ #category : #accessing }
-MicStrikeDelimiter class >> markup [
-	^ StrikeMarkup
-]
-
-{ #category : #accessing }
-MicStrikeDelimiter class >> type [
-	^ #strike
-]
diff --git a/src/Microdown/MicStrikeFormatBlock.class.st b/src/Microdown/MicStrikeFormatBlock.class.st
deleted file mode 100644
index 619dc885..00000000
--- a/src/Microdown/MicStrikeFormatBlock.class.st
+++ /dev/null
@@ -1,40 +0,0 @@
-"
-I represent a strike text section. I'm delimited using `~` as in `~strike~` to obtain ~strike~.
-"
-Class {
-	#name : #MicStrikeFormatBlock,
-	#superclass : #MicFormatBlock,
-	#category : #'Microdown-ModelInline'
-}
-
-{ #category : #accessing }
-MicStrikeFormatBlock class >> closingDelimiter [
-
- 	^ StrikeMarkup
-]
-
-{ #category : #accessing }
-MicStrikeFormatBlock class >> openingDelimiter [
-
- 	^ StrikeMarkup
-]
-
-{ #category : #visiting }
-MicStrikeFormatBlock >> accept: aVisitor [
-	^ aVisitor visitStrike: self
-]
-
-{ #category : #accessing }
-MicStrikeFormatBlock >> closingDelimiter [
-	^ self class closingDelimiter
-]
-
-{ #category : #accessing }
-MicStrikeFormatBlock >> kind [ 
-	^ #strike
-]
-
-{ #category : #accessing }
-MicStrikeFormatBlock >> openingDelimiter [
-	^ self class openingDelimiter
-]
diff --git a/src/Microdown/MicTextBlock.class.st b/src/Microdown/MicTextBlock.class.st
deleted file mode 100644
index 0f566eba..00000000
--- a/src/Microdown/MicTextBlock.class.st
+++ /dev/null
@@ -1,27 +0,0 @@
-"
-I'm a special inline block representing the fact that there is not markup. 
-"
-Class {
-	#name : #MicTextBlock,
-	#superclass : #MicInlineElement,
-	#category : #'Microdown-ModelInline'
-}
-
-{ #category : #visiting }
-MicTextBlock >> accept: aVisitor [
-	^ aVisitor visitText: self
-]
-
-{ #category : #accessing }
-MicTextBlock >> kind [
-
-	^ #basic
-]
-
-{ #category : #accessing }
-MicTextBlock >> printOn: aStream [
-
-	self printWithoutConventions: aStream.
-	self print: self substring surroundedOn: aStream.
-
-]
diff --git a/src/Microdown/MicURLCloserDelimiter.class.st b/src/Microdown/MicURLCloserDelimiter.class.st
deleted file mode 100644
index 57645760..00000000
--- a/src/Microdown/MicURLCloserDelimiter.class.st
+++ /dev/null
@@ -1,38 +0,0 @@
-"
-I am the closer delimiter for URL.
-"
-Class {
-	#name : #MicURLCloserDelimiter,
-	#superclass : #MicAbstractDelimiter,
-	#category : #'Microdown-Parser'
-}
-
-{ #category : #accessing }
-MicURLCloserDelimiter class >> associatedInlineBlock [
-	^ nil
-]
-
-{ #category : #testing }
-MicURLCloserDelimiter class >> isActive [
-	^ false
-]
-
-{ #category : #accessing }
-MicURLCloserDelimiter class >> isCloser [
-	^ true
-]
-
-{ #category : #accessing }
-MicURLCloserDelimiter class >> isOpener [
-	^ false
-]
-
-{ #category : #accessing }
-MicURLCloserDelimiter class >> markup [
-	^ URLCloserMarkup
-]
-
-{ #category : #accessing }
-MicURLCloserDelimiter class >> type [
-	^ #url
-]
diff --git a/src/Microdown/MicURLOpenerDelimiter.class.st b/src/Microdown/MicURLOpenerDelimiter.class.st
deleted file mode 100644
index 9287112d..00000000
--- a/src/Microdown/MicURLOpenerDelimiter.class.st
+++ /dev/null
@@ -1,38 +0,0 @@
-"
-I'm the opener delimiter for URL.
-"
-Class {
-	#name : #MicURLOpenerDelimiter,
-	#superclass : #MicAbstractDelimiter,
-	#category : #'Microdown-Parser'
-}
-
-{ #category : #accessing }
-MicURLOpenerDelimiter class >> associatedInlineBlock [
-	^ nil
-]
-
-{ #category : #testing }
-MicURLOpenerDelimiter class >> isActive [
-	^ false
-]
-
-{ #category : #accessing }
-MicURLOpenerDelimiter class >> isCloser [
-	^ false
-]
-
-{ #category : #accessing }
-MicURLOpenerDelimiter class >> isOpener [
-	^ true
-]
-
-{ #category : #accessing }
-MicURLOpenerDelimiter class >> markup [
-	^ URLOpenerMarkup
-]
-
-{ #category : #accessing }
-MicURLOpenerDelimiter class >> type [
-	^ #url
-]

From 778e765da73792508785fd76359eecac3c2a75d8 Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Thu, 3 Nov 2022 08:53:56 +0100
Subject: [PATCH 20/40] Renamed all new inline parser names to original names

---
 ...tension.st => MicFigureBlock.extension.st} |  4 +-
 .../MicInlineBlockWithUrl.extension.st        |  6 ++
 .../MicInlineBlockWithUrl2.extension.st       |  6 --
 .../MicLinkBlock2.extension.st                |  7 --
 ....st => MicInlineBlockWithUrl.extension.st} |  8 +--
 .../MicRichTextFormatConfiguration.class.st   |  2 +-
 .../MicCitationBlockTest.class.st             |  2 +-
 src/Microdown-Tests/MicCodeBlockTest.class.st |  2 +-
 .../MicEnvironmentBlockTest.class.st          |  4 +-
 .../MicFigureBlockTest.class.st               |  2 +-
 .../MicFormatBlockTest.class.st               | 50 ++++++-------
 .../MicHTTPResourceReferenceTest.class.st     |  2 +-
 .../MicHeaderBlockTest.class.st               |  6 +-
 .../MicInlineBlock2Test.class.st              |  6 +-
 .../MicInlineParser2Test.class.st             | 70 +++++++++----------
 src/Microdown-Tests/MicLinkBlockTest.class.st | 18 ++---
 .../MicMicrodownTextualBuilderTest.class.st   |  4 +-
 .../MicParagraphBlockTest.class.st            |  4 +-
 src/Microdown-Tests/MicRawBlockTest.class.st  |  2 +-
 .../MicrodownParserTest.class.st              | 20 +++---
 ...ss.st => MicAnchorReferenceBlock.class.st} | 10 +--
 ...2.class.st => MicAnnotationBlock.class.st} | 18 ++---
 ...2.class.st => MicBoldFormatBlock.class.st} | 10 +--
 src/Microdown/MicCitationBlock.class.st       |  2 +-
 src/Microdown/MicDocumentListBlock.class.st   |  2 +-
 src/Microdown/MicElement.class.st             |  2 +-
 ...k2.class.st => MicEvaluatedBlock.class.st} | 22 +++---
 ...lock2.class.st => MicFigureBlock.class.st} | 12 ++--
 src/Microdown/MicFootnoteBlock.class.st       |  2 +-
 ...lock2.class.st => MicInlineBlock.class.st} | 28 ++++----
 ...lass.st => MicInlineBlockWithUrl.class.st} | 36 +++++-----
 src/Microdown/MicInlineDelimiter.class.st     | 24 +++----
 ...ser2.class.st => MicInlineParser.class.st} | 30 ++++----
 ...class.st => MicItalicFormatBlock.class.st} | 10 +--
 ...kBlock2.class.st => MicLinkBlock.class.st} | 12 ++--
 ...2.class.st => MicMathInlineBlock.class.st} | 10 +--
 ...ss.st => MicMonospaceFormatBlock.class.st} | 18 ++---
 ...awBlock2.class.st => MicRawBlock.class.st} | 10 +--
 ...class.st => MicStrikeFormatBlock.class.st} | 10 +--
 ...tBlock2.class.st => MicTextBlock.class.st} | 12 ++--
 ....class.st => MicUnEvaluatedBlock.class.st} | 22 +++---
 41 files changed, 260 insertions(+), 267 deletions(-)
 rename src/Microdown-HTMLExporter/{MicFigureBlock2.extension.st => MicFigureBlock.extension.st} (59%)
 create mode 100644 src/Microdown-HTMLExporter/MicInlineBlockWithUrl.extension.st
 delete mode 100644 src/Microdown-HTMLExporter/MicInlineBlockWithUrl2.extension.st
 delete mode 100644 src/Microdown-HTMLExporter/MicLinkBlock2.extension.st
 rename src/Microdown-LaTeXExporter/{MicInlineBlockWithUrl2.extension.st => MicInlineBlockWithUrl.extension.st} (70%)
 rename src/Microdown/{MicAnchorReferenceBlock2.class.st => MicAnchorReferenceBlock.class.st} (63%)
 rename src/Microdown/{MicAnnotationBlock2.class.st => MicAnnotationBlock.class.st} (73%)
 rename src/Microdown/{MicBoldFormatBlock2.class.st => MicBoldFormatBlock.class.st} (59%)
 rename src/Microdown/{MicEvaluatedBlock2.class.st => MicEvaluatedBlock.class.st} (72%)
 rename src/Microdown/{MicFigureBlock2.class.st => MicFigureBlock.class.st} (79%)
 rename src/Microdown/{MicInlineBlock2.class.st => MicInlineBlock.class.st} (72%)
 rename src/Microdown/{MicInlineBlockWithUrl2.class.st => MicInlineBlockWithUrl.class.st} (70%)
 rename src/Microdown/{MicInlineParser2.class.st => MicInlineParser.class.st} (84%)
 rename src/Microdown/{MicItalicFormatBlock2.class.st => MicItalicFormatBlock.class.st} (58%)
 rename src/Microdown/{MicLinkBlock2.class.st => MicLinkBlock.class.st} (68%)
 rename src/Microdown/{MicMathInlineBlock2.class.st => MicMathInlineBlock.class.st} (81%)
 rename src/Microdown/{MicMonospaceFormatBlock2.class.st => MicMonospaceFormatBlock.class.st} (56%)
 rename src/Microdown/{MicRawBlock2.class.st => MicRawBlock.class.st} (61%)
 rename src/Microdown/{MicStrikeFormatBlock2.class.st => MicStrikeFormatBlock.class.st} (58%)
 rename src/Microdown/{MicTextBlock2.class.st => MicTextBlock.class.st} (75%)
 rename src/Microdown/{MicUnEvaluatedBlock2.class.st => MicUnEvaluatedBlock.class.st} (62%)

diff --git a/src/Microdown-HTMLExporter/MicFigureBlock2.extension.st b/src/Microdown-HTMLExporter/MicFigureBlock.extension.st
similarity index 59%
rename from src/Microdown-HTMLExporter/MicFigureBlock2.extension.st
rename to src/Microdown-HTMLExporter/MicFigureBlock.extension.st
index 0210293e..4b08a65f 100644
--- a/src/Microdown-HTMLExporter/MicFigureBlock2.extension.st
+++ b/src/Microdown-HTMLExporter/MicFigureBlock.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #MicFigureBlock2 }
+Extension { #name : #MicFigureBlock }
 
 { #category : #'*Microdown-HTMLExporter' }
-MicFigureBlock2 >> altText [
+MicFigureBlock >> altText [
 	^ (self children collect: #plainText) joinUsing: ' '
 ]
diff --git a/src/Microdown-HTMLExporter/MicInlineBlockWithUrl.extension.st b/src/Microdown-HTMLExporter/MicInlineBlockWithUrl.extension.st
new file mode 100644
index 00000000..961564bc
--- /dev/null
+++ b/src/Microdown-HTMLExporter/MicInlineBlockWithUrl.extension.st
@@ -0,0 +1,6 @@
+Extension { #name : #MicInlineBlockWithUrl }
+
+{ #category : #'*Microdown-HTMLExporter' }
+MicInlineBlockWithUrl >> hasChildren [
+	^ self children notEmpty
+]
diff --git a/src/Microdown-HTMLExporter/MicInlineBlockWithUrl2.extension.st b/src/Microdown-HTMLExporter/MicInlineBlockWithUrl2.extension.st
deleted file mode 100644
index 9e27d8f8..00000000
--- a/src/Microdown-HTMLExporter/MicInlineBlockWithUrl2.extension.st
+++ /dev/null
@@ -1,6 +0,0 @@
-Extension { #name : #MicInlineBlockWithUrl2 }
-
-{ #category : #'*Microdown-HTMLExporter' }
-MicInlineBlockWithUrl2 >> hasChildren [
-	^ self children notEmpty
-]
diff --git a/src/Microdown-HTMLExporter/MicLinkBlock2.extension.st b/src/Microdown-HTMLExporter/MicLinkBlock2.extension.st
deleted file mode 100644
index c41d32bf..00000000
--- a/src/Microdown-HTMLExporter/MicLinkBlock2.extension.st
+++ /dev/null
@@ -1,7 +0,0 @@
-Extension { #name : #MicLinkBlock2 }
-
-{ #category : #'*Microdown-HTMLExporter' }
-MicLinkBlock2 >> referencePath [
-
-	^ self reference fullName
-]
diff --git a/src/Microdown-LaTeXExporter/MicInlineBlockWithUrl2.extension.st b/src/Microdown-LaTeXExporter/MicInlineBlockWithUrl.extension.st
similarity index 70%
rename from src/Microdown-LaTeXExporter/MicInlineBlockWithUrl2.extension.st
rename to src/Microdown-LaTeXExporter/MicInlineBlockWithUrl.extension.st
index 7d35c395..d9821b34 100644
--- a/src/Microdown-LaTeXExporter/MicInlineBlockWithUrl2.extension.st
+++ b/src/Microdown-LaTeXExporter/MicInlineBlockWithUrl.extension.st
@@ -1,7 +1,7 @@
-Extension { #name : #MicInlineBlockWithUrl2 }
+Extension { #name : #MicInlineBlockWithUrl }
 
 { #category : #'*Microdown-LaTeXExporter' }
-MicInlineBlockWithUrl2 >> fileStringWithoutHostFile [
+MicInlineBlockWithUrl >> fileStringWithoutHostFile [
 	| urlString localFileIndicator |
 	urlString := url asString.
 	localFileIndicator := 'file://'.
@@ -11,13 +11,13 @@ MicInlineBlockWithUrl2 >> fileStringWithoutHostFile [
 ]
 
 { #category : #'*Microdown-LaTeXExporter' }
-MicInlineBlockWithUrl2 >> fullName [
+MicInlineBlockWithUrl >> fullName [
 
 	^ reference fullName
 ]
 
 { #category : #'*Microdown-LaTeXExporter' }
-MicInlineBlockWithUrl2 >> hasCaption [
+MicInlineBlockWithUrl >> hasCaption [
 
 	^ children notEmpty
 ]
diff --git a/src/Microdown-RichTextComposer/MicRichTextFormatConfiguration.class.st b/src/Microdown-RichTextComposer/MicRichTextFormatConfiguration.class.st
index 1ae7475d..f858889e 100644
--- a/src/Microdown-RichTextComposer/MicRichTextFormatConfiguration.class.st
+++ b/src/Microdown-RichTextComposer/MicRichTextFormatConfiguration.class.st
@@ -18,7 +18,7 @@ I support the following arguments: {!richtext|bullets=◊»!}
 "
 Class {
 	#name : #MicRichTextFormatConfiguration,
-	#superclass : #MicAnnotationBlock2,
+	#superclass : #MicAnnotationBlock,
 	#category : #'Microdown-RichTextComposer-BlockExtensions'
 }
 
diff --git a/src/Microdown-Tests/MicCitationBlockTest.class.st b/src/Microdown-Tests/MicCitationBlockTest.class.st
index e9beaaf6..ed2ce8a7 100644
--- a/src/Microdown-Tests/MicCitationBlockTest.class.st
+++ b/src/Microdown-Tests/MicCitationBlockTest.class.st
@@ -19,7 +19,7 @@ MicCitationBlockTest >> testDefaultingClassWhenNoTag [
 	
 	| doc |
 	doc := parser parse: '{!citation2|key=Duca99a!}'.
-	self assert: doc children first children first class equals: MicAnnotationBlock2.
+	self assert: doc children first children first class equals: MicAnnotationBlock.
 	self assert: doc children first children first name equals: 'citation2'.
 	self assert: (doc children first children first arguments at: #key) equals: 'Duca99a'.
 ]
diff --git a/src/Microdown-Tests/MicCodeBlockTest.class.st b/src/Microdown-Tests/MicCodeBlockTest.class.st
index 8b07b9fe..06995c9f 100644
--- a/src/Microdown-Tests/MicCodeBlockTest.class.st
+++ b/src/Microdown-Tests/MicCodeBlockTest.class.st
@@ -61,7 +61,7 @@ MicCodeBlockTest >> testCaption [
 	codeBlock := self subjectClass new.
 	codeBlock caption: '**Here** is a nice caption.'.
 	self assert: codeBlock hasCaption. 
-	self assert: codeBlock captionElements first class equals: MicBoldFormatBlock2.
+	self assert: codeBlock captionElements first class equals: MicBoldFormatBlock.
 	self assert: codeBlock captionElements size equals: 2.
 ]
 
diff --git a/src/Microdown-Tests/MicEnvironmentBlockTest.class.st b/src/Microdown-Tests/MicEnvironmentBlockTest.class.st
index e9c8a7de..3bfccd5b 100644
--- a/src/Microdown-Tests/MicEnvironmentBlockTest.class.st
+++ b/src/Microdown-Tests/MicEnvironmentBlockTest.class.st
@@ -107,7 +107,7 @@ blbababbab bababba', String cr, EnvironmentClosingBlockMarkup, String cr.
 	self assert: env children first children size equals: 2.
 	self assert: env children first children first class equals: MicListItemBlock.
 	self assert: env children second class equals: MicParagraphBlock.
-	self assert: env children second children first class equals: MicTextBlock2.
+	self assert: env children second children first class equals: MicTextBlock.
 	
 ]
 
@@ -242,7 +242,7 @@ blbababbab bababba' , String cr , EnvironmentClosingBlockMarkup
 		equals: MicListItemBlock.
 	self
 		assert: env children first children first children second class
-		equals: MicBoldFormatBlock2
+		equals: MicBoldFormatBlock
 ]
 
 { #category : #'tests - default environment' }
diff --git a/src/Microdown-Tests/MicFigureBlockTest.class.st b/src/Microdown-Tests/MicFigureBlockTest.class.st
index fcd87aa7..fb00c9e6 100644
--- a/src/Microdown-Tests/MicFigureBlockTest.class.st
+++ b/src/Microdown-Tests/MicFigureBlockTest.class.st
@@ -12,7 +12,7 @@ MicFigureBlockTest >> setUp [
 
 	super setUp.
 	parser := self parser.
-	splitterClass := MicInlineParser2 
+	splitterClass := MicInlineParser 
 ]
 
 { #category : #tests }
diff --git a/src/Microdown-Tests/MicFormatBlockTest.class.st b/src/Microdown-Tests/MicFormatBlockTest.class.st
index b4ead5f8..3fbcb66d 100644
--- a/src/Microdown-Tests/MicFormatBlockTest.class.st
+++ b/src/Microdown-Tests/MicFormatBlockTest.class.st
@@ -14,8 +14,8 @@ MicFormatBlockTest >> testBoldAPIToAccessText [
 
 	| bold |
 	bold := (self parser parse: '**a b**') children first children first.
-	self assert: bold class equals: MicBoldFormatBlock2.
-	self assert: bold children first class equals: MicTextBlock2.
+	self assert: bold class equals: MicBoldFormatBlock.
+	self assert: bold children first class equals: MicTextBlock.
 	self assert: bold children first bodystring equals: 'a b'
 ]
 
@@ -24,8 +24,8 @@ MicFormatBlockTest >> testBoldAPIToSetText [
 
 	| bold |
 	bold := (self parser parse: '**a b**') children first children first.
-	self assert: bold class equals: MicBoldFormatBlock2.
-	bold children: { (MicTextBlock2 new bodystring: 'Blblbl') }.
+	self assert: bold class equals: MicBoldFormatBlock.
+	bold children: { (MicTextBlock new bodystring: 'Blblbl') }.
 	self assert: bold children first bodystring equals: 'Blblbl'
 ]
 
@@ -34,8 +34,8 @@ MicFormatBlockTest >> testBoldCreatesInnerText [
 
 	| bold |
 	bold := (self parser parse: '**a b**') children first children first.
-	self assert: bold class equals: MicBoldFormatBlock2.
-	self assert: bold children first class equals: MicTextBlock2.
+	self assert: bold class equals: MicBoldFormatBlock.
+	self assert: bold children first class equals: MicTextBlock.
 	self assert: bold children first bodystring equals: 'a b'
 ]
 
@@ -45,13 +45,13 @@ MicFormatBlockTest >> testBoldItalicAPIToAccessText [
 	| italic |
 	italic := (self parser parse: '**_a b_**') children first children
 		          first.
-	self assert: italic class equals: MicBoldFormatBlock2.
+	self assert: italic class equals: MicBoldFormatBlock.
 	self
 		assert: italic children first class
-		equals: MicItalicFormatBlock2.
+		equals: MicItalicFormatBlock.
 	self
 		assert: italic children first children first class
-		equals: MicTextBlock2.
+		equals: MicTextBlock.
 	self
 		assert: italic children first children first bodystring
 		equals: 'a b'
@@ -66,10 +66,10 @@ MicFormatBlockTest >> testBoldWrappedElements [
 	self assert: paragraph children first children size equals: 1.
 	self
 		assert: paragraph children first class
-		equals: MicBoldFormatBlock2.
+		equals: MicBoldFormatBlock.
 	self
 		assert: paragraph children first children first class
-		equals: MicTextBlock2
+		equals: MicTextBlock
 ]
 
 { #category : #'tests - bold' }
@@ -81,7 +81,7 @@ MicFormatBlockTest >> testBoldWrappedWithAccessAPIElements [
 	self
 		assert: paragraph children first children first bodystring
 		equals: 'aa bb'.
-	self assert: paragraph children second class equals: MicTextBlock2.
+	self assert: paragraph children second class equals: MicTextBlock.
 	self assert: paragraph children second bodystring equals: ' c'
 ]
 
@@ -99,8 +99,8 @@ MicFormatBlockTest >> testItalicAPIToAccessText [
 
 	| italic |
 	italic := (self parser parse: '_a b_') children first children first.
-	self assert: italic class equals: MicItalicFormatBlock2.
-	self assert: italic children first class equals: MicTextBlock2.
+	self assert: italic class equals: MicItalicFormatBlock.
+	self assert: italic children first class equals: MicTextBlock.
 	self assert: italic children first bodystring equals: 'a b'
 ]
 
@@ -109,8 +109,8 @@ MicFormatBlockTest >> testItalicAPIToSetText [
 
 	| italic |
 	italic := (self parser parse: '_a b_') children first children first.
-	self assert: italic class equals: MicItalicFormatBlock2.
-	italic children: { (MicTextBlock2 new bodystring: 'Blblbl') }.
+	self assert: italic class equals: MicItalicFormatBlock.
+	italic children: { (MicTextBlock new bodystring: 'Blblbl') }.
 	self assert: italic children first bodystring equals: 'Blblbl'
 ]
 
@@ -119,8 +119,8 @@ MicFormatBlockTest >> testItalicCreatesInnerText [
 
 	| italic |
 	italic := (self parser parse: '_a b_') children first children first.
-	self assert: italic class equals: MicItalicFormatBlock2.
-	self assert: italic children first class equals: MicTextBlock2.
+	self assert: italic class equals: MicItalicFormatBlock.
+	self assert: italic children first class equals: MicTextBlock.
 	self assert: italic children first bodystring equals: 'a b'
 ]
 
@@ -133,10 +133,10 @@ MicFormatBlockTest >> testItalicWrappedElements [
 	self assert: paragraph children first children size equals: 1.
 	self
 		assert: paragraph children first class
-		equals: MicItalicFormatBlock2.
+		equals: MicItalicFormatBlock.
 	self
 		assert: paragraph children first children first class
-		equals: MicTextBlock2
+		equals: MicTextBlock
 ]
 
 { #category : #'tests - italic' }
@@ -148,7 +148,7 @@ MicFormatBlockTest >> testItalicWrappedWithAccessAPIElements [
 	self
 		assert: paragraph children first children first bodystring
 		equals: 'aa bb'.
-	self assert: paragraph children second class equals: MicTextBlock2.
+	self assert: paragraph children second class equals: MicTextBlock.
 	self assert: paragraph children second bodystring equals: ' c'
 ]
 
@@ -157,8 +157,8 @@ MicFormatBlockTest >> testMonospaceCreatesInnerText [
 
 	| mono |
 	mono := (self parser parse: '`a b`') children first children first.
-	self assert: mono class equals: MicMonospaceFormatBlock2.
-	self assert: mono children first class equals: MicTextBlock2.
+	self assert: mono class equals: MicMonospaceFormatBlock.
+	self assert: mono children first class equals: MicTextBlock.
 	self assert: mono children first bodystring equals: 'a b'
 ]
 
@@ -167,7 +167,7 @@ MicFormatBlockTest >> testMonospaceTextCreatesInnerText [
 
 	| mono |
 	mono := (self parser parse: '`a b`') children first children first.
-	self assert: mono class equals: MicMonospaceFormatBlock2.
+	self assert: mono class equals: MicMonospaceFormatBlock.
 	self assert: mono bodystring equals: 'a b'.
 	
 ]
@@ -177,7 +177,7 @@ MicFormatBlockTest >> testMonospaceWrappedElements [
 
 	| mono |
 	mono := (self parser parse: '`a b`') children first children first.
-	self assert: mono class equals: MicMonospaceFormatBlock2 .
+	self assert: mono class equals: MicMonospaceFormatBlock .
 	self assert: mono substring equals: 'a b'
 ]
 
diff --git a/src/Microdown-Tests/MicHTTPResourceReferenceTest.class.st b/src/Microdown-Tests/MicHTTPResourceReferenceTest.class.st
index 429bca82..f3873c97 100644
--- a/src/Microdown-Tests/MicHTTPResourceReferenceTest.class.st
+++ b/src/Microdown-Tests/MicHTTPResourceReferenceTest.class.st
@@ -109,7 +109,7 @@ MicHTTPResourceReferenceTest >> testLoadMicrodownResolvesUrlsRelativeToTheParent
 	doc := ref loadMicrodown.
 
 	topLevelImageRef := doc children fourth children first.
-	self assert: topLevelImageRef class equals: MicFigureBlock2.
+	self assert: topLevelImageRef class equals: MicFigureBlock.
 	self
 		assert: (topLevelImageRef reference loadImage) height
 		equals: 90
diff --git a/src/Microdown-Tests/MicHeaderBlockTest.class.st b/src/Microdown-Tests/MicHeaderBlockTest.class.st
index 4ecc8c81..6110ddc3 100644
--- a/src/Microdown-Tests/MicHeaderBlockTest.class.st
+++ b/src/Microdown-Tests/MicHeaderBlockTest.class.st
@@ -27,7 +27,7 @@ MicHeaderBlockTest >> testHeaderAPIToAccessText [
 	| header |
 	header := (self parser parse: '# titre1') children first.
 	self assert: header class equals: MicHeaderBlock.
-	self assert: header children first class equals: MicTextBlock2.
+	self assert: header children first class equals: MicTextBlock.
 	self assert: header children first bodystring equals: 'titre1'
 ]
 
@@ -48,7 +48,7 @@ MicHeaderBlockTest >> testHeaderCreatesInnerText [
 	| header |
 	header := (self parser parse: '# titre1') children first.
 	self assert: header class equals: MicHeaderBlock.
-	self assert: header children first class equals: MicTextBlock2.
+	self assert: header children first class equals: MicTextBlock.
 	self assert: header children first bodystring equals: 'titre1'
 ]
 
@@ -114,6 +114,6 @@ MicHeaderBlockTest >> testHeaderLongElements [
 	self assert: header children size equals: 1.
 	self
 		assert: header children first class
-		equals: MicTextBlock2.
+		equals: MicTextBlock.
 	
 ]
diff --git a/src/Microdown-Tests/MicInlineBlock2Test.class.st b/src/Microdown-Tests/MicInlineBlock2Test.class.st
index 240931e3..cac70a04 100644
--- a/src/Microdown-Tests/MicInlineBlock2Test.class.st
+++ b/src/Microdown-Tests/MicInlineBlock2Test.class.st
@@ -9,14 +9,14 @@ Class {
 
 { #category : #tests }
 MicInlineBlock2Test >> testAllTerminalNodesImplementsAccept [
-	(MicInlineBlock2 allSubclasses select: [ :cl | cl allSubclasses isEmpty ])
+	(MicInlineBlock allSubclasses select: [ :cl | cl allSubclasses isEmpty ])
 		do: [ :class |  self assert: (class includesSelector: #accept:) ]
 	
 ]
 
 { #category : #tests }
 MicInlineBlock2Test >> testBlockName [
-	self assert: MicFigureBlock2 blockName equals: 'Figure'.
-	self assert: MicBoldFormatBlock2 blockName equals: 'BoldFormat'
+	self assert: MicFigureBlock blockName equals: 'Figure'.
+	self assert: MicBoldFormatBlock blockName equals: 'BoldFormat'
 	
 ]
diff --git a/src/Microdown-Tests/MicInlineParser2Test.class.st b/src/Microdown-Tests/MicInlineParser2Test.class.st
index abec45b7..5db8f064 100644
--- a/src/Microdown-Tests/MicInlineParser2Test.class.st
+++ b/src/Microdown-Tests/MicInlineParser2Test.class.st
@@ -86,9 +86,9 @@ MicInlineParser2Test class >> generateEvaluatedTests_UnclompletedNested [
 		MicTextBlock2 new bodystring: ''aa{4}bbbbcc'' \}) printString
 	'.
 	tests := { 
-		{ 'Bold'. BoldMarkup. BoldMarkup. ItalicMarkup. MicBoldFormatBlock2}.
-		{ 'Italic'. ItalicMarkup. ItalicMarkup. StrikeMarkup. MicItalicFormatBlock2}.
-		{ 'Strike'. StrikeMarkup. StrikeMarkup. BoldMarkup. MicStrikeFormatBlock2 }
+		{ 'Bold'. BoldMarkup. BoldMarkup. ItalicMarkup. MicBoldFormatBlock}.
+		{ 'Italic'. ItalicMarkup. ItalicMarkup. StrikeMarkup. MicItalicFormatBlock}.
+		{ 'Strike'. StrikeMarkup. StrikeMarkup. BoldMarkup. MicStrikeFormatBlock }
 	 }.
 	^ tests do: [ :t | self compile: (template format: t ) classified: 'test generated']
 	
@@ -188,7 +188,7 @@ MicInlineParser2Test class >> generateUrlTests_Refs [
 
 { #category : #public }
 MicInlineParser2Test >> inlineParse: string [
-	^ MicInlineParser2 parse: string
+	^ MicInlineParser parse: string
 ]
 
 { #category : #'test generated' }
@@ -244,7 +244,7 @@ MicInlineParser2Test >> testBold [
 	"Auto generated by self class>>#generateEvaluatedTests"
 	| res |
 	res := ( self inlineParse:'**aaaa**') first.
-	self assert: res printString equals: (MicBoldFormatBlock2 new children: { MicTextBlock2 new bodystring: 'aaaa'}) printString
+	self assert: res printString equals: (MicBoldFormatBlock new children: { MicTextBlock new bodystring: 'aaaa'}) printString
 	
 ]
 
@@ -253,8 +253,8 @@ MicInlineParser2Test >> testBold_BackslashNotNested [
 	"Auto generated by self class>>#generateEvaluatedTests_BackslashNotNested"
 	| res |
 	res := ( self inlineParse:'**aa\_bbbb_cc**') first.
-	self assert: res printString equals: (MicBoldFormatBlock2 new children: {
-		MicTextBlock2 new bodystring: 'aa_bbbb_cc' }) printString
+	self assert: res printString equals: (MicBoldFormatBlock new children: {
+		MicTextBlock new bodystring: 'aa_bbbb_cc' }) printString
 	
 ]
 
@@ -263,10 +263,10 @@ MicInlineParser2Test >> testBold_Nested [
 	"Auto generated by self class>>#generateEvaluatedTests_Nested"
 	| res |
 	res := ( self inlineParse:'**aa_bbbb_cc**') first.
-	self assert: res printString equals: (MicBoldFormatBlock2 new children: {
-		MicTextBlock2 new bodystring: 'aa'.
-		MicItalicFormatBlock2 new children: { MicTextBlock2 new bodystring: 'bbbb'}.
-		MicTextBlock2 new bodystring: 'cc'
+	self assert: res printString equals: (MicBoldFormatBlock new children: {
+		MicTextBlock new bodystring: 'aa'.
+		MicItalicFormatBlock new children: { MicTextBlock new bodystring: 'bbbb'}.
+		MicTextBlock new bodystring: 'cc'
 		}) printString
 	
 ]
@@ -276,8 +276,8 @@ MicInlineParser2Test >> testBold_UnclompletedNested [
 	"Auto generated by self class>>#generateEvaluatedTests_UnclompletedNested"
 	| res |
 	res := ( self inlineParse:'**aa_bbbbcc**') first.
-	self assert: res printString equals: (MicBoldFormatBlock2 new children: {
-		MicTextBlock2 new bodystring: 'aa_bbbbcc' }) printString
+	self assert: res printString equals: (MicBoldFormatBlock new children: {
+		MicTextBlock new bodystring: 'aa_bbbbcc' }) printString
 	
 ]
 
@@ -294,8 +294,8 @@ MicInlineParser2Test >> testFigure [
 	| res |
 	res := ( self inlineParse: '![aaaa](bbb)') first.
 	self assert: res printString equals: (
-		MicFigureBlock2 new 
-			children: { MicTextBlock2 new bodystring: 'aaaa'}; url: 'bbb' ) printString
+		MicFigureBlock new 
+			children: { MicTextBlock new bodystring: 'aaaa'}; url: 'bbb' ) printString
 ]
 
 { #category : #'test generated' }
@@ -312,7 +312,7 @@ MicInlineParser2Test >> testItalic [
 	"Auto generated by self class>>#generateEvaluatedTests"
 	| res |
 	res := ( self inlineParse:'_aaaa_') first.
-	self assert: res printString equals: (MicItalicFormatBlock2 new children: { MicTextBlock2 new bodystring: 'aaaa'}) printString
+	self assert: res printString equals: (MicItalicFormatBlock new children: { MicTextBlock new bodystring: 'aaaa'}) printString
 	
 ]
 
@@ -321,8 +321,8 @@ MicInlineParser2Test >> testItalic_BackslashNotNested [
 	"Auto generated by self class>>#generateEvaluatedTests_BackslashNotNested"
 	| res |
 	res := ( self inlineParse:'_aa\~bbbb~cc_') first.
-	self assert: res printString equals: (MicItalicFormatBlock2 new children: {
-		MicTextBlock2 new bodystring: 'aa~bbbb~cc' }) printString
+	self assert: res printString equals: (MicItalicFormatBlock new children: {
+		MicTextBlock new bodystring: 'aa~bbbb~cc' }) printString
 	
 ]
 
@@ -331,10 +331,10 @@ MicInlineParser2Test >> testItalic_Nested [
 	"Auto generated by self class>>#generateEvaluatedTests_Nested"
 	| res |
 	res := ( self inlineParse:'_aa~bbbb~cc_') first.
-	self assert: res printString equals: (MicItalicFormatBlock2 new children: {
-		MicTextBlock2 new bodystring: 'aa'.
-		MicStrikeFormatBlock2 new children: { MicTextBlock2 new bodystring: 'bbbb'}.
-		MicTextBlock2 new bodystring: 'cc'
+	self assert: res printString equals: (MicItalicFormatBlock new children: {
+		MicTextBlock new bodystring: 'aa'.
+		MicStrikeFormatBlock new children: { MicTextBlock new bodystring: 'bbbb'}.
+		MicTextBlock new bodystring: 'cc'
 		}) printString
 	
 ]
@@ -344,8 +344,8 @@ MicInlineParser2Test >> testItalic_UnclompletedNested [
 	"Auto generated by self class>>#generateEvaluatedTests_UnclompletedNested"
 	| res |
 	res := ( self inlineParse:'_aa~bbbbcc_') first.
-	self assert: res printString equals: (MicItalicFormatBlock2 new children: {
-		MicTextBlock2 new bodystring: 'aa~bbbbcc' }) printString
+	self assert: res printString equals: (MicItalicFormatBlock new children: {
+		MicTextBlock new bodystring: 'aa~bbbbcc' }) printString
 	
 ]
 
@@ -355,8 +355,8 @@ MicInlineParser2Test >> testLink [
 	| res |
 	res := ( self inlineParse: '[aaaa](bbb)') first.
 	self assert: res printString equals: (
-		MicLinkBlock2 new 
-			children: { MicTextBlock2 new bodystring: 'aaaa'}; url: 'bbb' ) printString
+		MicLinkBlock new 
+			children: { MicTextBlock new bodystring: 'aaaa'}; url: 'bbb' ) printString
 ]
 
 { #category : #'test generated' }
@@ -453,7 +453,7 @@ MicInlineParser2Test >> testStrike [
 	"Auto generated by self class>>#generateEvaluatedTests"
 	| res |
 	res := ( self inlineParse:'~aaaa~') first.
-	self assert: res printString equals: (MicStrikeFormatBlock2 new children: { MicTextBlock2 new bodystring: 'aaaa'}) printString
+	self assert: res printString equals: (MicStrikeFormatBlock new children: { MicTextBlock new bodystring: 'aaaa'}) printString
 	
 ]
 
@@ -462,8 +462,8 @@ MicInlineParser2Test >> testStrike_BackslashNotNested [
 	"Auto generated by self class>>#generateEvaluatedTests_BackslashNotNested"
 	| res |
 	res := ( self inlineParse:'~aa\**bbbb**cc~') first.
-	self assert: res printString equals: (MicStrikeFormatBlock2 new children: {
-		MicTextBlock2 new bodystring: 'aa**bbbb**cc' }) printString
+	self assert: res printString equals: (MicStrikeFormatBlock new children: {
+		MicTextBlock new bodystring: 'aa**bbbb**cc' }) printString
 	
 ]
 
@@ -472,10 +472,10 @@ MicInlineParser2Test >> testStrike_Nested [
 	"Auto generated by self class>>#generateEvaluatedTests_Nested"
 	| res |
 	res := ( self inlineParse:'~aa**bbbb**cc~') first.
-	self assert: res printString equals: (MicStrikeFormatBlock2 new children: {
-		MicTextBlock2 new bodystring: 'aa'.
-		MicBoldFormatBlock2 new children: { MicTextBlock2 new bodystring: 'bbbb'}.
-		MicTextBlock2 new bodystring: 'cc'
+	self assert: res printString equals: (MicStrikeFormatBlock new children: {
+		MicTextBlock new bodystring: 'aa'.
+		MicBoldFormatBlock new children: { MicTextBlock new bodystring: 'bbbb'}.
+		MicTextBlock new bodystring: 'cc'
 		}) printString
 	
 ]
@@ -485,8 +485,8 @@ MicInlineParser2Test >> testStrike_UnclompletedNested [
 	"Auto generated by self class>>#generateEvaluatedTests_UnclompletedNested"
 	| res |
 	res := ( self inlineParse:'~aa**bbbbcc~') first.
-	self assert: res printString equals: (MicStrikeFormatBlock2 new children: {
-		MicTextBlock2 new bodystring: 'aa**bbbbcc' }) printString
+	self assert: res printString equals: (MicStrikeFormatBlock new children: {
+		MicTextBlock new bodystring: 'aa**bbbbcc' }) printString
 	
 ]
 
diff --git a/src/Microdown-Tests/MicLinkBlockTest.class.st b/src/Microdown-Tests/MicLinkBlockTest.class.st
index 49ae3337..ed324d32 100644
--- a/src/Microdown-Tests/MicLinkBlockTest.class.st
+++ b/src/Microdown-Tests/MicLinkBlockTest.class.st
@@ -67,7 +67,7 @@ MicLinkBlockTest >> setUp [
 
 	super setUp.
 	parser := self parser. 
-	splitterClass := MicInlineParser2
+	splitterClass := MicInlineParser
 ]
 
 { #category : #tests }
@@ -98,7 +98,7 @@ MicLinkBlockTest >> testHasArguments [
 MicLinkBlockTest >> testLinkAPIToAccessText [
 
 	link := self parseLink: self linkSample.
-	self assert: link class equals: MicLinkBlock2.
+	self assert: link class equals: MicLinkBlock.
 	self assert: link url equals: '/anUrl'
 ]
 
@@ -106,9 +106,9 @@ MicLinkBlockTest >> testLinkAPIToAccessText [
 MicLinkBlockTest >> testLinkBoldAPIToAccessText [
 
 	link := self parseLink: self linkBoldSample.
-	self assert: link class equals: MicLinkBlock2.
-	self assert: link children first class equals: MicBoldFormatBlock2.
-	self assert: link children first children first class equals: MicTextBlock2.
+	self assert: link class equals: MicLinkBlock.
+	self assert: link children first class equals: MicBoldFormatBlock.
+	self assert: link children first children first class equals: MicTextBlock.
 
 	self assert: link url equals: '/anUrl'
 ]
@@ -117,7 +117,7 @@ MicLinkBlockTest >> testLinkBoldAPIToAccessText [
 MicLinkBlockTest >> testLinkCreatesInnerText [
 
 	link := self parseLink: '[ab](https://ab.com)'.
-	self assert: link class equals: MicLinkBlock2.
+	self assert: link class equals: MicLinkBlock.
 	self assert: link url equals: 'https://ab.com'
 ]
 
@@ -125,11 +125,11 @@ MicLinkBlockTest >> testLinkCreatesInnerText [
 MicLinkBlockTest >> testLinkItalicAPIToAccessText [
 
 	link := self parseLink: self linkItalicSample.
-	self assert: link class equals: MicLinkBlock2.
-	self assert: link children first class equals: MicItalicFormatBlock2.
+	self assert: link class equals: MicLinkBlock.
+	self assert: link children first class equals: MicItalicFormatBlock.
 	self
 		assert: link children first children first class
-		equals: MicTextBlock2.
+		equals: MicTextBlock.
 
 	self assert: link url equals: '/anUrl'
 ]
diff --git a/src/Microdown-Tests/MicMicrodownTextualBuilderTest.class.st b/src/Microdown-Tests/MicMicrodownTextualBuilderTest.class.st
index 462608bb..de04826e 100644
--- a/src/Microdown-Tests/MicMicrodownTextualBuilderTest.class.st
+++ b/src/Microdown-Tests/MicMicrodownTextualBuilderTest.class.st
@@ -423,8 +423,8 @@ MicMicrodownTextualBuilderTest >> testRawFormat [
 { #category : #tests }
 MicMicrodownTextualBuilderTest >> testRawParametersWithNotStringAtValue [
 	
-	builder rawParameters: { 'label'->42 . 'size'->MicTextBlock2 } asDictionary.
-	self assert: builder contents equals: 'label=42&size=MicTextBlock2'
+	builder rawParameters: { 'label'->42 . 'size'->MicTextBlock } asDictionary.
+	self assert: builder contents equals: 'label=42&size=MicTextBlock'
 ]
 
 { #category : #'tests - slides' }
diff --git a/src/Microdown-Tests/MicParagraphBlockTest.class.st b/src/Microdown-Tests/MicParagraphBlockTest.class.st
index 8018378b..606acba0 100644
--- a/src/Microdown-Tests/MicParagraphBlockTest.class.st
+++ b/src/Microdown-Tests/MicParagraphBlockTest.class.st
@@ -47,12 +47,12 @@ another line** and more'.
 
 	self
 		assert:
-			(MicInlineParser2 new parse: root children first text) first
+			(MicInlineParser new parse: root children first text) first
 				blockName asLowercase
 		equals: #boldformat.
 	self
 		assert:
-			(MicInlineParser2 new parse: root children second text) first
+			(MicInlineParser new parse: root children second text) first
 				blockName asLowercase
 		equals: #text
 ]
diff --git a/src/Microdown-Tests/MicRawBlockTest.class.st b/src/Microdown-Tests/MicRawBlockTest.class.st
index 3f97820b..38bf7151 100644
--- a/src/Microdown-Tests/MicRawBlockTest.class.st
+++ b/src/Microdown-Tests/MicRawBlockTest.class.st
@@ -17,5 +17,5 @@ MicRawBlockTest >> testRaw [
 	self assert: root children first class equals: MicParagraphBlock.
 	self
 		assert: root children first children second class
-		equals: MicRawBlock2
+		equals: MicRawBlock
 ]
diff --git a/src/Microdown-Tests/MicrodownParserTest.class.st b/src/Microdown-Tests/MicrodownParserTest.class.st
index f21de7f7..71bbdb79 100644
--- a/src/Microdown-Tests/MicrodownParserTest.class.st
+++ b/src/Microdown-Tests/MicrodownParserTest.class.st
@@ -162,9 +162,9 @@ MicrodownParserTest >> testAnnotatedBlockTextElements [
 	root :=  parser parse: source.
 	self assert: root children size equals: 1.
 	annotated := root children first. 
-	self assert: root children first textElements first class equals: MicTextBlock2.
-	self assert: root children first textElements second class equals: MicBoldFormatBlock2.
-	self assert: root children first textElements third class equals: MicTextBlock2
+	self assert: root children first textElements first class equals: MicTextBlock.
+	self assert: root children first textElements second class equals: MicBoldFormatBlock.
+	self assert: root children first textElements third class equals: MicTextBlock
 	
 
 ]
@@ -551,7 +551,7 @@ MicrodownParserTest >> testSimpleTable [
 	self assert: mic class equals: MicTableBlock.
 	self assert: mic rows size equals: 2.
 	self assert: mic rows first size equals: 2.
-	self assert: mic rows first first first class equals: MicTextBlock2
+	self assert: mic rows first first first class equals: MicTextBlock
 ]
 
 { #category : #'tests - error' }
@@ -582,7 +582,7 @@ MicrodownParserTest >> testSimpleTableWithFormatting [
 	self assert: mic class equals: MicTableBlock.
 	self assert: mic rows size equals: 2.
 	self assert: mic rows first size equals: 2.
-	self assert: mic rows first first first class equals: MicBoldFormatBlock2
+	self assert: mic rows first first first class equals: MicBoldFormatBlock
 ]
 
 { #category : #'tests - table' }
@@ -601,11 +601,11 @@ MicrodownParserTest >> testSimpleTableWithFormattingWithSomeElements [
 	self assert: mic rows first size equals: 2.
 	self
 		assert: mic rows first first first class
-		equals: MicBoldFormatBlock2.
-	self assert: mic rows first first second class equals: MicTextBlock2.
+		equals: MicBoldFormatBlock.
+	self assert: mic rows first first second class equals: MicTextBlock.
 	self
 		assert: mic rows first first third class
-		equals: MicItalicFormatBlock2
+		equals: MicItalicFormatBlock
 ]
 
 { #category : #'tests - table' }
@@ -622,7 +622,7 @@ MicrodownParserTest >> testSimpleTableWithMoreLongRow [
 	self assert: mic class equals: MicTableBlock.
 	self assert: mic rows size equals: 2.
 	self assert: mic rows first size equals: 2.
-	self assert: mic rows first first first class equals: MicTextBlock2
+	self assert: mic rows first first first class equals: MicTextBlock
 ]
 
 { #category : #'tests - table' }
@@ -639,7 +639,7 @@ MicrodownParserTest >> testSimpleTableWithShortRow [
 	self assert: mic class equals: MicTableBlock.
 	self assert: mic rows size equals: 2.
 	self assert: mic rows first size equals: 2.
-	self assert: mic rows first first first class equals: MicTextBlock2
+	self assert: mic rows first first first class equals: MicTextBlock
 ]
 
 { #category : #'tests - comments' }
diff --git a/src/Microdown/MicAnchorReferenceBlock2.class.st b/src/Microdown/MicAnchorReferenceBlock.class.st
similarity index 63%
rename from src/Microdown/MicAnchorReferenceBlock2.class.st
rename to src/Microdown/MicAnchorReferenceBlock.class.st
index a5369b22..de2fb9e2 100644
--- a/src/Microdown/MicAnchorReferenceBlock2.class.st
+++ b/src/Microdown/MicAnchorReferenceBlock.class.st
@@ -7,8 +7,8 @@ See *@fig1@*
 
 "
 Class {
-	#name : #MicAnchorReferenceBlock2,
-	#superclass : #MicUnEvaluatedBlock2,
+	#name : #MicAnchorReferenceBlock,
+	#superclass : #MicUnEvaluatedBlock,
 	#instVars : [
 		'reference'
 	],
@@ -16,18 +16,18 @@ Class {
 }
 
 { #category : #accessing }
-MicAnchorReferenceBlock2 class >> closingDelimiter [
+MicAnchorReferenceBlock class >> closingDelimiter [
 
  	^ AnchorReferenceCloserMarkup
 ]
 
 { #category : #accessing }
-MicAnchorReferenceBlock2 class >> openingDelimiter [
+MicAnchorReferenceBlock class >> openingDelimiter [
 
  	^ AnchorReferenceOpenerMarkup
 ]
 
 { #category : #visiting }
-MicAnchorReferenceBlock2 >> accept: aVisitor [
+MicAnchorReferenceBlock >> accept: aVisitor [
  	^ aVisitor visitAnchorReference: self
 ]
diff --git a/src/Microdown/MicAnnotationBlock2.class.st b/src/Microdown/MicAnnotationBlock.class.st
similarity index 73%
rename from src/Microdown/MicAnnotationBlock2.class.st
rename to src/Microdown/MicAnnotationBlock.class.st
index 3d3ca29f..b9ce0ad3 100644
--- a/src/Microdown/MicAnnotationBlock2.class.st
+++ b/src/Microdown/MicAnnotationBlock.class.st
@@ -12,8 +12,8 @@ MicroDownParser parse: '{!citation|name=Duca99a!}'
 ```
 "
 Class {
-	#name : #MicAnnotationBlock2,
-	#superclass : #MicUnEvaluatedBlock2,
+	#name : #MicAnnotationBlock,
+	#superclass : #MicUnEvaluatedBlock,
 	#instVars : [
 		'arguments'
 	],
@@ -21,19 +21,19 @@ Class {
 }
 
 { #category : #accessing }
-MicAnnotationBlock2 class >> closingDelimiter [
+MicAnnotationBlock class >> closingDelimiter [
 
  	^ AnnotationCloserMarkup
 ]
 
 { #category : #accessing }
-MicAnnotationBlock2 class >> openingDelimiter [
+MicAnnotationBlock class >> openingDelimiter [
 
  	^ AnnotationOpenerMarkup
 ]
 
 { #category : #parsing }
-MicAnnotationBlock2 class >> parse: delimiter stream: aTokenStream for: aParser [
+MicAnnotationBlock class >> parse: delimiter stream: aTokenStream for: aParser [
 	| bodystring arguments tag extensionClass |
 	bodystring := delimiter undelimitedSubstring.
 	arguments := MicArgumentList
@@ -50,23 +50,23 @@ MicAnnotationBlock2 class >> parse: delimiter stream: aTokenStream for: aParser
 ]
 
 { #category : #visiting }
-MicAnnotationBlock2 >> accept: aVisitor [
+MicAnnotationBlock >> accept: aVisitor [
 	^ aVisitor visitAnnotation: self
 ]
 
 { #category : #accessing }
-MicAnnotationBlock2 >> arguments [
+MicAnnotationBlock >> arguments [
 
 	^ arguments
 ]
 
 { #category : #accessing }
-MicAnnotationBlock2 >> arguments: argumentList [
+MicAnnotationBlock >> arguments: argumentList [
 
 	arguments := argumentList
 ]
 
 { #category : #accessing }
-MicAnnotationBlock2 >> name [
+MicAnnotationBlock >> name [
 	^ arguments defaultValue
 ]
diff --git a/src/Microdown/MicBoldFormatBlock2.class.st b/src/Microdown/MicBoldFormatBlock.class.st
similarity index 59%
rename from src/Microdown/MicBoldFormatBlock2.class.st
rename to src/Microdown/MicBoldFormatBlock.class.st
index 1a9c664c..009cf32d 100644
--- a/src/Microdown/MicBoldFormatBlock2.class.st
+++ b/src/Microdown/MicBoldFormatBlock.class.st
@@ -2,24 +2,24 @@
 I represent a bold text section. I'm delimited using `**` as in `**bold**` to obtain **bold**.
 "
 Class {
-	#name : #MicBoldFormatBlock2,
-	#superclass : #MicEvaluatedBlock2,
+	#name : #MicBoldFormatBlock,
+	#superclass : #MicEvaluatedBlock,
 	#category : #'Microdown-InlineParser'
 }
 
 { #category : #accessing }
-MicBoldFormatBlock2 class >> closingDelimiter [
+MicBoldFormatBlock class >> closingDelimiter [
 
  	^ BoldMarkup
 ]
 
 { #category : #accessing }
-MicBoldFormatBlock2 class >> openingDelimiter [
+MicBoldFormatBlock class >> openingDelimiter [
 
  	^ BoldMarkup
 ]
 
 { #category : #visiting }
-MicBoldFormatBlock2 >> accept: aVisitor [
+MicBoldFormatBlock >> accept: aVisitor [
 	^ aVisitor visitBold: self
 ]
diff --git a/src/Microdown/MicCitationBlock.class.st b/src/Microdown/MicCitationBlock.class.st
index 3cb4f9dd..90640f6d 100644
--- a/src/Microdown/MicCitationBlock.class.st
+++ b/src/Microdown/MicCitationBlock.class.st
@@ -9,7 +9,7 @@ this is a text with a {!citation|ref=Duca99a!}
 "
 Class {
 	#name : #MicCitationBlock,
-	#superclass : #MicAnnotationBlock2,
+	#superclass : #MicAnnotationBlock,
 	#category : #'Microdown-Extensions'
 }
 
diff --git a/src/Microdown/MicDocumentListBlock.class.st b/src/Microdown/MicDocumentListBlock.class.st
index 09b9a214..c56dbf8d 100644
--- a/src/Microdown/MicDocumentListBlock.class.st
+++ b/src/Microdown/MicDocumentListBlock.class.st
@@ -1,6 +1,6 @@
 Class {
 	#name : #MicDocumentListBlock,
-	#superclass : #MicAnnotationBlock2,
+	#superclass : #MicAnnotationBlock,
 	#category : #'Microdown-Extensions'
 }
 
diff --git a/src/Microdown/MicElement.class.st b/src/Microdown/MicElement.class.st
index 3a6aa9d1..0c2c2440 100644
--- a/src/Microdown/MicElement.class.st
+++ b/src/Microdown/MicElement.class.st
@@ -67,7 +67,7 @@ MicElement >> inlineParse: aString [
 { #category : #private }
 MicElement >> inlineParserClass [
 
-	^ MicInlineParser2
+	^ MicInlineParser
 ]
 
 { #category : #private }
diff --git a/src/Microdown/MicEvaluatedBlock2.class.st b/src/Microdown/MicEvaluatedBlock.class.st
similarity index 72%
rename from src/Microdown/MicEvaluatedBlock2.class.st
rename to src/Microdown/MicEvaluatedBlock.class.st
index 20d2454c..8c6f8621 100644
--- a/src/Microdown/MicEvaluatedBlock2.class.st
+++ b/src/Microdown/MicEvaluatedBlock.class.st
@@ -2,8 +2,8 @@
 I represent blocks with sub structure. Typically italics inside bold
 "
 Class {
-	#name : #MicEvaluatedBlock2,
-	#superclass : #MicInlineBlock2,
+	#name : #MicEvaluatedBlock,
+	#superclass : #MicInlineBlock,
 	#instVars : [
 		'children'
 	],
@@ -11,34 +11,34 @@ Class {
 }
 
 { #category : #'as yet unclassified' }
-MicEvaluatedBlock2 class >> blockName [
+MicEvaluatedBlock class >> blockName [
 	^ (super blockName) "withoutSuffix: 'Format'"
 ]
 
 { #category : #parsing }
-MicEvaluatedBlock2 class >> parse: token stream: aTokenStream for: aParser [
+MicEvaluatedBlock class >> parse: token stream: aTokenStream for: aParser [
 	^ aParser parseEvaluatedBlock: self token: token stream: aTokenStream
 ]
 
 { #category : #accessing }
-MicEvaluatedBlock2 >> children [
+MicEvaluatedBlock >> children [
 
 	^ children
 ]
 
 { #category : #accessing }
-MicEvaluatedBlock2 >> children: anObject [
+MicEvaluatedBlock >> children: anObject [
 
 	children := anObject
 ]
 
 { #category : #printing }
-MicEvaluatedBlock2 >> plainText [
+MicEvaluatedBlock >> plainText [
 	^ (self children collect: #plainText) joinUsing: ' '
 ]
 
 { #category : #printing }
-MicEvaluatedBlock2 >> printOn: stream [
+MicEvaluatedBlock >> printOn: stream [
 	stream << self blockName << '{ '.
 	children do: [ :ch | ch printOn: stream. stream nextPut: Character space  ].
 	stream << $}
@@ -46,21 +46,21 @@ MicEvaluatedBlock2 >> printOn: stream [
 ]
 
 { #category : #accessing }
-MicEvaluatedBlock2 >> textElement [
+MicEvaluatedBlock >> textElement [
 	"Should only be used for tests"
 	self deprecated: 'Just use children' transformWith: '`@rec textElement' -> '`@rec children first'.
 	^ children first
 ]
 
 { #category : #accessing }
-MicEvaluatedBlock2 >> textElement: elem [
+MicEvaluatedBlock >> textElement: elem [
 	"Should only be used for tests"
 	self deprecated: 'Just use children' transformWith: '`@rec textElement: `@arg' -> '`@rec children: {`@arg}'.
 	^ children := { elem }
 ]
 
 { #category : #accessing }
-MicEvaluatedBlock2 >> wrappedElements [
+MicEvaluatedBlock >> wrappedElements [
 	self deprecated: 'Just use children' transformWith: '`@rec wrappedElements' -> '`@rec children'.
 	^ children 
 ]
diff --git a/src/Microdown/MicFigureBlock2.class.st b/src/Microdown/MicFigureBlock.class.st
similarity index 79%
rename from src/Microdown/MicFigureBlock2.class.st
rename to src/Microdown/MicFigureBlock.class.st
index 1220029f..8beaf3ab 100644
--- a/src/Microdown/MicFigureBlock2.class.st
+++ b/src/Microdown/MicFigureBlock.class.st
@@ -11,29 +11,29 @@ I have a resources, i.e. an object referencing either a file (in relative or abs
 What is important to see is that there is a space between the url arguments and microdown arguments. 
 "
 Class {
-	#name : #MicFigureBlock2,
-	#superclass : #MicInlineBlockWithUrl2,
+	#name : #MicFigureBlock,
+	#superclass : #MicInlineBlockWithUrl,
 	#category : #'Microdown-InlineParser'
 }
 
 { #category : #accessing }
-MicFigureBlock2 class >> closingDelimiter [
+MicFigureBlock class >> closingDelimiter [
 
  	^ NameCloserUrlOpener
 ]
 
 { #category : #accessing }
-MicFigureBlock2 class >> openingDelimiter [
+MicFigureBlock class >> openingDelimiter [
 
  	^ FigureNameOpenerMarkup
 ]
 
 { #category : #visiting }
-MicFigureBlock2 >> accept: aVisitor [
+MicFigureBlock >> accept: aVisitor [
  	^ aVisitor visitFigure: self
 ]
 
 { #category : #printing }
-MicFigureBlock2 >> plainText [
+MicFigureBlock >> plainText [
 	^ '![', ((self children collect: #plainText) joinUsing: ' '), '](', url ,')'
 ]
diff --git a/src/Microdown/MicFootnoteBlock.class.st b/src/Microdown/MicFootnoteBlock.class.st
index 1437170c..037c454b 100644
--- a/src/Microdown/MicFootnoteBlock.class.st
+++ b/src/Microdown/MicFootnoteBlock.class.st
@@ -5,7 +5,7 @@ this is a text with a `{!footnote|note=Here is a nice footenote.!}`
 "
 Class {
 	#name : #MicFootnoteBlock,
-	#superclass : #MicAnnotationBlock2,
+	#superclass : #MicAnnotationBlock,
 	#category : #'Microdown-Extensions'
 }
 
diff --git a/src/Microdown/MicInlineBlock2.class.st b/src/Microdown/MicInlineBlock.class.st
similarity index 72%
rename from src/Microdown/MicInlineBlock2.class.st
rename to src/Microdown/MicInlineBlock.class.st
index 5c0d61c4..6666b794 100644
--- a/src/Microdown/MicInlineBlock2.class.st
+++ b/src/Microdown/MicInlineBlock.class.st
@@ -10,65 +10,65 @@ I am characterized by:
 
 "
 Class {
-	#name : #MicInlineBlock2,
+	#name : #MicInlineBlock,
 	#superclass : #MicElement,
 	#category : #'Microdown-InlineParser'
 }
 
 { #category : #accessing }
-MicInlineBlock2 class >> blockName [
-	^ (self instanceSide name asString withoutPrefix: 'Mic') withoutSuffix: 'Block2'
+MicInlineBlock class >> blockName [
+	^ (self instanceSide name asString withoutPrefix: 'Mic') withoutSuffix: 'Block'
 ]
 
 { #category : #accessing }
-MicInlineBlock2 class >> closingDelimiter [
+MicInlineBlock class >> closingDelimiter [
 	^ self subclassResponsibility
 ]
 
 { #category : #testing }
-MicInlineBlock2 class >> isEvaluated [
+MicInlineBlock class >> isEvaluated [
 	^ true
 ]
 
 { #category : #accessing }
-MicInlineBlock2 class >> openingDelimiter [
+MicInlineBlock class >> openingDelimiter [
 	^ self subclassResponsibility
 ]
 
 { #category : #visiting }
-MicInlineBlock2 >> accept: dummy [
+MicInlineBlock >> accept: dummy [
 	"implemented in subclasses"
 ]
 
 { #category : #'as yet unclassified' }
-MicInlineBlock2 >> blockName [
+MicInlineBlock >> blockName [
 	^ self class blockName
 ]
 
 { #category : #visiting }
-MicInlineBlock2 >> closeMe [
+MicInlineBlock >> closeMe [
 	"use for post parsing initialization"
 ]
 
 { #category : #accessing }
-MicInlineBlock2 >> closingDelimiter [ 
+MicInlineBlock >> closingDelimiter [ 
 	^ self class closingDelimiter
 ]
 
 { #category : #private }
-MicInlineBlock2 >> inlineParserClass [
+MicInlineBlock >> inlineParserClass [
 
-	^ MicInlineParser2
+	^ MicInlineParser
 ]
 
 { #category : #accessing }
-MicInlineBlock2 >> kind [
+MicInlineBlock >> kind [
 	"Should only be used for tests"
 	self deprecated: 'use blockName instead' transformWith: '`@rec kind' -> '`@rec blockName asLowercase'.
 	^ self blockName asLowercase 
 ]
 
 { #category : #accessing }
-MicInlineBlock2 >> openingDelimiter [
+MicInlineBlock >> openingDelimiter [
 	^ self class openingDelimiter
 ]
diff --git a/src/Microdown/MicInlineBlockWithUrl2.class.st b/src/Microdown/MicInlineBlockWithUrl.class.st
similarity index 70%
rename from src/Microdown/MicInlineBlockWithUrl2.class.st
rename to src/Microdown/MicInlineBlockWithUrl.class.st
index 4ab2a217..ffcd480c 100644
--- a/src/Microdown/MicInlineBlockWithUrl2.class.st
+++ b/src/Microdown/MicInlineBlockWithUrl.class.st
@@ -8,8 +8,8 @@ My subclasses manage figures and links.
 ![Pharologo](https://files.pharo.org/media/logo/logo.png)
 "
 Class {
-	#name : #MicInlineBlockWithUrl2,
-	#superclass : #MicInlineBlock2,
+	#name : #MicInlineBlockWithUrl,
+	#superclass : #MicInlineBlock,
 	#instVars : [
 		'children',
 		'url',
@@ -20,55 +20,55 @@ Class {
 }
 
 { #category : #parsing }
-MicInlineBlockWithUrl2 class >> parse: token stream: aTokenStream for: aParser [
+MicInlineBlockWithUrl class >> parse: token stream: aTokenStream for: aParser [
 	^ aParser parseNameUrlBlock: self from: aTokenStream token: token
 ]
 
 { #category : #testing }
-MicInlineBlockWithUrl2 >> anchor [
+MicInlineBlockWithUrl >> anchor [
 	^ self arguments 
 		at: #anchor 
 		ifAbsent: [ nil ] 
 ]
 
 { #category : #accessing }
-MicInlineBlockWithUrl2 >> arguments [
+MicInlineBlockWithUrl >> arguments [
 
 	^ arguments
 ]
 
 { #category : #accessing }
-MicInlineBlockWithUrl2 >> arguments: anObject [
+MicInlineBlockWithUrl >> arguments: anObject [
 
 	arguments := anObject
 ]
 
 { #category : #visiting }
-MicInlineBlockWithUrl2 >> captionElements [
+MicInlineBlockWithUrl >> captionElements [
 	self deprecated: 'Use children instead' transformWith: '`@rec captionElements' -> '`@rec children'.
 	^ children
 ]
 
 { #category : #visiting }
-MicInlineBlockWithUrl2 >> captionElements: someChildren [
+MicInlineBlockWithUrl >> captionElements: someChildren [
 	self deprecated: 'Use children: instead' transformWith: '`@rec captionElements: `@arg' -> '`@rec children: `@arg'.
 	children := someChildren 
 ]
 
 { #category : #accessing }
-MicInlineBlockWithUrl2 >> children [
+MicInlineBlockWithUrl >> children [
 
 	^ children
 ]
 
 { #category : #accessing }
-MicInlineBlockWithUrl2 >> children: anObject [
+MicInlineBlockWithUrl >> children: anObject [
 
 	children := anObject
 ]
 
 { #category : #visiting }
-MicInlineBlockWithUrl2 >> closeMe [
+MicInlineBlockWithUrl >> closeMe [
 	"the link url - ![alt text](url) - url is allowed to have title in quotes
 	(url ""title"") "
 
@@ -81,18 +81,18 @@ MicInlineBlockWithUrl2 >> closeMe [
 ]
 
 { #category : #testing }
-MicInlineBlockWithUrl2 >> hasAnchor [
+MicInlineBlockWithUrl >> hasAnchor [
 
 	^ self anchor isNotNil
 ]
 
 { #category : #testing }
-MicInlineBlockWithUrl2 >> hasArguments [
+MicInlineBlockWithUrl >> hasArguments [
 	^ arguments size > 0
 ]
 
 { #category : #printing }
-MicInlineBlockWithUrl2 >> printOn: stream [
+MicInlineBlockWithUrl >> printOn: stream [
 	stream << self blockName << '{ '.
 	children do: [ :ch | ch printOn: stream. stream nextPut: Character space  ].
 	stream << $}.
@@ -101,25 +101,25 @@ MicInlineBlockWithUrl2 >> printOn: stream [
 ]
 
 { #category : #accessing }
-MicInlineBlockWithUrl2 >> reference [
+MicInlineBlockWithUrl >> reference [
 
 	^ reference
 ]
 
 { #category : #accessing }
-MicInlineBlockWithUrl2 >> reference: anObject [
+MicInlineBlockWithUrl >> reference: anObject [
 
 	reference := anObject
 ]
 
 { #category : #accessing }
-MicInlineBlockWithUrl2 >> url [
+MicInlineBlockWithUrl >> url [
 
 	^ url
 ]
 
 { #category : #accessing }
-MicInlineBlockWithUrl2 >> url: anObject [
+MicInlineBlockWithUrl >> url: anObject [
 
 	url := anObject
 ]
diff --git a/src/Microdown/MicInlineDelimiter.class.st b/src/Microdown/MicInlineDelimiter.class.st
index 0dd8d7d0..f1ca5d0a 100644
--- a/src/Microdown/MicInlineDelimiter.class.st
+++ b/src/Microdown/MicInlineDelimiter.class.st
@@ -47,25 +47,25 @@ MicInlineDelimiter class >> initialize [
 { #category : #initialization }
 MicInlineDelimiter class >> initializeDelimiters [
 	"The fixious text delimiter"
-	self new markup: FixiousTextDelimiter; blockClass: MicTextBlock2; closer: nil; addMe.
+	self new markup: FixiousTextDelimiter; blockClass: MicTextBlock; closer: nil; addMe.
 	"formating"
-	self new markup: BoldMarkup; blockClass: MicBoldFormatBlock2; closer: BoldMarkup; addMe.
-	self new markup: ItalicMarkup; blockClass: MicItalicFormatBlock2; closer: ItalicMarkup; addMe.
-	self new markup: StrikeMarkup; blockClass: MicStrikeFormatBlock2; closer: StrikeMarkup; addMe.
+	self new markup: BoldMarkup; blockClass: MicBoldFormatBlock; closer: BoldMarkup; addMe.
+	self new markup: ItalicMarkup; blockClass: MicItalicFormatBlock; closer: ItalicMarkup; addMe.
+	self new markup: StrikeMarkup; blockClass: MicStrikeFormatBlock; closer: StrikeMarkup; addMe.
 	"anchors & annotations"
-	self new markup: AnchorReferenceOpenerMarkup; blockClass: MicAnchorReferenceBlock2; closer: AnchorReferenceCloserMarkup; addMe.
+	self new markup: AnchorReferenceOpenerMarkup; blockClass: MicAnchorReferenceBlock; closer: AnchorReferenceCloserMarkup; addMe.
 	self new markup: AnchorReferenceCloserMarkup; blockClass: nil; closer: nil; addMe.
 	self new markup: AnnotationCloserMarkup; blockClass: nil; closer: nil; addMe.
-	self new markup: AnnotationOpenerMarkup; blockClass: MicAnnotationBlock2; closer: AnnotationCloserMarkup; addMe.
+	self new markup: AnnotationOpenerMarkup; blockClass: MicAnnotationBlock; closer: AnnotationCloserMarkup; addMe.
 	"unevaluated"
-	self new markup: MathMarkup; blockClass: MicMathInlineBlock2; closer: MathMarkup; addMe.
-	self new markup: MonospaceMarkup; blockClass: MicMonospaceFormatBlock2; closer: MonospaceMarkup; addMe.
-	self new markup: RawOpenerMarkup; blockClass: MicRawBlock2; closer: RawCloserMarkup; addMe.
+	self new markup: MathMarkup; blockClass: MicMathInlineBlock; closer: MathMarkup; addMe.
+	self new markup: MonospaceMarkup; blockClass: MicMonospaceFormatBlock; closer: MonospaceMarkup; addMe.
+	self new markup: RawOpenerMarkup; blockClass: MicRawBlock; closer: RawCloserMarkup; addMe.
 	self new markup: RawCloserMarkup; blockClass: nil; closer: nil; addMe.
 	"Containing URLs"
-	self new markup: LinkNameOpenerMarkup; blockClass: MicLinkBlock2; closer: NameCloserUrlOpener; addMe.
-	self new markup: FigureNameOpenerMarkup; blockClass: MicFigureBlock2; closer: NameCloserUrlOpener; addMe.
-	self new markup: NameCloserUrlOpener; blockClass: MicRawBlock2 ; closer: URLCloserMarkup; addMe.
+	self new markup: LinkNameOpenerMarkup; blockClass: MicLinkBlock; closer: NameCloserUrlOpener; addMe.
+	self new markup: FigureNameOpenerMarkup; blockClass: MicFigureBlock; closer: NameCloserUrlOpener; addMe.
+	self new markup: NameCloserUrlOpener; blockClass: MicRawBlock ; closer: URLCloserMarkup; addMe.
 	self new markup: URLCloserMarkup; blockClass: nil ; closer: nil; addMe
 		
 ]
diff --git a/src/Microdown/MicInlineParser2.class.st b/src/Microdown/MicInlineParser.class.st
similarity index 84%
rename from src/Microdown/MicInlineParser2.class.st
rename to src/Microdown/MicInlineParser.class.st
index 6597a231..3557b005 100644
--- a/src/Microdown/MicInlineParser2.class.st
+++ b/src/Microdown/MicInlineParser.class.st
@@ -4,7 +4,7 @@ I am a parser for paragraphs with substructure in Microdown.
 My only external method is `parse:`.
 "
 Class {
-	#name : #MicInlineParser2,
+	#name : #MicInlineParser,
 	#superclass : #Object,
 	#pools : [
 		'MicMicrodownSharedPool'
@@ -13,18 +13,18 @@ Class {
 }
 
 { #category : #parsing }
-MicInlineParser2 class >> parse: string [
+MicInlineParser class >> parse: string [
 	^ self new parse: string
 ]
 
 { #category : #'as yet unclassified' }
-MicInlineParser2 class >> rootParse: aString [
+MicInlineParser class >> rootParse: aString [
 	"I am used for test, returning a root block with my children"
 	^ MicRootBlock new children: (self parse: aString)
 ]
 
 { #category : #'block creation' }
-MicInlineParser2 >> createInlineBlock: token inStream: aReadStream [ 
+MicInlineParser >> createInlineBlock: token inStream: aReadStream [ 
 	| blockClass newBlock|
 	blockClass := token delimiter blockClass.
 	newBlock := blockClass parse: token stream: aReadStream for: self.
@@ -34,18 +34,18 @@ MicInlineParser2 >> createInlineBlock: token inStream: aReadStream [
 ]
 
 { #category : #'block creation' }
-MicInlineParser2 >> createTextBlock: token [
-	^ MicTextBlock2 new bodystring: token
+MicInlineParser >> createTextBlock: token [
+	^ MicTextBlock new bodystring: token
 ]
 
 { #category : #'private parsing' }
-MicInlineParser2 >> joinTextNodesOf: children [
+MicInlineParser >> joinTextNodesOf: children [
 	"children might have several text blocks following each other - join them and remove empty Text blocks"
 	| outStream bufferText  |
 	outStream := WriteStream on: OrderedCollection new.
 	bufferText := nil.
 	children do: [ :child |
-		child class = MicTextBlock2
+		child class = MicTextBlock
 			ifTrue: [ bufferText 
 				ifNil: [ bufferText := child ]
 				ifNotNil: [ bufferText bodystring: (bufferText bodystring , child bodystring) ] ]
@@ -62,7 +62,7 @@ MicInlineParser2 >> joinTextNodesOf: children [
 ]
 
 { #category : #parsing }
-MicInlineParser2 >> parse: aString [
+MicInlineParser >> parse: aString [
 	"I return an array of inline blocks"
 	| tokenStream |
 	tokenStream := MicInlineTokenStream on: aString.
@@ -70,7 +70,7 @@ MicInlineParser2 >> parse: aString [
 ]
 
 { #category : #'private parsing' }
-MicInlineParser2 >> parseChildrenIn: tokenStream [
+MicInlineParser >> parseChildrenIn: tokenStream [
 	"return an array of blocks from parsing tokenStream"
 	| children child |
 	children := OrderedCollection new.
@@ -86,7 +86,7 @@ MicInlineParser2 >> parseChildrenIn: tokenStream [
 ]
 
 { #category : #'private parsing' }
-MicInlineParser2 >> parseEvaluatedBlock: blockType token: token stream: tokenStream [
+MicInlineParser >> parseEvaluatedBlock: blockType token: token stream: tokenStream [
 	| skipRes |
 	skipRes := (self skipTo: token delimiter closer inStream: tokenStream).
 	skipRes ifNil: [ ^ self createTextBlock: token string].
@@ -97,7 +97,7 @@ MicInlineParser2 >> parseEvaluatedBlock: blockType token: token stream: tokenStr
 ]
 
 { #category : #'private parsing' }
-MicInlineParser2 >> parseNameUrlBlock: blockType from: aTokenStream token: token [
+MicInlineParser >> parseNameUrlBlock: blockType from: aTokenStream token: token [
 	| skipRes children urlToken|
 	skipRes := (self skipToUrlStartInStream: aTokenStream).
 	skipRes ifNil: [ ^ self createTextBlock: token string].
@@ -113,14 +113,14 @@ MicInlineParser2 >> parseNameUrlBlock: blockType from: aTokenStream token: token
 ]
 
 { #category : #'private parsing' }
-MicInlineParser2 >> parseNonEvaluatedBlock: blockClass token: token stream: aTokenStream [
+MicInlineParser >> parseNonEvaluatedBlock: blockClass token: token stream: aTokenStream [
 	^ blockClass new
 		bodystring: token undelimitedSubstring;
 		closeMe
 ]
 
 { #category : #'private parsing' }
-MicInlineParser2 >> skipTo: closer inStream: tokenStream [
+MicInlineParser >> skipTo: closer inStream: tokenStream [
 	"skip tokenStream to closer, ignore closers in non-evaluated. if we find it return the accumulates text and a subtokenstream to read it from"
 	| startPos substringStream |
 	startPos := tokenStream position.
@@ -140,7 +140,7 @@ MicInlineParser2 >> skipTo: closer inStream: tokenStream [
 ]
 
 { #category : #'private parsing' }
-MicInlineParser2 >> skipToUrlStartInStream: tokenStream [
+MicInlineParser >> skipToUrlStartInStream: tokenStream [
 	"Skip to my UrlStart. Notice, I might find a nested url construct"
 	| startPos substringStream nestingLevel|
 	startPos := tokenStream position.
diff --git a/src/Microdown/MicItalicFormatBlock2.class.st b/src/Microdown/MicItalicFormatBlock.class.st
similarity index 58%
rename from src/Microdown/MicItalicFormatBlock2.class.st
rename to src/Microdown/MicItalicFormatBlock.class.st
index 71f4c0b2..34229629 100644
--- a/src/Microdown/MicItalicFormatBlock2.class.st
+++ b/src/Microdown/MicItalicFormatBlock.class.st
@@ -2,24 +2,24 @@
 I represent an italic text section. I'm delimited using `_` as in `_italic_` to obtain _italic_.
 "
 Class {
-	#name : #MicItalicFormatBlock2,
-	#superclass : #MicEvaluatedBlock2,
+	#name : #MicItalicFormatBlock,
+	#superclass : #MicEvaluatedBlock,
 	#category : #'Microdown-InlineParser'
 }
 
 { #category : #accessing }
-MicItalicFormatBlock2 class >> closingDelimiter [
+MicItalicFormatBlock class >> closingDelimiter [
 
  	^ ItalicMarkup
 ]
 
 { #category : #accessing }
-MicItalicFormatBlock2 class >> openingDelimiter [
+MicItalicFormatBlock class >> openingDelimiter [
 
  	^ ItalicMarkup
 ]
 
 { #category : #visiting }
-MicItalicFormatBlock2 >> accept: aVisitor [
+MicItalicFormatBlock >> accept: aVisitor [
 	^ aVisitor visitItalic: self
 ]
diff --git a/src/Microdown/MicLinkBlock2.class.st b/src/Microdown/MicLinkBlock.class.st
similarity index 68%
rename from src/Microdown/MicLinkBlock2.class.st
rename to src/Microdown/MicLinkBlock.class.st
index fec3af64..a4ade1a5 100644
--- a/src/Microdown/MicLinkBlock2.class.st
+++ b/src/Microdown/MicLinkBlock.class.st
@@ -2,29 +2,29 @@
 I represent a reference in a text. For example `[http://pharo.org](http://pharo.org)` creates [http://pharo.org](http://pharo.org).
 "
 Class {
-	#name : #MicLinkBlock2,
-	#superclass : #MicInlineBlockWithUrl2,
+	#name : #MicLinkBlock,
+	#superclass : #MicInlineBlockWithUrl,
 	#category : #'Microdown-InlineParser'
 }
 
 { #category : #accessing }
-MicLinkBlock2 class >> closingDelimiter [
+MicLinkBlock class >> closingDelimiter [
 
  	^ NameCloserUrlOpener
 ]
 
 { #category : #accessing }
-MicLinkBlock2 class >> openingDelimiter [
+MicLinkBlock class >> openingDelimiter [
 
  	^ LinkNameOpenerMarkup
 ]
 
 { #category : #visiting }
-MicLinkBlock2 >> accept: aVisitor [
+MicLinkBlock >> accept: aVisitor [
 	^ aVisitor visitLink: self
 ]
 
 { #category : #printing }
-MicLinkBlock2 >> plainText [
+MicLinkBlock >> plainText [
 	^ '[', ((self children collect: #plainText) joinUsing: ' '), '](', url ,')'
 ]
diff --git a/src/Microdown/MicMathInlineBlock2.class.st b/src/Microdown/MicMathInlineBlock.class.st
similarity index 81%
rename from src/Microdown/MicMathInlineBlock2.class.st
rename to src/Microdown/MicMathInlineBlock.class.st
index 83a00f82..4ae038a8 100644
--- a/src/Microdown/MicMathInlineBlock2.class.st
+++ b/src/Microdown/MicMathInlineBlock.class.st
@@ -25,24 +25,24 @@ $f(a) = \frac{1}{2\pi i} \oint_{\gamma} \frac{f(z)}{z - a} dz$
 
 "
 Class {
-	#name : #MicMathInlineBlock2,
-	#superclass : #MicUnEvaluatedBlock2,
+	#name : #MicMathInlineBlock,
+	#superclass : #MicUnEvaluatedBlock,
 	#category : #'Microdown-InlineParser'
 }
 
 { #category : #accessing }
-MicMathInlineBlock2 class >> closingDelimiter [
+MicMathInlineBlock class >> closingDelimiter [
 
  	^ MathMarkup
 ]
 
 { #category : #accessing }
-MicMathInlineBlock2 class >> openingDelimiter [
+MicMathInlineBlock class >> openingDelimiter [
 
  	^ MathMarkup
 ]
 
 { #category : #visiting }
-MicMathInlineBlock2 >> accept: aVisitor [
+MicMathInlineBlock >> accept: aVisitor [
 	^ aVisitor visitMathInline: self
 ]
diff --git a/src/Microdown/MicMonospaceFormatBlock2.class.st b/src/Microdown/MicMonospaceFormatBlock.class.st
similarity index 56%
rename from src/Microdown/MicMonospaceFormatBlock2.class.st
rename to src/Microdown/MicMonospaceFormatBlock.class.st
index 1836cf0f..2476304a 100644
--- a/src/Microdown/MicMonospaceFormatBlock2.class.st
+++ b/src/Microdown/MicMonospaceFormatBlock.class.st
@@ -2,41 +2,41 @@
 I represent a monospaced text section. I'm delimited using `\`` as in `\`monospace\`` to obtain `monospace`.
 "
 Class {
-	#name : #MicMonospaceFormatBlock2,
-	#superclass : #MicUnEvaluatedBlock2,
+	#name : #MicMonospaceFormatBlock,
+	#superclass : #MicUnEvaluatedBlock,
 	#category : #'Microdown-InlineParser'
 }
 
 { #category : #'as yet unclassified' }
-MicMonospaceFormatBlock2 class >> blockName [
+MicMonospaceFormatBlock class >> blockName [
 	^ (super blockName) withoutSuffix: 'Format'
 ]
 
 { #category : #accessing }
-MicMonospaceFormatBlock2 class >> closingDelimiter [
+MicMonospaceFormatBlock class >> closingDelimiter [
 
  	^ MonospaceMarkup
 ]
 
 { #category : #accessing }
-MicMonospaceFormatBlock2 class >> openingDelimiter [
+MicMonospaceFormatBlock class >> openingDelimiter [
 
  	^ MonospaceMarkup
 ]
 
 { #category : #visiting }
-MicMonospaceFormatBlock2 >> accept: aVisitor [
+MicMonospaceFormatBlock >> accept: aVisitor [
 	^ aVisitor visitMonospace: self
 ]
 
 { #category : #accessing }
-MicMonospaceFormatBlock2 >> children [
+MicMonospaceFormatBlock >> children [
 	"should be deprecated"
-	^ Array with: (MicTextBlock2 new bodystring: self bodystring)
+	^ Array with: (MicTextBlock new bodystring: self bodystring)
 ]
 
 { #category : #accessing }
-MicMonospaceFormatBlock2 >> text [
+MicMonospaceFormatBlock >> text [
 	"should be deprecated "
 	^ self bodystring 
 ]
diff --git a/src/Microdown/MicRawBlock2.class.st b/src/Microdown/MicRawBlock.class.st
similarity index 61%
rename from src/Microdown/MicRawBlock2.class.st
rename to src/Microdown/MicRawBlock.class.st
index bc1581a6..366471d6 100644
--- a/src/Microdown/MicRawBlock2.class.st
+++ b/src/Microdown/MicRawBlock.class.st
@@ -6,24 +6,24 @@ Raw lets the user place anything (so don't use it).
 ```
 "
 Class {
-	#name : #MicRawBlock2,
-	#superclass : #MicUnEvaluatedBlock2,
+	#name : #MicRawBlock,
+	#superclass : #MicUnEvaluatedBlock,
 	#category : #'Microdown-InlineParser'
 }
 
 { #category : #accessing }
-MicRawBlock2 class >> closingDelimiter [
+MicRawBlock class >> closingDelimiter [
 
  	^ RawCloserMarkup
 ]
 
 { #category : #accessing }
-MicRawBlock2 class >> openingDelimiter [
+MicRawBlock class >> openingDelimiter [
 
  	^ RawOpenerMarkup
 ]
 
 { #category : #visiting }
-MicRawBlock2 >> accept: aVisitor [
+MicRawBlock >> accept: aVisitor [
 	^ aVisitor visitRaw: self
 ]
diff --git a/src/Microdown/MicStrikeFormatBlock2.class.st b/src/Microdown/MicStrikeFormatBlock.class.st
similarity index 58%
rename from src/Microdown/MicStrikeFormatBlock2.class.st
rename to src/Microdown/MicStrikeFormatBlock.class.st
index b9fee1fc..e5d8d86d 100644
--- a/src/Microdown/MicStrikeFormatBlock2.class.st
+++ b/src/Microdown/MicStrikeFormatBlock.class.st
@@ -2,24 +2,24 @@
 I represent a strike text section. I'm delimited using `~` as in `~strike~` to obtain ~strike~.
 "
 Class {
-	#name : #MicStrikeFormatBlock2,
-	#superclass : #MicEvaluatedBlock2,
+	#name : #MicStrikeFormatBlock,
+	#superclass : #MicEvaluatedBlock,
 	#category : #'Microdown-InlineParser'
 }
 
 { #category : #accessing }
-MicStrikeFormatBlock2 class >> closingDelimiter [
+MicStrikeFormatBlock class >> closingDelimiter [
 
  	^ StrikeMarkup
 ]
 
 { #category : #accessing }
-MicStrikeFormatBlock2 class >> openingDelimiter [
+MicStrikeFormatBlock class >> openingDelimiter [
 
  	^ StrikeMarkup
 ]
 
 { #category : #visiting }
-MicStrikeFormatBlock2 >> accept: aVisitor [
+MicStrikeFormatBlock >> accept: aVisitor [
 	^ aVisitor visitStrike: self
 ]
diff --git a/src/Microdown/MicTextBlock2.class.st b/src/Microdown/MicTextBlock.class.st
similarity index 75%
rename from src/Microdown/MicTextBlock2.class.st
rename to src/Microdown/MicTextBlock.class.st
index fc11c473..929bcb96 100644
--- a/src/Microdown/MicTextBlock2.class.st
+++ b/src/Microdown/MicTextBlock.class.st
@@ -2,31 +2,31 @@
 I'm a special inline block representing the fact that there is not markup. 
 "
 Class {
-	#name : #MicTextBlock2,
-	#superclass : #MicUnEvaluatedBlock2,
+	#name : #MicTextBlock,
+	#superclass : #MicUnEvaluatedBlock,
 	#category : #'Microdown-InlineParser'
 }
 
 { #category : #visiting }
-MicTextBlock2 >> accept: aVisitor [
+MicTextBlock >> accept: aVisitor [
 	^ aVisitor visitText: self
 ]
 
 { #category : #obsolete }
-MicTextBlock2 >> substring [
+MicTextBlock >> substring [
 	"Should only be used for tests"
 	self deprecated: 'Just use bodystring' transformWith: '`@rec substring' -> '`@rec bodystring'.
 	^ bodystring 
 ]
 
 { #category : #obsolete }
-MicTextBlock2 >> substring: aBody [
+MicTextBlock >> substring: aBody [
 	"Should only be used for tests"
 	self deprecated: 'Just use bodystring:' transformWith: '`@rec substring: `@arg' -> '`@rec bodystring: `@arg'.
 	^ bodystring 
 ]
 
 { #category : #accessing }
-MicTextBlock2 >> text [
+MicTextBlock >> text [
 	^ bodystring 
 ]
diff --git a/src/Microdown/MicUnEvaluatedBlock2.class.st b/src/Microdown/MicUnEvaluatedBlock.class.st
similarity index 62%
rename from src/Microdown/MicUnEvaluatedBlock2.class.st
rename to src/Microdown/MicUnEvaluatedBlock.class.st
index e1fe00ec..d1842e86 100644
--- a/src/Microdown/MicUnEvaluatedBlock2.class.st
+++ b/src/Microdown/MicUnEvaluatedBlock.class.st
@@ -2,8 +2,8 @@
 I represent blocks whose contents is not microdown markup as such.
 "
 Class {
-	#name : #MicUnEvaluatedBlock2,
-	#superclass : #MicInlineBlock2,
+	#name : #MicUnEvaluatedBlock,
+	#superclass : #MicInlineBlock,
 	#instVars : [
 		'bodystring'
 	],
@@ -11,51 +11,51 @@ Class {
 }
 
 { #category : #testing }
-MicUnEvaluatedBlock2 class >> isEvaluated [
+MicUnEvaluatedBlock class >> isEvaluated [
 	^ false
 ]
 
 { #category : #parsing }
-MicUnEvaluatedBlock2 class >> parse: delimiter stream: aTokenStream for: aParser [
+MicUnEvaluatedBlock class >> parse: delimiter stream: aTokenStream for: aParser [
 	^ aParser parseNonEvaluatedBlock: self token: delimiter stream: aTokenStream
 ]
 
 { #category : #accessing }
-MicUnEvaluatedBlock2 >> bodystring [
+MicUnEvaluatedBlock >> bodystring [
 
 	^ bodystring
 ]
 
 { #category : #accessing }
-MicUnEvaluatedBlock2 >> bodystring: anObject [
+MicUnEvaluatedBlock >> bodystring: anObject [
 
 	bodystring := anObject
 ]
 
 { #category : #accessing }
-MicUnEvaluatedBlock2 >> children [
+MicUnEvaluatedBlock >> children [
 	"to be nicely polymorphic all nodes have children"
 	^#()
 ]
 
 { #category : #accessing }
-MicUnEvaluatedBlock2 >> children: newChildren [
+MicUnEvaluatedBlock >> children: newChildren [
 	"to be nicely polymorphic all nodes have children"
 ]
 
 { #category : #printing }
-MicUnEvaluatedBlock2 >> plainText [
+MicUnEvaluatedBlock >> plainText [
 	^ bodystring 
 ]
 
 { #category : #printing }
-MicUnEvaluatedBlock2 >> printOn: stream [
+MicUnEvaluatedBlock >> printOn: stream [
 	stream << self blockName << '(' << bodystring << ')'
 	
 ]
 
 { #category : #obsolete }
-MicUnEvaluatedBlock2 >> substring [
+MicUnEvaluatedBlock >> substring [
 	self flag: 'to be obsoleted, use bodystring'.
 	^ bodystring
 ]

From 0259c2706999a5aae91c9acd07d99fd794f88318 Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Thu, 3 Nov 2022 09:01:12 +0100
Subject: [PATCH 21/40] Dumper all green

---
 .../MicDumperTest.class.st                    |  4 +-
 .../MicRealDumper.class.st                    | 44 +++++++++----------
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/src/Microdown-PrettyPrinter-Tests/MicDumperTest.class.st b/src/Microdown-PrettyPrinter-Tests/MicDumperTest.class.st
index 3f66b9bf..93acc2e5 100644
--- a/src/Microdown-PrettyPrinter-Tests/MicDumperTest.class.st
+++ b/src/Microdown-PrettyPrinter-Tests/MicDumperTest.class.st
@@ -54,12 +54,12 @@ MicDumperTest >> testBoldFormat [
 	| micBold |
 	micBold := (parser parse: factory boldFormatSample) children first
 		           children first.
-	self assert: micBold children first class equals: MicTextBlock2.
+	self assert: micBold children first class equals: MicTextBlock. 
 	visitor visit: micBold.
 	self
 		assert: visitor contents
 		equals:
-		'(MicBoldFormatBlock2 new children: (MicTextBlock2 new substring: ''Foo''))'
+		'(MicBoldFormatBlock new textElements: {(MicTextBlock new substring: ''Foo'')})'
 ]
 
 { #category : #'test - inline - blocks' }
diff --git a/src/Microdown-PrettyPrinter/MicRealDumper.class.st b/src/Microdown-PrettyPrinter/MicRealDumper.class.st
index 377d4777..3c2257d7 100644
--- a/src/Microdown-PrettyPrinter/MicRealDumper.class.st
+++ b/src/Microdown-PrettyPrinter/MicRealDumper.class.st
@@ -147,20 +147,18 @@ MicRealDumper >> visitComment: aComment [
 MicRealDumper >> visitFigure: aMicFigure [
 
 	self flag: #arg.
-	self 
-		element: aMicFigure 
-		during: [
-			aMicFigure hasArguments ifTrue: [ self emitParameters: aMicFigure ].
-			stream nextPutAll: 'url: '.
-			stream print: aMicFigure reference fullName.
-			stream
-				space;
-				nextPutAll: ';'.
-			stream nextPutAll: ' caption: { '.
-			aMicFigure captionElements
-				do: [ :each | self visit: each ]
-				separatedBy: [ stream nextPutAll: ' . ' ].
-			stream nextPutAll: '}; yourself' ]
+	self element: aMicFigure during: [ 
+		aMicFigure hasArguments ifTrue: [ self emitParameters: aMicFigure ].
+		stream nextPutAll: 'url: '.
+		stream print: aMicFigure reference fullName.
+		stream
+			space;
+			nextPutAll: ';'.
+		stream nextPutAll: ' caption: { '.
+		aMicFigure children
+			do: [ :each | self visit: each ]
+			separatedBy: [ stream nextPutAll: ' . ' ].
+		stream nextPutAll: '}; yourself' ]
 ]
 
 { #category : #'visit - section' }
@@ -187,15 +185,15 @@ MicRealDumper >> visitItalic: aMicItalic [
 { #category : #'visit - section' }
 MicRealDumper >> visitLink: aMicLink [
 
-	self 
-		element: aMicLink 
-		during: [
-			stream nextPutAll: 'captionElements: '.
-			stream nextPutAll: '{'.
-			aMicLink captionElements do: [ :each | self visit: each  ] separatedBy: [ stream nextPutAll: ' . ' ].
-			stream nextPutAll: '} ; url: '.
-			stream print: aMicLink url.
-			stream nextPutAll: ' ; yourself' ]
+	self element: aMicLink during: [ 
+		stream nextPutAll: 'captionElements: '.
+		stream nextPutAll: '{'.
+		aMicLink children
+			do: [ :each | self visit: each ]
+			separatedBy: [ stream nextPutAll: ' . ' ].
+		stream nextPutAll: '} ; url: '.
+		stream print: aMicLink url.
+		stream nextPutAll: ' ; yourself' ]
 ]
 
 { #category : #'visit - section' }

From a9b38f66912d8fe3b1625d1108468bf1075ac326 Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Fri, 4 Nov 2022 07:21:01 +0100
Subject: [PATCH 22/40] removed suffix 2 from test classes also

---
 .../MicInlineBlock2Test.class.st              | 22 -----
 ....class.st => MicInlineParserTest.class.st} | 96 +++++++++----------
 2 files changed, 48 insertions(+), 70 deletions(-)
 delete mode 100644 src/Microdown-Tests/MicInlineBlock2Test.class.st
 rename src/Microdown-Tests/{MicInlineParser2Test.class.st => MicInlineParserTest.class.st} (87%)

diff --git a/src/Microdown-Tests/MicInlineBlock2Test.class.st b/src/Microdown-Tests/MicInlineBlock2Test.class.st
deleted file mode 100644
index cac70a04..00000000
--- a/src/Microdown-Tests/MicInlineBlock2Test.class.st
+++ /dev/null
@@ -1,22 +0,0 @@
-Class {
-	#name : #MicInlineBlock2Test,
-	#superclass : #TestCase,
-	#pools : [
-		'MicMicrodownSharedPool'
-	],
-	#category : #'Microdown-Tests-InlineParser'
-}
-
-{ #category : #tests }
-MicInlineBlock2Test >> testAllTerminalNodesImplementsAccept [
-	(MicInlineBlock allSubclasses select: [ :cl | cl allSubclasses isEmpty ])
-		do: [ :class |  self assert: (class includesSelector: #accept:) ]
-	
-]
-
-{ #category : #tests }
-MicInlineBlock2Test >> testBlockName [
-	self assert: MicFigureBlock blockName equals: 'Figure'.
-	self assert: MicBoldFormatBlock blockName equals: 'BoldFormat'
-	
-]
diff --git a/src/Microdown-Tests/MicInlineParser2Test.class.st b/src/Microdown-Tests/MicInlineParserTest.class.st
similarity index 87%
rename from src/Microdown-Tests/MicInlineParser2Test.class.st
rename to src/Microdown-Tests/MicInlineParserTest.class.st
index 5db8f064..801b2df2 100644
--- a/src/Microdown-Tests/MicInlineParser2Test.class.st
+++ b/src/Microdown-Tests/MicInlineParserTest.class.st
@@ -1,5 +1,5 @@
 Class {
-	#name : #MicInlineParser2Test,
+	#name : #MicInlineParserTest,
 	#superclass : #TestCase,
 	#pools : [
 		'MicMicrodownSharedPool'
@@ -8,7 +8,7 @@ Class {
 }
 
 { #category : #'as yet unclassified' }
-MicInlineParser2Test class >> generateAllTests [
+MicInlineParserTest class >> generateAllTests [
 	<script>
 	| testGenerators |
 	testGenerators := (self class methods select: [ :meth | meth selector beginsWith: #'generate' ])
@@ -17,7 +17,7 @@ MicInlineParser2Test class >> generateAllTests [
 ]
 
 { #category : #'as yet unclassified' }
-MicInlineParser2Test class >> generateEvaluatedTests [
+MicInlineParserTest class >> generateEvaluatedTests [
 	| template tests|
 	template := 'test{1}
 	"Auto generated by self class>>#generateEvaluatedTests"
@@ -35,7 +35,7 @@ MicInlineParser2Test class >> generateEvaluatedTests [
 ]
 
 { #category : #'as yet unclassified' }
-MicInlineParser2Test class >> generateEvaluatedTests_BackslashNotNested [
+MicInlineParserTest class >> generateEvaluatedTests_BackslashNotNested [
 	| template tests|
 	template := 'test{1}_BackslashNotNested
 	"Auto generated by self class>>#generateEvaluatedTests_BackslashNotNested"
@@ -54,7 +54,7 @@ MicInlineParser2Test class >> generateEvaluatedTests_BackslashNotNested [
 ]
 
 { #category : #'as yet unclassified' }
-MicInlineParser2Test class >> generateEvaluatedTests_Nested [
+MicInlineParserTest class >> generateEvaluatedTests_Nested [
 	| template tests|
 	template := 'test{1}_Nested
 	"Auto generated by self class>>#generateEvaluatedTests_Nested"
@@ -76,7 +76,7 @@ MicInlineParser2Test class >> generateEvaluatedTests_Nested [
 ]
 
 { #category : #'as yet unclassified' }
-MicInlineParser2Test class >> generateEvaluatedTests_UnclompletedNested [
+MicInlineParserTest class >> generateEvaluatedTests_UnclompletedNested [
 	| template tests|
 	template := 'test{1}_UnclompletedNested
 	"Auto generated by self class>>#generateEvaluatedTests_UnclompletedNested"
@@ -95,7 +95,7 @@ MicInlineParser2Test class >> generateEvaluatedTests_UnclompletedNested [
 ]
 
 { #category : #'as yet unclassified' }
-MicInlineParser2Test class >> generateUnEvaluated [
+MicInlineParserTest class >> generateUnEvaluated [
 	| template tests|
 	template := 'test{1}
 	"Auto generated by self class>>#generateUnEvaluated"
@@ -114,7 +114,7 @@ MicInlineParser2Test class >> generateUnEvaluated [
 ]
 
 { #category : #'as yet unclassified' }
-MicInlineParser2Test class >> generateUnEvaluated_backSlashed [
+MicInlineParserTest class >> generateUnEvaluated_backSlashed [
 	| template tests|
 	template := 'test{1}_backSlashed
 	"Auto generated by self class>>#generateUnEvaluated_backSlashed"
@@ -133,7 +133,7 @@ MicInlineParser2Test class >> generateUnEvaluated_backSlashed [
 ]
 
 { #category : #'as yet unclassified' }
-MicInlineParser2Test class >> generateUnEvaluated_unevaluated [
+MicInlineParserTest class >> generateUnEvaluated_unevaluated [
 	| template tests|
 	template := 'test{1}_unevaluated
 	"Auto generated by self class>>#generateUnEvaluated_unevaluated"
@@ -152,7 +152,7 @@ MicInlineParser2Test class >> generateUnEvaluated_unevaluated [
 ]
 
 { #category : #'as yet unclassified' }
-MicInlineParser2Test class >> generateUrlTests [
+MicInlineParserTest class >> generateUrlTests [
 	| template tests|
 	template := 'test{1}
 	"Auto generated by self class>>#generateUrlTests"
@@ -170,7 +170,7 @@ MicInlineParser2Test class >> generateUrlTests [
 ]
 
 { #category : #'as yet unclassified' }
-MicInlineParser2Test class >> generateUrlTests_Refs [
+MicInlineParserTest class >> generateUrlTests_Refs [
 	| template tests|
 	template := 'test{1}_Refs
 	"Auto generated by self class>>#generateUrlTests_Refs"
@@ -187,12 +187,12 @@ MicInlineParser2Test class >> generateUrlTests_Refs [
 ]
 
 { #category : #public }
-MicInlineParser2Test >> inlineParse: string [
+MicInlineParserTest >> inlineParse: string [
 	^ MicInlineParser parse: string
 ]
 
 { #category : #'test generated' }
-MicInlineParser2Test >> testAnchorReference [
+MicInlineParserTest >> testAnchorReference [
 	"Auto generated by self class>>#generateUnEvaluated"
 	| res |
 	res := self inlineParse: '*@bbbb@*'.
@@ -200,7 +200,7 @@ MicInlineParser2Test >> testAnchorReference [
 ]
 
 { #category : #'test generated' }
-MicInlineParser2Test >> testAnchorReference_backSlashed [
+MicInlineParserTest >> testAnchorReference_backSlashed [
 	"Auto generated by self class>>#generateUnEvaluated_backSlashed"
 	| res |
 	res := self inlineParse: '*@bb\xccc\@*cccbb@*'.
@@ -208,7 +208,7 @@ MicInlineParser2Test >> testAnchorReference_backSlashed [
 ]
 
 { #category : #'test generated' }
-MicInlineParser2Test >> testAnchorReference_unevaluated [
+MicInlineParserTest >> testAnchorReference_unevaluated [
 	"Auto generated by self class>>#generateUnEvaluated_unevaluated"
 	| res |
 	res := self inlineParse:'*@bb**ccc**bb@*'.
@@ -216,7 +216,7 @@ MicInlineParser2Test >> testAnchorReference_unevaluated [
 ]
 
 { #category : #'test generated' }
-MicInlineParser2Test >> testAnnotation [
+MicInlineParserTest >> testAnnotation [
 	"Auto generated by self class>>#generateUnEvaluated"
 	| res |
 	res := self inlineParse: '{!bbbb!}'.
@@ -224,7 +224,7 @@ MicInlineParser2Test >> testAnnotation [
 ]
 
 { #category : #'test generated' }
-MicInlineParser2Test >> testAnnotation_backSlashed [
+MicInlineParserTest >> testAnnotation_backSlashed [
 	"Auto generated by self class>>#generateUnEvaluated_backSlashed"
 	| res |
 	res := self inlineParse: '{!bb\xccc\!}cccbb!}'.
@@ -232,7 +232,7 @@ MicInlineParser2Test >> testAnnotation_backSlashed [
 ]
 
 { #category : #'test generated' }
-MicInlineParser2Test >> testAnnotation_unevaluated [
+MicInlineParserTest >> testAnnotation_unevaluated [
 	"Auto generated by self class>>#generateUnEvaluated_unevaluated"
 	| res |
 	res := self inlineParse:'{!bb**ccc**bb!}'.
@@ -240,7 +240,7 @@ MicInlineParser2Test >> testAnnotation_unevaluated [
 ]
 
 { #category : #'test generated' }
-MicInlineParser2Test >> testBold [
+MicInlineParserTest >> testBold [
 	"Auto generated by self class>>#generateEvaluatedTests"
 	| res |
 	res := ( self inlineParse:'**aaaa**') first.
@@ -249,7 +249,7 @@ MicInlineParser2Test >> testBold [
 ]
 
 { #category : #'test generated' }
-MicInlineParser2Test >> testBold_BackslashNotNested [
+MicInlineParserTest >> testBold_BackslashNotNested [
 	"Auto generated by self class>>#generateEvaluatedTests_BackslashNotNested"
 	| res |
 	res := ( self inlineParse:'**aa\_bbbb_cc**') first.
@@ -259,7 +259,7 @@ MicInlineParser2Test >> testBold_BackslashNotNested [
 ]
 
 { #category : #'test generated' }
-MicInlineParser2Test >> testBold_Nested [
+MicInlineParserTest >> testBold_Nested [
 	"Auto generated by self class>>#generateEvaluatedTests_Nested"
 	| res |
 	res := ( self inlineParse:'**aa_bbbb_cc**') first.
@@ -272,7 +272,7 @@ MicInlineParser2Test >> testBold_Nested [
 ]
 
 { #category : #'test generated' }
-MicInlineParser2Test >> testBold_UnclompletedNested [
+MicInlineParserTest >> testBold_UnclompletedNested [
 	"Auto generated by self class>>#generateEvaluatedTests_UnclompletedNested"
 	| res |
 	res := ( self inlineParse:'**aa_bbbbcc**') first.
@@ -282,14 +282,14 @@ MicInlineParser2Test >> testBold_UnclompletedNested [
 ]
 
 { #category : #tests }
-MicInlineParser2Test >> testBrokenNestedBlocksHandles [
+MicInlineParserTest >> testBrokenNestedBlocksHandles [
 	| res |
 	res := (self inlineParse: '![[aaaa]bbb)](ccc)sss![[aaaa](bbb](ccc)').
 	self assert: res printString equals: 'an Array(Text(![) Link{ Text(aaaa]bbb)) }(ccc) Text(sss![) Link{ Text(aaaa) }(bbb](ccc))'
 ]
 
 { #category : #'test generated' }
-MicInlineParser2Test >> testFigure [
+MicInlineParserTest >> testFigure [
 	"Auto generated by self class>>#generateUrlTests"
 	| res |
 	res := ( self inlineParse: '![aaaa](bbb)') first.
@@ -299,7 +299,7 @@ MicInlineParser2Test >> testFigure [
 ]
 
 { #category : #'test generated' }
-MicInlineParser2Test >> testFigure_Refs [
+MicInlineParserTest >> testFigure_Refs [
 	"Auto generated by self class>>#generateUrlTests_Refs"
 	| res |
 	res := ( self inlineParse: '![aaaa](bbb)') first.
@@ -308,7 +308,7 @@ MicInlineParser2Test >> testFigure_Refs [
 ]
 
 { #category : #'test generated' }
-MicInlineParser2Test >> testItalic [
+MicInlineParserTest >> testItalic [
 	"Auto generated by self class>>#generateEvaluatedTests"
 	| res |
 	res := ( self inlineParse:'_aaaa_') first.
@@ -317,7 +317,7 @@ MicInlineParser2Test >> testItalic [
 ]
 
 { #category : #'test generated' }
-MicInlineParser2Test >> testItalic_BackslashNotNested [
+MicInlineParserTest >> testItalic_BackslashNotNested [
 	"Auto generated by self class>>#generateEvaluatedTests_BackslashNotNested"
 	| res |
 	res := ( self inlineParse:'_aa\~bbbb~cc_') first.
@@ -327,7 +327,7 @@ MicInlineParser2Test >> testItalic_BackslashNotNested [
 ]
 
 { #category : #'test generated' }
-MicInlineParser2Test >> testItalic_Nested [
+MicInlineParserTest >> testItalic_Nested [
 	"Auto generated by self class>>#generateEvaluatedTests_Nested"
 	| res |
 	res := ( self inlineParse:'_aa~bbbb~cc_') first.
@@ -340,7 +340,7 @@ MicInlineParser2Test >> testItalic_Nested [
 ]
 
 { #category : #'test generated' }
-MicInlineParser2Test >> testItalic_UnclompletedNested [
+MicInlineParserTest >> testItalic_UnclompletedNested [
 	"Auto generated by self class>>#generateEvaluatedTests_UnclompletedNested"
 	| res |
 	res := ( self inlineParse:'_aa~bbbbcc_') first.
@@ -350,7 +350,7 @@ MicInlineParser2Test >> testItalic_UnclompletedNested [
 ]
 
 { #category : #'test generated' }
-MicInlineParser2Test >> testLink [
+MicInlineParserTest >> testLink [
 	"Auto generated by self class>>#generateUrlTests"
 	| res |
 	res := ( self inlineParse: '[aaaa](bbb)') first.
@@ -360,7 +360,7 @@ MicInlineParser2Test >> testLink [
 ]
 
 { #category : #'test generated' }
-MicInlineParser2Test >> testLink_Refs [
+MicInlineParserTest >> testLink_Refs [
 	"Auto generated by self class>>#generateUrlTests_Refs"
 	| res |
 	res := ( self inlineParse: '[aaaa](bbb)') first.
@@ -369,7 +369,7 @@ MicInlineParser2Test >> testLink_Refs [
 ]
 
 { #category : #'test generated' }
-MicInlineParser2Test >> testMathInline [
+MicInlineParserTest >> testMathInline [
 	"Auto generated by self class>>#generateUnEvaluated"
 	| res |
 	res := self inlineParse: '$bbbb$'.
@@ -377,7 +377,7 @@ MicInlineParser2Test >> testMathInline [
 ]
 
 { #category : #'test generated' }
-MicInlineParser2Test >> testMathInline_backSlashed [
+MicInlineParserTest >> testMathInline_backSlashed [
 	"Auto generated by self class>>#generateUnEvaluated_backSlashed"
 	| res |
 	res := self inlineParse: '$bb\xccc\$cccbb$'.
@@ -385,7 +385,7 @@ MicInlineParser2Test >> testMathInline_backSlashed [
 ]
 
 { #category : #'test generated' }
-MicInlineParser2Test >> testMathInline_unevaluated [
+MicInlineParserTest >> testMathInline_unevaluated [
 	"Auto generated by self class>>#generateUnEvaluated_unevaluated"
 	| res |
 	res := self inlineParse:'$bb**ccc**bb$'.
@@ -393,7 +393,7 @@ MicInlineParser2Test >> testMathInline_unevaluated [
 ]
 
 { #category : #'test generated' }
-MicInlineParser2Test >> testMonospace [
+MicInlineParserTest >> testMonospace [
 	"Auto generated by self class>>#generateUnEvaluated"
 	| res |
 	res := self inlineParse: '`bbbb`'.
@@ -401,7 +401,7 @@ MicInlineParser2Test >> testMonospace [
 ]
 
 { #category : #'test generated' }
-MicInlineParser2Test >> testMonospace_backSlashed [
+MicInlineParserTest >> testMonospace_backSlashed [
 	"Auto generated by self class>>#generateUnEvaluated_backSlashed"
 	| res |
 	res := self inlineParse: '`bb\xccc\`cccbb`'.
@@ -409,7 +409,7 @@ MicInlineParser2Test >> testMonospace_backSlashed [
 ]
 
 { #category : #'test generated' }
-MicInlineParser2Test >> testMonospace_unevaluated [
+MicInlineParserTest >> testMonospace_unevaluated [
 	"Auto generated by self class>>#generateUnEvaluated_unevaluated"
 	| res |
 	res := self inlineParse:'`bb**ccc**bb`'.
@@ -417,7 +417,7 @@ MicInlineParser2Test >> testMonospace_unevaluated [
 ]
 
 { #category : #tests }
-MicInlineParser2Test >> testNestedBlocksWithUrl [
+MicInlineParserTest >> testNestedBlocksWithUrl [
 	| res |
 	res := (self inlineParse: '[![aaaa](bbb)](ccc)   ![[aaaa](bbb)](ccc)').
 	self assert: res first printString equals: 'Link{ Figure{ Text(aaaa) }(bbb) }(ccc)'.
@@ -425,7 +425,7 @@ MicInlineParser2Test >> testNestedBlocksWithUrl [
 ]
 
 { #category : #'test generated' }
-MicInlineParser2Test >> testRaw [
+MicInlineParserTest >> testRaw [
 	"Auto generated by self class>>#generateUnEvaluated"
 	| res |
 	res := self inlineParse: '{{bbbb}}'.
@@ -433,7 +433,7 @@ MicInlineParser2Test >> testRaw [
 ]
 
 { #category : #'test generated' }
-MicInlineParser2Test >> testRaw_backSlashed [
+MicInlineParserTest >> testRaw_backSlashed [
 	"Auto generated by self class>>#generateUnEvaluated_backSlashed"
 	| res |
 	res := self inlineParse: '{{bb\xccc\}}cccbb}}'.
@@ -441,7 +441,7 @@ MicInlineParser2Test >> testRaw_backSlashed [
 ]
 
 { #category : #'test generated' }
-MicInlineParser2Test >> testRaw_unevaluated [
+MicInlineParserTest >> testRaw_unevaluated [
 	"Auto generated by self class>>#generateUnEvaluated_unevaluated"
 	| res |
 	res := self inlineParse:'{{bb**ccc**bb}}'.
@@ -449,7 +449,7 @@ MicInlineParser2Test >> testRaw_unevaluated [
 ]
 
 { #category : #'test generated' }
-MicInlineParser2Test >> testStrike [
+MicInlineParserTest >> testStrike [
 	"Auto generated by self class>>#generateEvaluatedTests"
 	| res |
 	res := ( self inlineParse:'~aaaa~') first.
@@ -458,7 +458,7 @@ MicInlineParser2Test >> testStrike [
 ]
 
 { #category : #'test generated' }
-MicInlineParser2Test >> testStrike_BackslashNotNested [
+MicInlineParserTest >> testStrike_BackslashNotNested [
 	"Auto generated by self class>>#generateEvaluatedTests_BackslashNotNested"
 	| res |
 	res := ( self inlineParse:'~aa\**bbbb**cc~') first.
@@ -468,7 +468,7 @@ MicInlineParser2Test >> testStrike_BackslashNotNested [
 ]
 
 { #category : #'test generated' }
-MicInlineParser2Test >> testStrike_Nested [
+MicInlineParserTest >> testStrike_Nested [
 	"Auto generated by self class>>#generateEvaluatedTests_Nested"
 	| res |
 	res := ( self inlineParse:'~aa**bbbb**cc~') first.
@@ -481,7 +481,7 @@ MicInlineParser2Test >> testStrike_Nested [
 ]
 
 { #category : #'test generated' }
-MicInlineParser2Test >> testStrike_UnclompletedNested [
+MicInlineParserTest >> testStrike_UnclompletedNested [
 	"Auto generated by self class>>#generateEvaluatedTests_UnclompletedNested"
 	| res |
 	res := ( self inlineParse:'~aa**bbbbcc~') first.
@@ -491,21 +491,21 @@ MicInlineParser2Test >> testStrike_UnclompletedNested [
 ]
 
 { #category : #tests }
-MicInlineParser2Test >> testText [
+MicInlineParserTest >> testText [
 	| res |
 	res := self inlineParse: 'bbbb'.
 	self assert: res first printString equals: 'Text(bbbb)'
 ]
 
 { #category : #tests }
-MicInlineParser2Test >> testText_backSlashed [
+MicInlineParserTest >> testText_backSlashed [
 	| res |
 	res := self inlineParse: 'bb\xbb'.
 	self assert: res first printString equals: 'Text(bbxbb)'
 ]
 
 { #category : #tests }
-MicInlineParser2Test >> testText_isEvaluated [
+MicInlineParserTest >> testText_isEvaluated [
 	| res |
 	res := self inlineParse: 'bb**cccc**bb'.
 	self assert: res printString equals: 'an Array(Text(bb) BoldFormat{ Text(cccc) } Text(bb))'

From 10c97c6c8bcd85d26740751be81f6eb1e97e05d0 Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Fri, 4 Nov 2022 07:22:46 +0100
Subject: [PATCH 23/40] Setting HTML accessor methods as extension methods

---
 .../MicInlineBlockWithUrl.extension.st         | 18 ++++++++++++++++++
 .../MicLinkBlock.extension.st                  |  7 -------
 2 files changed, 18 insertions(+), 7 deletions(-)
 delete mode 100644 src/Microdown-HTMLExporter/MicLinkBlock.extension.st

diff --git a/src/Microdown-HTMLExporter/MicInlineBlockWithUrl.extension.st b/src/Microdown-HTMLExporter/MicInlineBlockWithUrl.extension.st
index 961564bc..930cea56 100644
--- a/src/Microdown-HTMLExporter/MicInlineBlockWithUrl.extension.st
+++ b/src/Microdown-HTMLExporter/MicInlineBlockWithUrl.extension.st
@@ -1,5 +1,23 @@
 Extension { #name : #MicInlineBlockWithUrl }
 
+{ #category : #'*Microdown-HTMLExporter' }
+MicInlineBlockWithUrl >> argumentAt: aKey ifPresent: aBlock [
+	"Lookup the given key in the receiver. If it is present, answer the value of evaluating the given block with the value associated with the key. Otherwise, answer self."
+
+	self arguments 
+		at: aKey
+		ifPresent: aBlock
+]
+
+{ #category : #'*Microdown-HTMLExporter' }
+MicInlineBlockWithUrl >> argumentAt: aKey put: value [
+	"Lookup the given key in the receiver. If it is present, answer the value of evaluating the given block with the value associated with the key. Otherwise, answer self."
+
+	self arguments 
+		at: aKey
+		put: value
+]
+
 { #category : #'*Microdown-HTMLExporter' }
 MicInlineBlockWithUrl >> hasChildren [
 	^ self children notEmpty
diff --git a/src/Microdown-HTMLExporter/MicLinkBlock.extension.st b/src/Microdown-HTMLExporter/MicLinkBlock.extension.st
deleted file mode 100644
index 4c7ff8ae..00000000
--- a/src/Microdown-HTMLExporter/MicLinkBlock.extension.st
+++ /dev/null
@@ -1,7 +0,0 @@
-Extension { #name : #MicLinkBlock }
-
-{ #category : #'*Microdown-HTMLExporter' }
-MicLinkBlock >> referencePath [
-
-	^ self reference fullName
-]

From dd479ac705c81e5c451093e58527857e6460ec6b Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Fri, 4 Nov 2022 07:27:43 +0100
Subject: [PATCH 24/40] One more HTML extension method

---
 src/Microdown-HTMLExporter/MicLinkBlock.extension.st | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 src/Microdown-HTMLExporter/MicLinkBlock.extension.st

diff --git a/src/Microdown-HTMLExporter/MicLinkBlock.extension.st b/src/Microdown-HTMLExporter/MicLinkBlock.extension.st
new file mode 100644
index 00000000..4c7ff8ae
--- /dev/null
+++ b/src/Microdown-HTMLExporter/MicLinkBlock.extension.st
@@ -0,0 +1,7 @@
+Extension { #name : #MicLinkBlock }
+
+{ #category : #'*Microdown-HTMLExporter' }
+MicLinkBlock >> referencePath [
+
+	^ self reference fullName
+]

From b31c277113e56712cb6c487d340b41d5b1faa403 Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Fri, 4 Nov 2022 07:29:22 +0100
Subject: [PATCH 25/40] substring to bodystring rewrites

---
 src/Microdown-Evaluator/MicCodeBlock.extension.st          | 6 ++++--
 .../MicHTMLVisitorTest.class.st                            | 7 ++++---
 src/Microdown-Tests/MicHeaderBlockTest.class.st            | 4 ++--
 .../MicNodeTransformerCodeDeleterMock.class.st             | 2 +-
 .../MicNodeTransformerTest.class.st                        | 2 +-
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/Microdown-Evaluator/MicCodeBlock.extension.st b/src/Microdown-Evaluator/MicCodeBlock.extension.st
index b190c01e..88b547e9 100644
--- a/src/Microdown-Evaluator/MicCodeBlock.extension.st
+++ b/src/Microdown-Evaluator/MicCodeBlock.extension.st
@@ -17,8 +17,10 @@ MicCodeBlock >> evaluate [
 	| content |
 	content := self evaluationString.
 	^ [ (self parserClass parse: content) children ]
-		on: Error
-		do: [ :e | MicBoldFormatBlock new children: { (MicTextBlock new substring: e messageText) } ]
+		  on: Error
+		  do: [ :e | 
+			  MicBoldFormatBlock new children:
+				  { (MicTextBlock new bodystring: e messageText) } ]
 ]
 
 { #category : #'*Microdown-Evaluator' }
diff --git a/src/Microdown-HTMLExporter-Tests/MicHTMLVisitorTest.class.st b/src/Microdown-HTMLExporter-Tests/MicHTMLVisitorTest.class.st
index 302c209f..9af8a53a 100644
--- a/src/Microdown-HTMLExporter-Tests/MicHTMLVisitorTest.class.st
+++ b/src/Microdown-HTMLExporter-Tests/MicHTMLVisitorTest.class.st
@@ -79,11 +79,12 @@ MicHTMLVisitorTest >> testConfiguration [
 ]
 
 { #category : #tests }
-MicHTMLVisitorTest >> testContents [ 
+MicHTMLVisitorTest >> testContents [
 
 	self assert: writer contents equals: String empty.
-	writer visitItalic: (MicItalicFormatBlock new textElement: (MicTextBlock new substring: 'test')).
-	self assert: writer contents equals: '<i>test</i>'.
+	writer visitItalic: (MicItalicFormatBlock new children:
+			 { (MicTextBlock new bodystring: 'test') }).
+	self assert: writer contents equals: '<i>test</i>'
 ]
 
 { #category : #tests }
diff --git a/src/Microdown-Tests/MicHeaderBlockTest.class.st b/src/Microdown-Tests/MicHeaderBlockTest.class.st
index 6110ddc3..84e53dbb 100644
--- a/src/Microdown-Tests/MicHeaderBlockTest.class.st
+++ b/src/Microdown-Tests/MicHeaderBlockTest.class.st
@@ -38,8 +38,8 @@ MicHeaderBlockTest >> testHeaderAPIToSetText [
 	header := (self parser parse: '# titre1') children first.
 	self assert: header class equals: MicHeaderBlock.
 	self assert: header headerElements first text equals: 'titre1'.
-	header headerElements: { (MicTextBlock new substring: 'Blblbl') }.
-	self assert: header headerElements first substring equals: 'Blblbl'
+	header headerElements: { (MicTextBlock new bodystring: 'Blblbl') }.
+	self assert: header headerElements first bodystring equals: 'Blblbl'
 ]
 
 { #category : #tests }
diff --git a/src/Microdown-Transformer-Tests/MicNodeTransformerCodeDeleterMock.class.st b/src/Microdown-Transformer-Tests/MicNodeTransformerCodeDeleterMock.class.st
index 8849ccf8..9ecb3899 100644
--- a/src/Microdown-Transformer-Tests/MicNodeTransformerCodeDeleterMock.class.st
+++ b/src/Microdown-Transformer-Tests/MicNodeTransformerCodeDeleterMock.class.st
@@ -16,5 +16,5 @@ MicNodeTransformerCodeDeleterMock >> visitCode: aCode [
 { #category : #visiting }
 MicNodeTransformerCodeDeleterMock >> visitParagraph: aParagraph [
 
-	self replaceCurrentNodeBy: { MicTextBlock new substring: 'test' }
+	self replaceCurrentNodeBy: { (MicTextBlock new bodystring: 'test') }
 ]
diff --git a/src/Microdown-Transformer-Tests/MicNodeTransformerTest.class.st b/src/Microdown-Transformer-Tests/MicNodeTransformerTest.class.st
index 6527b9d9..ee36ffac 100644
--- a/src/Microdown-Transformer-Tests/MicNodeTransformerTest.class.st
+++ b/src/Microdown-Transformer-Tests/MicNodeTransformerTest.class.st
@@ -34,5 +34,5 @@ MicNodeTransformerTest >> testReplaceNodeByAnotherNode [
 	self assert: root children first class equals: MicParagraphBlock.
 	transformer visit: root.
 	self assert: root children first class equals: MicTextBlock.
-	self assert: root children first substring equals: 'test'
+	self assert: root children first bodystring equals: 'test'
 ]

From 5f2e9485976db9efa893e54ac671b713ee8b5fa1 Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Fri, 4 Nov 2022 07:29:57 +0100
Subject: [PATCH 26/40] initialize arguments

---
 src/Microdown/MicInlineBlockWithUrl.class.st | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Microdown/MicInlineBlockWithUrl.class.st b/src/Microdown/MicInlineBlockWithUrl.class.st
index ffcd480c..1f171e51 100644
--- a/src/Microdown/MicInlineBlockWithUrl.class.st
+++ b/src/Microdown/MicInlineBlockWithUrl.class.st
@@ -91,6 +91,11 @@ MicInlineBlockWithUrl >> hasArguments [
 	^ arguments size > 0
 ]
 
+{ #category : #initialization }
+MicInlineBlockWithUrl >> initialize [
+	arguments := OrderedDictionary new.
+]
+
 { #category : #printing }
 MicInlineBlockWithUrl >> printOn: stream [
 	stream << self blockName << '{ '.

From 41c0e87a2290adf8de746b5a4e72fb80e4254c47 Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Fri, 4 Nov 2022 07:30:42 +0100
Subject: [PATCH 27/40] A few overall inline block tests

---
 .../MicInlineBlockTest.class.st               | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 src/Microdown-Tests/MicInlineBlockTest.class.st

diff --git a/src/Microdown-Tests/MicInlineBlockTest.class.st b/src/Microdown-Tests/MicInlineBlockTest.class.st
new file mode 100644
index 00000000..b10e1494
--- /dev/null
+++ b/src/Microdown-Tests/MicInlineBlockTest.class.st
@@ -0,0 +1,22 @@
+Class {
+	#name : #MicInlineBlockTest,
+	#superclass : #TestCase,
+	#pools : [
+		'MicMicrodownSharedPool'
+	],
+	#category : #'Microdown-Tests-InlineParser'
+}
+
+{ #category : #tests }
+MicInlineBlockTest >> testAllTerminalNodesImplementsAccept [
+	(MicInlineBlock allSubclasses select: [ :cl | cl allSubclasses isEmpty ])
+		do: [ :class |  self assert: (class includesSelector: #accept:) ]
+	
+]
+
+{ #category : #tests }
+MicInlineBlockTest >> testBlockName [
+	self assert: MicFigureBlock blockName equals: 'Figure'.
+	self assert: MicBoldFormatBlock blockName equals: 'BoldFormat'
+	
+]

From 79018b18d4c6a989602bea5d0cd2cd42e66e3742 Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Fri, 4 Nov 2022 08:08:41 +0100
Subject: [PATCH 28/40] Added accessors

---
 src/Microdown/MicAnchorReferenceBlock.class.st | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/Microdown/MicAnchorReferenceBlock.class.st b/src/Microdown/MicAnchorReferenceBlock.class.st
index de2fb9e2..fa39072e 100644
--- a/src/Microdown/MicAnchorReferenceBlock.class.st
+++ b/src/Microdown/MicAnchorReferenceBlock.class.st
@@ -31,3 +31,15 @@ MicAnchorReferenceBlock class >> openingDelimiter [
 MicAnchorReferenceBlock >> accept: aVisitor [
  	^ aVisitor visitAnchorReference: self
 ]
+
+{ #category : #accessing }
+MicAnchorReferenceBlock >> reference [
+
+	^ reference
+]
+
+{ #category : #accessing }
+MicAnchorReferenceBlock >> reference: anObject [
+
+	reference := anObject
+]

From ceff3550101542f96540b5a044865eb634ec829c Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Fri, 4 Nov 2022 08:09:11 +0100
Subject: [PATCH 29/40] fixing release test problems

---
 .../MicLaTeXWriter.class.st                   | 22 -------------------
 ...icRichTextFormatConfigurationTest.class.st |  2 +-
 src/Microdown-Tests/MicElementTest.class.st   |  2 +-
 .../MicInlineParserTest.class.st              | 20 ++++++++---------
 src/Microdown/MicEvaluatedBlock.class.st      |  2 +-
 src/Microdown/MicInlineBlock.class.st         |  2 +-
 src/Microdown/MicInlineParser.class.st        |  6 -----
 src/Microdown/MicInlineTokenStream.class.st   |  3 +--
 src/Microdown/MicListItemBlock.class.st       |  3 +--
 .../MicMonospaceFormatBlock.class.st          |  2 +-
 10 files changed, 17 insertions(+), 47 deletions(-)

diff --git a/src/Microdown-LaTeXExporter/MicLaTeXWriter.class.st b/src/Microdown-LaTeXExporter/MicLaTeXWriter.class.st
index 2d2ca13a..9072ee69 100644
--- a/src/Microdown-LaTeXExporter/MicLaTeXWriter.class.st
+++ b/src/Microdown-LaTeXExporter/MicLaTeXWriter.class.st
@@ -238,28 +238,6 @@ MicLaTeXWriter >> visitLink: aLink [
 		parameter: [ canvas command name: 'url'; parameter: (self protectUrl: reference) ]
 ]
 
-{ #category : #'blocks - inline' }
-MicLaTeXWriter >> visitLink_old: aLink [
-	| text reference |
-	reference := aLink fileStringWithoutHostFile.
-	self flag: #todo.
-	"I do not get this logic if the string does not have file:// it can still be
-	something else than a url... all this logic is bogus."
-	text := aLink halt.
-	(text isEmptyOrNil or: [ reference = text ])
-		ifTrue: [ canvas command
-				name: 'url';
-				parameter: reference ]
-		ifFalse: [
-			canvas command
-				name: 'href';
-				parameter: reference;
-				parameter: [ canvas nextPutAll: text ].
-			canvas command
-				name: 'footnotesize';
-				parameter: [ canvas command name: 'url'; parameter: (self protectUrl: reference) ] ]
-]
-
 { #category : #'blocks - list' }
 MicLaTeXWriter >> visitListItem: anItem [
 	self tabList.
diff --git a/src/Microdown-RichTextComposer-Tests/MicRichTextFormatConfigurationTest.class.st b/src/Microdown-RichTextComposer-Tests/MicRichTextFormatConfigurationTest.class.st
index e7ef34d8..bbed6ec8 100644
--- a/src/Microdown-RichTextComposer-Tests/MicRichTextFormatConfigurationTest.class.st
+++ b/src/Microdown-RichTextComposer-Tests/MicRichTextFormatConfigurationTest.class.st
@@ -7,7 +7,7 @@ Class {
 	#category : #'Microdown-RichTextComposer-Tests-Composer'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #'test data' }
 MicRichTextFormatConfigurationTest >> fontString [
 	^ TextStyle defaultFont familyName,';72'
 ]
diff --git a/src/Microdown-Tests/MicElementTest.class.st b/src/Microdown-Tests/MicElementTest.class.st
index 8cef2b92..2d1204a0 100644
--- a/src/Microdown-Tests/MicElementTest.class.st
+++ b/src/Microdown-Tests/MicElementTest.class.st
@@ -29,7 +29,7 @@ MicElementTest >> parserClass [
 	^ MicrodownParser
 ]
 
-{ #category : #initialization }
+{ #category : #running }
 MicElementTest >> setUp [
 
 	super setUp.
diff --git a/src/Microdown-Tests/MicInlineParserTest.class.st b/src/Microdown-Tests/MicInlineParserTest.class.st
index 801b2df2..49f91dce 100644
--- a/src/Microdown-Tests/MicInlineParserTest.class.st
+++ b/src/Microdown-Tests/MicInlineParserTest.class.st
@@ -7,7 +7,7 @@ Class {
 	#category : #'Microdown-Tests-InlineParser'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #'method generation' }
 MicInlineParserTest class >> generateAllTests [
 	<script>
 	| testGenerators |
@@ -16,7 +16,7 @@ MicInlineParserTest class >> generateAllTests [
 	testGenerators do: [ :method | method valueWithReceiver: self arguments: #() ]
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #'method generation' }
 MicInlineParserTest class >> generateEvaluatedTests [
 	| template tests|
 	template := 'test{1}
@@ -34,7 +34,7 @@ MicInlineParserTest class >> generateEvaluatedTests [
 	
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #'method generation' }
 MicInlineParserTest class >> generateEvaluatedTests_BackslashNotNested [
 	| template tests|
 	template := 'test{1}_BackslashNotNested
@@ -53,7 +53,7 @@ MicInlineParserTest class >> generateEvaluatedTests_BackslashNotNested [
 	
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #'method generation' }
 MicInlineParserTest class >> generateEvaluatedTests_Nested [
 	| template tests|
 	template := 'test{1}_Nested
@@ -75,7 +75,7 @@ MicInlineParserTest class >> generateEvaluatedTests_Nested [
 	
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #'method generation' }
 MicInlineParserTest class >> generateEvaluatedTests_UnclompletedNested [
 	| template tests|
 	template := 'test{1}_UnclompletedNested
@@ -94,7 +94,7 @@ MicInlineParserTest class >> generateEvaluatedTests_UnclompletedNested [
 	
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #'method generation' }
 MicInlineParserTest class >> generateUnEvaluated [
 	| template tests|
 	template := 'test{1}
@@ -113,7 +113,7 @@ MicInlineParserTest class >> generateUnEvaluated [
 	
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #'method generation' }
 MicInlineParserTest class >> generateUnEvaluated_backSlashed [
 	| template tests|
 	template := 'test{1}_backSlashed
@@ -132,7 +132,7 @@ MicInlineParserTest class >> generateUnEvaluated_backSlashed [
 	
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #'method generation' }
 MicInlineParserTest class >> generateUnEvaluated_unevaluated [
 	| template tests|
 	template := 'test{1}_unevaluated
@@ -151,7 +151,7 @@ MicInlineParserTest class >> generateUnEvaluated_unevaluated [
 	
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #'method generation' }
 MicInlineParserTest class >> generateUrlTests [
 	| template tests|
 	template := 'test{1}
@@ -169,7 +169,7 @@ MicInlineParserTest class >> generateUrlTests [
 	
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #'method generation' }
 MicInlineParserTest class >> generateUrlTests_Refs [
 	| template tests|
 	template := 'test{1}_Refs
diff --git a/src/Microdown/MicEvaluatedBlock.class.st b/src/Microdown/MicEvaluatedBlock.class.st
index 8c6f8621..eec50818 100644
--- a/src/Microdown/MicEvaluatedBlock.class.st
+++ b/src/Microdown/MicEvaluatedBlock.class.st
@@ -10,7 +10,7 @@ Class {
 	#category : #'Microdown-InlineParser'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #parsing }
 MicEvaluatedBlock class >> blockName [
 	^ (super blockName) "withoutSuffix: 'Format'"
 ]
diff --git a/src/Microdown/MicInlineBlock.class.st b/src/Microdown/MicInlineBlock.class.st
index 6666b794..dda45fa7 100644
--- a/src/Microdown/MicInlineBlock.class.st
+++ b/src/Microdown/MicInlineBlock.class.st
@@ -40,7 +40,7 @@ MicInlineBlock >> accept: dummy [
 	"implemented in subclasses"
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #accessing }
 MicInlineBlock >> blockName [
 	^ self class blockName
 ]
diff --git a/src/Microdown/MicInlineParser.class.st b/src/Microdown/MicInlineParser.class.st
index 3557b005..2f6ea00f 100644
--- a/src/Microdown/MicInlineParser.class.st
+++ b/src/Microdown/MicInlineParser.class.st
@@ -17,12 +17,6 @@ MicInlineParser class >> parse: string [
 	^ self new parse: string
 ]
 
-{ #category : #'as yet unclassified' }
-MicInlineParser class >> rootParse: aString [
-	"I am used for test, returning a root block with my children"
-	^ MicRootBlock new children: (self parse: aString)
-]
-
 { #category : #'block creation' }
 MicInlineParser >> createInlineBlock: token inStream: aReadStream [ 
 	| blockClass newBlock|
diff --git a/src/Microdown/MicInlineTokenStream.class.st b/src/Microdown/MicInlineTokenStream.class.st
index 2a4efa0c..6e4ec7df 100644
--- a/src/Microdown/MicInlineTokenStream.class.st
+++ b/src/Microdown/MicInlineTokenStream.class.st
@@ -6,8 +6,7 @@ Class {
 	#name : #MicInlineTokenStream,
 	#superclass : #Object,
 	#instVars : [
-		'tokens',
-		'parser'
+		'tokens'
 	],
 	#pools : [
 		'MicMicrodownSharedPool'
diff --git a/src/Microdown/MicListItemBlock.class.st b/src/Microdown/MicListItemBlock.class.st
index b44f7b64..fb063af7 100644
--- a/src/Microdown/MicListItemBlock.class.st
+++ b/src/Microdown/MicListItemBlock.class.st
@@ -43,8 +43,7 @@ Class {
 	#name : #MicListItemBlock,
 	#superclass : #MicAbstractBlock,
 	#instVars : [
-		'text',
-		'textElements'
+		'text'
 	],
 	#category : #'Microdown-Model'
 }
diff --git a/src/Microdown/MicMonospaceFormatBlock.class.st b/src/Microdown/MicMonospaceFormatBlock.class.st
index 2476304a..21139105 100644
--- a/src/Microdown/MicMonospaceFormatBlock.class.st
+++ b/src/Microdown/MicMonospaceFormatBlock.class.st
@@ -7,7 +7,7 @@ Class {
 	#category : #'Microdown-InlineParser'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #accessing }
 MicMonospaceFormatBlock class >> blockName [
 	^ (super blockName) withoutSuffix: 'Format'
 ]

From f3f8ff52c518f3a43e4520f3bae5f63a6306ef52 Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Fri, 4 Nov 2022 08:15:09 +0100
Subject: [PATCH 30/40] wrong protocol name

---
 .../MicRichTextFormatConfigurationTest.class.st                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Microdown-RichTextComposer-Tests/MicRichTextFormatConfigurationTest.class.st b/src/Microdown-RichTextComposer-Tests/MicRichTextFormatConfigurationTest.class.st
index bbed6ec8..8daace63 100644
--- a/src/Microdown-RichTextComposer-Tests/MicRichTextFormatConfigurationTest.class.st
+++ b/src/Microdown-RichTextComposer-Tests/MicRichTextFormatConfigurationTest.class.st
@@ -7,7 +7,7 @@ Class {
 	#category : #'Microdown-RichTextComposer-Tests-Composer'
 }
 
-{ #category : #'test data' }
+{ #category : #helpers }
 MicRichTextFormatConfigurationTest >> fontString [
 	^ TextStyle defaultFont familyName,';72'
 ]

From 958d43d271e313a7aa2aa4143ed40d3f7dd48d27 Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Sun, 6 Nov 2022 08:46:21 +0100
Subject: [PATCH 31/40] Refactored delimiters to auto instantiate

---
 src/Microdown/MicInlineDelimiter.class.st     | 104 +++++-------------
 .../MicInlineStandardDelimiter.class.st       |  97 ++++++++++++++++
 2 files changed, 124 insertions(+), 77 deletions(-)
 create mode 100644 src/Microdown/MicInlineStandardDelimiter.class.st

diff --git a/src/Microdown/MicInlineDelimiter.class.st b/src/Microdown/MicInlineDelimiter.class.st
index f1ca5d0a..4dcbd9a3 100644
--- a/src/Microdown/MicInlineDelimiter.class.st
+++ b/src/Microdown/MicInlineDelimiter.class.st
@@ -1,18 +1,16 @@
 "
-I am a class representing a inline delimiter (for example `**` for bold).
+I am a superclass for the inline delimiters.
+I am an administrer class which gathers delimiters from my subclasses.
+
+I store the actual delimiters in the class variable `DelimiterDictionary`.
+My class side method `initializeDelimiters` gathers delimiters from my subclasses.
 
-My class side manages the set of delimiters. The delimiters are defined and set up in class side `initializeDelimiters`
 "
 Class {
 	#name : #MicInlineDelimiter,
 	#superclass : #Object,
-	#instVars : [
-		'markup',
-		'blockClass',
-		'closer'
-	],
 	#classVars : [
-		'DelimiterMap'
+		'DelimiterDictionary'
 	],
 	#pools : [
 		'MicMicrodownSharedPool'
@@ -22,7 +20,8 @@ Class {
 
 { #category : #accessing }
 MicInlineDelimiter class >> all [
-	^ DelimiterMap values
+	DelimiterDictionary ifNil: [ self initializeDelimiters ].
+	^ DelimiterDictionary values
 ]
 
 { #category : #'private utilities' }
@@ -34,40 +33,26 @@ MicInlineDelimiter class >> allRegex [
 { #category : #accessing }
 MicInlineDelimiter class >> at: markup [
 	"return delimiter at markup, or nil"
-	^ DelimiterMap at: markup ifAbsent: [ nil ]
+	^ DelimiterDictionary at: markup ifAbsent: [ nil ]
 ]
 
 { #category : #initialization }
 MicInlineDelimiter class >> initialize [
 	<script>
-	DelimiterMap := Dictionary new.
-	self initializeDelimiters.
+	DelimiterDictionary := nil
 ]
 
 { #category : #initialization }
 MicInlineDelimiter class >> initializeDelimiters [
-	"The fixious text delimiter"
-	self new markup: FixiousTextDelimiter; blockClass: MicTextBlock; closer: nil; addMe.
-	"formating"
-	self new markup: BoldMarkup; blockClass: MicBoldFormatBlock; closer: BoldMarkup; addMe.
-	self new markup: ItalicMarkup; blockClass: MicItalicFormatBlock; closer: ItalicMarkup; addMe.
-	self new markup: StrikeMarkup; blockClass: MicStrikeFormatBlock; closer: StrikeMarkup; addMe.
-	"anchors & annotations"
-	self new markup: AnchorReferenceOpenerMarkup; blockClass: MicAnchorReferenceBlock; closer: AnchorReferenceCloserMarkup; addMe.
-	self new markup: AnchorReferenceCloserMarkup; blockClass: nil; closer: nil; addMe.
-	self new markup: AnnotationCloserMarkup; blockClass: nil; closer: nil; addMe.
-	self new markup: AnnotationOpenerMarkup; blockClass: MicAnnotationBlock; closer: AnnotationCloserMarkup; addMe.
-	"unevaluated"
-	self new markup: MathMarkup; blockClass: MicMathInlineBlock; closer: MathMarkup; addMe.
-	self new markup: MonospaceMarkup; blockClass: MicMonospaceFormatBlock; closer: MonospaceMarkup; addMe.
-	self new markup: RawOpenerMarkup; blockClass: MicRawBlock; closer: RawCloserMarkup; addMe.
-	self new markup: RawCloserMarkup; blockClass: nil; closer: nil; addMe.
-	"Containing URLs"
-	self new markup: LinkNameOpenerMarkup; blockClass: MicLinkBlock; closer: NameCloserUrlOpener; addMe.
-	self new markup: FigureNameOpenerMarkup; blockClass: MicFigureBlock; closer: NameCloserUrlOpener; addMe.
-	self new markup: NameCloserUrlOpener; blockClass: MicRawBlock ; closer: URLCloserMarkup; addMe.
-	self new markup: URLCloserMarkup; blockClass: nil ; closer: nil; addMe
-		
+	self = MicInlineDelimiter ifFalse: [ ^self ].
+	DelimiterDictionary := Dictionary new.
+	self allSubclasses do: [ :class | class initializeDelimiters ]
+]
+
+{ #category : #compiling }
+MicInlineDelimiter class >> noteCompilationOf: aSelector meta: isMeta [
+	"I reset when any method is recompiled"
+	self initialize
 ]
 
 { #category : #'private utilities' }
@@ -88,77 +73,42 @@ MicInlineDelimiter class >> regexNot: markup [
 { #category : #adding }
 MicInlineDelimiter >> addMe [
 	"add me to the dictionary in my class"
-	DelimiterMap at: markup put: self
+	DelimiterDictionary at: self markup put: self
 ]
 
 { #category : #accessing }
 MicInlineDelimiter >> blockClass [
-
-	^ blockClass
-]
-
-{ #category : #accessing }
-MicInlineDelimiter >> blockClass: anObject [
-
-	blockClass := anObject
+	self subclassResponsibility
 ]
 
 { #category : #accessing }
 MicInlineDelimiter >> closer [
-
-	^ closer
-]
-
-{ #category : #accessing }
-MicInlineDelimiter >> closer: anObject [
-
-	closer := anObject
+	self subclassResponsibility
 ]
 
 { #category : #testing }
 MicInlineDelimiter >> isEvaluated [
 	"I am an opener whose resultering block will need further inline parsing"
-	^ self isOpener and: [blockClass isEvaluated ]
+	^ self isOpener and: [self blockClass isEvaluated ]
 ]
 
 { #category : #testing }
 MicInlineDelimiter >> isOpener [
-	^ closer notNil or: [ markup = closer ]
+	^ self closer notNil or: [ self markup = self closer ]
 ]
 
 { #category : #testing }
 MicInlineDelimiter >> isRawkind [
 	"I am an opener whose resulting nodes body is not further parsed"
-	^ self isOpener and: [ blockClass isEvaluated not ]
+	^ self isOpener and: [ self blockClass isEvaluated not ]
 ]
 
 { #category : #accessing }
 MicInlineDelimiter >> markup [
-
-	^ markup
-]
-
-{ #category : #accessing }
-MicInlineDelimiter >> markup: anObject [
-
-	markup := anObject
+	self subclassResponsibility
 ]
 
 { #category : #accessing }
 MicInlineDelimiter >> markupAsRegex [
-	"return a regex (as string) matching this delimiter"
-	| str |
-	str := WriteStream on: ''. 
-	self isRawkind
-		ifTrue: [ 
-				markup do: [:char| str nextPut: $\;nextPut: char].
-				str nextPutAll: (self class regexNot: closer).
-				closer do: [:char| str nextPut: $\;nextPut: char]]
-		ifFalse: [ markup do: [:char| str nextPut: $\;nextPut: char] ].
-	^ str contents
-]
-
-{ #category : #printing }
-MicInlineDelimiter >> printOn: stream [
-	stream << $« << markup << $»
+	self subclassResponsibility
 ]
diff --git a/src/Microdown/MicInlineStandardDelimiter.class.st b/src/Microdown/MicInlineStandardDelimiter.class.st
new file mode 100644
index 00000000..3d149d59
--- /dev/null
+++ b/src/Microdown/MicInlineStandardDelimiter.class.st
@@ -0,0 +1,97 @@
+"
+I define the standard inline delimiters
+"
+Class {
+	#name : #MicInlineStandardDelimiter,
+	#superclass : #MicInlineDelimiter,
+	#instVars : [
+		'markup',
+		'closer',
+		'blockClass'
+	],
+	#pools : [
+		'MicMicrodownSharedPool'
+	],
+	#category : #'Microdown-InlineParser'
+}
+
+{ #category : #initialization }
+MicInlineStandardDelimiter class >> initializeDelimiters [
+	"The fixious text delimiter"
+	self new markup: FixiousTextDelimiter; blockClass: MicTextBlock; closer: nil; addMe.
+	"formating"
+	self new markup: BoldMarkup; blockClass: MicBoldFormatBlock; closer: BoldMarkup; addMe.
+	self new markup: ItalicMarkup; blockClass: MicItalicFormatBlock; closer: ItalicMarkup; addMe.
+	self new markup: StrikeMarkup; blockClass: MicStrikeFormatBlock; closer: StrikeMarkup; addMe.
+	"anchors & annotations"
+	self new markup: AnchorReferenceOpenerMarkup; blockClass: MicAnchorReferenceBlock; closer: AnchorReferenceCloserMarkup; addMe.
+	self new markup: AnchorReferenceCloserMarkup; blockClass: nil; closer: nil; addMe.
+	self new markup: AnnotationCloserMarkup; blockClass: nil; closer: nil; addMe.
+	self new markup: AnnotationOpenerMarkup; blockClass: MicAnnotationBlock; closer: AnnotationCloserMarkup; addMe.
+	"unevaluated"
+	self new markup: MathMarkup; blockClass: MicMathInlineBlock; closer: MathMarkup; addMe.
+	self new markup: MonospaceMarkup; blockClass: MicMonospaceFormatBlock; closer: MonospaceMarkup; addMe.
+	self new markup: RawOpenerMarkup; blockClass: MicRawBlock; closer: RawCloserMarkup; addMe.
+	self new markup: RawCloserMarkup; blockClass: nil; closer: nil; addMe.
+	"Containing URLs"
+	self new markup: LinkNameOpenerMarkup; blockClass: MicLinkBlock; closer: NameCloserUrlOpener; addMe.
+	self new markup: FigureNameOpenerMarkup; blockClass: MicFigureBlock; closer: NameCloserUrlOpener; addMe.
+	self new markup: NameCloserUrlOpener; blockClass: MicRawBlock ; closer: URLCloserMarkup; addMe.
+	self new markup: URLCloserMarkup; blockClass: nil ; closer: nil; addMe
+		
+]
+
+{ #category : #accessing }
+MicInlineStandardDelimiter >> blockClass [
+
+	^ blockClass
+]
+
+{ #category : #accessing }
+MicInlineStandardDelimiter >> blockClass: anObject [
+
+	blockClass := anObject
+]
+
+{ #category : #accessing }
+MicInlineStandardDelimiter >> closer [
+
+	^ closer
+]
+
+{ #category : #accessing }
+MicInlineStandardDelimiter >> closer: anObject [
+
+	closer := anObject
+]
+
+{ #category : #accessing }
+MicInlineStandardDelimiter >> markup [
+
+	^ markup
+]
+
+{ #category : #accessing }
+MicInlineStandardDelimiter >> markup: anObject [
+
+	markup := anObject
+]
+
+{ #category : #accessing }
+MicInlineStandardDelimiter >> markupAsRegex [
+	"return a regex (as string) matching this delimiter"
+	| str |
+	str := WriteStream on: ''. 
+	self isRawkind
+		ifTrue: [ 
+				markup do: [:char| str nextPut: $\;nextPut: char].
+				str nextPutAll: (self class regexNot: closer).
+				closer do: [:char| str nextPut: $\;nextPut: char]]
+		ifFalse: [ markup do: [:char| str nextPut: $\;nextPut: char] ].
+	^ str contents
+]
+
+{ #category : #printing }
+MicInlineStandardDelimiter >> printOn: stream [
+	stream << $« << markup << $»
+]

From ccc6d446401ae7fef51ce9d1e7a49e3e6d9727f6 Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Sun, 6 Nov 2022 08:47:02 +0100
Subject: [PATCH 32/40] Added http inline and alt syntax for bold and italic

---
 .../MicInlineExtenedSyntaxTest.class.st       | 36 ++++++++++++++++
 .../MicInlineAlternativesDelimiter.class.st   | 23 ++++++++++
 src/Microdown/MicInlineHttpBlock.class.st     | 30 +++++++++++++
 src/Microdown/MicInlineHttpDelimiter.class.st | 43 +++++++++++++++++++
 4 files changed, 132 insertions(+)
 create mode 100644 src/Microdown-Tests/MicInlineExtenedSyntaxTest.class.st
 create mode 100644 src/Microdown/MicInlineAlternativesDelimiter.class.st
 create mode 100644 src/Microdown/MicInlineHttpBlock.class.st
 create mode 100644 src/Microdown/MicInlineHttpDelimiter.class.st

diff --git a/src/Microdown-Tests/MicInlineExtenedSyntaxTest.class.st b/src/Microdown-Tests/MicInlineExtenedSyntaxTest.class.st
new file mode 100644
index 00000000..4691b88f
--- /dev/null
+++ b/src/Microdown-Tests/MicInlineExtenedSyntaxTest.class.st
@@ -0,0 +1,36 @@
+Class {
+	#name : #MicInlineExtenedSyntaxTest,
+	#superclass : #TestCase,
+	#category : #'Microdown-Tests-InlineParser'
+}
+
+{ #category : #tests }
+MicInlineExtenedSyntaxTest >> testBoldAndItalicAlternatives [
+	"MicInlineAlternativesDelimiter should add `__` as a bold delimiter and `*` as an italic delimiter"
+	| doc |
+	doc :=MicInlineParser parse: '__aaaa__bbbb*cccc*'.
+	self 
+		assert: doc first class equals: MicBoldFormatBlock;
+		assert: doc first children first bodystring equals: 'aaaa'.
+	self
+		assert: doc third class equals: MicItalicFormatBlock;
+		assert: doc third children first bodystring equals: 'cccc'
+]
+
+{ #category : #tests }
+MicInlineExtenedSyntaxTest >> testInlineHttp [
+	"MicInlineHttpDelimiter recognizes `http://somewhere.org` as a link (and generates a link)"
+	| doc |
+	doc :=MicInlineParser parse: 'http://somewhere.org'.
+	self 
+		assert: doc first class equals: MicLinkBlock;
+		assert: doc first children first bodystring equals: 'http://somewhere.org';
+		assert: doc first url equals: 'http://somewhere.org'.
+	"Also https"
+	doc :=MicInlineParser parse: 'https://somewhere.org'.
+	self 
+		assert: doc first class equals: MicLinkBlock;
+		assert: doc first children first bodystring equals: 'https://somewhere.org';
+		assert: doc first url equals: 'https://somewhere.org'.
+	
+]
diff --git a/src/Microdown/MicInlineAlternativesDelimiter.class.st b/src/Microdown/MicInlineAlternativesDelimiter.class.st
new file mode 100644
index 00000000..4b679b5c
--- /dev/null
+++ b/src/Microdown/MicInlineAlternativesDelimiter.class.st
@@ -0,0 +1,23 @@
+"
+I add two github variations of bold and italic.
+In Microdown bold is with `**` and italic with `_`.
+I add bold also with `__`, and italic with `*`.
+
+
+"
+Class {
+	#name : #MicInlineAlternativesDelimiter,
+	#superclass : #MicInlineStandardDelimiter,
+	#pools : [
+		'MicMicrodownSharedPool'
+	],
+	#category : #'Microdown-InlineParser'
+}
+
+{ #category : #initialization }
+MicInlineAlternativesDelimiter class >> initializeDelimiters [
+	"formating"
+	self new markup: '__'; blockClass: MicBoldFormatBlock; closer: '__'; addMe.
+	self new markup: '*'; blockClass: MicItalicFormatBlock; closer: '*'; addMe.
+	
+]
diff --git a/src/Microdown/MicInlineHttpBlock.class.st b/src/Microdown/MicInlineHttpBlock.class.st
new file mode 100644
index 00000000..94c62782
--- /dev/null
+++ b/src/Microdown/MicInlineHttpBlock.class.st
@@ -0,0 +1,30 @@
+"
+I implement the inline use of `https://somewhere.com` as a link directly in microdown.
+My parse method on the class side transform me directly into a MicLinkBlock, and as such, I am never instantiated
+"
+Class {
+	#name : #MicInlineHttpBlock,
+	#superclass : #MicUnEvaluatedBlock,
+	#category : #'Microdown-InlineParser'
+}
+
+{ #category : #accessing }
+MicInlineHttpBlock class >> closingDelimiter [
+	"I am never instantiated, but transformed into a MicLinkBlock"
+	^ self shouldNotImplement 
+]
+
+{ #category : #accessing }
+MicInlineHttpBlock class >> openingDelimiter [
+	"I am never instantiated, but transformed into a MicLinkBlock"
+	^ self shouldNotImplement 
+]
+
+{ #category : #parsing }
+MicInlineHttpBlock class >> parse: delimiter stream: aTokenStream for: aParser [
+	"I transform myself into a MicLinkBlock"
+	^ MicLinkBlock new
+		children: { MicTextBlock new bodystring: delimiter string};
+		url: delimiter string;
+		closeMe
+]
diff --git a/src/Microdown/MicInlineHttpDelimiter.class.st b/src/Microdown/MicInlineHttpDelimiter.class.st
new file mode 100644
index 00000000..65ac939d
--- /dev/null
+++ b/src/Microdown/MicInlineHttpDelimiter.class.st
@@ -0,0 +1,43 @@
+"
+I implement the inline use of `https://somewhere.com` as a link directly in microdown
+"
+Class {
+	#name : #MicInlineHttpDelimiter,
+	#superclass : #MicInlineDelimiter,
+	#pools : [
+		'MicMicrodownSharedPool'
+	],
+	#category : #'Microdown-InlineParser'
+}
+
+{ #category : #initialization }
+MicInlineHttpDelimiter class >> initializeDelimiters [
+	self new addMe.
+	
+]
+
+{ #category : #accessing }
+MicInlineHttpDelimiter >> blockClass [
+	^ MicInlineHttpBlock
+]
+
+{ #category : #accessing }
+MicInlineHttpDelimiter >> closer [
+	^ String space
+]
+
+{ #category : #testing }
+MicInlineHttpDelimiter >> isRawkind [
+	"I am an opener whose resulting nodes body is not further parsed"
+	^ true
+]
+
+{ #category : #accessing }
+MicInlineHttpDelimiter >> markup [
+	^ 'http'
+]
+
+{ #category : #accessing }
+MicInlineHttpDelimiter >> markupAsRegex [
+	^ 'http(s)?\://[\S]+' 
+]

From 125f6d6b3ca3687ae516abd6560089e997a3d445 Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Sun, 6 Nov 2022 09:18:05 +0100
Subject: [PATCH 33/40] added accept: to satisfy test

---
 src/Microdown/MicInlineHttpBlock.class.st | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Microdown/MicInlineHttpBlock.class.st b/src/Microdown/MicInlineHttpBlock.class.st
index 94c62782..f29dfb5e 100644
--- a/src/Microdown/MicInlineHttpBlock.class.st
+++ b/src/Microdown/MicInlineHttpBlock.class.st
@@ -28,3 +28,8 @@ MicInlineHttpBlock class >> parse: delimiter stream: aTokenStream for: aParser [
 		url: delimiter string;
 		closeMe
 ]
+
+{ #category : #visiting }
+MicInlineHttpBlock >> accept: dummy [
+	self error: 'I should not be instantiatied and used by visitor'
+]

From 520504d3e46143213402e1e3d862f0785826ee1e Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Sun, 6 Nov 2022 09:18:35 +0100
Subject: [PATCH 34/40] Single star is now also italic

---
 .../MicTextualMicrodownExporterTest.class.st                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Microdown-PrettyPrinter-Tests/MicTextualMicrodownExporterTest.class.st b/src/Microdown-PrettyPrinter-Tests/MicTextualMicrodownExporterTest.class.st
index 9765f94b..b8922c3d 100644
--- a/src/Microdown-PrettyPrinter-Tests/MicTextualMicrodownExporterTest.class.st
+++ b/src/Microdown-PrettyPrinter-Tests/MicTextualMicrodownExporterTest.class.st
@@ -405,7 +405,7 @@ MicTextualMicrodownExporterTest >> testParagraphWithItalic [
 MicTextualMicrodownExporterTest >> testParagraphWithMicroDownMarkup [
 
 	| mic |
-	mic := parser parse: 'blab\~l\**a*1'.
+	mic := parser parse: 'blab\~l\*\*a*1'.
 	self assert: (mic accept: visitor) contents equals: '
 blab\~l\**a*1
 '

From 279effb77018a4ea1c47d1bfd16ad4f9ef8a58c9 Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Sun, 6 Nov 2022 09:30:18 +0100
Subject: [PATCH 35/40] HTML visitHeader fixed

---
 src/Microdown-HTMLExporter/MicHTMLVisitor.class.st | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Microdown-HTMLExporter/MicHTMLVisitor.class.st b/src/Microdown-HTMLExporter/MicHTMLVisitor.class.st
index 1b348c96..84ec62ef 100644
--- a/src/Microdown-HTMLExporter/MicHTMLVisitor.class.st
+++ b/src/Microdown-HTMLExporter/MicHTMLVisitor.class.st
@@ -333,7 +333,7 @@ MicHTMLVisitor >> visitHeader: aHeader [
 	canvas newLine.	
 	canvas tag 
 		name: 'h',  aHeader level asString;
-		with: aHeader header
+		with: [ self visitAll: aHeader children]
 	
 ]
 

From 0300f0fbe7843f4f89d44ed47146fd829a50cf45 Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Sun, 6 Nov 2022 09:48:56 +0100
Subject: [PATCH 36/40] Removed usage of wrong header method

---
 src/Microdown-Tests/MicHeaderBlockTest.class.st    |  8 ++++----
 src/Microdown-Tests/MicrodownParserTest.class.st   |  2 +-
 .../MicFileIncluderTest.class.st                   | 14 +++++++-------
 src/Microdown/MicHeaderBlock.class.st              |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/Microdown-Tests/MicHeaderBlockTest.class.st b/src/Microdown-Tests/MicHeaderBlockTest.class.st
index 84e53dbb..fdea504b 100644
--- a/src/Microdown-Tests/MicHeaderBlockTest.class.st
+++ b/src/Microdown-Tests/MicHeaderBlockTest.class.st
@@ -57,7 +57,7 @@ MicHeaderBlockTest >> testHeaderLevel1 [
 	| root |
 	root := parser parse: HeaderMarkup, ' Level1'.
 	self assert: root children size equals: 1.
-	self assert: root children first header equals: 'Level1'.
+	self assert: root children first children first bodystring equals: 'Level1'.
 	self assert: root children first level equals: 1
 ]
 
@@ -68,7 +68,7 @@ MicHeaderBlockTest >> testHeaderLevel1NoSpace [
 	source := HeaderMarkup, 'Level1'.
 	root := parser parse: source.
 	self assert: root children size equals: 1.
-	self assert: root children first header equals: 'Level1'.
+	self assert: root children first children first bodystring equals: 'Level1'.
 	self assert: root children first level equals: 1
 ]
 
@@ -79,7 +79,7 @@ MicHeaderBlockTest >> testHeaderLevel4 [
 	source := (HeaderMarkup repeat: 4), '    Level four'.
 	root := parser parse: source.
 	self assert: root children size equals: 1.
-	self assert: root children first header equals: 'Level four'.
+	self assert: root children first children first bodystring equals: 'Level four'.
 	self assert: root children first level equals: 4
 ]
 
@@ -89,7 +89,7 @@ MicHeaderBlockTest >> testHeaderLevel6 [
 	source := (HeaderMarkup repeat: 6), '    Level six'.
 	root := parser parse: source.
 	self assert: root children size equals: 1.
-	self assert: root children first header equals: 'Level six'.
+	self assert: root children first children first bodystring equals: 'Level six'.
 	self assert: root children first level equals: 6
 ]
 
diff --git a/src/Microdown-Tests/MicrodownParserTest.class.st b/src/Microdown-Tests/MicrodownParserTest.class.st
index 71bbdb79..2dfa1a80 100644
--- a/src/Microdown-Tests/MicrodownParserTest.class.st
+++ b/src/Microdown-Tests/MicrodownParserTest.class.st
@@ -330,7 +330,7 @@ MicrodownParserTest >> testHeaderLevel4 [
 	source := (HeaderMarkup repeat: 4), '    Level four'.
 	root := self parser parse: source.
 	self assert: root children size equals: 1.
-	self assert: root children first header equals: 'Level four'.
+	self assert: root children first children first bodystring equals: 'Level four'.
 	self assert: root children first level equals: 4
 ]
 
diff --git a/src/Microdown-Transformer-Tests/MicFileIncluderTest.class.st b/src/Microdown-Transformer-Tests/MicFileIncluderTest.class.st
index acafb5fb..091e4292 100644
--- a/src/Microdown-Transformer-Tests/MicFileIncluderTest.class.st
+++ b/src/Microdown-Transformer-Tests/MicFileIncluderTest.class.st
@@ -113,10 +113,10 @@ MicFileIncluderTest >> testHandleNestedFileResolution [
 	includer visit: (root := reference loadMicrodown).
 	
 	self assert: root children first class equals: MicHeaderBlock.
-	self assert: root children first header equals: 'Foo'.
+	self assert: root children first children first bodystring equals: 'Foo'.
 	
 	self assert: root children second class equals: MicHeaderBlock.
-	self assert: root children second header equals: 'Example2'.
+	self assert: root children second children first bodystring equals: 'Example2'.
 
 
 
@@ -155,10 +155,10 @@ MicFileIncluderTest >> testHandleNestedFileResolutionOnDifferentLevel [
 	includer visit: (root := reference loadMicrodown).
 	
 	self assert: root children first class equals: MicHeaderBlock.
-	self assert: root children first header equals: 'Foo'.
+	self assert: root children first children first bodystring equals: 'Foo'.
 	
 	self assert: root children second class equals: MicHeaderBlock.
-	self assert: root children second header equals: 'Example2'.
+	self assert: root children second children first bodystring equals: 'Example2'.
 
 
 
@@ -194,7 +194,7 @@ MicFileIncluderTest >> testIncluderIncludesInputFileFromTheSameLevel [
 	includer visit: root.
 
 	self assert: root children first class equals: MicHeaderBlock.
-	self assert: root children first header equals: 'Foo'.
+	self assert: root children first children first bodystring equals: 'Foo'.
 	self assert: root children second class equals: MicParagraphBlock.
 	self assert: root children third class equals: MicCodeBlock.
 
@@ -218,13 +218,13 @@ MicFileIncluderTest >> testIncluderIncludesInputFilesWithinTheSameParagraph [
 	includer visit: root.
 
 	self assert: root children first class equals: MicHeaderBlock.
-	self assert: root children first header equals: 'Foo'.
+	self assert: root children first children first bodystring equals: 'Foo'.
 	self assert: root children first level equals: 1.
 	self assert: root children second class equals: MicParagraphBlock.
 	self assert: root children third class equals: MicCodeBlock.
 	
 	self assert: root children fourth class equals: MicHeaderBlock.
-	self assert: root children fourth header equals: 'Bar'.
+	self assert: root children fourth children first bodystring equals: 'Bar'.
 	self assert: root children fourth level equals: 2.
 	self assert: root children fifth class equals: MicParagraphBlock.
 	self assert: root children sixth class equals: MicCodeBlock
diff --git a/src/Microdown/MicHeaderBlock.class.st b/src/Microdown/MicHeaderBlock.class.st
index 954ad0b5..c64e815b 100644
--- a/src/Microdown/MicHeaderBlock.class.st
+++ b/src/Microdown/MicHeaderBlock.class.st
@@ -53,7 +53,7 @@ MicHeaderBlock >> formattedCode [
 
 { #category : #accessing }
 MicHeaderBlock >> header [
-
+	"I am used to get an adhoc string for the header"
 	^ String streamContents: [ :s | 
 		  children do: [ :e | s nextPutAll: e bodystring ] ]
 ]

From fb83a6ce9176b06f23a160fb017e3b85ceace0fb Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Mon, 7 Nov 2022 07:27:59 +0100
Subject: [PATCH 37/40] Renamed MicInlineBlock back to MicInlineElement

---
 .../MicInlineBlockTest.class.st               |  2 +-
 src/Microdown/MicEvaluatedBlock.class.st      |  2 +-
 src/Microdown/MicInlineBlockWithUrl.class.st  |  2 +-
 ...ock.class.st => MicInlineElement.class.st} | 24 +++++++++----------
 src/Microdown/MicUnEvaluatedBlock.class.st    |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)
 rename src/Microdown/{MicInlineBlock.class.st => MicInlineElement.class.st} (74%)

diff --git a/src/Microdown-Tests/MicInlineBlockTest.class.st b/src/Microdown-Tests/MicInlineBlockTest.class.st
index b10e1494..ea41b83f 100644
--- a/src/Microdown-Tests/MicInlineBlockTest.class.st
+++ b/src/Microdown-Tests/MicInlineBlockTest.class.st
@@ -9,7 +9,7 @@ Class {
 
 { #category : #tests }
 MicInlineBlockTest >> testAllTerminalNodesImplementsAccept [
-	(MicInlineBlock allSubclasses select: [ :cl | cl allSubclasses isEmpty ])
+	(MicInlineElement allSubclasses select: [ :cl | cl allSubclasses isEmpty ])
 		do: [ :class |  self assert: (class includesSelector: #accept:) ]
 	
 ]
diff --git a/src/Microdown/MicEvaluatedBlock.class.st b/src/Microdown/MicEvaluatedBlock.class.st
index eec50818..7063c9e0 100644
--- a/src/Microdown/MicEvaluatedBlock.class.st
+++ b/src/Microdown/MicEvaluatedBlock.class.st
@@ -3,7 +3,7 @@ I represent blocks with sub structure. Typically italics inside bold
 "
 Class {
 	#name : #MicEvaluatedBlock,
-	#superclass : #MicInlineBlock,
+	#superclass : #MicInlineElement,
 	#instVars : [
 		'children'
 	],
diff --git a/src/Microdown/MicInlineBlockWithUrl.class.st b/src/Microdown/MicInlineBlockWithUrl.class.st
index 1f171e51..794ca3cf 100644
--- a/src/Microdown/MicInlineBlockWithUrl.class.st
+++ b/src/Microdown/MicInlineBlockWithUrl.class.st
@@ -9,7 +9,7 @@ My subclasses manage figures and links.
 "
 Class {
 	#name : #MicInlineBlockWithUrl,
-	#superclass : #MicInlineBlock,
+	#superclass : #MicInlineElement,
 	#instVars : [
 		'children',
 		'url',
diff --git a/src/Microdown/MicInlineBlock.class.st b/src/Microdown/MicInlineElement.class.st
similarity index 74%
rename from src/Microdown/MicInlineBlock.class.st
rename to src/Microdown/MicInlineElement.class.st
index dda45fa7..fa2bf157 100644
--- a/src/Microdown/MicInlineBlock.class.st
+++ b/src/Microdown/MicInlineElement.class.st
@@ -10,65 +10,65 @@ I am characterized by:
 
 "
 Class {
-	#name : #MicInlineBlock,
+	#name : #MicInlineElement,
 	#superclass : #MicElement,
 	#category : #'Microdown-InlineParser'
 }
 
 { #category : #accessing }
-MicInlineBlock class >> blockName [
+MicInlineElement class >> blockName [
 	^ (self instanceSide name asString withoutPrefix: 'Mic') withoutSuffix: 'Block'
 ]
 
 { #category : #accessing }
-MicInlineBlock class >> closingDelimiter [
+MicInlineElement class >> closingDelimiter [
 	^ self subclassResponsibility
 ]
 
 { #category : #testing }
-MicInlineBlock class >> isEvaluated [
+MicInlineElement class >> isEvaluated [
 	^ true
 ]
 
 { #category : #accessing }
-MicInlineBlock class >> openingDelimiter [
+MicInlineElement class >> openingDelimiter [
 	^ self subclassResponsibility
 ]
 
 { #category : #visiting }
-MicInlineBlock >> accept: dummy [
+MicInlineElement >> accept: dummy [
 	"implemented in subclasses"
 ]
 
 { #category : #accessing }
-MicInlineBlock >> blockName [
+MicInlineElement >> blockName [
 	^ self class blockName
 ]
 
 { #category : #visiting }
-MicInlineBlock >> closeMe [
+MicInlineElement >> closeMe [
 	"use for post parsing initialization"
 ]
 
 { #category : #accessing }
-MicInlineBlock >> closingDelimiter [ 
+MicInlineElement >> closingDelimiter [ 
 	^ self class closingDelimiter
 ]
 
 { #category : #private }
-MicInlineBlock >> inlineParserClass [
+MicInlineElement >> inlineParserClass [
 
 	^ MicInlineParser
 ]
 
 { #category : #accessing }
-MicInlineBlock >> kind [
+MicInlineElement >> kind [
 	"Should only be used for tests"
 	self deprecated: 'use blockName instead' transformWith: '`@rec kind' -> '`@rec blockName asLowercase'.
 	^ self blockName asLowercase 
 ]
 
 { #category : #accessing }
-MicInlineBlock >> openingDelimiter [
+MicInlineElement >> openingDelimiter [
 	^ self class openingDelimiter
 ]
diff --git a/src/Microdown/MicUnEvaluatedBlock.class.st b/src/Microdown/MicUnEvaluatedBlock.class.st
index d1842e86..edda6d84 100644
--- a/src/Microdown/MicUnEvaluatedBlock.class.st
+++ b/src/Microdown/MicUnEvaluatedBlock.class.st
@@ -3,7 +3,7 @@ I represent blocks whose contents is not microdown markup as such.
 "
 Class {
 	#name : #MicUnEvaluatedBlock,
-	#superclass : #MicInlineBlock,
+	#superclass : #MicInlineElement,
 	#instVars : [
 		'bodystring'
 	],

From c62b73c59f363b5b562423b0268605d8c1b0c856 Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Mon, 7 Nov 2022 07:31:16 +0100
Subject: [PATCH 38/40] Added MicAbstractDelimiter.

---
 src/Microdown/MicAbstractDelimiter.class.st | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 src/Microdown/MicAbstractDelimiter.class.st

diff --git a/src/Microdown/MicAbstractDelimiter.class.st b/src/Microdown/MicAbstractDelimiter.class.st
new file mode 100644
index 00000000..e376539b
--- /dev/null
+++ b/src/Microdown/MicAbstractDelimiter.class.st
@@ -0,0 +1,14 @@
+"
+I am here to facilitate loading of packages depending on the previous version of the inline parser
+"
+Class {
+	#name : #MicAbstractDelimiter,
+	#superclass : #Object,
+	#classVars : [
+		'DelimiterDictionary'
+	],
+	#pools : [
+		'MicMicrodownSharedPool'
+	],
+	#category : #'Microdown-InlineParser'
+}

From f7b2007add87b35fd7a63630ad06d63d80a4968b Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Mon, 7 Nov 2022 11:33:41 +0100
Subject: [PATCH 39/40] Added a few more tests to inline http detection

---
 .../MicInlineExtenedSyntaxTest.class.st       | 83 +++++++++++++++++++
 src/Microdown/MicInlineHttpDelimiter.class.st |  5 +-
 2 files changed, 87 insertions(+), 1 deletion(-)

diff --git a/src/Microdown-Tests/MicInlineExtenedSyntaxTest.class.st b/src/Microdown-Tests/MicInlineExtenedSyntaxTest.class.st
index 4691b88f..d94197fa 100644
--- a/src/Microdown-Tests/MicInlineExtenedSyntaxTest.class.st
+++ b/src/Microdown-Tests/MicInlineExtenedSyntaxTest.class.st
@@ -34,3 +34,86 @@ MicInlineExtenedSyntaxTest >> testInlineHttp [
 		assert: doc first url equals: 'https://somewhere.org'.
 	
 ]
+
+{ #category : #tests }
+MicInlineExtenedSyntaxTest >> testInlineHttp_Newline [
+	"The closer of inline http is a blank (or tab, newline, etc)"
+	| bold |
+	bold  :=(MicInlineParser parse: '**http://somewhere.org
+**') first children.
+	self 
+		assert: bold first class equals: MicLinkBlock;
+		assert: bold first children first bodystring equals: 'http://somewhere.org';
+		assert: bold first url equals: 'http://somewhere.org';
+		assert: bold second bodystring equals: String cr
+	
+]
+
+{ #category : #tests }
+MicInlineExtenedSyntaxTest >> testInlineHttp_inBold [
+	"The closer of inline http is a blank (or tab, newline, etc)"
+	| bold |
+	bold  :=(MicInlineParser parse: '**http://somewhere.org **') first children.
+	self 
+		assert: bold first class equals: MicLinkBlock;
+		assert: bold first children first bodystring equals: 'http://somewhere.org';
+		assert: bold first url equals: 'http://somewhere.org';
+		assert: bold second bodystring equals: ' '
+	
+]
+
+{ #category : #tests }
+MicInlineExtenedSyntaxTest >> testInlineHttp_inContext [
+	"The closer of inline http is a blank (or tab, newline, etc)"
+	| doc |
+	doc :=MicInlineParser parse: 'aa http://somewhere.org bb'.
+	self 
+		assert: doc second class equals: MicLinkBlock;
+		assert: doc second children first bodystring equals: 'http://somewhere.org';
+		assert: doc second url equals: 'http://somewhere.org'.
+	
+]
+
+{ #category : #tests }
+MicInlineExtenedSyntaxTest >> testInlineHttp_inItalic [
+	"The closer of inline http is a blank (or tab, newline, etc)"
+	| bold |
+	bold  :=(MicInlineParser parse: '_http://some_where.org _') first children.
+	self 
+		assert: bold first class equals: MicLinkBlock;
+		assert: bold first children first bodystring equals: 'http://some_where.org';
+		assert: bold first url equals: 'http://some_where.org';
+		assert: bold second bodystring equals: ' '
+	
+]
+
+{ #category : #tests }
+MicInlineExtenedSyntaxTest >> testInlineHttp_tab [
+	"The closer of inline http is a blank (or tab, newline, etc)"
+	| bold |
+	bold  :=(MicInlineParser parse: '**http://somewhere.org',String tab, '**') first children.
+	self 
+		assert: bold first class equals: MicLinkBlock;
+		assert: bold first children first bodystring equals: 'http://somewhere.org';
+		assert: bold first url equals: 'http://somewhere.org';
+		assert: bold second bodystring equals: String tab
+	
+]
+
+{ #category : #tests }
+MicInlineExtenedSyntaxTest >> testInlineHttp_tabAndNewline [
+	"The closer of inline http is a blank (or tab, newline, etc)"
+	| doc |
+	doc :=MicInlineParser parse: 'http://somewhere.org'.
+	self 
+		assert: doc first class equals: MicLinkBlock;
+		assert: doc first children first bodystring equals: 'http://somewhere.org';
+		assert: doc first url equals: 'http://somewhere.org'.
+	"Also https"
+	doc :=MicInlineParser parse: 'https://somewhere.org'.
+	self 
+		assert: doc first class equals: MicLinkBlock;
+		assert: doc first children first bodystring equals: 'https://somewhere.org';
+		assert: doc first url equals: 'https://somewhere.org'.
+	
+]
diff --git a/src/Microdown/MicInlineHttpDelimiter.class.st b/src/Microdown/MicInlineHttpDelimiter.class.st
index 65ac939d..eaa505f3 100644
--- a/src/Microdown/MicInlineHttpDelimiter.class.st
+++ b/src/Microdown/MicInlineHttpDelimiter.class.st
@@ -1,5 +1,8 @@
 "
-I implement the inline use of `https://somewhere.com` as a link directly in microdown
+I implement the inline use of `https://somewhere.com` as a link directly in microdown.
+I am recognized by `http[s]://(something not whitespace)+`.
+I have an unfortunate restiction, if I am inlined in an other inline block, I should be followed by a whitespace.
+Forexample `**https://somewhere.org_**` (`_` representing Character space)
 "
 Class {
 	#name : #MicInlineHttpDelimiter,

From e140ad4d81a728d318136ca019007a7be775ec1c Mon Sep 17 00:00:00 2001
From: kasperosterbye <kasper.osterbye@gmail.com>
Date: Mon, 7 Nov 2022 11:37:31 +0100
Subject: [PATCH 40/40] And removed MicAbstractDelimiter again

---
 src/Microdown/MicAbstractDelimiter.class.st | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 src/Microdown/MicAbstractDelimiter.class.st

diff --git a/src/Microdown/MicAbstractDelimiter.class.st b/src/Microdown/MicAbstractDelimiter.class.st
deleted file mode 100644
index e376539b..00000000
--- a/src/Microdown/MicAbstractDelimiter.class.st
+++ /dev/null
@@ -1,14 +0,0 @@
-"
-I am here to facilitate loading of packages depending on the previous version of the inline parser
-"
-Class {
-	#name : #MicAbstractDelimiter,
-	#superclass : #Object,
-	#classVars : [
-		'DelimiterDictionary'
-	],
-	#pools : [
-		'MicMicrodownSharedPool'
-	],
-	#category : #'Microdown-InlineParser'
-}