[PATCH] kdoctools/meinproc: Use XML catalog files instead of SGML catalog files

[Ingo Klöcker]

Hi,

the attached patch fixes meinproc's inability to handle 
source/build/install paths with spaces correctly (cf. the recent 
thread "meinproc/docbook can't handle paths with spaces ?" [1], [2]). 
This is fixed by using XML catalog files instead of SGML catalog files 
because XML catalog files can be specified via URLs while SGML catalog 
files can only be specified as paths without the possibility to 
properly escape spaces.

Attached are two patch files. kdoctools-use-xml-catalog-files.diff 
contains the changes of CMakeLists.txt, meinproc.cpp, and xslt.cpp. The 
other patch file replaces all "catalog" files under 
kdoctools/customization by "catalog.xml" files and adds 
docbook/xml-dtd-4.1.2/catalog.xml.

Detailed description of the changes:
CMakeLists.txt
- Install the "catalog.xml" files instead of the (removed) "catalog" 
files.

meinproc.cpp
- Make xmllint use the XML catalog files instead of the SGML catalog 
files. This fixes syntax checking for paths containing spaces.

xslt.cpp
- Set XML_CATALOG_FILES and call xmlInitializeCatalog() which uses the 
XML catalog files specified by XML_CATALOG_FILES. xmlLoadCatalogs() 
cannot be used because it expects a space- and/or colon-separated list 
of file path.


I have built kdelibs, kdepimlibs, kdebase, and kdepim with this patch 
(and my other patches) and, as far as I can tell, all docbook-related 
tasks now work correctly even if the source/build/install paths contain 
spaces. OTOH, this fix is not crucial for the release and therefore it 
might be wise to postpone it till after KDE 4.0.0 (just in case I've 
missed something).


Regards,
Ingo


[1] http://lists.kde.org/?t=119792241400002
[2] http://lists.kde.org/?t=119810454600018
-------------- next part --------------
A non-text attachment was scrubbed...
Name: kdoctools-use-xml-catalog-files_added-removed-catalogs.diff.bz2
Type: application/x-bzip2
Size: 7383 bytes
Desc: not available
URL: <http://mail.kde.org/pipermail/kde-core-devel/attachments/20071231/603225c4/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: kdoctools-use-xml-catalog-files.diff
Type: text/x-diff
Size: 4111 bytes
Desc: not available
URL: <http://mail.kde.org/pipermail/kde-core-devel/attachments/20071231/603225c4/attachment.diff>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 194 bytes
Desc: This is a digitally signed message part.
URL: <http://mail.kde.org/pipermail/kde-core-devel/attachments/20071231/603225c4/attachment.sig>