Skip to content

Commit 6b7ac1b

Browse files
DucasseDucasse
committed
Merge 89887bf 
2 parents 5cfb419 + 89887bf commit 6b7ac1b

13 files changed

Lines changed: 149 additions & 136 deletions

‎README.md‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,12 @@ In the near future we will retire the Pillar markup from the compilation chain.
2222
### 1. Building from sources
2323
For HTTPS setup, execute the `build.sh` script found in the `scripts` directory:
2424

25-
### Here is the latesst version for Pharo 13.
26-
```bash
27-
$ git clone https://github.com/pillar-markup/pillar.git
28-
$ cd pillar
29-
$ git checkout v10.4.2
30-
$ chmod a+x ./scripts/build.sh
31-
$ ./scripts/build.sh
32-
```
33-
3425

3526
### Here is the latest version for Pharo 12.
3627
```bash
3728
$ git clone https://github.com/pillar-markup/pillar.git
3829
$ cd pillar
39-
$ git checkout v10.4.0
30+
$ git checkout v10.4.3
4031
$ chmod a+x ./scripts/build.sh
4132
$ ./scripts/build.sh
4233
```

‎src/Pillar-ExporterHTML/PRDocumentListTransformer.class.st‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,19 @@ doc = PRDocument new.
88
99
"
1010
Class {
11-
#name : #PRDocumentListTransformer,
12-
#superclass : #PRNodeTransformer,
11+
#name : 'PRDocumentListTransformer',
12+
#superclass : 'PRNodeTransformer',
1313
#instVars : [
1414
'workingDirectory',
1515
'currentFile',
1616
'filesDirectory',
1717
'availableTemplates'
1818
],
19-
#category : #'Pillar-ExporterHTML'
19+
#category : 'Pillar-ExporterHTML',
20+
#package : 'Pillar-ExporterHTML'
2021
}
2122

