[groovy] branch master updated (500a2a1 -> b8232f5)

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

[groovy] branch master updated (500a2a1 -> b8232f5)

paulk
This is an automated email from the ASF dual-hosted git repository.

paulk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git.


    from 500a2a1  Fix missing roles in POM files (closes #1402)
     new 7d09a6b  asciidoc tweaks: section anchors/links
     new cd2b4c3  asciidoc tweaks: improved pdf highlighter
     new b8232f5  asciidoc tweaks: add images back into single page html with corrected URLs

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../groovy/org.apache.groovy-asciidoctor.gradle    |  3 +-
 subprojects/groovy-binary/build.gradle             |  7 +++
 subprojects/groovy-binary/src/spec/doc/index.adoc  | 63 ++++++++++++----------
 3 files changed, 45 insertions(+), 28 deletions(-)

Reply | Threaded
Open this post in threaded view
|

[groovy] 01/03: asciidoc tweaks: section anchors/links

paulk
This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit 7d09a6be089e7ccea1be2587a5f30a8d396960ab
Author: Paul King <[hidden email]>
AuthorDate: Wed Oct 14 00:17:53 2020 +1000

    asciidoc tweaks: section anchors/links
---
 buildSrc/src/main/groovy/org.apache.groovy-asciidoctor.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/buildSrc/src/main/groovy/org.apache.groovy-asciidoctor.gradle b/buildSrc/src/main/groovy/org.apache.groovy-asciidoctor.gradle
index 9a4ab7a..81d5f02 100644
--- a/buildSrc/src/main/groovy/org.apache.groovy-asciidoctor.gradle
+++ b/buildSrc/src/main/groovy/org.apache.groovy-asciidoctor.gradle
@@ -75,7 +75,8 @@ asciidoctor {
             encoding: 'utf-8',
             toclevels: 10,
             numbered: '',
-            sectanchors: ''
+            sectanchors: true,
+            sectlinks: true
 }
 
 asciidoctorj {

Reply | Threaded
Open this post in threaded view
|

[groovy] 02/03: asciidoc tweaks: improved pdf highlighter

paulk
In reply to this post by paulk
This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit cd2b4c3c07bfa66d300940116c577c585e6bc72d
Author: Paul King <[hidden email]>
AuthorDate: Wed Oct 14 00:19:04 2020 +1000

    asciidoc tweaks: improved pdf highlighter
---
 subprojects/groovy-binary/src/spec/doc/index.adoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/subprojects/groovy-binary/src/spec/doc/index.adoc b/subprojects/groovy-binary/src/spec/doc/index.adoc
index cc7fd06..9062306 100644
--- a/subprojects/groovy-binary/src/spec/doc/index.adoc
+++ b/subprojects/groovy-binary/src/spec/doc/index.adoc
@@ -21,6 +21,7 @@
 
 = Groovy Language Documentation
 :doctype: book
+ifdef::backend-pdf[:source-highlighter: rouge]
 
 :reldir_root: ../../../../../src/spec/doc
 include::{reldir_root}/core-introduction.adoc[]

Reply | Threaded
Open this post in threaded view
|

[groovy] 03/03: asciidoc tweaks: add images back into single page html with corrected URLs

paulk
In reply to this post by paulk
This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit b8232f5d24c5019fea4c0816a6aeedb44647a493
Author: Paul King <[hidden email]>
AuthorDate: Wed Oct 14 00:20:38 2020 +1000

    asciidoc tweaks: add images back into single page html with corrected URLs
---
 subprojects/groovy-binary/build.gradle            |  7 +++
 subprojects/groovy-binary/src/spec/doc/index.adoc | 62 +++++++++++++----------
 2 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/subprojects/groovy-binary/build.gradle b/subprojects/groovy-binary/build.gradle
index a83b830..70fabc7 100644
--- a/subprojects/groovy-binary/build.gradle
+++ b/subprojects/groovy-binary/build.gradle
@@ -30,6 +30,13 @@ docAggregation {
             '**/GroovyRecognizer.java' // generated file
 }
 
+tasks.named('asciidoctor') {
+    attributes reldir_root: '.',
+            reldir_jmx: '.',
+            reldir_swing: '.',
+            reldir_console: '.'
+}
+
 distribution {
     docs ':', 'org.codehaus.groovy.runtime.DefaultGroovyMethods',
             'org.codehaus.groovy.runtime.DefaultGroovyStaticMethods',
diff --git a/subprojects/groovy-binary/src/spec/doc/index.adoc b/subprojects/groovy-binary/src/spec/doc/index.adoc
index 9062306..07e933d 100644
--- a/subprojects/groovy-binary/src/spec/doc/index.adoc
+++ b/subprojects/groovy-binary/src/spec/doc/index.adoc
@@ -23,8 +23,20 @@
 :doctype: book
 ifdef::backend-pdf[:source-highlighter: rouge]
 
+ifndef::reldir_root[]
 :reldir_root: ../../../../../src/spec/doc
-include::{reldir_root}/core-introduction.adoc[]
+endif::[]
+ifndef::reldir_console[]
+:reldir_console: ../../../../../subprojects/groovy-console/src/spec/doc
+endif::[]
+ifndef::reldir_swing[]
+:reldir_swing: ../../../../../subprojects/groovy-swing/src/spec/doc
+endif::[]
+ifndef::reldir_jmx[]
+:reldir_jmx: ../../../../../subprojects/groovy-jmx/src/spec/doc
+endif::[]
+
+include::../../../../../src/spec/doc/core-introduction.adoc[]
 
 == Groovy Language Specification
 
@@ -44,46 +56,45 @@ include::{reldir_root}/core-introduction.adoc[]
 :tools-groovyc:
 :xml-userguide:
 
-include::{reldir_root}/core-syntax.adoc[leveloffset=+2]
+include::../../../../../src/spec/doc/core-syntax.adoc[leveloffset=+2]
 
-include::{reldir_root}/core-operators.adoc[leveloffset=+2]
+include::../../../../../src/spec/doc/core-operators.adoc[leveloffset=+2]
 
-include::{reldir_root}/core-program-structure.adoc[leveloffset=+2]
+include::../../../../../src/spec/doc/core-program-structure.adoc[leveloffset=+2]
 
-include::{reldir_root}/core-object-orientation.adoc[leveloffset=+2]
+include::../../../../../src/spec/doc/core-object-orientation.adoc[leveloffset=+2]
 
-include::{reldir_root}/core-closures.adoc[leveloffset=+2]
+include::../../../../../src/spec/doc/core-closures.adoc[leveloffset=+2]
 
-include::{reldir_root}/core-semantics.adoc[leveloffset=+2]
+include::../../../../../src/spec/doc/core-semantics.adoc[leveloffset=+2]
 
 == Tools
 
-include::{reldir_root}/tools-groovy.adoc[leveloffset=+2]
+include::../../../../../src/spec/doc/tools-groovy.adoc[leveloffset=+2]
 
-include::{reldir_root}/tools-groovyc.adoc[leveloffset=+2]
+include::../../../../../src/spec/doc/tools-groovyc.adoc[leveloffset=+2]
 
 include::../../../../../subprojects/groovy-groovysh/src/spec/doc/groovysh.adoc[leveloffset=+2]
 
-:reldir_console: ../../../../../subprojects/groovy-console/src/spec/doc
-include::{reldir_console}/groovy-console.adoc[leveloffset=+2]
+include::../../../../../subprojects/groovy-console/src/spec/doc/groovy-console.adoc[leveloffset=+2]
 
 include::../../../../../subprojects/groovy-groovydoc/src/spec/doc/groovydoc.adoc[leveloffset=+2]
 
-include::{reldir_root}/tools-ide.adoc[leveloffset=+2]
+include::../../../../../src/spec/doc/tools-ide.adoc[leveloffset=+2]
 
 == User Guides
 
-include::{reldir_root}/core-getting-started.adoc[leveloffset=+2]
+include::../../../../../src/spec/doc/core-getting-started.adoc[leveloffset=+2]
 
-include::{reldir_root}/core-differences-java.adoc[leveloffset=+2]
+include::../../../../../src/spec/doc/core-differences-java.adoc[leveloffset=+2]
 
-include::{reldir_root}/core-gdk.adoc[leveloffset=+2]
+include::../../../../../src/spec/doc/core-gdk.adoc[leveloffset=+2]
 
-include::{reldir_root}/core-metaprogramming.adoc[leveloffset=+2]
+include::../../../../../src/spec/doc/core-metaprogramming.adoc[leveloffset=+2]
 
-include::{reldir_root}/grape.adoc[leveloffset=+2]
+include::../../../../../src/spec/doc/grape.adoc[leveloffset=+2]
 
-include::{reldir_root}/core-testing-guide.adoc[leveloffset=+2]
+include::../../../../../src/spec/doc/core-testing-guide.adoc[leveloffset=+2]
 
 include::../../../../../subprojects/groovy-json/src/spec/doc/json-userguide.adoc[leveloffset=+2]
 
@@ -105,13 +116,11 @@ include::../../../../../subprojects/groovy-templates/src/spec/doc/template-engin
 
 include::../../../../../subprojects/groovy-servlet/src/spec/doc/servlet-userguide.adoc[leveloffset=+2]
 
-include::{reldir_root}/guide-integrating.adoc[leveloffset=+2]
+include::../../../../../src/spec/doc/guide-integrating.adoc[leveloffset=+2]
 
-:reldir_swing: ../../../../../subprojects/groovy-swing/src/spec/doc
-include::{reldir_root}/core-domain-specific-languages.adoc[leveloffset=+2]
+include::../../../../../src/spec/doc/core-domain-specific-languages.adoc[leveloffset=+2]
 
-:reldir_jmx: ../../../../../subprojects/groovy-jmx/src/spec/doc
-include::{reldir_jmx}/jmx.adoc[leveloffset=+2]
+include::../../../../../subprojects/groovy-jmx/src/spec/doc/jmx.adoc[leveloffset=+2]
 
 === Creating Swing UIs
 
@@ -121,11 +130,10 @@ Creating Swing UIs is made easy thanks to the use of <<swingbuilder,SwingBuilder
 
 (TBD)
 
-include::{reldir_root}/design-patterns-in-groovy.adoc[leveloffset=+2]
+include::../../../../../src/spec/doc/design-patterns-in-groovy.adoc[leveloffset=+2]
 
 == Acknowledgements
 
-include::{reldir_root}/contributors.adoc[leveloffset=+2]
-
-include::{reldir_root}/license.adoc[leveloffset=+2]
+include::../../../../../src/spec/doc/contributors.adoc[leveloffset=+2]
 
+include::../../../../../src/spec/doc/license.adoc[leveloffset=+2]