Merge branch 'main' into develop

.gitignore

@@ -58,6 +58,5 @@ doc/jason-cli/commands.html
 jason-interpreter/gradle.properties
 jason-interpreter/settings.gradle
 doc/install.html
+doc/index.html
 doc/doc.html
-jason-cli/src/test/water-jugs/settings.gradle
-jason-cli/src/test/water-jugs/build.gradle

doc/install.adoc

@@ -1,13 +1,13 @@
 = Jason Installation
 
 1. Install link:https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html[Java 17]
-2. Install link:https://code.visualstudio.com/download[Visual Sudio Code] for an IDE
+2. Install link:https://code.visualstudio.com/download[Visual Sudio Code]
 3. [windows] Install a terminal & shell tool like link:https://gitforwindows.org/[GitBash]
-4. Install Jason. 
+4. Install Jason:
 +
 Unix and Windows::
 +
-Download a Jason release from link:https://github.com/jason-lang/jason/releases[here] (download the file named `jason-bin-.....zip`) and decompress it. The zip file contains documentation, examples, and a subdirectory `bin` with the file *`jason`*. It is a unix executable file, if not, change its properties with `chmod +x jason`. Finally, link:https://www.computerhope.com/issues/ch000549.htm[adds the directory `bin` in your machine `PATH`] so that the command `jason` can be executed in a terminal.
+Download a Jason release from link:https://github.com/jason-lang/jason/releases[here] (download the file named `jason-bin-.....zip`) and decompress it. The zip file contains documentation, examples, and a sub-directory `bin` with the file *`jason`*. It is a unix executable file, if not, change its properties with `chmod +x jason`. Finally, link:https://www.computerhope.com/issues/ch000549.htm[adds the directory `bin` in your machine `PATH`] so that the command `jason` can be executed in a terminal. 
 
 Linux::
 You can use `apt-get` to install Jason (details link:https://github.com/chon-group/dpkg-jason[here]):

doc/publishDocInGHPages.sh

@@ -2,27 +2,25 @@ cd ..
 
 ./gradlew doc
 
-#rm -rf /tmp/gh-pages*
-#git clone https://github.com/jason-lang/jason.git --branch gh-pages-new --single-branch /tmp/gh-pages
+rm -rf ../jason-pages/api
+rm -rf ../jason-pages/doc
 
-SITE_PATH=../jason-lang.github.io
+#asciidoctor -a stylesheet=adoc-empty.css readme.adoc -o doc.html
+IMAGE=jomifred/adoc
+docker run --rm -i --user="$(id -u):$(id -g)" --net=none -v "$PWD":/app "$IMAGE" asciidoctor -r /pygments_init.rb -a stylesheet=adoc-empty.css readme.adoc -o doc.html
 
-rm -rf $SITE_PATH/api
-rm -rf $SITE_PATH/doc
+cp -R jason-interpreter/build/docs/javadoc ../jason-pages/api
+cp -R doc ../jason-pages
 
-cp -R jason-interpreter/build/docs/javadoc $SITE_PATH/api
-cp -R doc $SITE_PATH
-
-
-cd $SITE_PATH
+cd ../jason-pages
 git add api
 git commit -a -m "add javadoc api"
 
-find doc -name readme.html -execdir cp readme.html index.html \;
+#find doc -name readme.html -execdir cp readme.html index.html \;
 git add doc
 git commit -a -m "add jason github doc folder"
 
 git push
 
-echo "edit jason-site.../doc/doc.html properly"
+
 

doc/readme.adoc

@@ -19,7 +19,7 @@ endif::[]
 * xref:./tutorials/hello-bdi/readme.adoc[BDI concepts]
 * xref:./tutorials/jason-jade/readme.adoc[Interoperating with JADE]
 
-== Others
+== Other
 
 - xref:./faq.adoc[FAQ]
 - link:./Jason.pdf[First Jason Manual] (outdated)

readme.adoc

@@ -5,11 +5,11 @@
 
 Jason is an interpreter for an extended version of AgentSpeak. It implements the operational semantics of that language, and provides a platform for the development of multi-agent systems, with many user-customisable features. Jason is available as Open Source, and is distributed under GNU LGPL.
 
-Jason is developed by http://https://jomifred.github.io[Jomi F. Hübner] and http://www.inf.pucrs.br/r.bordini[Rafael H. Bordini], based on previous work done with many colleagues, in particular Michael Fisher, Joyce Martins, Álvaro Moreira, Renata Vieira, Willem Visser, Mike Wooldridge, but also many others, as acknowledged in the manual (see the http://jason-lang.github.io/jason/doc[documents] page).
+Jason is developed by http://https://jomifred.github.io[Jomi F. Hübner] and http://www.inf.pucrs.br/r.bordini[Rafael H. Bordini], based on previous work done with many colleagues, in particular Michael Fisher, Joyce Martins, Álvaro Moreira, Renata Vieira, Willem Visser, Mike Wooldridge, but also many others, as acknowledged in the manual (see the http://jason-lang.github.io/[documents] page).
 
 == Documentation
 
-Most of the Jason documentation is available xref:doc/readme.adoc[in the doc folder] and at the http://jason-lang.github.io/jason[Jason web site].
+Most of the Jason documentation is available xref:doc/readme.adoc[in the doc folder] and at the http://jason-lang.github.io[Jason web site].
 
 == Installation