22-
{ #category : #'instance-creation' }
23+
{ #category : 'instance-creation' }
2324
PRDocumentListTransformer class >> withContext: aContext [
2425

2526
| inst |
@@ -28,7 +29,7 @@ PRDocumentListTransformer class >> withContext: aContext [
2829
^ inst
2930
]
3031

31-
{ #category : #adding }
32+
{ #category : 'adding' }
3233
PRDocumentListTransformer >> addAbstractOfCurrentFileToDocument: aDocument inAnnotation: aPRDocListAnnotation [
3334
| abstractOfCurrentFile |
3435
abstractOfCurrentFile := PRPillarParserMain parse: self currentFile contents.
@@ -44,7 +45,7 @@ PRDocumentListTransformer >> addAbstractOfCurrentFileToDocument: aDocument inAnn
4445
self addLinkToDocument: aDocument ]
4546
]
4647

47-
{ #category : #adding }
48+
{ #category : 'adding' }
4849
PRDocumentListTransformer >> addLinkToDocument: aDocument [
4950
aDocument
5051
add:
@@ -53,12 +54,12 @@ PRDocumentListTransformer >> addLinkToDocument: aDocument [
5354
yourself)
5455
]
5556

56-
{ #category : #accessing }
57+
{ #category : 'accessing' }
5758
PRDocumentListTransformer >> availableTemplates [
5859
^ availableTemplates
5960
]
6061

61-
{ #category : #transforming }
62+
{ #category : 'transforming' }
6263
PRDocumentListTransformer >> createDocList: aPRDocListAnnotation [
6364
| files document sortedFiles |
6465
"Check if the specified path exist and get pillar files from it.
@@ -84,23 +85,23 @@ PRDocumentListTransformer >> createDocList: aPRDocListAnnotation [
8485
^ document
8586
]
8687

87-
{ #category : #adding }
88+
{ #category : 'adding' }
8889
PRDocumentListTransformer >> currentDocumentInternalLink [
8990

9091
^ PRInternalLink reference: self filesDirectory , '/' , self currentFile basename
9192
]
9293

93-
{ #category : #visiting }
94+
{ #category : 'visiting' }
9495
PRDocumentListTransformer >> currentFile [
9596
^ currentFile
9697
]
9798

98-
{ #category : #accessing }
99+
{ #category : 'accessing' }
99100
PRDocumentListTransformer >> filesDirectory [
100101
^ filesDirectory
101102
]
102103

103-
{ #category : #parsing }
104+
{ #category : 'parsing' }
104105
PRDocumentListTransformer >> generateFileUsingTemplateFromDocument: aDocument [
105106
| conf htmlDoc |
106107
"Read configurations"
@@ -117,12 +118,12 @@ PRDocumentListTransformer >> generateFileUsingTemplateFromDocument: aDocument [
117118
^ htmlDoc
118119
]
119120

120-
{ #category : #accessing }
121+
{ #category : 'accessing' }
121122
PRDocumentListTransformer >> lookForAvailableTemplates: aCollection [
122123
^ (aCollection select: [ :each | (self workingDirectory resolve: each) exists and: [ each asFileReference extension = 'mustache' ] ]) asOrderedCollection
123124
]
124125

125-
{ #category : #sorting }
126+
{ #category : 'sorting' }
126127
PRDocumentListTransformer >> sort: aCollectionOfReferences limit: anInteger by: aString [
127128
| references |
128129
references := aCollectionOfReferences first: anInteger.
@@ -133,18 +134,18 @@ PRDocumentListTransformer >> sort: aCollectionOfReferences limit: anInteger by:
133134
^ references
134135
]
135136

136-
{ #category : #visiting }
137+
{ #category : 'visiting' }
137138
PRDocumentListTransformer >> visitDocListAnnotation: aPRDocListAnnotation [
138139

139140
self replace: { (self createDocList: aPRDocListAnnotation) }
140141
]
141142

142-
{ #category : #accessing }
143+
{ #category : 'accessing' }
143144
PRDocumentListTransformer >> workingDirectory [
144145
^ workingDirectory
145146
]
146147

147-
{ #category : #accessing }
148+
{ #category : 'accessing' }
148149
PRDocumentListTransformer >> workingDirectory: aFileReference [
149150
workingDirectory := aFileReference
150151
]

‎src/Pillar-ExporterHTML/PRHTMLBrush.class.st‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
I'm an abstract brush dedicated to HTML documents. As of today, the only subclass is the tag brush but we can imagine others (e.g., to write HTML comments).
33
"
44
Class {
5-
#name : #PRHTMLBrush,
6-
#superclass : #PRExportBrush,
7-
#category : 'Pillar-ExporterHTML'
5+
#name : 'PRHTMLBrush',
6+
#superclass : 'PRExportBrush',
7+
#category : 'Pillar-ExporterHTML',
8+
#package : 'Pillar-ExporterHTML'
89
}

‎src/Pillar-ExporterHTML/PRHTMLCanvas.class.st‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,16 @@ canvas tag
77
with: [ ""some code that generates the HTML inside the link"" ]
88
"
99
Class {
10-
#name : #PRHTMLCanvas,
11-
#superclass : #PRExportCanvas,
10+
#name : 'PRHTMLCanvas',
11+
#superclass : 'PRExportCanvas',
1212
#classVars : [
1313
'HTMLCharacters'
1414
],
15-
#category : #'Pillar-ExporterHTML'
15+
#category : 'Pillar-ExporterHTML',
16+
#package : 'Pillar-ExporterHTML'
1617
}
1718

18-
{ #category : #'class initialization' }
19+
{ #category : 'class initialization' }
1920
PRHTMLCanvas class >> initialize [
2021
HTMLCharacters := Dictionary new.
2122
HTMLCharacters
@@ -25,19 +26,19 @@ PRHTMLCanvas class >> initialize [
2526
at: $> put: '>'
2627
]
2728
28-
{ #category : #tags }
29+
{ #category : 'tags' }
2930
PRHTMLCanvas >> emptyTag [
3031
^ self brush: PRHTMLEmptyTag new
3132
]
3233
33-
{ #category : #'writing text' }
34+
{ #category : 'writing text' }
3435
PRHTMLCanvas >> nextPut: aCharacter [
3536
(HTMLCharacters at: aCharacter ifAbsent: nil)
3637
ifNil: [ super nextPut: aCharacter ]
3738
ifNotNil: [ :string | self raw: string ]
3839
]
3940
40-
{ #category : #tags }
41+
{ #category : 'tags' }
4142
PRHTMLCanvas >> tag [
4243
^ self brush: PRHTMLTag new
4344
]

‎src/Pillar-ExporterHTML/PRHTMLEmptyTag.class.st‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,27 @@ String streamContents: [ :stream | | canvas |
1414
closeTag ]
1515
"
1616
Class {
17-
#name : #PRHTMLEmptyTag,
18-
#superclass : #PRHTMLBrush,
17+
#name : 'PRHTMLEmptyTag',
18+
#superclass : 'PRHTMLBrush',
1919
#instVars : [
2020
'name'
2121
],
22-
#category : 'Pillar-ExporterHTML'
22+
#category : 'Pillar-ExporterHTML',
23+
#package : 'Pillar-ExporterHTML'
2324
}
2425

25-
{ #category : #accessing }
26+
{ #category : 'accessing' }
2627
PRHTMLEmptyTag >> closeTag [
2728
stream << '/>'
2829
]
2930

30-
{ #category : #accessing }
31+
{ #category : 'accessing' }
3132
PRHTMLEmptyTag >> name: aString [
3233
name := aString.
3334
stream nextPut: $<; << aString
3435
]
3536

36-
{ #category : #accessing }
37+
{ #category : 'accessing' }
3738
PRHTMLEmptyTag >> parameterAt: aString put: anotherString [
3839
stream space. stream << aString << '="' << anotherString << '"'
3940
]

‎src/Pillar-ExporterHTML/PRHTMLTag.class.st‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,26 +41,27 @@ While when the argument is a block the block result is not used, just executed.
4141
]]]
4242
"
4343
Class {
44-
#name : #PRHTMLTag,
45-
#superclass : #PRHTMLBrush,
44+
#name : 'PRHTMLTag',
45+
#superclass : 'PRHTMLBrush',
4646
#instVars : [
4747
'name'
4848
],
49-
#category : 'Pillar-ExporterHTML'
49+
#category : 'Pillar-ExporterHTML',
50+
#package : 'Pillar-ExporterHTML'
5051
}
5152

52-
{ #category : #accessing }
53+
{ #category : 'accessing' }
5354
PRHTMLTag >> name: aString [
5455
name := aString.
5556
stream nextPut: $<; << aString
5657
]
5758

58-
{ #category : #accessing }
59+
{ #category : 'accessing' }
5960
PRHTMLTag >> parameterAt: aString put: anotherString [
6061
stream space. stream << aString << '="' << anotherString << '"'
6162
]
6263

63-
{ #category : #accessing }
64+
{ #category : 'accessing' }
6465
PRHTMLTag >> with: aString [
6566
stream
6667
nextPut: $>;

0 commit comments

Comments
 (0)