Skip to content

Commit 75fe158

Browse files
committed
allow externalization of AsciiDoc engine attributes
1 parent 6453f00 commit 75fe158

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

grails-docs/src/main/groovy/grails/doc/DocPublisher.groovy

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,11 @@ class DocPublisher {
310310
// pass attributes to asciidoc
311311
((AsciiDocEngine)engine).attributes.putAll(
312312
version: version,
313-
apiDocs: "http://docs.grails.org/${version}/api/"
313+
apiDocs: "http://docs.grails.org/${version}/api/",
314+
sourceRepo: sourceRepo
315+
)
316+
((AsciiDocEngine)engine).attributes.putAll(
317+
engineProperties
314318
)
315319
}
316320

grails-docs/src/main/groovy/grails/doc/asciidoc/AsciiDocEngine.groovy

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@ class AsciiDocEngine extends DocEngine {
2020
Map attributes = [
2121
'imagesdir': '../img',
2222
'source-highlighter':'coderay',
23-
'icons':'font',
24-
'javaee': 'https://docs.oracle.com/javaee/7/api/',
25-
'javase': 'https://docs.oracle.com/javase/7/docs/api/',
26-
'groovyapi': 'http://docs.groovy-lang.org/latest/html/gapi/',
27-
'springapi': 'https://docs.spring.io/spring/docs/current/javadoc-api/'
23+
'icons':'font'
2824
]
2925
@Override
3026
String render(String content, RenderContext context) {

grails-docs/src/main/groovy/grails/doc/gradle/PublishGuide.groovy

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class PublishGuide extends DefaultTask {
3131
@Input String language = ""
3232
@Input boolean asciidoc = false
3333
@Input @Optional String sourceRepo
34-
34+
@Input @Optional Properties properties = new Properties()
3535
Collection macros = []
3636
File workDir = project.buildDir as File
3737

@@ -49,6 +49,8 @@ class PublishGuide extends DefaultTask {
4949
}
5050
}
5151

52+
props.putAll(properties)
53+
5254
def publisher = new DocPublisher(sourceDir, targetDir)
5355
publisher.ant = project.ant
5456
publisher.asciidoc = asciidoc

0 commit comments

Comments
 (0)