branch develop updated (b559012 -> bab2985)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository jrst. See https://gitlab.nuiton.org/nuiton/jrst.git from b559012 [jgitflow-maven-plugin]updating poms for 2.4-SNAPSHOT development new c51749f [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new db04a7d [jgitflow-maven-plugin]updating poms for branch'release/2.3' with non-snapshot versions new 4070092 [jgitflow-maven-plugin]merging 'release/2.3' into 'master' new 92c2458 [jgitflow-maven-plugin]merging 'master' into 'develop' new bab2985 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit bab2985848a4986d7cbf6f10cb3db29c253898d5 Author: Éric <chatellier@codelutin.com> Date: Thu May 17 15:59:49 2018 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 92c24589f158a9bb0d81886b02d32b3f85a0e961 Merge: c51749f 4070092 Author: Éric <chatellier@codelutin.com> Date: Thu May 17 15:59:49 2018 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit c51749f4822eeedb9239be7b4e6c80cdaf3bbf49 Author: Éric <chatellier@codelutin.com> Date: Thu May 17 15:59:49 2018 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 4070092216a1eb7cfc58d7e64338d54a3425a7f1 Merge: 6ca4b5d db04a7d Author: Éric <chatellier@codelutin.com> Date: Thu May 17 15:59:47 2018 +0200 [jgitflow-maven-plugin]merging 'release/2.3' into 'master' commit db04a7df00715962f0502f95d1155e510188305f Author: Éric <chatellier@codelutin.com> Date: Thu May 17 15:56:15 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.3' with non-snapshot versions Summary of changes: -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jrst. See https://gitlab.nuiton.org/nuiton/jrst.git commit db04a7df00715962f0502f95d1155e510188305f Author: Éric <chatellier@codelutin.com> Date: Thu May 17 15:56:15 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.3' with non-snapshot versions --- docutils/pom.xml | 2 +- doxia-module-jrst-legacy/pom.xml | 2 +- doxia-module-jrst/pom.xml | 2 +- jrst-doc/pom.xml | 2 +- jrst-site-util/pom.xml | 2 +- jrst/pom.xml | 2 +- pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docutils/pom.xml b/docutils/pom.xml index f04b713..c5e4ada 100644 --- a/docutils/pom.xml +++ b/docutils/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> </parent> <groupId>org.nuiton.jrst</groupId> diff --git a/doxia-module-jrst-legacy/pom.xml b/doxia-module-jrst-legacy/pom.xml index 1e8d8a3..469333b 100644 --- a/doxia-module-jrst-legacy/pom.xml +++ b/doxia-module-jrst-legacy/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> </parent> <groupId>org.nuiton.jrst</groupId> diff --git a/doxia-module-jrst/pom.xml b/doxia-module-jrst/pom.xml index 3f4ac38..f4c19f7 100644 --- a/doxia-module-jrst/pom.xml +++ b/doxia-module-jrst/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> </parent> <groupId>org.nuiton.jrst</groupId> diff --git a/jrst-doc/pom.xml b/jrst-doc/pom.xml index f53060f..a9141c4 100644 --- a/jrst-doc/pom.xml +++ b/jrst-doc/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> </parent> <groupId>org.nuiton.jrst</groupId> diff --git a/jrst-site-util/pom.xml b/jrst-site-util/pom.xml index 0a82c15..0031421 100644 --- a/jrst-site-util/pom.xml +++ b/jrst-site-util/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> </parent> <groupId>org.nuiton.jrst</groupId> diff --git a/jrst/pom.xml b/jrst/pom.xml index d2075ce..8627da2 100644 --- a/jrst/pom.xml +++ b/jrst/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> </parent> <groupId>org.nuiton.jrst</groupId> diff --git a/pom.xml b/pom.xml index 1ced6e5..21297db 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ </parent> <artifactId>jrst</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> <packaging>pom</packaging> <name>JRst</name> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jrst. See https://gitlab.nuiton.org/nuiton/jrst.git commit 4070092216a1eb7cfc58d7e64338d54a3425a7f1 Merge: 6ca4b5d db04a7d Author: Éric <chatellier@codelutin.com> Date: Thu May 17 15:59:47 2018 +0200 [jgitflow-maven-plugin]merging 'release/2.3' into 'master' .gitlab-ci.yml | 19 + README.md | 5 +- docutils/pom.xml | 2 +- .../main/resources/docutils/docutils/__init__.py | 67 +- .../src/main/resources/docutils/docutils/core.py | 8 +- .../main/resources/docutils/docutils/frontend.py | 50 +- .../src/main/resources/docutils/docutils/io.py | 23 +- .../resources/docutils/docutils/languages/fa.py | 61 + .../resources/docutils/docutils/languages/lt.py | 67 +- .../resources/docutils/docutils/languages/lv.py | 60 + .../resources/docutils/docutils/languages/sv.py | 15 +- .../src/main/resources/docutils/docutils/nodes.py | 4 +- .../docutils/docutils/parsers/rst/__init__.py | 33 +- .../docutils/parsers/rst/directives/__init__.py | 20 +- .../docutils/parsers/rst/directives/misc.py | 22 +- .../docutils/parsers/rst/directives/tables.py | 64 +- .../docutils/docutils/parsers/rst/languages/de.py | 28 +- .../docutils/docutils/parsers/rst/languages/fa.py | 102 ++ .../docutils/docutils/parsers/rst/languages/lv.py | 108 ++ .../docutils/docutils/parsers/rst/languages/sv.py | 107 +- .../docutils/docutils/parsers/rst/roles.py | 7 +- .../docutils/docutils/parsers/rst/states.py | 299 ++--- .../docutils/docutils/parsers/rst/tableparser.py | 4 +- .../docutils/docutils/transforms/frontmatter.py | 6 +- .../resources/docutils/docutils/transforms/peps.py | 8 +- .../docutils/docutils/transforms/references.py | 16 +- .../docutils/docutils/transforms/universal.py | 43 +- .../docutils/docutils/transforms/writer_aux.py | 2 +- .../resources/docutils/docutils/utils/__init__.py | 72 +- .../docutils/docutils/utils/code_analyzer.py | 4 +- .../docutils/docutils/utils/error_reporting.py | 28 +- .../docutils/docutils/utils/math/__init__.py | 7 +- .../docutils/docutils/utils/math/latex2mathml.py | 17 +- .../docutils/docutils/utils/math/math2html.py | 406 ++++--- .../docutils/utils/math/tex2mathml_extern.py | 147 +++ .../docutils/docutils/utils/punctuation_chars.py | 331 +----- .../docutils/docutils/utils/smartquotes.py | 520 +++++---- .../docutils/docutils/utils/urischemes.py | 4 +- .../docutils/docutils/writers/__init__.py | 13 +- .../{html4css1/__init__.py => _html_base.py} | 1056 ++++++++--------- .../docutils/docutils/writers/docutils_xml.py | 22 +- .../docutils/writers/html4css1/__init__.py | 1201 +++----------------- .../docutils/writers/html4css1/html4css1.css | 28 +- .../docutils/writers/html5_polyglot/__init__.py | 214 ++++ .../writers/{html4css1 => html5_polyglot}/math.css | 0 .../docutils/writers/html5_polyglot/minimal.css | 260 +++++ .../docutils/writers/html5_polyglot/plain.css | 288 +++++ .../docutils/writers/html5_polyglot/template.txt | 8 + .../docutils/docutils/writers/latex2e/__init__.py | 793 +++++++------ .../docutils/docutils/writers/latex2e/default.tex | 1 - .../docutils/docutils/writers/latex2e/xelatex.tex | 7 +- .../resources/docutils/docutils/writers/manpage.py | 14 +- .../docutils/docutils/writers/odf_odt/__init__.py | 339 ++++-- .../docutils/docutils/writers/pep_html/pep.css | 2 +- .../docutils/docutils/writers/xetex/__init__.py | 30 +- doxia-module-jrst-legacy/pom.xml | 10 +- .../src/main/java/org/nuiton/jrst/JrstParser.java | 4 +- .../test/java/org/nuiton/jrst/JrstParserTest.java | 7 +- doxia-module-jrst/pom.xml | 10 +- .../src/main/java/org/nuiton/jrst/JrstParser.java | 4 +- .../test/java/org/nuiton/jrst/JrstParserTest.java | 7 +- jrst-doc/pom.xml | 2 +- jrst-site-util/pom.xml | 5 +- .../java/org/nuiton/jrst/AbstractJrstParser.java | 7 +- jrst/pom.xml | 9 +- jrst/src/main/assembly/jrst.sh | 2 +- jrst/src/main/java/org/nuiton/jrst/JRST.java | 2 +- jrst/src/main/java/org/nuiton/jrst/JRSTConfig.java | 2 +- .../java/org/nuiton/jrst/JRSTConfigAction.java | 2 +- .../java/org/nuiton/jrst/JRSTConfigOption.java | 2 +- .../java/org/nuiton/jrst/JRSTEntityResolver.java | 45 + .../main/java/org/nuiton/jrst/JRSTInterface.java | 2 +- .../org/nuiton/jrst/JRSTToXmlStrategyDocutils.java | 50 +- .../java/org/nuiton/jrst/legacy/JRSTLexer.java | 2 +- jrst/src/main/resources/dtd/docutils.dtd | 642 +++++++++++ jrst/src/main/resources/dtd/soextblx.dtd | 333 ++++++ jrst/src/main/resources/xsl/rst2xhtml.xsl | 2 +- .../java/org/nuiton/jrst/bugs/DirectiveTest.java | 2 +- .../test/java/org/nuiton/jrst/bugs/HtmlTest.java | 2 +- .../test/java/org/nuiton/jrst/bugs/TableTest.java | 2 +- .../test/java/org/nuiton/jrst/bugs/TextTest.java | 2 +- .../test/java/org/nuiton/jrst/bugs/TitlesTest.java | 2 +- maven-jrst-plugin/pom.xml | 2 +- pom.xml | 76 +- 84 files changed, 5149 insertions(+), 3152 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jrst. See https://gitlab.nuiton.org/nuiton/jrst.git commit c51749f4822eeedb9239be7b4e6c80cdaf3bbf49 Author: Éric <chatellier@codelutin.com> Date: Thu May 17 15:59:49 2018 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- docutils/pom.xml | 2 +- doxia-module-jrst-legacy/pom.xml | 2 +- doxia-module-jrst/pom.xml | 2 +- jrst-doc/pom.xml | 2 +- jrst-site-util/pom.xml | 2 +- jrst/pom.xml | 2 +- pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docutils/pom.xml b/docutils/pom.xml index 161ffbe..c5e4ada 100644 --- a/docutils/pom.xml +++ b/docutils/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.3</version> </parent> <groupId>org.nuiton.jrst</groupId> diff --git a/doxia-module-jrst-legacy/pom.xml b/doxia-module-jrst-legacy/pom.xml index 4029359..469333b 100644 --- a/doxia-module-jrst-legacy/pom.xml +++ b/doxia-module-jrst-legacy/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.3</version> </parent> <groupId>org.nuiton.jrst</groupId> diff --git a/doxia-module-jrst/pom.xml b/doxia-module-jrst/pom.xml index cfae6f6..f4c19f7 100644 --- a/doxia-module-jrst/pom.xml +++ b/doxia-module-jrst/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.3</version> </parent> <groupId>org.nuiton.jrst</groupId> diff --git a/jrst-doc/pom.xml b/jrst-doc/pom.xml index 5872a73..a9141c4 100644 --- a/jrst-doc/pom.xml +++ b/jrst-doc/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.3</version> </parent> <groupId>org.nuiton.jrst</groupId> diff --git a/jrst-site-util/pom.xml b/jrst-site-util/pom.xml index 42e62c7..0031421 100644 --- a/jrst-site-util/pom.xml +++ b/jrst-site-util/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.3</version> </parent> <groupId>org.nuiton.jrst</groupId> diff --git a/jrst/pom.xml b/jrst/pom.xml index 56bb45d..8627da2 100644 --- a/jrst/pom.xml +++ b/jrst/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.3</version> </parent> <groupId>org.nuiton.jrst</groupId> diff --git a/pom.xml b/pom.xml index b38e780..21297db 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ </parent> <artifactId>jrst</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.3</version> <packaging>pom</packaging> <name>JRst</name> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jrst. See https://gitlab.nuiton.org/nuiton/jrst.git commit 92c24589f158a9bb0d81886b02d32b3f85a0e961 Merge: c51749f 4070092 Author: Éric <chatellier@codelutin.com> Date: Thu May 17 15:59:49 2018 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jrst. See https://gitlab.nuiton.org/nuiton/jrst.git commit bab2985848a4986d7cbf6f10cb3db29c253898d5 Author: Éric <chatellier@codelutin.com> Date: Thu May 17 15:59:49 2018 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- docutils/pom.xml | 2 +- doxia-module-jrst-legacy/pom.xml | 2 +- doxia-module-jrst/pom.xml | 2 +- jrst-doc/pom.xml | 2 +- jrst-site-util/pom.xml | 2 +- jrst/pom.xml | 2 +- pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docutils/pom.xml b/docutils/pom.xml index c5e4ada..161ffbe 100644 --- a/docutils/pom.xml +++ b/docutils/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.3</version> + <version>2.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> diff --git a/doxia-module-jrst-legacy/pom.xml b/doxia-module-jrst-legacy/pom.xml index 469333b..4029359 100644 --- a/doxia-module-jrst-legacy/pom.xml +++ b/doxia-module-jrst-legacy/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.3</version> + <version>2.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> diff --git a/doxia-module-jrst/pom.xml b/doxia-module-jrst/pom.xml index f4c19f7..cfae6f6 100644 --- a/doxia-module-jrst/pom.xml +++ b/doxia-module-jrst/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.3</version> + <version>2.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> diff --git a/jrst-doc/pom.xml b/jrst-doc/pom.xml index a9141c4..5872a73 100644 --- a/jrst-doc/pom.xml +++ b/jrst-doc/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.3</version> + <version>2.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> diff --git a/jrst-site-util/pom.xml b/jrst-site-util/pom.xml index 0031421..42e62c7 100644 --- a/jrst-site-util/pom.xml +++ b/jrst-site-util/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.3</version> + <version>2.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> diff --git a/jrst/pom.xml b/jrst/pom.xml index 8627da2..56bb45d 100644 --- a/jrst/pom.xml +++ b/jrst/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.3</version> + <version>2.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> diff --git a/pom.xml b/pom.xml index 21297db..b38e780 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ </parent> <artifactId>jrst</artifactId> - <version>2.3</version> + <version>2.4-SNAPSHOT</version> <packaging>pom</packaging> <name>JRst</name> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm