diff --git a/src/BaselineOfPillarApp/BaselineOfPillarApp.class.st b/src/BaselineOfPillarApp/BaselineOfPillarApp.class.st index b17fbce8..3c3b9f39 100644 --- a/src/BaselineOfPillarApp/BaselineOfPillarApp.class.st +++ b/src/BaselineOfPillarApp/BaselineOfPillarApp.class.st @@ -19,8 +19,6 @@ BaselineOfPillarApp >> baseline: spec [ spec package: 'Pillar-MicrodownToPillarConverter' with: [ spec requires: #( 'Pillar-Core' 'Microdown' ) ]; - package: 'Pillar-Microdown' - with: [ spec requires: #( 'Pillar-MicrodownToPillarConverter' 'Pillar-Model' 'Pillar-ExporterCore' 'Pillar-Tests-ExporterCore' ) ]; package: 'Pillar-ExporterMicrodown' with: [ spec requires: #( 'Microdown' 'Pillar-PetitPillar' 'Pillar-ExporterCore' ) ]; package: 'Pillar-Core'; package: 'Pillar-Tests-Core' with: [ spec requires: #( 'Pillar-Core' 'Pillar-ExporterText' 'Pillar-ExporterPillar' 'Pillar-PetitPillar' ) ]; diff --git a/src/Pillar-Microdown/PRMicrodownInputDocumentTest.class.st b/src/Pillar-ExporterMicrodown/PRMicrodownInputDocumentTest.class.st similarity index 64% rename from src/Pillar-Microdown/PRMicrodownInputDocumentTest.class.st rename to src/Pillar-ExporterMicrodown/PRMicrodownInputDocumentTest.class.st index e4801372..7402e56b 100644 --- a/src/Pillar-Microdown/PRMicrodownInputDocumentTest.class.st +++ b/src/Pillar-ExporterMicrodown/PRMicrodownInputDocumentTest.class.st @@ -1,72 +1,53 @@ Class { #name : #PRMicrodownInputDocumentTest, #superclass : #PRInputDocumentTest, - #category : #'Pillar-Microdown' + #category : #'Pillar-ExporterMicrodown' } { #category : #tests } PRMicrodownInputDocumentTest >> testParsedDocument [ - - | doc | - doc := ((PRInputDocument inputClassForFile: memoryFileSystem / 'input1.md') new - file: memoryFileSystem / 'input1.md') parsedDocument. - self - assert: doc class - equals: MicRootBlock + | doc | + doc := ((PRInputDocument inputClassForFile: memoryFileSystem / 'input1.md') new file: memoryFileSystem / 'input1.md') parsedDocument. + self assert: doc class equals: MicRootBlock ] { #category : #tests } PRMicrodownInputDocumentTest >> testParsedDocument2 [ - + | doc | doc := (PRInputDocument forFile: memoryFileSystem / 'input1.md') parsedDocument. - self - assert: doc class - equals: MicRootBlock - + self assert: doc class equals: MicRootBlock ] { #category : #tests } PRMicrodownInputDocumentTest >> testParserClass [ - + | input | input := (PRInputDocument inputClassForFile: memoryFileSystem / 'input1.md') new. - self - assert: input parserClass - equals: MicrodownParser - + self assert: input parserClass equals: MicrodownParser ] { #category : #tests } PRMicrodownInputDocumentTest >> testParserClass2 [ - + | input | input := PRInputDocument forFile: memoryFileSystem / 'input1.md'. - self - assert: input parserClass - equals: MicrodownParser - + self assert: input parserClass equals: MicrodownParser ] { #category : #tests } PRMicrodownInputDocumentTest >> testRegistration [ - - | inputClass | - inputClass := (PRInputDocument inputClassForFile: memoryFileSystem / 'input1.md'). - self - assert: inputClass - equals: MicMicrodownInputDocument + | inputClass | + inputClass := PRInputDocument inputClassForFile: memoryFileSystem / 'input1.md'. + self assert: inputClass equals: MicMicrodownInputDocument ] { #category : #tests } PRMicrodownInputDocumentTest >> testRegistration2 [ - + | inputClass | inputClass := (PRInputDocument forFile: memoryFileSystem / 'input1.md') class. - self - assert: inputClass - equals: MicMicrodownInputDocument - + self assert: inputClass equals: MicMicrodownInputDocument ] diff --git a/src/Pillar-Microdown/ManifestPillarMicrodown.class.st b/src/Pillar-Microdown/ManifestPillarMicrodown.class.st deleted file mode 100644 index 79723c11..00000000 --- a/src/Pillar-Microdown/ManifestPillarMicrodown.class.st +++ /dev/null @@ -1,9 +0,0 @@ -" -I contain microdown extension that are only relevant when the full pillar is loaded. -By default we do not load environment and annotation. -" -Class { - #name : #ManifestPillarMicrodown, - #superclass : #PackageManifest, - #category : #'Pillar-Microdown-Manifest' -} diff --git a/src/Pillar-Microdown/MicInlineParserTest.extension.st b/src/Pillar-Microdown/MicInlineParserTest.extension.st deleted file mode 100644 index 60020c5f..00000000 --- a/src/Pillar-Microdown/MicInlineParserTest.extension.st +++ /dev/null @@ -1,10 +0,0 @@ -Extension { #name : #MicInlineParserTest } - -{ #category : #'*Pillar-Microdown' } -MicInlineParserTest >> testAnnotationAsPillar [ - | res | - res := self splitter pillarFrom: 'abc{!cite|a=2&b=5!}def'. - self assert: res second class equals: PRCitationAnnotation. - self assert: (res second parameters at: 'a') equals: '2'. - self assert: (res second parameters at: 'b') equals: '5'. -] diff --git a/src/Pillar-Microdown/PRMicrodownInputDocument.class.st b/src/Pillar-Microdown/PRMicrodownInputDocument.class.st deleted file mode 100644 index 47b8cf51..00000000 --- a/src/Pillar-Microdown/PRMicrodownInputDocument.class.st +++ /dev/null @@ -1,22 +0,0 @@ -Class { - #name : #PRMicrodownInputDocument, - #superclass : #PRInputDocument, - #category : #'Pillar-Microdown' -} - -{ #category : #registration } -PRMicrodownInputDocument class >> doesHandleExtension: anExtension [ - - ^ anExtension asLowercase= 'md' -] - -{ #category : #accessing } -PRMicrodownInputDocument >> parsedDocument [ -1halt. - ^ (self parserClass parse: file contents) asPillar -] - -{ #category : #accessing } -PRMicrodownInputDocument >> parserClass [ - ^ MicrodownParser -] diff --git a/src/Pillar-Microdown/package.st b/src/Pillar-Microdown/package.st deleted file mode 100644 index 8dbb6abc..00000000 --- a/src/Pillar-Microdown/package.st +++ /dev/null @@ -1 +0,0 @@ -Package { #name : #'Pillar-Microdown' }