Merge pull request #972 from pillar-markup/dev

Merge dev in P14

Author: Ducasse

.github/scripts/preLoading.st

@@ -1,7 +1,7 @@
 
 #( 'Microdown' 'BeautifulComments' 'DocumentBrowser' ) do: [ :name |
 		(IceRepository repositoryNamed: name)
-			ifNil: [ self inform: 'Project not found: ' , name ]
+			ifNil: [ ('Project not found: ' , name) traceCr ]
 			ifNotNil: [ :found |
 				found
 					unload;

.github/workflows/tests.yml

@@ -7,11 +7,9 @@ on:
   push:
     branches:
       - dev
-      - master
   pull_request:
     branches:
       - dev
-      - master
   workflow_dispatch:
 
 jobs:

.smalltalk.Release.ston

@@ -3,7 +3,7 @@ SmalltalkCISpec {
   #loading : [
     SCIMetacelloLoadSpec {
       #baseline : 'Microdown',
-      #load : [ 'RichText', 'Tests' ],
+      #load : [ 'RichText' ],
       #onConflict : #useIncoming,
       #onUpgrade : #useIncoming,
       #ignoreImage : true,

README.md

@@ -12,6 +12,23 @@ Microdown is a smaller markdown but it is more extensible. It contains a nice bu
 Microdown is now the default markup for the Pillar document compilation chain. 
 
 
+## Install
+
+```Smalltalk
+
+Smalltalk globals
+	at: #BaselineOfMicrodown 
+	ifPresent: [ :c | c removeFromSystem ].
+
+Metacello new
+	baseline: 'Microdown';
+	repository: 'github://pillar-markup/Microdown:v2.9.3/src';
+	onConflict: [ :ex | ex useIncoming ];
+	onUpgrade: [ :ex | ex useIncoming ];
+	load: #('All').
+```
+
+
 ## Why should you use Microdown?
 
 Microdown is a smaller markdown but it is more extensible.
@@ -163,12 +180,13 @@ The markup is not interpreted.
 Codeblock does not support more than four backticks.
 
 
-## Development in Pharo 12!
+## Development in Pharo 13!
 
 ### Loading specific version
 
-To load the latest stable version load the master. If you have trouble loading in the latest Pharo just execute the preloading.st script in the .github folder.
-This script will remove the existing Microdown package and clear the system.
+To load the latest stable version load the master. If you have trouble loading in the latest Pharo just execute the preloading.st script in the .github folder. This script will remove the existing Microdown package and clear the system.
+You can also execute the script provided below. 
+
 
 ```Smalltalk
 Metacello new
@@ -178,8 +196,8 @@ Metacello new
 ```
 
 The process is the following:
-- Development in dev
-- When stable dev -> in master
+- Development happens dev.
+- When stable dev -> in master.
 - When we can build books master is tagged.
 - Then there is the Pharo integration in dedicated branches.
 
@@ -189,13 +207,7 @@ The process is the following:
 The following script loads all groups in the Baseline:
 
 ```Smalltalk
-#( 'Microdown' 'BeautifulComments' 'DocumentBrowser' ) do: [ :name |
-        (IceRepository repositoryNamed: name)
-            ifNil: [ self inform: 'Project not found: ' , name ]
-            ifNotNil: [ :found |
-                found
-                    unload;
-                    forget ] ].
+
 
 Smalltalk globals
 	at: #BaselineOfMicrodown 
@@ -207,14 +219,38 @@ Metacello new
 	onConflict: [ :ex | ex useIncoming ];
 	onUpgrade: [ :ex | ex useIncoming ];
 	load: #('All').
- ```
+```
+
+In addition you may want to execute this before. 
+```
+#( 'Microdown' ) do: [ :name |
+        (IceRepository repositoryNamed: name)
+            ifNil: [ self inform: 'Project not found: ' , name ]
+            ifNotNil: [ :found |
+                found
+                    unload;
+                    forget ] ].
+```
 
 ## History
 
-We have two sources: Pharo in one hand and Pillar and both are not totally synchronized. 
+We have two sources: 
+- Pharo in one hand (a minimal version managed with the pharo* branches) and
+- Pillar (eg. all the tools and support for slides and books) and both are not totally synchronized. 
+
+Now we also maintain different versions between Pharo versions. Currently the situation is the following:
+
+Working with Pharo 13: 
+- v2.9.2 a little release to support Foliage v2.1.0 and two new release of Pillar (probably one for P13 and one for P13 dropping pillar format).
+- v2.9.1 provides a better integration with Pillar (the Microdown visitors were not used before even if they worked)
+v2.7.x
+-  v2.7.2 merge pharo 13 changes / added gitbridge / OCompiler migration / cleaning syntax description / Ready for Pillar and Foliage
+-  v2.7.1 LatexQuoteblock-should-not-use-verbatim
+-  v2.7.0 Fix some errors and API/clients of the textualbuilder
 
-Using Pharo 12: v2.5.x
 
+Working with Pharo 12: v2.5.x
+- v2.5.6 - Change html visitor and test for annotated paragraph
 - v2.5.5 - add support for top-level header as slide definition
 - v2.5.4 - add backward compatible anchor in caption + tonel V3 format
 - v2.5.1 - add LaTeX math with reference support for Pharo 12 and Pillar development up to v10.0.0
@@ -223,7 +259,8 @@ Using Pharo 12: v2.5.x
 
 Watch out v2.6.0 is older than v.2.5.4
 
-### Pillar History
+### Extract of Pillar History
+
 For Pharo 12
 - v10.0.0 but with some links problems due to new inline parser using MD v2.5.0
 
@@ -235,7 +272,10 @@ For Pharo 10
 -v8.3.2 fixed baseline and updated readme
 
 
+
+
 ## Implementation
+
 The parser follows the design mentioned in [https://github.github.com/gfm](https://github.github.com/gfm), in particular the parsing strategy in Appendix A.
 
 In short, the strategy is that at any point in time, we might have several children of the root which are ""open"". The deepest in open in the tree is called ""current"". All the parents of the current are open. 

src/BaselineOfMicrodown/BaselineOfMicrodown.class.st

@@ -19,15 +19,9 @@ BaselineOfMicrodown >> baseline: spec [
 			xmlParserHtml: spec;
 			mustache: spec;
 			gitBridge: spec.
-		" I disable this because against all my best effort, I cannot avoid the fucking pop up to raise 
-		even if I unload all the packages. I get the Microdown-RichTextComposer in conflict."
-			
+
 		spec preLoadDoIt: #'preload:package:'.
-		
-		
-		"I disable this because in a postload 
-			(IceRepository repositoryNamed: 'microdown') is nil and I do not get why"
-	
+
 		spec postLoadDoIt: #'postload:package:'.
 
 		spec
@@ -43,6 +37,7 @@ BaselineOfMicrodown >> baseline: spec [
 
 			package: #'Microdown-RichTextComposer'
 				with: [ spec requires: #( #Microdown ) ];
+				
 			package: #'Microdown-RichTextComposer-Tests'
 				with: [ spec requires: #( #'Microdown-RichTextComposer' ) ];
 
@@ -65,12 +60,13 @@ BaselineOfMicrodown >> baseline: spec [
 				with: [ spec requires: #( #'Microdown-HTMLExporter' 'Microdown-Tests' 'XMLParserHTML') ];			
 
 			package: #'Microdown-LaTeXExporter'
-				with: [ spec requires: #( #Microdown ) ];				
+				with: [ spec requires: #( #Microdown ) ];
 			package: #'Microdown-LaTeXExporter-Tests'
 				with: [ spec requires: #( #'Microdown-LaTeXExporter' #'Microdown-Tests') ];
-
+	
 			package: #'Microdown-BeamerExporter'
 				with: [ spec requires: #( #'Microdown-LaTeXExporter' ) ];				
+	
 			package: #'Microdown-BeamerExporter-Tests'
 				with: [ spec requires: #( #'Microdown-LaTeXExporter-Tests') ];
 
@@ -83,22 +79,23 @@ BaselineOfMicrodown >> baseline: spec [
 
 			package: #'Microdown-ParentChildrenChecker' with: [
 				spec requires: #( #'Microdown' ) ];
+			
 			package: #'Microdown-BookTester' with: [
 				spec requires: #( #'Microdown' ) ];
 			package: #'Microdown-BookTester-Tests' with: [
 				spec requires: #( #'Microdown-BookTester' ) ];	
 
 			package: #'Microdown-Blog' with: [
-				spec requires: #( #'Microdown' #'Mustache') ];
+				spec requires: #( #'Microdown' #'Mustache' #'Microdown-HTMLExporter') ];
 			package: #'Microdown-Blog-Tests' with: [
 				spec requires: #( #'Microdown-Blog' 'GitBridge') ].
 
-		"I do not want group without tests for now"
 		spec
-			group: 'Core' with: #('Microdown');
+			group: 'Core' with: #('Microdown' 'Microdown-Tests');
 			group: 'ForPharo' with: #('Microdown' #'Microdown-BrowserExtensions');
-			group: 'Tests' with: #('Core' 'Microdown-Tests');
 			group: 'RichText' with: #('Core' 'Microdown-RichTextComposer' );
+			group: 'Editor' with: #('RichText' #'Microdown-PrettyPrinter' #'Microdown-PrettyPrinter-Tests');
+			group: 'LaTeX' with:  #('Core' #'Microdown-LaTeXExporter' #'Microdown-LaTeXExporter-Tests');
 			group: 'Extensions' with: #(
 				#'Microdown-Evaluator'
 				#'Microdown-Evaluator-Tests'
@@ -115,9 +112,15 @@ BaselineOfMicrodown >> baseline: spec [
 				#'Microdown-BookTester-Tests'
 				#'Microdown-Blog'
 				#'Microdown-Blog-Tests'
-				
 				);
-			group: 'All' with: #('Core' #'Microdown-BrowserExtensions' 'Tests' 'Extensions' 'Microdown-Pharo-Tools' 'RichText') ]
+			group: 'All' with: #('Core' #'Microdown-BrowserExtensions'  'Editor' 'LaTeX' 'Extensions' 'Microdown-Pharo-Tools' 'RichText')
+			]
+
+
+
+
+
+
 ]
 
 { #category : 'baselines' }
@@ -131,7 +134,7 @@ BaselineOfMicrodown >> mustache: spec [
 
 	spec baseline: 'Mustache' with: [
 		spec
-			repository: 'github://noha/mustache:v1.0/repository';
+			repository: 'github://noha/mustache:v1.3/repository';
 			loads: #( 'Core' 'Tests' ) ]
 ]
 
@@ -162,16 +165,21 @@ BaselineOfMicrodown >> preload: loader package: packageSpec [
 					forget ] ]"
 
 	| packagesToUnload |
-	"If we are building the Pharo image, we do not want to unload packages."
-	SystemBuildInfo current isBuildFinished ifFalse: [ ^ self ].
+
+	self flag: 'This is necessary to not break the bootstrapping. Microdown makes a cleaning of classes and as Microdown is loaded in the image it can cause conflits.'.
+	self flag: 'We do not access the class SystemBuildInfo directly because it is only present in Pharo 13 but Microdown works on different Pharo versions. We can simplifly this when Pharo 13 will be the minimal supported version.'.
+	self class environment at: #SystemBuildInfo ifPresent: [ :info | info 
+			current isBuildFinished ifFalse: [ ^ self ]. ].
 
 	"If it is absent it's because we are in the Pharo bootstrap"
 	self class environment at: #IceRepository ifPresent: [ :iceRepositoryClass |
-		packagesToUnload := ((PackageOrganizer default packages select: [ :each | each name beginsWith: 'Microdown' ]) collect: [ :each | each name ]) reject: [ :each |
-			                    #( 'Microdown-RichTextPresenter' 'Microdown-RichTextPresenter-Tests' ) includes: each ].
+		| packages |
+		"The same here, not direct access to PackageOrganizer because it is only for Pharo 13."
+		packages := self class environment allClasses collect: #package as: Set.
+		packagesToUnload := ((packages select: [ :each | each name beginsWith: 'Microdown' ]) collect: [ :each | each name ]) reject: [ :each |
+			               #( 'Microdown-RichTextPresenter' 'Microdown-RichTextPresenter-Tests' ) includes: each ].
 
-		"these two are not managed by the microdown repo but the documentation.
-			I should rename them in the future to avoid confusion"
+		"these two are not managed by the microdown repo but the documentation. We should rename them in the future to avoid confusion"
 
 		packagesToUnload do: [ :each | ((iceRepositoryClass repositoryNamed: 'Microdown') packageNamed: each) unload ] ]
 ]

src/Microdown-Blog-Tests/MicBridge.class.st

@@ -4,8 +4,9 @@ I am a bridge to access resources from Microdown clone
 Class {
 	#name : 'MicBridge',
 	#superclass : 'GitBridge',
-	#category : 'Microdown-Blog-Tests',
-	#package : 'Microdown-Blog-Tests'
+	#category : 'Microdown-Blog-Tests-Utils',
+	#package : 'Microdown-Blog-Tests',
+	#tag : 'Utils'
 }
 
 { #category : 'accessing' }

src/Microdown-BookSanitizer-Tests/AddParagraphLabelPeriodVisitorTest.class.st

@@ -0,0 +1,57 @@
+Class {
+	#name : 'AddParagraphLabelPeriodVisitorTest',
+	#superclass : 'BookSanitizerVisitorTest',
+	#category : 'Microdown-BookSanitizer-Tests',
+	#package : 'Microdown-BookSanitizer-Tests'
+}
+
+{ #category : 'tests' }
+AddParagraphLabelPeriodVisitorTest >> testVisitParagraph [
+
+	| aParagraph aTextBlock aAddParagraphLabelPeriodVisitor |
+	aAddParagraphLabelPeriodVisitor := AddParagraphLabelPeriodVisitor new.
+
+	aParagraph := MicParagraphBlock new.
+
+	"Stef note: 
+	A paragraph should be more like 
+		#### A Label 
+		llkjlkjlkjlk
+		"
+
+	aTextBlock := MicTextBlock new.
+	aTextBlock bodyString: '2. Analyse
+
+Bonjour tout le monde1
+
+Bonjour tout le monde2
+
+3 Contact
+
+Bonjour tout le monde3
+
+4. ttttt
+
+Bonjour tout le monde4
+
+5. fpzfpe'.
+	aParagraph children add: aTextBlock.
+
+	aAddParagraphLabelPeriodVisitor visitParagraph: aParagraph.
+
+	self assert: aParagraph children first bodyString equals: '2. Analyse
+
+Bonjour tout le monde1
+
+Bonjour tout le monde2
+
+3. Contact
+
+Bonjour tout le monde3
+
+4. ttttt
+
+Bonjour tout le monde4
+
+5. fpzfpe'
+]

src/Microdown-BookSanitizer-Tests/BookSanitizerVisitorTest.class.st

@@ -0,0 +1,6 @@
+Class {
+	#name : 'BookSanitizerVisitorTest',
+	#superclass : 'TestCase',
+	#category : 'Microdown-BookSanitizer-Tests',
+	#package : 'Microdown-BookSanitizer-Tests'
+}