Merge 9b86f05

pharo-spec · Jul 23, 2020 · 8406c86 · 8406c86
2 parents ea4b5b0 + 9b86f05
commit 8406c86
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 5 deletions.
diff --git a/src/BaselineOfSpecCore/BaselineOfSpecCore.class.st b/src/BaselineOfSpecCore/BaselineOfSpecCore.class.st
@@ -87,7 +87,7 @@ BaselineOfSpecCore >> complishon: spec [
 BaselineOfSpecCore >> pillar: spec [
 	spec
 		baseline: 'PillarCore'
-		with: [ spec repository: 'github://pillar-markup/pillar:v7.7.5/src' ]
+		with: [ spec repository: 'github://pillar-markup/pillar:dev-8/src' ]
 ]
 
 { #category : #acccessing }

diff --git a/src/Spec2-Core/SpPresenter.class.st b/src/Spec2-Core/SpPresenter.class.st
@@ -820,6 +820,12 @@ SpPresenter >> newNumberInput [
 	^ self instantiate: SpNumberInputFieldPresenter
 ]
 
+{ #category : #widgets }
+SpPresenter >> newPillarText [
+
+	^ self instantiate: SpPillarTextPresenter
+]
+
 { #category : #widgets }
 SpPresenter >> newPopover [
 

diff --git a/src/Spec2-Core/SpRichTextPresenter.class.st b/src/Spec2-Core/SpRichTextPresenter.class.st
@@ -66,15 +66,15 @@ SpRichTextPresenter >> model [
 
 { #category : #'as yet unclassified' }
 SpRichTextPresenter >> plaintext [ 
-	^ self textStyler writePlaintextString: self model
+	^ self textStyler value writePlaintextString: self model
 ]
 
 { #category : #rendering }
 SpRichTextPresenter >> renderTree [
 
-	"^ SpRenderTreeBuilderVisitor new 
+	^ SpRenderTreeBuilderVisitor new 
 			styleProvider: self styleAttributes;
-			render: self model"
+			render: self model 
 ]
 
 { #category : #initialization }

diff --git a/src/Spec2-Pillar/SpPillarTextPresenter.class.st b/src/Spec2-Pillar/SpPillarTextPresenter.class.st
@@ -8,10 +8,24 @@
 Class {
 	#name : #SpPillarTextPresenter,
 	#superclass : #SpRichTextPresenter,
+	#instVars : [
+		'formatString'
+	],
 	#category : #'Spec2-Pillar'
 }
 
 { #category : #accessing }
 SpPillarTextPresenter >> defaultTextStyler [
 	^ SpPillarTextStyler new
 ]
+
+{ #category : #rendering }
+SpPillarTextPresenter >> formatString [
+	^  formatString 
+]
+
+{ #category : #rendering }
+SpPillarTextPresenter >> formatString: aString [
+	super formatString: aString.
+	formatString := aString
+]
diff --git a/src/Spec2-Pillar/SpPillarTextStyler.class.st b/src/Spec2-Pillar/SpPillarTextStyler.class.st
@@ -6,7 +6,10 @@ Class {
 
 { #category : #parsing }
 SpPillarTextStyler >> parseFormatString: aFormatString [
-	^ PRPillarParser parse: aFormatString
+	self class environment 
+		at: #MicroDownParser
+		ifPresent: [ :cls | ^  (cls parse: aFormatString) asPillar ].
+	^ PRPillarParser parse: aFormatString 
 ]
 
 { #category : #accessing }

diff --git a/src/Spec2-Pillar/SpPillarTextWriter.class.st b/src/Spec2-Pillar/SpPillarTextWriter.class.st
@@ -85,6 +85,12 @@ SpPillarTextWriter >> visitDocumentGroup: anObject [
 	^ group
 ]
 
+{ #category : #'visiting-document' }
+SpPillarTextWriter >> visitHeader: anObject [
+	super visitHeader: anObject.
+	self newline
+]
+
 { #category : #'visiting-document' }
 SpPillarTextWriter >> visitHorizontalRule: anObject [
 	stream
@@ -117,6 +123,12 @@ SpPillarTextWriter >> visitOrderedList: anObject [
 	self nest: 0 do: [ super visitOrderedList: anObject ]
 ]
 
+{ #category : #'visiting-document' }
+SpPillarTextWriter >> visitParagraph: anObject [
+	super visitDocumentGroup: anObject.
+	self newline
+]
+
 { #category : #'visiting-document' }
 SpPillarTextWriter >> visitPreformatted: anObject [
 	anObject children do: [ :each | self visit: each. self newline ]