From a4565925a7e82153ba1e0816797351271178fcdc Mon Sep 17 00:00:00 2001 From: Jarno Elovirta Date: Mon, 12 Feb 2024 13:12:36 +0200 Subject: [PATCH 01/11] Fix preprocess2 initialization with memory store Signed-off-by: Jarno Elovirta --- src/main/plugins/org.dita.base/build_preprocess2_template.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/plugins/org.dita.base/build_preprocess2_template.xml b/src/main/plugins/org.dita.base/build_preprocess2_template.xml index 403044ee5e..10179d94bc 100644 --- a/src/main/plugins/org.dita.base/build_preprocess2_template.xml +++ b/src/main/plugins/org.dita.base/build_preprocess2_template.xml @@ -96,7 +96,9 @@ See the accompanying LICENSE file for applicable license. ${log-prefix}input = ${args.input} * resources = ${args.resources} ***************************************************************** - + + + From 6cb72e47f57b1c8a7f3f30c0e525ea503c7c2c10 Mon Sep 17 00:00:00 2001 From: Jarno Elovirta Date: Mon, 12 Feb 2024 15:10:09 +0200 Subject: [PATCH 02/11] Run release workflow for hotfix branches Signed-off-by: Jarno Elovirta --- .github/workflows/release-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release-test.yml b/.github/workflows/release-test.yml index ee199c1c02..cf854df20e 100644 --- a/.github/workflows/release-test.yml +++ b/.github/workflows/release-test.yml @@ -3,6 +3,7 @@ on: push: branches: - "release/**" + - "hotfix/**" jobs: distribution: if: ${{ github.repository == 'dita-ot/dita-ot' }} From c99875a845311641a6042d68b98add3b547a59e8 Mon Sep 17 00:00:00 2001 From: Jarno Elovirta Date: Mon, 12 Feb 2024 15:14:45 +0200 Subject: [PATCH 03/11] Open receiver explicitly to fix NPE Signed-off-by: Jarno Elovirta --- src/main/java/org/dita/dost/store/CacheStore.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/org/dita/dost/store/CacheStore.java b/src/main/java/org/dita/dost/store/CacheStore.java index 161a79cc8c..8ac9f069ec 100644 --- a/src/main/java/org/dita/dost/store/CacheStore.java +++ b/src/main/java/org/dita/dost/store/CacheStore.java @@ -301,6 +301,11 @@ public ContentHandler getContentHandler(final URI outputFile) throws SaxonApiExc final Destination dst = getDestination(outputFile); final Receiver receiver = dst.getReceiver(pipelineConfiguration, new SerializationProperties()); + try { + receiver.open(); + } catch (XPathException e) { + throw new SaxonApiException("Failed to open receiver for %s".formatted(outputFile), e); + } final ReceivingContentHandler receivingContentHandler = new ReceivingContentHandler(); receivingContentHandler.setPipelineConfiguration(pipelineConfiguration); From b5163d61d5a8960ee834de57ea486cdafd4f1bfe Mon Sep 17 00:00:00 2001 From: Jarno Elovirta Date: Mon, 12 Feb 2024 15:23:16 +0200 Subject: [PATCH 04/11] Update version number to 4.2.1 Signed-off-by: Jarno Elovirta --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0b81e8350e..c08908fe88 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ apply plugin: 'signing' group = 'org.dita-ot' archivesBaseName = 'dost' /** Semver version number */ -version = '4.2.0' +version = '4.2.1' description = """DITA Open Toolkit""" From fa186a29280327b6291a1649308afc34dc660d3e Mon Sep 17 00:00:00 2001 From: Jarno Elovirta Date: Mon, 12 Feb 2024 15:40:04 +0200 Subject: [PATCH 05/11] Add missing env.tag variable declaration in release GA workflow job Signed-off-by: Jarno Elovirta --- .github/workflows/release.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 68c1732d8a..38bc654d10 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -112,6 +112,9 @@ jobs: needs: dist runs-on: ubuntu-latest steps: + - name: Set tag name + run: | + echo "tag=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV - name: Repository Dispatch uses: peter-evans/repository-dispatch@v2 with: From 1e2878fc8bc3137d1857176743e823d859d08817 Mon Sep 17 00:00:00 2001 From: Jarno Elovirta Date: Fri, 16 Feb 2024 09:43:41 +0200 Subject: [PATCH 06/11] Fix missing log level prefix when not using colours Signed-off-by: Jarno Elovirta --- .../org/dita/dost/log/AbstractLogger.java | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/dita/dost/log/AbstractLogger.java b/src/main/java/org/dita/dost/log/AbstractLogger.java index fa4c2f50a9..80903e27e1 100644 --- a/src/main/java/org/dita/dost/log/AbstractLogger.java +++ b/src/main/java/org/dita/dost/log/AbstractLogger.java @@ -233,18 +233,24 @@ protected void log(final String msg, final Object[] args, final Throwable t, fin } StringBuilder buf = null; if (!legacyFormat) { - if (useColor && level == Project.MSG_ERR) { - buf = - new StringBuilder() - .append(ANSI_RED) - .append(Main.locale.getString("error_msg").formatted("")) - .append(ANSI_RESET); - } else if (useColor && level == Project.MSG_WARN) { - buf = - new StringBuilder() - .append(ANSI_YELLOW) - .append(Main.locale.getString("warn_msg").formatted("")) - .append(ANSI_RESET); + if (level == Project.MSG_ERR) { + buf = new StringBuilder(); + if (useColor) { + buf.append(ANSI_RED); + } + buf.append(Main.locale.getString("error_msg").formatted("")); + if (useColor) { + buf.append(ANSI_RESET); + } + } else if (level == Project.MSG_WARN) { + buf = new StringBuilder(); + if (useColor) { + buf.append(ANSI_YELLOW); + } + buf.append(Main.locale.getString("warn_msg").formatted("")); + if (useColor) { + buf.append(ANSI_RESET); + } } } if (args.length > 0) { From 7619cd574b63d05a2d4fc343d4fe16138fd05cf8 Mon Sep 17 00:00:00 2001 From: Jarno Elovirta Date: Fri, 23 Feb 2024 12:00:07 +0200 Subject: [PATCH 07/11] Only remove logging level when content matches supported level names Signed-off-by: Jarno Elovirta --- src/main/java/org/dita/dost/log/AbstractLogger.java | 11 ++++++++--- .../java/org/dita/dost/log/AbstractLoggerTest.java | 5 ++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/dita/dost/log/AbstractLogger.java b/src/main/java/org/dita/dost/log/AbstractLogger.java index 80903e27e1..60024f12ad 100644 --- a/src/main/java/org/dita/dost/log/AbstractLogger.java +++ b/src/main/java/org/dita/dost/log/AbstractLogger.java @@ -285,7 +285,10 @@ protected static String removeLevelPrefix(String msg) { if (end == -1) { return msg; } - return msg.substring(0, start) + msg.substring(end); + return switch (msg.substring(start + 2, end)) { + case "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "FATAL" -> msg.substring(0, start) + msg.substring(end); + default -> msg; + }; } protected static StringBuilder removeLevelPrefix(StringBuilder msg) { @@ -297,8 +300,10 @@ protected static StringBuilder removeLevelPrefix(StringBuilder msg) { if (end == -1) { return msg; } - msg.replace(start, end, ""); - return msg; + return switch (msg.substring(start + 2, end)) { + case "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "FATAL" -> msg.replace(start, end, ""); + default -> msg; + }; } private static final Pattern ARGUMENT = Pattern.compile("\\{}|%s"); diff --git a/src/test/java/org/dita/dost/log/AbstractLoggerTest.java b/src/test/java/org/dita/dost/log/AbstractLoggerTest.java index 7a34e9b45d..73534158ad 100644 --- a/src/test/java/org/dita/dost/log/AbstractLoggerTest.java +++ b/src/test/java/org/dita/dost/log/AbstractLoggerTest.java @@ -25,7 +25,10 @@ static List removeLevelPrefix() { return List.of( Arguments.of("[DOTJ037W][INFO] Message", "[DOTJ037W] Message"), Arguments.of("[DOTJ037W][INFO]: Message", "[DOTJ037W]: Message"), - Arguments.of("[DOTJ037W] Message", "[DOTJ037W] Message") + Arguments.of("[DOTJ037W] Message", "[DOTJ037W] Message"), + Arguments.of("[DOTJ037W][Warning]: Message", "[DOTJ037W][Warning]: Message"), + Arguments.of("[WARN][DOTJ037W]: Message", "[WARN][DOTJ037W]: Message"), + Arguments.of("[WARN] Message", "[WARN] Message") ); } From 2a38380d4ad8376e9b42eb851e9dfbce67909783 Mon Sep 17 00:00:00 2001 From: Jarno Elovirta Date: Sat, 24 Feb 2024 10:29:25 +0200 Subject: [PATCH 08/11] Improve HTML5 integration test to include keyword test Signed-off-by: Jarno Elovirta --- .../resources/html5/exp/html5/concept.html | 18 ++++++-- src/test/resources/html5/exp/html5/index.html | 15 ++++--- .../resources/html5/exp/html5/reference.html | 24 +++++++++-- src/test/resources/html5/exp/html5/task.html | 34 +++++++++++++-- src/test/resources/html5/exp/html5/topic.html | 18 +++++++- src/test/resources/html5/src/concept.dita | 20 +++++++++ src/test/resources/html5/src/map.ditamap | 42 +++++++++++++++++-- src/test/resources/html5/src/reference.dita | 23 ++++++++++ src/test/resources/html5/src/task.dita | 27 ++++++++++++ src/test/resources/html5/src/topic.dita | 20 +++++++++ 10 files changed, 219 insertions(+), 22 deletions(-) diff --git a/src/test/resources/html5/exp/html5/concept.html b/src/test/resources/html5/exp/html5/concept.html index 36dc5dbb34..074dca3d5d 100644 --- a/src/test/resources/html5/exp/html5/concept.html +++ b/src/test/resources/html5/exp/html5/concept.html @@ -5,17 +5,29 @@ + Concept - +
-
+

Concept

Body.

+ +
+

Nested Concept

+
+

Body.

+
+
- \ No newline at end of file + diff --git a/src/test/resources/html5/exp/html5/index.html b/src/test/resources/html5/exp/html5/index.html index bd6d21124a..156dc2a87c 100644 --- a/src/test/resources/html5/exp/html5/index.html +++ b/src/test/resources/html5/exp/html5/index.html @@ -5,18 +5,21 @@ + Map - +

Map

- \ No newline at end of file + diff --git a/src/test/resources/html5/exp/html5/reference.html b/src/test/resources/html5/exp/html5/reference.html index 2613d7d6c4..e1ba4ac69e 100644 --- a/src/test/resources/html5/exp/html5/reference.html +++ b/src/test/resources/html5/exp/html5/reference.html @@ -5,19 +5,35 @@ + Reference - +
-
+

Reference

-

Section title

+
+

Section title

Body.

+ +
+

Nested Reference

+
+
+

Section title

+

Body.

+
+
+
- \ No newline at end of file + diff --git a/src/test/resources/html5/exp/html5/task.html b/src/test/resources/html5/exp/html5/task.html index 687b10d7d1..cb9752360b 100644 --- a/src/test/resources/html5/exp/html5/task.html +++ b/src/test/resources/html5/exp/html5/task.html @@ -4,9 +4,10 @@ - + + Task - +
@@ -30,7 +31,34 @@

Procedure

+ + +
+

Nested Task

+
+
+
+

About this task

+
+

Context.

+
+
+
+

Procedure

+
+
+
+ Command. +
+
+
+
+
- \ No newline at end of file + diff --git a/src/test/resources/html5/exp/html5/topic.html b/src/test/resources/html5/exp/html5/topic.html index f43bc38546..57c87d93f1 100644 --- a/src/test/resources/html5/exp/html5/topic.html +++ b/src/test/resources/html5/exp/html5/topic.html @@ -5,16 +5,30 @@ + Topic - +
-
diff --git a/src/test/resources/html5/src/concept.dita b/src/test/resources/html5/src/concept.dita index ac1c06e276..7512606254 100644 --- a/src/test/resources/html5/src/concept.dita +++ b/src/test/resources/html5/src/concept.dita @@ -2,7 +2,27 @@ Concept + + + + concept + + +

Body.

 + + Nested Concept + + + + nested concept + + + + +

Body.

+ + diff --git a/src/test/resources/html5/src/map.ditamap b/src/test/resources/html5/src/map.ditamap index 0fbefc4dcb..69586dad7f 100644 --- a/src/test/resources/html5/src/map.ditamap +++ b/src/test/resources/html5/src/map.ditamap @@ -2,8 +2,42 @@ Map - - - - + + + + metadata + + + + topicmeta + + + + + + topicref topic + + + + + + topicref concept + + + + + + + topicref task + + + + + + + topicref reference + + + + diff --git a/src/test/resources/html5/src/reference.dita b/src/test/resources/html5/src/reference.dita index afd81e1411..f67fe81e04 100644 --- a/src/test/resources/html5/src/reference.dita +++ b/src/test/resources/html5/src/reference.dita @@ -2,10 +2,33 @@ Reference + + + + reference + + +
Section title

Body.

 + + Nested Reference + + + + nested reference + + + + +
+ Section title +

Body.

+
+ + diff --git a/src/test/resources/html5/src/task.dita b/src/test/resources/html5/src/task.dita index 3062860184..d971dfa9de 100644 --- a/src/test/resources/html5/src/task.dita +++ b/src/test/resources/html5/src/task.dita @@ -2,6 +2,13 @@ Task + + + + task + + +

Context.

@@ -12,4 +19,24 @@ + + Nested Task + + + + nested task + + + + + +

Context.

+ + + + Command. + + + + diff --git a/src/test/resources/html5/src/topic.dita b/src/test/resources/html5/src/topic.dita index af9bce9115..851635a761 100755 --- a/src/test/resources/html5/src/topic.dita +++ b/src/test/resources/html5/src/topic.dita @@ -2,7 +2,27 @@ Topic + + + + topic + + +

Body.

+ + Nested Topic + + + + nested topic + + + + +

Body.

+ + From 563a35d3703f91af0bedf1666d7c44f2732fa920 Mon Sep 17 00:00:00 2001 From: Jarno Elovirta Date: Fri, 23 Feb 2024 16:39:07 +0200 Subject: [PATCH 09/11] Refactor keyword generation Signed-off-by: Jarno Elovirta --- .../plugins/org.dita.html5/xsl/get-meta.xsl | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/src/main/plugins/org.dita.html5/xsl/get-meta.xsl b/src/main/plugins/org.dita.html5/xsl/get-meta.xsl index 9fe933deaa..22000da34a 100644 --- a/src/main/plugins/org.dita.html5/xsl/get-meta.xsl +++ b/src/main/plugins/org.dita.html5/xsl/get-meta.xsl @@ -13,6 +13,7 @@ See the accompanying LICENSE file for applicable license. + @@ -244,24 +245,26 @@ See the accompanying LICENSE file for applicable license. - - - - - - - - , - - - - - + + + + + + - - + + + + + From df90544d07c850020be0881e268427f4c2a54229 Mon Sep 17 00:00:00 2001 From: Jarno Elovirta Date: Sat, 24 Feb 2024 10:08:32 +0200 Subject: [PATCH 10/11] Only collect keywords from top level topicmeta Signed-off-by: Jarno Elovirta Co-authored-by: chrispy Signed-off-by: Jarno Elovirta --- src/main/plugins/org.dita.html5/xsl/get-meta.xsl | 2 +- src/test/resources/html5/exp/html5/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/plugins/org.dita.html5/xsl/get-meta.xsl b/src/main/plugins/org.dita.html5/xsl/get-meta.xsl index 22000da34a..6bf3dff907 100644 --- a/src/main/plugins/org.dita.html5/xsl/get-meta.xsl +++ b/src/main/plugins/org.dita.html5/xsl/get-meta.xsl @@ -258,7 +258,7 @@ See the accompanying LICENSE file for applicable license. + select="*[contains(@class,' map/topicmeta ')]"/> - + Map From ca6551dade2f8f7cb27e04a210658acf6c8fe84b Mon Sep 17 00:00:00 2001 From: Jarno Elovirta Date: Fri, 1 Mar 2024 10:05:45 +0200 Subject: [PATCH 11/11] Update docs submodule Signed-off-by: Jarno Elovirta --- src/main/docsrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/docsrc b/src/main/docsrc index bf7ea79b99..3773b6ae75 160000 --- a/src/main/docsrc +++ b/src/main/docsrc @@ -1 +1 @@ -Subproject commit bf7ea79b99bd7ce6a68678611de2b164b149eb55 +Subproject commit 3773b6ae75ace15fb3a56ad4de185b47bd55cd29