Revision 758414

Go back to digest for 13th January 2008

Bug Fixes in KDE Base

Ingo Klöcker committed changes in /trunk/KDE/kdelibs/kdoctools:

Fix meinproc's inability to handle source/build/install paths with spaces correctly. 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.

Detailed description of the changes:
- Replace all "catalog" files under kdoctools/customization by "catalog.xml" files.
- Add docbook/xml-dtd-4.1.2/catalog.xml (XML version of docbook.cat).

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.

Should eventually be ported to branches/KDE/4.0.

File Changes

Added 43 files
  • /trunk/KDE/kdelibs/kdoctools
  •   /customization/catalog.xml
  •   /customization/af/catalog.xml
  •   /customization/bg/catalog.xml
  •   /customization/ca/catalog.xml
  •   /customization/cs/catalog.xml
  •   /customization/da/catalog.xml
  •   /customization/de/catalog.xml
  •   /customization/el/catalog.xml
  •   /customization/en-GB/catalog.xml
  •   /customization/en/catalog.xml
  •   /customization/eo/catalog.xml
  •   /customization/es/catalog.xml
  •   /customization/et/catalog.xml
  •   /customization/fi/catalog.xml
  •   /customization/fo/catalog.xml
  •   /customization/fr/catalog.xml
  •   /customization/he/catalog.xml
  •   /customization/hu/catalog.xml
  •   /customization/id/catalog.xml
  •   /customization/it/catalog.xml
  •   /customization/ja/catalog.xml
  •   /customization/ko/catalog.xml
  •   /customization/lt/catalog.xml
  •   /customization/nl/catalog.xml
  •   /customization/nn/catalog.xml
  •   /customization/no/catalog.xml
  •   /customization/pl/catalog.xml
  •   /customization/pt-BR/catalog.xml
  •   /customization/pt/catalog.xml
  •   /customization/ro/catalog.xml
  •   /customization/ru/catalog.xml
  •   /customization/sk/catalog.xml
  •   /customization/sl/catalog.xml
  •   /customization/sr/catalog.xml
  •   /customization/sv/catalog.xml
  •   /customization/tr/catalog.xml
  •   /customization/uk/catalog.xml
  •   /customization/wa/catalog.xml
  •   /customization/xh/catalog.xml
  •   /customization/xx/catalog.xml
  •   /customization/zh-CN/catalog.xml
  •   /customization/zh-TW/catalog.xml
  •   /docbook/xml-dtd-4.1.2/catalog.xml
Deleted 42 files
  • /trunk/KDE/kdelibs/kdoctools/customization
  •   /catalog
  •   /af/catalog
  •   /bg/catalog
  •   /ca/catalog
  •   /cs/catalog
  •   /da/catalog
  •   /de/catalog
  •   /el/catalog
  •   /en-GB/catalog
  •   /en/catalog
  •   /eo/catalog
  •   /es/catalog
  •   /et/catalog
  •   /fi/catalog
  •   /fo/catalog
  •   /fr/catalog
  •   /he/catalog
  •   /hu/catalog
  •   /id/catalog
  •   /it/catalog
  •   /ja/catalog
  •   /ko/catalog
  •   /lt/catalog
  •   /nl/catalog
  •   /nn/catalog
  •   /no/catalog
  •   /pl/catalog
  •   /pt-BR/catalog
  •   /pt/catalog
  •   /ro/catalog
  •   /ru/catalog
  •   /sk/catalog
  •   /sl/catalog
  •   /sr/catalog
  •   /sv/catalog
  •   /tr/catalog
  •   /uk/catalog
  •   /wa/catalog
  •   /xh/catalog
  •   /xx/catalog
  •   /zh-CN/catalog
  •   /zh-TW/catalog
Modified 3 files
  • /trunk/KDE/kdelibs/kdoctools
  •   /CMakeLists.txt
  •   /meinproc.cpp
  •   /xslt.cpp
88 files changed in total