Skip to content

Commit 0914777

Browse files
committed
Merge branch 'hotfix/4.3.1'
* hotfix/4.3.1: Implement review feedback Fix outdated info on default output directory Add details on issues resolved in 4.3.1 Add details on updated dependency versions Prepare 4.3.1 Release Notes stub Bump Docker image version to ”4.3.1“ Bump 'maintenance-version' key to “4.3.1” Bump prettier from 3.4.2 to 3.5.3 (#601) Bump stylelint from 16.14.1 to 16.15.0 (#599) Update GitHub Actions for 4.3 (#596) Add 4.3 release date
2 parents 924ad8f + 5a1c0cf commit 0914777

File tree

8 files changed

+132
-54
lines changed

8 files changed

+132
-54
lines changed

.github/actions/render/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ inputs:
66
default: 'master'
77
DITA_OT_VERSION:
88
description: 'DITA-OT version used for rendering'
9-
default: '4.2.4'
9+
default: '4.3'
1010
runs:
1111
using: 'composite'
1212
steps:

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
env:
1919
WEBSITE_PLUGIN_BRANCH: 'master'
20-
DITA_OT_VERSION: '4.2.4'
20+
DITA_OT_VERSION: '4.3'
2121
steps:
2222
- name: Parse arguments
2323
run: |

package-lock.json

+42-41
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
"@prettier/plugin-xml": "3.4.1",
4949
"husky": "^9.1.7",
5050
"lint-staged": "15.4.3",
51-
"prettier": "3.4.2",
52-
"stylelint": "^16.14.1",
51+
"prettier": "3.5.3",
52+
"stylelint": "^16.15.0",
5353
"stylelint-config-recommended": "^15.0.0",
5454
"stylelint-config-sass-guidelines": "^12.1.0"
5555
}

parameters/ant-parameters-details.dita

+2-2
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,8 @@
304304
<pd conaction="pushafter">
305305
<p>This parameter corresponds to the command-line option
306306
<xref keyref="dita-command-arguments/output">--output</xref>.</p>
307-
<p>By default, the output is written to
308-
<filepath><varname>DITA-dir</varname>/out</filepath>.</p></pd>
307+
<p>By default, the output is written to the <filepath>out</filepath> subdirectory of the current
308+
directory.</p></pd>
309309
</plentry>
310310
<plentry id="result.rewrite-rule.class">
311311
<pt>

release-notes/index.dita

+79-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
</titlealts>
99

1010
<abstract>
11-
<shortdesc>DITA Open Toolkit <keyword keyref="release"/> includes <ph conref="#v4.3/summary"/>.</shortdesc>
11+
<shortdesc>DITA Open Toolkit <keyword keyref="maintenance-version"/> is a maintenance release that fixes issues
12+
reported in DITA-OT <keyword keyref="release"/>, which includes <ph conref="#v4.3/summary"/>.</shortdesc>
1213
<p conkeyref="conref-task/semver-info"/>
1314
<note type="tip"><ph conkeyref="conref-task/download-ot"/></note>
1415
</abstract>
@@ -25,9 +26,85 @@
2526
</refbody>
2627
</reference>
2728

