Git commit 60f900ce562a4fb1148c7495e750c1a679012315 by Luigi Toscano. Committed on 04/03/2014 at 21:57. Pushed by ltoscano into branch 'master'.
Bump supported DocBookXML version to 4.5 - rename the DTD file (the old one will be kept for for compatibility in kde4support); - adapt the existing documentation and all the other references to the new DTD file and the new DTD DOCTYPE. REVIEW: 116068 M +1 -1 CMakeLists.txt M +2 -2 cmake/FindDocBookXML4.cmake M +1 -1 docs/checkXML5/man-checkXML5.1.docbook M +1 -1 docs/kf5options/man-kf5options.7.docbook M +1 -1 docs/meinproc5/man-meinproc5.8.docbook M +1 -1 docs/qt5options/man-qt5options.7.docbook M +1 -1 src/CMakeLists.txt M +3 -3 src/customization/catalog.xml R +4 -4 src/customization/dtd/kdedbx45.dtd.cmake [from: src/customization/dtd/kdex.dtd.cmake - 095% similarity] M +1 -1 src/man-template.docbook M +1 -1 src/template.docbook M +1 -1 src/xslt.cpp http://commits.kde.org/kdoctools/60f900ce562a4fb1148c7495e750c1a679012315 diff --git a/CMakeLists.txt b/CMakeLists.txt index e5ca7e4..700a126 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,7 +42,7 @@ set_package_properties(LibXml2 PROPERTIES ) -find_package(DocBookXML4 "4.2") +find_package(DocBookXML4 "4.5") set_package_properties(DocBookXML4 PROPERTIES TYPE REQUIRED diff --git a/cmake/FindDocBookXML4.cmake b/cmake/FindDocBookXML4.cmake index dcc0cf6..415745f 100644 --- a/cmake/FindDocBookXML4.cmake +++ b/cmake/FindDocBookXML4.cmake @@ -1,5 +1,5 @@ # Try to find DocBook XML 4.x DTD. -# By default it will find version 4.2. A different version can be specified +# By default it will find version 4.5. A different version can be specified # as parameter for find_package(). # Once done, it will define: # @@ -16,7 +16,7 @@ if (NOT DocBookXML_FIND_VERSION) - set(DocBookXML_FIND_VERSION "4.2") + set(DocBookXML_FIND_VERSION "4.5") endif () set (DocBookXML4_DTD_VERSION ${DocBookXML_FIND_VERSION} diff --git a/docs/checkXML5/man-checkXML5.1.docbook b/docs/checkXML5/man-checkXML5.1.docbook index 68509b9..15854b5 100644 --- a/docs/checkXML5/man-checkXML5.1.docbook +++ b/docs/checkXML5/man-checkXML5.1.docbook @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY % English "INCLUDE"> ]> diff --git a/docs/kf5options/man-kf5options.7.docbook b/docs/kf5options/man-kf5options.7.docbook index cb7973d..f1c4783 100644 --- a/docs/kf5options/man-kf5options.7.docbook +++ b/docs/kf5options/man-kf5options.7.docbook @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY % English "INCLUDE"> ]> diff --git a/docs/meinproc5/man-meinproc5.8.docbook b/docs/meinproc5/man-meinproc5.8.docbook index 77799b4..7b4c535 100644 --- a/docs/meinproc5/man-meinproc5.8.docbook +++ b/docs/meinproc5/man-meinproc5.8.docbook @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY % English "INCLUDE"><!-- change language only here --> ]> diff --git a/docs/qt5options/man-qt5options.7.docbook b/docs/qt5options/man-qt5options.7.docbook index 7afbf07..25e2994 100644 --- a/docs/qt5options/man-qt5options.7.docbook +++ b/docs/qt5options/man-qt5options.7.docbook @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY % English "INCLUDE"> ]> diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5ba35d0..8a9d3aa 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,6 @@ include_directories( ${LIBXML2_INCLUDE_DIR} ${LIBXSLT_INCLUDE_DIR} ) -set (_custom_dtd_kdex "customization/dtd/kdex.dtd") +set (_custom_dtd_kdex "customization/dtd/kdedbx45.dtd") configure_file(${_custom_dtd_kdex}.cmake ${CMAKE_CURRENT_BINARY_DIR}/${_custom_dtd_kdex} ) # WARNING: this is due to severe limitations on the windows platform to keep the dtd relocateable # see the .xsl.cmake files for a more verbose explanation below diff --git a/src/customization/catalog.xml b/src/customization/catalog.xml index 229ae70..31e01eb 100644 --- a/src/customization/catalog.xml +++ b/src/customization/catalog.xml @@ -31,10 +31,10 @@ SGMLDECL "xml.dcl" <!-- DocBook --> - <!-- DocBook 4.2 KDE Variant V1.1 --> + <!-- DocBook 4.5 KDE Variant V1.1 --> - <public publicId="-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" - uri="dtd/kdex.dtd"/> + <public publicId="-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" + uri="dtd/kdedbx45.dtd"/> <public publicId="-//KDE//ELEMENTS DocBook XML Hierarchy Redeclarations 2 V1.0//EN" uri="dtd/rdbhier2.elements"/> <public publicId="-//KDE//ELEMENTS DocBook XML Pool Redeclarations V1.1//EN" diff --git a/src/customization/dtd/kdex.dtd.cmake b/src/customization/dtd/kdedbx45.dtd.cmake similarity index 95% rename from src/customization/dtd/kdex.dtd.cmake rename to src/customization/dtd/kdedbx45.dtd.cmake index c2f7b2c..0712e24 100644 --- a/src/customization/dtd/kdex.dtd.cmake +++ b/src/customization/dtd/kdedbx45.dtd.cmake @@ -25,12 +25,12 @@ Refer to this DTD as - "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" + "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" For instance: - <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" - "customization/dtd/kdex.dtd"> + <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" + "customization/dtd/kdedbx45.dtd"> and use catalog.xml or docbook.cat as the catalog file. Note: the system identifier is interpreted relative to the place @@ -96,7 +96,7 @@ <!-- ============================================================= --> <!ENTITY % DocBookDTD PUBLIC - "-//OASIS//DTD DocBook XML V4.2//EN" + "-//OASIS//DTD DocBook XML V4.5//EN" "@DocBookXML4_DTD_DIR@/docbookx.dtd" > %DocBookDTD; diff --git a/src/man-template.docbook b/src/man-template.docbook index bdc88c7..6c2e995 100644 --- a/src/man-template.docbook +++ b/src/man-template.docbook @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY % English "INCLUDE"> ]> diff --git a/src/template.docbook b/src/template.docbook index 08762e5..3b5dc8a 100644 --- a/src/template.docbook +++ b/src/template.docbook @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!-- Define an entity for your application if it is not part of KDE Git --> <!ENTITY kmyapplication "<application>KMyApp</application>"> diff --git a/src/xslt.cpp b/src/xslt.cpp index 280f51b..6d5819e 100644 --- a/src/xslt.cpp +++ b/src/xslt.cpp @@ -145,7 +145,7 @@ QString transform(const QString &pat, const QString &tss, defaultEntityLoader = xmlGetExternalEntityLoader(); xmlSetExternalEntityLoader(xsltprocExternalEntityLoader); - replaceURLList[QLatin1String("http://www.oasis-open.org/docbook/xml/4.2")] = QString("file:///%1").arg(DOCBOOK_XML_CURRDTD); + replaceURLList[QLatin1String("http://www.oasis-open.org/docbook/xml/4.5")] = QString("file:///%1").arg(DOCBOOK_XML_CURRDTD); } #endif