Changeset 105569 in vbox

Timestamp:

Aug 1, 2024 5:13:33 PM (4 months ago)

Author:

vboxsync

Message:

doc/manual/Config.kmk: Switching to even older DITA DTD (version 1.1) seems to avoid triggering the new entity amplification limitations of libxslt2 2.12 and later within def_vbox_xref_to_text xsltproc invocations (without having to add $(VBOX_XSLTPROC_WORKAROUND)). bugref:10348 bugref:10705

File:

• trunk/doc/manual/Config.kmk (modified) (2 diffs)

trunk/doc/manual/Config.kmk

@@ -117 +117 @@
   VBOX_PATH_DOCBOOK       ?= $(KBUILD_DEVTOOLS)/common/DocBook/v1.69.1
   VBOX_PATH_DOCBOOK_DTD   ?= $(KBUILD_DEVTOOLS)/common/docbook-xml/v4.5
-  VBOX_PATH_DITA_DTD      ?= $(VBOX_DITA_OT_PATH)/plugins/org.oasis-open.dita.v1_2/dtd
+  VBOX_PATH_DITA_DTD      ?= $(VBOX_DITA_OT_PATH)/plugins/org.dita.specialization.dita11/dtd/
  else
   # use docbook of the build host
   VBOX_PATH_DOCBOOK       ?= /usr/share/xml/docbook/stylesheet/docbook-xsl
   VBOX_PATH_DOCBOOK_DTD   ?= /usr/share/xml/docbook/schema/dtd/4.5
-  VBOX_PATH_DITA_DTD      ?= $(VBOX_DITA_OT_PATH)/plugins/org.oasis-open.dita.v1_2/dtd
+  VBOX_PATH_DITA_DTD      ?= $(VBOX_DITA_OT_PATH)/plugins/org.dita.specialization.dita11/dtd/
  endif
  VBOX_XML_CATALOG         ?= $(VBOX_PATH_MANUAL_OUTBASE)/vbox-doc.cat
@@ -316 +316 @@
                 '<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">' \
                 '<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">' \
-                '  <public publicId="-//OASIS//DTD DITA BookMap//EN"        uri="file://$(VBOX_FILE_URL_MAYBE_SLASH)$(VBOX_PATH_DITA_DTD)/bookmap/dtd/bookmap.dtd"/>' \
-                '  <public publicId="-//OASIS//DTD DITA Topic//EN"          uri="file://$(VBOX_FILE_URL_MAYBE_SLASH)$(VBOX_PATH_DITA_DTD)/technicalContent/dtd/topic.dtd"/>' \
-                '  <system systemId="$(VBOX_PATH_MANUAL_SRC)/en_US/dita/bookmap.dtd"    uri="file://$(VBOX_FILE_URL_MAYBE_SLASH)$(VBOX_PATH_DITA_DTD)/bookmap/dtd/bookmap.dtd"/>' \
-                '  <system systemId="$(VBOX_PATH_MANUAL_SRC)/en_US/dita/topics/topic.dtd"      uri="file://$(VBOX_FILE_URL_MAYBE_SLASH)$(VBOX_PATH_DITA_DTD)/technicalContent/dtd/topic.dtd"/>' \
+                '  <public publicId="-//OASIS//DTD DITA BookMap//EN"        uri="file://$(VBOX_FILE_URL_MAYBE_SLASH)$(VBOX_PATH_DITA_DTD)/bookmap.dtd"/>' \
+                '  <public publicId="-//OASIS//DTD DITA Topic//EN"          uri="file://$(VBOX_FILE_URL_MAYBE_SLASH)$(VBOX_PATH_DITA_DTD)/topic.dtd"/>' \
+                '  <system systemId="$(VBOX_PATH_MANUAL_SRC)/en_US/dita/bookmap.dtd"        uri="file://$(VBOX_FILE_URL_MAYBE_SLASH)$(VBOX_PATH_DITA_DTD)/bookmap.dtd"/>' \
+                '  <system systemId="$(VBOX_PATH_MANUAL_SRC)/en_US/dita/topics/topic.dtd"   uri="file://$(VBOX_FILE_URL_MAYBE_SLASH)$(VBOX_PATH_DITA_DTD)/topic.dtd"/>' \
                 '</catalog>'