29+
<reference id="v4.3.1" outputclass="mark">
30+
<title>DITA-OT <keyword keyref="maintenance-version"/>
31+
<!--<ph outputclass="small text-muted">released mmmm D, yyyy</ph>-->
32+
</title>
33+
<refbody>
34+
<section>
35+
<p>DITA Open Toolkit <keyword keyref="maintenance-version"/> is a maintenance release that includes the
36+
following bug fixes.</p>
37+
<ul>
38+
<!-- https://github.com/dita-ot/dita-ot/issues?q=milestone%3A4.3.1%20sort%3Acreated-asc -->
39+
<li id="4564">DITA-OT 4.2 and later versions produced broken links in the navigation ToC when the
40+
<xmlatt>copy-to</xmlatt> attribute was defined on topic references, or the
41+
<parmname>force-unique</parmname> option was used. Generated temporary file names were used instead of
42+
the <xmlatt>copy-to</xmlatt> attribute value. The <xmlatt>copy-to</xmlatt> attribute value is now respected
43+
to ensure the correct links are written to the ToC.
44+
<xref href="https://github.com/dita-ot/dita-ot/issues/4564" format="html" scope="external">#4564</xref>,
45+
<xref href="https://github.com/dita-ot/dita-ot/issues/4569" format="html" scope="external">#4569</xref>
46+
</li>
47+
<li id="4589">DITA-OT 4.3 included a regression bug that generated output in the <filepath>out</filepath>
48+
subdirectory of the DITA-OT installation directory if the output location was not explicitly specified. In
49+
this case, output is now generated in the <filepath>out</filepath> subdirectory of the current directory as
50+
in DITA-OT 4.2.4 and earlier versions.
51+
<xref href="https://github.com/dita-ot/dita-ot/issues/4589" format="html" scope="external">#4589</xref>,
52+
<xref href="https://github.com/dita-ot/dita-ot/issues/4594" format="html" scope="external">#4594</xref>
53+
</li>
54+
<li id="4590">The new <cmdname>validate</cmdname> subcommand introduced in DITA-OT 4.3 can now also be run by
55+
setting the <parmname>-f</parmname> or <parmname>--format</parmname> options to <codeph>validate</codeph>.
56+
The <cmdname>dita</cmdname> command line interface has also been updated to prevent conflicts between the
57+
<cmdname>validate</cmdname> subcommand and the existing <parmname>validate</parmname> parameter.
58+
<xref href="https://github.com/dita-ot/dita-ot/issues/4590" format="html" scope="external">#4590</xref>,
59+
<xref href="https://github.com/dita-ot/dita-ot/issues/4592" format="html" scope="external">#4592</xref>,
60+
<xref href="https://github.com/dita-ot/dita-ot/issues/4602" format="html" scope="external">#4602</xref>,
61+
<xref href="https://github.com/dita-ot/dita-ot/issues/4603" format="html" scope="external">#4603</xref>
62+
</li>
63+
<li id="4593">DITA-OT Docker images can now be built for both 64-bit Linux AMD and ARM architectures. No
64+
changes are required to benefit from this enhancement. Docker should automatically select the image that
65+
corresponds to the current machine architecture.
66+
<xref href="https://github.com/dita-ot/dita-ot/issues/4593" format="html" scope="external">#4593</xref>
67+
</li>
68+
<li id="4596">Earlier versions of DITA-OT generated invalid nested paragraphs in HTML output when the
69+
<xmlelement>lines</xmlelement> element was used in a paragraph. Processing has been updated to ensure that
70+
lines content is treated as a block element and rendered in separate paragraphs.
71+
<xref href="https://github.com/dita-ot/dita-ot/issues/4596" format="html" scope="external">#4596</xref>,
72+
<xref href="https://github.com/dita-ot/dita-ot/issues/4599" format="html" scope="external">#4599</xref>
73+
</li>
74+
<li id="4606">Earlier versions of DITA-OT miscalculated the base directory when publications included
75+
resource-only topics that were outside of the root map directory. Resource-only topics are now ignored in
76+
this process to ensure that relative paths between resources are generated correctly.
77+
<xref href="https://github.com/dita-ot/dita-ot/issues/4606" format="html" scope="external">#4606</xref>
78+
</li>
79+
<li>Several dependencies have been upgraded to include the latest utility versions and fix security issues:
80+
<ul>
81+
<li id="4595">Ant 1.10.15
82+
<xref href="https://github.com/dita-ot/dita-ot/issues/4595" format="html" scope="external">#4595</xref>
83+
</li>
84+
<li id="4588">Logback 1.5.17
85+
<xref href="https://github.com/dita-ot/dita-ot/issues/4588" format="html" scope="external">#4588</xref>
86+
</li>
87+
<li>Saxon 12.5
88+
<xref href="https://github.com/dita-ot/dita-ot/issues/4595" format="html" scope="external">#4595</xref>
89+
</li>
90+
</ul>
91+
</li>
92+
</ul>
93+
<p>For additional information on the issues resolved since the previous release, see the
94+
<xref
95+
href="https://github.com/dita-ot/dita-ot/issues?q=milestone%3A4.3.1+is%3Aclosed"
96+
format="html"
97+
scope="external"
98+
>4.3.1 milestone</xref> and
99+
<xref href="https://github.com/dita-ot/dita-ot/compare/4.3...4.3.1" format="html" scope="external">
100+
changelog</xref> on GitHub.</p>
101+
</section>
102+
</refbody>
103+
</reference>
104+
28105
<reference id="v4.3">
29106
<title>DITA-OT <keyword keyref="release"/>
30-
<ph outputclass="small text-muted"> work in progress… <!--released mmmm D, yyyy--></ph>
107+
<ph outputclass="small text-muted"> released February 15, 2025</ph>
31108
</title>
32109
<prolog>
33110
<metadata>

resources/key-definitions.ditamap

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<keydef keys="maintenance-version">
2727
<topicmeta>
2828
<keywords>
29-
<keyword>4.3</keyword>
29+
<keyword>4.3.1</keyword>
3030
</keywords>
3131
</topicmeta>
3232
</keydef>
@@ -61,7 +61,7 @@
6161
<keydef keys="tool.ant.version">
6262
<topicmeta>
6363
<keywords>
64-
<keyword>1.10.14</keyword>
64+
<keyword>1.10.15</keyword>
6565
</keywords>
6666
</topicmeta>
6767
</keydef>
@@ -117,7 +117,7 @@
117117
<keydef keys="tool.logback.version">
118118
<topicmeta>
119119
<keywords>
120-
<keyword>1.4.14</keyword>
120+
<keyword>1.5.17</keyword>
121121
</keywords>
122122
</topicmeta>
123123
</keydef>
@@ -206,7 +206,7 @@
206206
<keydef keys="tool.saxon.version">
207207
<topicmeta>
208208
<keywords>
209-
<keyword>12.4</keyword>
209+
<keyword>12.5</keyword>
210210
</keywords>
211211
</topicmeta>
212212
</keydef>

samples/docker/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Use the latest DITA-OT image ↓ as parent:
2-
FROM ghcr.io/dita-ot/dita-ot:4.3
2+
FROM ghcr.io/dita-ot/dita-ot:4.3.1
33

44
# Install a custom plug-in from a remote location:
55
RUN dita --install https://github.com/infotexture/dita-bootstrap/archive/master.zip

0 commit comments

Comments
 (0)